diff options
1365 files changed, 14527 insertions, 12920 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt index 5705705f..9a2066a1 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,7 +9,11 @@ # ################################################# -cmake_minimum_required( VERSION 3.5 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# diff --git a/CMakeLists.txt b/CMakeLists.txt index fb6daabd..ca0b5652 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,12 @@ # ################################################# -cmake_minimum_required( VERSION 3.5 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) ##### general package setup ##################### @@ -35,11 +40,6 @@ enable_testing( ) include( TDEMacros ) -##### set version number ######################## - -tde_set_project_version( ) - - ##### setup install paths ####################### include( TDESetupPaths ) @@ -48,14 +48,8 @@ tde_setup_paths( ) ##### add apidox targets ############ -if( "${CMAKE_VERSION}" VERSION_LESS "3.1" ) - set( CMAKE_ENV "env" ) -else() - set( CMAKE_ENV "${CMAKE_COMMAND};-E;env" ) -endif() - add_custom_target( apidox - COMMAND ${CMAKE_ENV} + COMMAND ${CMAKE_COMMAND} -E env "TQTDOCDIR=/usr/share/tqt3/doc/html" "DOXDATA=${HTML_INSTALL_DIR}/en/common" ${CMAKE_SOURCE_DIR}/admin/doxygen.sh diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 67500f42..21423943 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -35,7 +35,6 @@ if( BUILD_INDEXLIB OR BUILD_KMAIL ) # check for stl coping with namespace std tde_save( CMAKE_CXX_FLAGS ) - string( REGEX REPLACE "-include tqt.h" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" ) check_cxx_source_compiles(" #include <iterator> struct s : public std::iterator<std::forward_iterator_tag, int> {}; @@ -149,7 +148,6 @@ if( (BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBO tde_save( CMAKE_CXX_FLAGS ) tde_save( CMAKE_REQUIRED_INCLUDES ) tde_save( CMAKE_REQUIRED_LIBRARIES ) - string( REGEX REPLACE "-include tqt.h" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LARGEFILES_DEFINITIONS}") set( CMAKE_REQUIRED_INCLUDES "${GPGME_INCLUDE_DIRS}") set( CMAKE_REQUIRED_LIBRARIES "${GPGME_LIBRARIES}") diff --git a/admin b/admin -Subproject 3bdc9fd55ff86f033cc1ffab9178d8453fa1ab2 +Subproject 4185112a621d8c5bc88984b117f434c9560e2cc diff --git a/akregator/HACKING b/akregator/HACKING index cf8b640b..3dc85fbd 100644 --- a/akregator/HACKING +++ b/akregator/HACKING @@ -87,17 +87,17 @@ class should be roughly as follows: public typedefs: public ctors: public methods: -public Q_SLOTS: -Q_SIGNALS: +public slots: +signals: protected methods: -protected Q_SLOTS: +protected slots: protected fields: private methods: -private Q_SLOTS: +private slots: private fields: private ctors: // if you define ctors/dtor as private, put them at end -If there are no private Q_SLOTS there is no need for two private sections, however +If there are no private slots there is no need for two private sections, however private functions and private variables should be clearly separated. The implementations files -- .cpp files -- should follow (when possible) the @@ -163,10 +163,10 @@ class Test : public TQObject static Test *instance() { return m_instance; } - public Q_SLOTS: + public slots: void receive(QSomething &); - Q_SIGNALS: + signals: void send(QSomething &); protected: @@ -174,7 +174,7 @@ class Test : public TQObject static void someProtectedStaticFunc(); - protected Q_SLOTS: + protected slots: void protectedSlot(); protected: @@ -185,7 +185,7 @@ class Test : public TQObject static int staticPrivateMethod(); - private Q_SLOTS: + private slots: void privateSlotIndeed(int youWonder); private: diff --git a/akregator/src/aboutdata.h b/akregator/src/aboutdata.h index 9b57d201..50f04c45 100644 --- a/akregator/src/aboutdata.h +++ b/akregator/src/aboutdata.h @@ -26,7 +26,7 @@ #define ABOUTDATA_H #include <tdeaboutdata.h> -#include <kdemacros.h> +#include <tdemacros.h> #define AKREGATOR_VERSION "1.2.9" @@ -34,7 +34,7 @@ namespace Akregator { /** @author Teemu Rytilahti */ -class KDE_EXPORT AboutData : public TDEAboutData +class TDE_EXPORT AboutData : public TDEAboutData { public: AboutData(); diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp index 7fa61cdc..6c7b3cee 100644 --- a/akregator/src/actionmanagerimpl.cpp +++ b/akregator/src/actionmanagerimpl.cpp @@ -161,16 +161,16 @@ void ActionManagerImpl::setTagSet(TagSet* tagSet) if (d->tagSet != 0) { - disconnect(d->tagSet, TQT_SIGNAL(signalTagAdded(const Tag&)), this, TQT_SLOT(slotTagAdded(const Tag&))); - disconnect(d->tagSet, TQT_SIGNAL(signalTagRemoved(const Tag&)), this, TQT_SLOT(slotTagRemoved(const Tag&))); + disconnect(d->tagSet, TQ_SIGNAL(signalTagAdded(const Tag&)), this, TQ_SLOT(slotTagAdded(const Tag&))); + disconnect(d->tagSet, TQ_SIGNAL(signalTagRemoved(const Tag&)), this, TQ_SLOT(slotTagRemoved(const Tag&))); } d->tagSet = tagSet; if (tagSet != 0) { - connect(d->tagSet, TQT_SIGNAL(signalTagAdded(const Tag&)), this, TQT_SLOT(slotTagAdded(const Tag&))); - connect(d->tagSet, TQT_SIGNAL(signalTagRemoved(const Tag&)), this, TQT_SLOT(slotTagRemoved(const Tag&))); + connect(d->tagSet, TQ_SIGNAL(signalTagAdded(const Tag&)), this, TQ_SLOT(slotTagAdded(const Tag&))); + connect(d->tagSet, TQ_SIGNAL(signalTagRemoved(const Tag&)), this, TQ_SLOT(slotTagRemoved(const Tag&))); } TQValueList<TagAction*> actions = d->tagActions.values(); @@ -200,7 +200,7 @@ void ActionManagerImpl::slotTagAdded(const Tag& tag) if (!d->tagActions.contains(tag.id())) { - d->tagActions[tag.id()] = new TagAction(tag, TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu); + d->tagActions[tag.id()] = new TagAction(tag, d->view, TQ_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu); d->tagMenu->insert(d->tagActions[tag.id()]); } } @@ -263,15 +263,15 @@ void ActionManagerImpl::initTrayIcon(TrayIcon* trayIcon) void ActionManagerImpl::initPart() { - new TDEAction(i18n("&Import Feeds..."), "", "", d->part, TQT_SLOT(fileImport()), d->actionCollection, "file_import"); - new TDEAction(i18n("&Export Feeds..."), "", "", d->part, TQT_SLOT(fileExport()), d->actionCollection, "file_export"); - //new TDEAction(i18n("&Get Feeds From Web..."), "", "", d->part, TQT_SLOT(fileGetFeeds()), d->actionCollection, "file_getfromweb"); + new TDEAction(i18n("&Import Feeds..."), "", "", d->part, TQ_SLOT(fileImport()), d->actionCollection, "file_import"); + new TDEAction(i18n("&Export Feeds..."), "", "", d->part, TQ_SLOT(fileExport()), d->actionCollection, "file_export"); + //new TDEAction(i18n("&Get Feeds From Web..."), "", "", d->part, TQ_SLOT(fileGetFeeds()), d->actionCollection, "file_getfromweb"); - new TDEAction(i18n("Send &Link Address..."), "mail_generic", "", d->part, TQT_SLOT(fileSendLink()), d->actionCollection, "file_sendlink"); - new TDEAction(i18n("Send &File..."), "mail_generic", "", d->part, TQT_SLOT(fileSendFile()), d->actionCollection, "file_sendfile"); + new TDEAction(i18n("Send &Link Address..."), "mail_generic", "", d->part, TQ_SLOT(fileSendLink()), d->actionCollection, "file_sendlink"); + new TDEAction(i18n("Send &File..."), "mail_generic", "", d->part, TQ_SLOT(fileSendFile()), d->actionCollection, "file_sendfile"); - KStdAction::configureNotifications(d->part, TQT_SLOT(showKNotifyOptions()), d->actionCollection); // options_configure_notifications - new TDEAction( i18n("Configure &Akregator..."), "configure", "", d->part, TQT_SLOT(showOptions()), d->actionCollection, "akregator_configure_akregator" ); + KStdAction::configureNotifications(d->part, TQ_SLOT(showKNotifyOptions()), d->actionCollection); // options_configure_notifications + new TDEAction( i18n("Configure &Akregator..."), "configure", "", d->part, TQ_SLOT(showOptions()), d->actionCollection, "akregator_configure_akregator" ); } void ActionManagerImpl::initView(View* view) @@ -282,51 +282,51 @@ void ActionManagerImpl::initView(View* view) d->view = view; // tag actions - new TDEAction(i18n("&New Tag..."), "", "", TQT_TQOBJECT(d->view), TQT_SLOT(slotNewTag()), actionCollection(), "tag_new"); + new TDEAction(i18n("&New Tag..."), "", "", d->view, TQ_SLOT(slotNewTag()), actionCollection(), "tag_new"); // Feed/Feed Group popup menu - new TDEAction(i18n("&Open Homepage"), "", "Ctrl+H", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage"); - new TDEAction(i18n("&Add Feed..."), "bookmark_add", "Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAdd()), actionCollection(), "feed_add"); - new TDEAction(i18n("Ne&w Folder..."), "folder-new", "Shift+Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group"); - new TDEAction(i18n("&Delete Feed"), "edit-delete", "Alt+Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove"); - new TDEAction(i18n("&Edit Feed..."), "edit", "F2", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedModify()), actionCollection(), "feed_modify"); + new TDEAction(i18n("&Open Homepage"), "", "Ctrl+H", d->view, TQ_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage"); + new TDEAction(i18n("&Add Feed..."), "bookmark_add", "Insert", d->view, TQ_SLOT(slotFeedAdd()), actionCollection(), "feed_add"); + new TDEAction(i18n("Ne&w Folder..."), "folder-new", "Shift+Insert", d->view, TQ_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group"); + new TDEAction(i18n("&Delete Feed"), "edit-delete", "Alt+Delete", d->view, TQ_SLOT(slotFeedRemove()), actionCollection(), "feed_remove"); + new TDEAction(i18n("&Edit Feed..."), "edit", "F2", d->view, TQ_SLOT(slotFeedModify()), actionCollection(), "feed_modify"); TDEActionMenu* vm = new TDEActionMenu( i18n( "&View Mode" ), actionCollection(), "view_mode" ); - TDERadioAction *ra = new TDERadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", TQT_TQOBJECT(d->view), TQT_SLOT(slotNormalView()), actionCollection(), "normal_view"); + TDERadioAction *ra = new TDERadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", d->view, TQ_SLOT(slotNormalView()), actionCollection(), "normal_view"); ra->setExclusiveGroup( "ViewMode" ); vm->insert(ra); - ra = new TDERadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", TQT_TQOBJECT(d->view), TQT_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view"); + ra = new TDERadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", d->view, TQ_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view"); ra->setExclusiveGroup( "ViewMode" ); vm->insert(ra); - ra = new TDERadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", TQT_TQOBJECT(d->view), TQT_SLOT(slotCombinedView()), actionCollection(), "combined_view"); + ra = new TDERadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", d->view, TQ_SLOT(slotCombinedView()), actionCollection(), "combined_view"); ra->setExclusiveGroup( "ViewMode" ); vm->insert(ra); // toolbar / feed menu - new TDEAction(i18n("&Fetch Feed"), "go-down", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch"); - new TDEAction(i18n("Fe&tch All Feeds"), "go-bottom", "Ctrl+L", TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all"); + new TDEAction(i18n("&Fetch Feed"), "go-down", TDEStdAccel::shortcut(TDEStdAccel::Reload), d->view, TQ_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch"); + new TDEAction(i18n("Fe&tch All Feeds"), "go-bottom", "Ctrl+L", d->view, TQ_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all"); - TDEAction* stopAction = new TDEAction(i18n( "&Abort Fetches" ), "process-stop", Key_Escape, Kernel::self()->fetchQueue(), TQT_SLOT(slotAbort()), actionCollection(), "feed_stop"); + TDEAction* stopAction = new TDEAction(i18n( "&Abort Fetches" ), "process-stop", Key_Escape, Kernel::self()->fetchQueue(), TQ_SLOT(slotAbort()), actionCollection(), "feed_stop"); stopAction->setEnabled(false); - new TDEAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", TQT_TQOBJECT(d->view), TQT_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read"); - new TDEAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", TQT_TQOBJECT(d->view), TQT_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read"); + new TDEAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", d->view, TQ_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read"); + new TDEAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", d->view, TQ_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read"); // Settings menu - TDEToggleAction* sqf = new TDEToggleAction(i18n("Show Quick Filter"), TQString(), 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter"); + TDEToggleAction* sqf = new TDEToggleAction(i18n("Show Quick Filter"), TQString(), 0, d->view, TQ_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter"); sqf->setChecked( Settings::showQuickFilter() ); - new TDEAction( i18n("Open in Tab"), "tab_new", "Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" ); - new TDEAction( i18n("Open in Background Tab"), TQString(), "tab_new", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" ); - new TDEAction( i18n("Open in External Browser"), "window-new", "Ctrl+Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" ); - new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->view), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" ); + new TDEAction( i18n("Open in Tab"), "tab_new", "Shift+Return", d->view, TQ_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" ); + new TDEAction( i18n("Open in Background Tab"), TQString(), "tab_new", d->view, TQ_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" ); + new TDEAction( i18n("Open in External Browser"), "window-new", "Ctrl+Shift+Return", d->view, TQ_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" ); + new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), d->view, TQ_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" ); - new TDEAction(i18n("Pre&vious Unread Article"), "", Key_Minus, TQT_TQOBJECT(d->view), TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article"); - new TDEAction(i18n("Ne&xt Unread Article"), "", Key_Plus, TQT_TQOBJECT(d->view), TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article"); + new TDEAction(i18n("Pre&vious Unread Article"), "", Key_Minus, d->view, TQ_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article"); + new TDEAction(i18n("Ne&xt Unread Article"), "", Key_Plus, d->view, TQ_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article"); - new TDEAction(i18n("&Delete"), "edit-delete", "Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete"); + new TDEAction(i18n("&Delete"), "edit-delete", "Delete", d->view, TQ_SLOT(slotArticleDelete()), actionCollection(), "article_delete"); if (Settings::showTaggingGUI()) { @@ -336,39 +336,39 @@ void ActionManagerImpl::initView(View* view) TDEActionMenu* statusMenu = new TDEActionMenu ( i18n( "&Mark As" ), actionCollection(), "article_set_status" ); - d->speakSelectedArticlesAction = new TDEAction(i18n("&Speak Selected Articles"), "kttsd", "", TQT_TQOBJECT(d->view), TQT_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech"); + d->speakSelectedArticlesAction = new TDEAction(i18n("&Speak Selected Articles"), "kttsd", "", d->view, TQ_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech"); - TDEAction* abortTTS = new TDEAction(i18n( "&Stop Speaking" ), "media-playback-stop", Key_Escape, SpeechClient::self(), TQT_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech"); + TDEAction* abortTTS = new TDEAction(i18n( "&Stop Speaking" ), "media-playback-stop", Key_Escape, SpeechClient::self(), TQ_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech"); abortTTS->setEnabled(false); - connect(SpeechClient::self(), TQT_SIGNAL(signalActivated(bool)), - abortTTS, TQT_SLOT(setEnabled(bool))); + connect(SpeechClient::self(), TQ_SIGNAL(signalActivated(bool)), + abortTTS, TQ_SLOT(setEnabled(bool))); statusMenu->insert(new TDEAction(KGuiItem(i18n("as in: mark as read","&Read"), "", i18n("Mark selected article as read")), - "Ctrl+E", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleRead()), + "Ctrl+E", d->view, TQ_SLOT(slotSetSelectedArticleRead()), actionCollection(), "article_set_status_read")); statusMenu->insert(new TDEAction(KGuiItem(i18n("&New"), "", i18n("Mark selected article as new")), - "Ctrl+N", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleNew()), + "Ctrl+N", d->view, TQ_SLOT(slotSetSelectedArticleNew()), actionCollection(), "article_set_status_new" )); statusMenu->insert(new TDEAction(KGuiItem(i18n("&Unread"), "", i18n("Mark selected article as unread")), - "Ctrl+U", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleUnread()), + "Ctrl+U", d->view, TQ_SLOT(slotSetSelectedArticleUnread()), actionCollection(), "article_set_status_unread")); TDEToggleAction* importantAction = new TDEToggleAction(i18n("&Mark as Important"), "flag", "Ctrl+I", actionCollection(), "article_set_status_important"); importantAction->setCheckedState(i18n("Remove &Important Mark")); - connect(importantAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleToggleKeepFlag(bool))); + connect(importantAction, TQ_SIGNAL(toggled(bool)), d->view, TQ_SLOT(slotArticleToggleKeepFlag(bool))); - new TDEAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" ); - new TDEAction( i18n("Move Node Down"), TQString(), "Shift+Alt+Down", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" ); - new TDEAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" ); - new TDEAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right"); + new TDEAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", view, TQ_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" ); + new TDEAction( i18n("Move Node Down"), TQString(), "Shift+Alt+Down", view, TQ_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" ); + new TDEAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", view, TQ_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" ); + new TDEAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", view, TQ_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right"); } void ActionManagerImpl::initArticleViewer(ArticleViewer* articleViewer) @@ -386,8 +386,8 @@ void ActionManagerImpl::initArticleListView(ArticleListView* articleList) else d->articleList = articleList; - new TDEAction( i18n("&Previous Article"), TQString(), "Left", TQT_TQOBJECT(articleList), TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" ); - new TDEAction( i18n("&Next Article"), TQString(), "Right", TQT_TQOBJECT(articleList), TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" ); + new TDEAction( i18n("&Previous Article"), TQString(), "Left", articleList, TQ_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" ); + new TDEAction( i18n("&Next Article"), TQString(), "Right", articleList, TQ_SLOT(slotNextArticle()), actionCollection(), "go_next_article" ); } void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget) @@ -397,17 +397,17 @@ void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget) else d->listTabWidget = listTabWidget; - new TDEAction(i18n("&Previous Feed"), "", "P", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed"); - new TDEAction(i18n("&Next Feed"), "", "N", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextFeed()),actionCollection(), "go_next_feed"); - new TDEAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed"); - new TDEAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed"); - - new TDEAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" ); - new TDEAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" ); - new TDEAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" ); - new TDEAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" ); - new TDEAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" ); - new TDEAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" ); + new TDEAction(i18n("&Previous Feed"), "", "P", listTabWidget, TQ_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed"); + new TDEAction(i18n("&Next Feed"), "", "N", listTabWidget, TQ_SLOT(slotNextFeed()),actionCollection(), "go_next_feed"); + new TDEAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", listTabWidget, TQ_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed"); + new TDEAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", listTabWidget, TQ_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed"); + + new TDEAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", listTabWidget, TQ_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" ); + new TDEAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", listTabWidget, TQ_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" ); + new TDEAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", listTabWidget, TQ_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" ); + new TDEAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", listTabWidget, TQ_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" ); + new TDEAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", listTabWidget, TQ_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" ); + new TDEAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", listTabWidget, TQ_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" ); } void ActionManagerImpl::initTabWidget(TabWidget* tabWidget) @@ -417,11 +417,11 @@ void ActionManagerImpl::initTabWidget(TabWidget* tabWidget) else d->tabWidget = tabWidget; - new TDEAction(i18n("Select Next Tab"), "", "Ctrl+Period", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab"); - new TDEAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab"); - new TDEAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" ); - new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" ); - new TDEAction( i18n("&Close Tab"), "tab_remove", TDEStdAccel::close(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" ); + new TDEAction(i18n("Select Next Tab"), "", "Ctrl+Period", d->tabWidget, TQ_SLOT(slotNextTab()),actionCollection(), "select_next_tab"); + new TDEAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", d->tabWidget, TQ_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab"); + new TDEAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, d->tabWidget, TQ_SLOT(slotDetachTab()), actionCollection(), "tab_detach" ); + new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), d->tabWidget, TQ_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" ); + new TDEAction( i18n("&Close Tab"), "tab_remove", TDEStdAccel::close(), d->tabWidget, TQ_SLOT(slotCloseTab()), actionCollection(), "tab_remove" ); } TQWidget* ActionManagerImpl::container(const char* name) diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp index 24dc8b49..1e09dc71 100644 --- a/akregator/src/addfeeddialog.cpp +++ b/akregator/src/addfeeddialog.cpp @@ -42,7 +42,7 @@ namespace Akregator { AddFeedWidget::AddFeedWidget(TQWidget *parent, const char *name) : AddFeedWidgetBase(parent, name) { - pixmapLabel1->setPixmap(kapp->iconLoader()->loadIcon( "applications-internet",TDEIcon::Desktop,TDEIcon::SizeHuge, TDEIcon::DefaultState, 0, true)); + pixmapLabel1->setPixmap(tdeApp->iconLoader()->loadIcon( "applications-internet",TDEIcon::Desktop,TDEIcon::SizeHuge, TDEIcon::DefaultState, 0, true)); statusLabel->setText(TQString()); } @@ -53,7 +53,7 @@ AddFeedDialog::AddFeedDialog(TQWidget *parent, const char *name) : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, parent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel) { widget = new AddFeedWidget(this); - connect(widget->urlEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged(const TQString&))); + connect(widget->urlEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(textChanged(const TQString&))); enableButtonOK(false); setMainWidget(widget); } @@ -85,12 +85,12 @@ void AddFeedDialog::slotOk( ) widget->statusLabel->setText( i18n("Downloading %1").arg(feedURL) ); - connect( feed, TQT_SIGNAL(fetched(Feed* )), - this, TQT_SLOT(fetchCompleted(Feed *)) ); - connect( feed, TQT_SIGNAL(fetchError(Feed* )), - this, TQT_SLOT(fetchError(Feed *)) ); - connect( feed, TQT_SIGNAL(fetchDiscovery(Feed* )), - this, TQT_SLOT(fetchDiscovery(Feed *)) ); + connect( feed, TQ_SIGNAL(fetched(Feed* )), + this, TQ_SLOT(fetchCompleted(Feed *)) ); + connect( feed, TQ_SIGNAL(fetchError(Feed* )), + this, TQ_SLOT(fetchError(Feed *)) ); + connect( feed, TQ_SIGNAL(fetchDiscovery(Feed* )), + this, TQ_SLOT(fetchDiscovery(Feed *)) ); f->fetch(true); } diff --git a/akregator/src/akregator_export.h b/akregator/src/akregator_export.h index d389c0d9..4ee5db1c 100644 --- a/akregator/src/akregator_export.h +++ b/akregator/src/akregator_export.h @@ -21,8 +21,8 @@ #ifndef AKREGATOR_AKREGATOREXPORT_H #define AKREGATOR_AKREGATOREXPORT_H -#include <kdemacros.h> +#include <tdemacros.h> -#define AKREGATOR_EXPORT KDE_EXPORT +#define AKREGATOR_EXPORT TDE_EXPORT #endif diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index d7ca0d44..14562fc8 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -33,14 +33,14 @@ #include <tdefiledialog.h> #include <tdeglobalsettings.h> #include <tdehtmldefaults.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdemainwindow.h> #include <tdemessagebox.h> #include <knotifyclient.h> #include <knotifydialog.h> #include <tdepopupmenu.h> #include <kservice.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdaction.h> #include <tdetempfile.h> #include <ktrader.h> @@ -54,7 +54,7 @@ #include <tqstringlist.h> #include <tqtimer.h> #include <tqwidgetlist.h> -#include <tqucomextra_p.h> +#include <private/tqucomextra_p.h> #include <cerrno> #include <sys/types.h> @@ -195,12 +195,12 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, m_extension = new BrowserExtension(this, "ak_extension"); - connect(m_view, TQT_SIGNAL(setWindowCaption(const TQString&)), this, TQT_SIGNAL(setWindowCaption(const TQString&))); - connect(m_view, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&))); - connect(m_view, TQT_SIGNAL(setProgress(int)), m_extension, TQT_SIGNAL(loadingProgress(int))); - connect(m_view, TQT_SIGNAL(signalCanceled(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&))); - connect(m_view, TQT_SIGNAL(signalStarted(TDEIO::Job*)), this, TQT_SIGNAL(started(TDEIO::Job*))); - connect(m_view, TQT_SIGNAL(signalCompleted()), this, TQT_SIGNAL(completed())); + connect(m_view, TQ_SIGNAL(setWindowCaption(const TQString&)), this, TQ_SIGNAL(setWindowCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(setStatusBarText(const TQString&)), this, TQ_SIGNAL(setStatusBarText(const TQString&))); + connect(m_view, TQ_SIGNAL(setProgress(int)), m_extension, TQ_SIGNAL(loadingProgress(int))); + connect(m_view, TQ_SIGNAL(signalCanceled(const TQString&)), this, TQ_SIGNAL(canceled(const TQString&))); + connect(m_view, TQ_SIGNAL(signalStarted(TDEIO::Job*)), this, TQ_SIGNAL(started(TDEIO::Job*))); + connect(m_view, TQ_SIGNAL(signalCompleted()), this, TQ_SIGNAL(completed())); // notify the part that this is our internal widget setWidget(m_view); @@ -209,7 +209,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, TrayIcon::setInstance(trayIcon); m_actionManager->initTrayIcon(trayIcon); - connect(trayIcon, TQT_SIGNAL(showPart()), this, TQT_SIGNAL(showPart())); + connect(trayIcon, TQ_SIGNAL(showPart()), this, TQ_SIGNAL(showPart())); if ( isTrayIconEnabled() ) { @@ -219,15 +219,15 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, else NotificationManager::self()->setWidget(getMainWindow(), instance()); - connect( trayIcon, TQT_SIGNAL(quitSelected()), - kapp, TQT_SLOT(quit())) ; + connect( trayIcon, TQ_SIGNAL(quitSelected()), + tdeApp, TQ_SLOT(quit())) ; - connect( m_view, TQT_SIGNAL(signalUnreadCountChanged(int)), trayIcon, TQT_SLOT(slotSetUnread(int)) ); + connect( m_view, TQ_SIGNAL(signalUnreadCountChanged(int)), trayIcon, TQ_SLOT(slotSetUnread(int)) ); - connect(kapp, TQT_SIGNAL(shutDown()), this, TQT_SLOT(slotOnShutdown())); + connect(tdeApp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(slotOnShutdown())); m_autosaveTimer = new TQTimer(this); - connect(m_autosaveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSaveFeedList())); + connect(m_autosaveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSaveFeedList())); m_autosaveTimer->start(5*60*1000); // 5 minutes setXMLFile("akregator_part.rc", true); @@ -255,7 +255,7 @@ void Part::slotOnShutdown() m_shuttingDown = true; const TQString lockLocation = locateLocal("data", "akregator/lock"); - KSimpleConfig config(lockLocation); + TDESimpleConfig config(lockLocation); config.writeEntry("pid", -1); config.sync(); @@ -530,7 +530,7 @@ TQWidget* Part::getMainWindow() { // this is a dirty fix to get the main window used for the tray icon - TQWidgetList *l = kapp->topLevelWidgets(); + TQWidgetList *l = tdeApp->topLevelWidgets(); TQWidgetListIt it( *l ); TQWidget *wid; @@ -721,7 +721,7 @@ void Part::fileSendArticle(bool attach) title = m_view->currentFrame()->title(); if(attach) { - kapp->invokeMailer("", + tdeApp->invokeMailer("", "", "", title, @@ -730,7 +730,7 @@ void Part::fileSendArticle(bool attach) text); } else { - kapp->invokeMailer("", + tdeApp->invokeMailer("", "", "", title, @@ -782,10 +782,10 @@ void Part::showOptions() TDEConfigDialog* dialog = new ConfigDialog( m_view, "settings", Settings::self() ); - connect( dialog, TQT_SIGNAL(settingsChanged()), - this, TQT_SLOT(slotSettingsChanged()) ); - connect( dialog, TQT_SIGNAL(settingsChanged()), - TrayIcon::getInstance(), TQT_SLOT(settingsChanged()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), + this, TQ_SLOT(slotSettingsChanged()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), + TrayIcon::getInstance(), TQ_SLOT(settingsChanged()) ); dialog->show(); } @@ -946,19 +946,19 @@ static TQString getMyHostName() bool Part::tryToLock(const TQString& backendName) { // Check and create a lock file to prevent concurrent access to metakit archive - TQString appName = kapp->instanceName(); + TQString appName = tdeApp->instanceName(); if ( appName.isEmpty() ) appName = "akregator"; TQString programName; - const TDEAboutData *about = kapp->aboutData(); + const TDEAboutData *about = tdeApp->aboutData(); if ( about ) programName = about->programName(); if ( programName.isEmpty() ) programName = i18n("Akregator"); TQString lockLocation = locateLocal("data", "akregator/lock"); - KSimpleConfig config(lockLocation); + TDESimpleConfig config(lockLocation); int oldPid = config.readNumEntry("pid", -1); const TQString oldHostName = config.readEntry("hostname"); const TQString oldAppName = config.readEntry( "appName", appName ); @@ -982,7 +982,7 @@ bool Part::tryToLock(const TQString& backendName) { // this can only happen if the user is running this application on // different displays on the same machine. All other cases will be - // taken care of by KUniqueApplication() + // taken care of by TDEUniqueApplication() if ( oldAppName == appName ) msg = i18n("<qt>%1 already seems to be running on another display on " "this machine. <b>Running %2 more than once is not supported " diff --git a/akregator/src/akregator_run.cpp b/akregator/src/akregator_run.cpp index 89bb190a..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); } diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index 3f516315..35d55057 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -76,10 +76,10 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kpassdlg.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krun.h> #include <kshell.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> #include <kxmlguifactory.h> #include <tdeparts/partmanager.h> @@ -233,17 +233,17 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons 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.")); @@ -292,34 +292,34 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons 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) @@ -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))); } } @@ -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/akregatorconfig.kcfgc b/akregator/src/akregatorconfig.kcfgc index 66183471..fef64628 100644 --- a/akregator/src/akregatorconfig.kcfgc +++ b/akregator/src/akregatorconfig.kcfgc @@ -4,5 +4,5 @@ ClassName=Settings NameSpace=Akregator Singleton=true Mutators=true -Visibility=KDE_EXPORT +Visibility=TDE_EXPORT MemberVariables=private diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp index 48114f97..7cbe624f 100644 --- a/akregator/src/articlelistview.cpp +++ b/akregator/src/articlelistview.cpp @@ -32,7 +32,7 @@ #include "treenode.h" #include "treenodevisitor.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdeglobal.h> #include <kiconloader.h> @@ -271,13 +271,13 @@ ArticleListView::ArticleListView(TQWidget *parent, const char *name) "You can also manage articles, as marking them as persistent (\"Keep Article\") or delete them, using the right mouse button menu." "To view the web page of the article, you can open the article internally in a tab or in an external browser window.")); - connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem* ))); - connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(slotDoubleClicked(TQListViewItem*, const TQPoint&, int)) ); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(currentChanged(TQListViewItem*)), this, TQ_SLOT(slotCurrentChanged(TQListViewItem* ))); + connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(slotDoubleClicked(TQListViewItem*, const TQPoint&, int)) ); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT(slotMouseButtonPressed(int, TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)), this, TQ_SLOT(slotMouseButtonPressed(int, TQListViewItem *, const TQPoint &, int))); } Article ArticleListView::currentArticle() const @@ -482,18 +482,18 @@ void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const TQValueList< void ArticleListView::connectToNode(TreeNode* node) { - connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear()) ); - connect(node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); - connect(node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); - connect(node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); + connect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotClear()) ); + connect(node, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); + connect(node, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); + connect(node, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); } void ArticleListView::disconnectFromNode(TreeNode* node) { - disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear()) ); - disconnect(node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); - disconnect(node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); - disconnect(node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); + disconnect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotClear()) ); + disconnect(node, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); + disconnect(node, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); + disconnect(node, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); } void ArticleListView::applyFilters() diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index 8067b732..e2259ad5 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -33,9 +33,9 @@ #include <tdeglobalsettings.h> #include <tdehtmlview.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kshell.h> #include <tdemessagebox.h> #include <tdeio/netaccess.h> @@ -170,13 +170,13 @@ ArticleViewer::ArticleViewer(TQWidget *parent, const char *name) generateNormalModeCSS(); generateCombinedModeCSS(); - new TDEAction( i18n("&Scroll Up"), TQString(), "Up", this, TQT_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" ); - new TDEAction( i18n("&Scroll Down"), TQString(), "Down", this, TQT_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" ); + new TDEAction( i18n("&Scroll Up"), TQString(), "Up", this, TQ_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" ); + new TDEAction( i18n("&Scroll Down"), TQString(), "Down", this, TQ_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" ); - connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(slotPaletteOrFontChanged()) ); - connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), this, TQT_SLOT(slotPaletteOrFontChanged()) ); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) ); + connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) ); m_imageDir.setPath(TDEGlobal::dirs()->saveLocation("cache", "akregator/Media/")); m_htmlFooter = "</body></html>"; @@ -370,7 +370,7 @@ void ArticleViewer::displayAboutPage() TQString location = locate("data", "akregator/about/main.html"); TQString content = KPIM::kFileToString(location); content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); - if ( kapp->reverseLayout() ) + if ( tdeApp->reverseLayout() ) content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else content = content.arg( "" ); @@ -767,15 +767,15 @@ void ArticleViewer::connectToNode(TreeNode* node) { if (m_viewMode == CombinedView) { -// connect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotUpdateCombinedView() ) ); - connect( node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&))); - connect( node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&))); - connect( node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&))); +// connect( node, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotUpdateCombinedView() ) ); + connect( node, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&))); + connect( node, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&))); + connect( node, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&))); } if (m_viewMode == SummaryView) - connect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotShowSummary(TreeNode*) ) ); + connect( node, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotShowSummary(TreeNode*) ) ); - connect( node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear() ) ); + connect( node, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotClear() ) ); } } @@ -783,12 +783,12 @@ void ArticleViewer::disconnectFromNode(TreeNode* node) { if (node) { -// disconnect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotUpdateCombinedView() ) ); - disconnect( node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear() ) ); - disconnect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotShowSummary(TreeNode*) ) ); - disconnect( node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&))); - disconnect( node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&))); - disconnect( node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&))); +// disconnect( node, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotUpdateCombinedView() ) ); + disconnect( node, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotClear() ) ); + disconnect( node, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotShowSummary(TreeNode*) ) ); + disconnect( node, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&))); + disconnect( node, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&))); + disconnect( node, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&))); } } diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp index 7e7f59e8..ef54e082 100644 --- a/akregator/src/feed.cpp +++ b/akregator/src/feed.cpp @@ -34,7 +34,7 @@ #include <kurl.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "akregatorconfig.h" #include "article.h" @@ -579,8 +579,8 @@ void Feed::tryFetch() { d->fetchError = false; - d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, Status)) ); - //connect(d->loader, TQT_SIGNAL(progress(unsigned long)), this, TQT_SLOT(slotSetProgress(unsigned long))); + d->loader = RSS::Loader::create( this, TQ_SLOT(fetchCompleted(Loader *, Document, Status)) ); + //connect(d->loader, TQ_SIGNAL(progress(unsigned long)), this, TQ_SLOT(slotSetProgress(unsigned long))); d->loader->loadFrom( d->xmlUrl, new RSS::FileRetriever ); } @@ -635,7 +635,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status) if (doc.image() && d->imagePixmap.isNull()) { d->image = *doc.image(); - connect(&d->image, TQT_SIGNAL(gotPixmap(const TQPixmap&)), this, TQT_SLOT(slotImageFetched(const TQPixmap&))); + connect(&d->image, TQ_SIGNAL(gotPixmap(const TQPixmap&)), this, TQ_SLOT(slotImageFetched(const TQPixmap&))); d->image.getPixmap(); } diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp index 61d2ad82..39aad70d 100644 --- a/akregator/src/feediconmanager.cpp +++ b/akregator/src/feediconmanager.cpp @@ -29,7 +29,7 @@ #include <dcopclient.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <kurl.h> @@ -62,7 +62,7 @@ void FeedIconManager::fetchIcon(Feed* feed) if (!d->registeredFeeds.contains(feed)) { d->registeredFeeds.append(feed); - connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotFeedDestroyed(TreeNode*))); + connect(feed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotFeedDestroyed(TreeNode*))); } TQString iconURL = getIconURL(KURL(feed->xmlUrl())); d->urlDict.insert(iconURL, feed); @@ -95,7 +95,7 @@ void FeedIconManager::loadIcon(const TQString & url) TQByteArray data; TQDataStream ds(data, IO_WriteOnly); ds << u; - kapp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", + tdeApp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data); } else @@ -116,7 +116,7 @@ TQString FeedIconManager::iconLocation(const KURL & url) const ds << url; - kapp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data, + tdeApp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data, replyType, reply); if (replyType == "TQString") { 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/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/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/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/librss/CMakeLists.txt b/akregator/src/librss/CMakeLists.txt index c2e7a001..23dc39a2 100644 --- a/akregator/src/librss/CMakeLists.txt +++ b/akregator/src/librss/CMakeLists.txt @@ -16,7 +16,6 @@ include_directories( ${TQT_INCLUDE_DIRS} ) - ##### rsslocal (static) ######################### tde_add_library( rsslocal STATIC_PIC AUTOMOC @@ -25,3 +24,30 @@ tde_add_library( rsslocal STATIC_PIC AUTOMOC tools_p.cpp loader.cpp enclosure.cpp category.cpp feeddetector.cpp ) + +tde_add_check_executable( testlibrss AUTOMOC + SOURCES testlibrss.cpp + LINK rsslocal-static ${TQT_LIBRARIES} tdeio-shared +) + +set( TEST_DATA "${CMAKE_CURRENT_SOURCE_DIR}/test_data") + +add_test( NAME TestLibRSS_0.91 + COMMAND testlibrss ${TEST_DATA}/rss091.xml +) + +add_test( NAME TestLibRSS_CommentAPI + COMMAND testlibrss ${TEST_DATA}/comment_api.xml +) + +add_test( NAME TestLibRSS_DublinCore + COMMAND testlibrss ${TEST_DATA}/dublincore.xml +) + +add_test( NAME TestLibRSS_RDF + COMMAND testlibrss ${TEST_DATA}/rdf.xml +) + +add_test( NAME TestLibRSS_AtomSpec + COMMAND testlibrss ${TEST_DATA}/atom_spec.xml +) diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp index 18522fe3..88d42a7d 100644 --- a/akregator/src/librss/article.cpp +++ b/akregator/src/librss/article.cpp @@ -92,13 +92,16 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new d->link = elemText; } + // prefer content/content:encoded over summary/description for feeds that provide it + if (format == AtomFeed) + { + d->description = extractNode(node, TQString::fromLatin1("content"), false); + } + else + { + d->description = extractElementTextNS(node, ContentNamespace, TQString::fromLatin1("encoded"), false); + } - // prefer content/content:encoded over summary/description for feeds that provide it - TQString tagName=(format==AtomFeed)? TQString::fromLatin1("content"): TQString::fromLatin1("content:encoded"); - - if (!(elemText = extractNode(node, tagName, false)).isNull()) - d->description = elemText; - if (d->description.isEmpty()) { if (!(elemText = extractNode(node, TQString::fromLatin1("body"), false)).isNull()) @@ -130,7 +133,7 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new time = KRFCDate::parseDate(elemText); } - if (!(elemText = extractNode(node, TQString::fromLatin1("dc:date"))).isNull()) + if (!(elemText = extractElementTextNS(node, DublinCoreNamespace, TQString::fromLatin1("date"))).isNull()) { time = parseISO8601Date(elemText); } @@ -139,27 +142,22 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new if (time != 0) d->pubDate.setTime_t(time); - if (!(elemText = extractNode(node, TQString::fromLatin1("wfw:comment"))).isNull()) { - d->commentsLink = elemText; - } - - if (!(elemText = extractNode(node, TQString::fromLatin1("slash:comments"))).isNull()) { - d->numComments = elemText.toInt(); - } + d->commentsLink = extractElementTextNS(node, CommentAPINamespace, TQString::fromLatin1("comment")); + d->numComments = extractElementTextNS(node, SlashNamespace, TQString::fromLatin1("comments")).toInt(); TQDomElement element = TQDomNode(node).toElement(); // in RSS 1.0, we use <item about> attribute as ID // FIXME: pass format version instead of checking for attribute - if (!element.isNull() && element.hasAttribute(TQString::fromLatin1("rdf:about"))) + if (!element.isNull() && element.hasAttributeNS(RDFNamespace, TQString::fromLatin1("about"))) { - d->guid = element.attribute(TQString::fromLatin1("rdf:about")); // HACK: using ns properly did not work + d->guid = element.attributeNS(RDFNamespace, TQString::fromLatin1("about"), TQString::null); d->guidIsPermaLink = false; } else { - tagName=(format==AtomFeed)? TQString::fromLatin1("id"): TQString::fromLatin1("guid"); + TQString tagName=(format==AtomFeed)? TQString::fromLatin1("id"): TQString::fromLatin1("guid"); TQDomNode n = node.namedItem(tagName); if (!n.isNull()) { diff --git a/akregator/src/librss/article.h b/akregator/src/librss/article.h index c27fdfe7..574f4840 100644 --- a/akregator/src/librss/article.h +++ b/akregator/src/librss/article.h @@ -34,7 +34,7 @@ namespace RSS * is via Document::articles(). * @see Document::articles() */ - class KDE_EXPORT Article + class TDE_EXPORT Article { public: /** diff --git a/akregator/src/librss/category.h b/akregator/src/librss/category.h index 0c40e418..c38a1c4e 100644 --- a/akregator/src/librss/category.h +++ b/akregator/src/librss/category.h @@ -33,7 +33,7 @@ class TQString; namespace RSS { - class KDE_EXPORT Category + class TDE_EXPORT Category { public: diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp index 3bc64d00..7d94a252 100644 --- a/akregator/src/librss/document.cpp +++ b/akregator/src/librss/document.cpp @@ -224,7 +224,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->copyright = elemText; if (d->format == AtomFeed) - elemText = rootNode.toElement().attribute(TQString::fromLatin1("xml:lang"), TQString()); + elemText = rootNode.toElement().attributeNS(XMLNamespace, "lang", TQString::null); else elemText = extractNode(channelNode, TQString::fromLatin1("language")); @@ -441,7 +441,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->pubDate.setTime_t(_time); } - if (!(elemText = extractNode(channelNode, TQString::fromLatin1("dc:date"))).isNull()) { + if (!(elemText = extractElementTextNS(channelNode, DublinCoreNamespace, "date")).isNull()) { time_t _time = parseISO8601Date(elemText); /* \bug This isn't really the right way since it will set the date to * Jan 1 1970, 1:00:00 if the passed date was invalid; this means that diff --git a/akregator/src/librss/document.h b/akregator/src/librss/document.h index 8d098e7d..b876caf2 100644 --- a/akregator/src/librss/document.h +++ b/akregator/src/librss/document.h @@ -28,7 +28,7 @@ namespace RSS * but rather use Loader::loadFrom() to produce a Document object. * @see Loader::loadForm() */ - class KDE_EXPORT Document + class TDE_EXPORT Document { public: /** diff --git a/akregator/src/librss/enclosure.h b/akregator/src/librss/enclosure.h index 154f8bc0..54ee2059 100644 --- a/akregator/src/librss/enclosure.h +++ b/akregator/src/librss/enclosure.h @@ -33,7 +33,7 @@ class TQString; namespace RSS { - class KDE_EXPORT Enclosure + class TDE_EXPORT Enclosure { public: diff --git a/akregator/src/librss/global.h b/akregator/src/librss/global.h index 966521cc..8ff4e406 100644 --- a/akregator/src/librss/global.h +++ b/akregator/src/librss/global.h @@ -11,13 +11,28 @@ #ifndef LIBRSS_GLOBAL_H #define LIBRSS_GLOBAL_H -#include <kdemacros.h> +#include <tdemacros.h> template <class> class TQValueList; namespace RSS { + /// The Atom 1.0 XML namespace. + constexpr const char *AtomNamespace = "http://www.w3.org/2005/Atom"; + /// The CommentAPI XML namespace. + constexpr const char *CommentAPINamespace = "http://wellformedweb.org/CommentAPI/"; + /// The Content XML namespace. + constexpr const char *ContentNamespace = "http://purl.org/rss/1.0/modules/content/"; + /// The Dublin Core XML namespace. + constexpr const char *DublinCoreNamespace = "http://purl.org/dc/elements/1.1/"; + /// The RDF Concepts Vocabulary (RDF) namespace. + constexpr const char *RDFNamespace = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + /// The Slash XML namespace. + constexpr const char *SlashNamespace = "http://purl.org/rss/1.0/modules/slash/"; + /// The XML namespace. + constexpr const char *XMLNamespace = "http://www.w3.org/XML/1998/namespace"; + /** * Versions currently supported by this library. This enumeration is * subject to be extended in the future and used by Document::version() to diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp index 174a105b..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) diff --git a/akregator/src/librss/image.h b/akregator/src/librss/image.h index 4c99c7f3..d98a59fc 100644 --- a/akregator/src/librss/image.h +++ b/akregator/src/librss/image.h @@ -31,7 +31,7 @@ namespace RSS * is via Document::image(). * @see Document::image() */ - class KDE_EXPORT Image : public TQObject + class TDE_EXPORT Image : public TQObject { TQ_OBJECT diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp index 8e2967b7..8674dfb7 100644 --- a/akregator/src/librss/loader.cpp +++ b/akregator/src/librss/loader.cpp @@ -13,7 +13,7 @@ #include "feeddetector.h" #include <tdeio/job.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kstaticdeleter.h> #include <kurl.h> #include <kdebug.h> @@ -111,13 +111,13 @@ void FileRetriever::retrieveData(const KURL &url) d->job->addMetaData("UserAgent", ua); - TQTimer::singleShot(1000*90, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(1000*90, this, TQ_SLOT(slotTimeout())); - connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); - connect(d->job, TQT_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)), - TQT_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &))); + connect(d->job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(d->job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *))); + connect(d->job, TQ_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)), + TQ_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &))); } void FileRetriever::slotTimeout() @@ -207,10 +207,10 @@ void OutputRetriever::retrieveData(const KURL &url) d->buffer->open(IO_WriteOnly); d->process = new KShellProcess(); - connect(d->process, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(slotExited(TDEProcess *))); - connect(d->process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - TQT_SLOT(slotOutput(TDEProcess *, char *, int))); + connect(d->process, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(slotExited(TDEProcess *))); + connect(d->process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQ_SLOT(slotOutput(TDEProcess *, char *, int))); *d->process << url.path(); d->process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } @@ -268,7 +268,7 @@ Loader *Loader::create() Loader *Loader::create(TQObject *object, const char *slot) { Loader *loader = create(); - connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), + connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)), object, slot); return loader; } @@ -290,8 +290,8 @@ void Loader::loadFrom(const KURL &url, DataRetriever *retriever) d->url=url; d->retriever = retriever; - connect(d->retriever, TQT_SIGNAL(dataRetrieved(const TQByteArray &, bool)), - this, TQT_SLOT(slotRetrieverDone(const TQByteArray &, bool))); + connect(d->retriever, TQ_SIGNAL(dataRetrieved(const TQByteArray &, bool)), + this, TQ_SLOT(slotRetrieverDone(const TQByteArray &, bool))); d->retriever->retrieveData(url); } @@ -351,7 +351,7 @@ void Loader::slotRetrieverDone(const TQByteArray &data, bool success) TQByteArray tmpData; tmpData.setRawData(charData, len); - if (doc.setContent(tmpData)) + if (doc.setContent(tmpData, /* namespaceProcessing */ true)) { rssDoc = Document(doc); if (!rssDoc.isValid()) diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h index c9d3eb09..ce93fc25 100644 --- a/akregator/src/librss/loader.h +++ b/akregator/src/librss/loader.h @@ -32,7 +32,7 @@ namespace RSS * a new retrieval algorithm which can then be plugged into the RSS loader. * @see Loader, FileRetriever, OutputRetriever */ - class KDE_EXPORT DataRetriever : public TQObject + class TDE_EXPORT DataRetriever : public TQObject { TQ_OBJECT @@ -87,7 +87,7 @@ namespace RSS * Implements a file retriever, to be used with Loader::loadFrom(). * @see DataRetriever, Loader::loadFrom() */ - class KDE_EXPORT FileRetriever : public DataRetriever + class TDE_EXPORT FileRetriever : public DataRetriever { TQ_OBJECT @@ -211,8 +211,8 @@ namespace RSS * * \code * Loader *loader = Loader::create(); - * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), - * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status))); + * connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)), + * this, TQ_SLOT(slotLoadingComplete(Loader *, Document, Status))); * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever); * \endcode * @@ -254,7 +254,7 @@ namespace RSS * loadingComplete signal goes out of scope. This is e.g. the case if you * intend to call getPixmap() on Document::image()! */ - class KDE_EXPORT Loader : public TQObject + class TDE_EXPORT Loader : public TQObject { TQ_OBJECT diff --git a/akregator/src/librss/test_data/atom_spec.xml b/akregator/src/librss/test_data/atom_spec.xml new file mode 100644 index 00000000..b8e3dff4 --- /dev/null +++ b/akregator/src/librss/test_data/atom_spec.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en-us"> + <title type="text">dive into mark</title> + <subtitle type="html"> + A <em>lot</em> of effort + went into making this effortless + </subtitle> + <updated>2005-07-31T12:29:29Z</updated> + <id>tag:example.org,2003:3</id> + <link rel="alternate" type="text/html" hreflang="en" href="http://example.org/"/> + <link rel="self" type="application/atom+xml" href="http://example.org/feed.atom"/> + <rights>Copyright (c) 2003, Mark Pilgrim</rights> + <generator uri="http://www.example.com/" version="1.0"> + Example Toolkit + </generator> + <entry> + <title>Atom draft-07 snapshot</title> + <link rel="alternate" type="text/html" href="http://example.org/2005/04/02/atom"/> + <link rel="enclosure" type="audio/mpeg" length="1337" href="http://example.org/audio/ph34r_my_podcast.mp3"/> + <id>tag:example.org,2003:3.2397</id> + <updated>2005-07-31T12:29:29Z</updated> + <published>2003-12-13T08:29:29-04:00</published> + <author> + <name>Mark Pilgrim</name> + <uri>http://example.org/</uri> + <email>f8dy@example.com</email> + </author> + <contributor> + <name>Sam Ruby</name> + </contributor> + <contributor> + <name>Joe Gregorio</name> + </contributor> + <content type="xhtml" xml:lang="en" xml:base="http://diveintomark.org/"> + <div xmlns="http://www.w3.org/1999/xhtml"> + <p> + <i>[Update: The Atom draft is finished.]</i> + </p> + </div> + </content> + </entry> +</feed> diff --git a/akregator/src/librss/test_data/comment_api.xml b/akregator/src/librss/test_data/comment_api.xml new file mode 100644 index 00000000..7bbb29ae --- /dev/null +++ b/akregator/src/librss/test_data/comment_api.xml @@ -0,0 +1,411 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:wfw='http://wellformedweb.org/CommentAPI/' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:rl='http://www.purl.org/RESTLog/'> + <channel> + <title>The Well-Formed Web</title> + <link>http://wellformedweb.org/news/</link> + <description>Exploring the limits of XML and HTTP</description> + <dc:creator>BitWorking, Inc</dc:creator> + <item> + <title>Should you use Content Negotiation in your Web Services?</title> + <link>http://bitworking.org/news/WebServicesAndContentNegotiation</link> + <description> + <p>Should you use Content Negotiation when building your web service? +The short answer is no. There are definite problems with <abbrev title="Content Negotiation">conneg</abbrev> +and I can give some examples of problems I have run into and also point to problems +other have run into.</p> + + +<p>First let's back up and explain Content Negotiation. Your browser is + a generic display program and can take in various kinds of media, such + as HTML, JPEGs, CSS, Flash, etc. and display it for you. The first thing to + note is that each of those kinds of media have different mime types. + Each format has it's own registered mime type and when a client + does a GET on a URL it gets back not only the content but the response + also includes a <code>Content-Type:</code> header which lists + the mime-type of what is in the body. +</p> + +<p>One of the interesting things about HTTP is that it allows + the same URI to have multiple representations. For example I + could have a URL that had both <code>plain/text</code> and <code>text/html</code> + representations. Now that leads to two obvious questions.</p> + +<ol> + <li>How does the server know which represenation to serve?</li> + <li>How can the browser influence the servers choice to get something it can handle?</li> +</ol> + +<p>Let's start by answering question two first. The browser uses the <code>Accept:</code> + header to list out the mime-types that it is willing to accept. There is also a weighting + scheme that allows the client to specify a preference for one media type + over another. For example, here is the capture of some of the headers, including the <code>Accept:</code> header, + sent by Mozilla when it does a GET on a URI:</p> + +<pre class="example"><code>Accept: text/xml,application/xml,application/xhtml+xml,\ + text/html;q=0.9,text/plain;q=0.8,video/x-mng,\ + image/png,image/jpeg,image/gif;q=0.2,*/*;q=0.1 +Accept-Language: en-us,en;q=0.5 +Accept-Encoding: gzip,deflate,compress;q=0.9 +Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7 +</code></pre> + +<p>The <code>Accept:</code> header list the mime-types that the browser can + handle along with weights of the form <code>q=</code> where the argument + is a floating point number between 0 and 1. The weights indicate a preference + for that media type, with a higher number inidicating a higher preference. Note that + there are several bits of complexity I am going to ignore for now. The first is the last + type the Mozilla browser says in can accept, */*;q=0.1. This is a wild card + match, which will match any mime-type that the server could want to serve up. The second + is that there are multiple Accept headers, one for language, one for encoding, another + for charset. How these over-lap and influence the response sent won't be covered here. +</p> + +<p>Now to answer the first question. The server looks at the available representations + is has and servers up the one with the highest preference to the client. + Based on the <code>Accept:</code> + header it sends an appropriate representation back and indicates the type it + chose using the <code>Content-Type:</code> header.</p> + +<p>This seems like a really cool and vastly under utilized feature of HTTP. It also + seems particularly intriguing for web services. You could return + JPEGs from that mapping service for the older client platforms, but also + serve up SVG for the newer clients so they can scale and rotate their maps. + What could possibly go wrong?</p> + +<p>The first thing that could go wrong is a bug or mis-configuration on the client or the server. + This has happened to me in the + past. The W3C does conneg on some of their recommendations, returning either HTML or plain + text based on the clients capabilities. This is fine, but one day their server was + either confused or mis-configured because it would only serve the recommendation in <code>plain/text</code>. + I really needed the HTML form, but after trying multiple browsers from multipe locations I could only retrieve the text + format. I ended up pulling the HTML version out of the Google cache.</p> + +<p>The second problem that I ran across highlights the real core problem with conneg. I was + trying to use the W3C XSLT service to do some transformations on my web pages. Now the server side + software I use to run Well-Formed Web does conneg and can return either HTML or an RSS item + fragment for each URI. At the time I was serving up XHTML 1.0, which is valid XML and + thus good input into an XSLT service. So the way the XSLT service works is that you enter two URIs, one + for the source content and the other for the XSLT sheet to apply to the source content. + My transformation kept failing and it was because of the + Accept headers that the XSLT service sent when it went to retrieve the source content. + My server kept returning the RSS item fragment and not + the XHTML. Now this would have been fine if I wanted to apply an XSLT sheet to my RSS item fragment, but in this + case I wanted it to apply to the XHTML. Note that the problem could have been completely reversed, I could have + been trying to apply the XSLT to the RSS item and not to the XHTML and my server could have returned + the XHTML all the time. The crux of the problem is that when I gave the URI to the XSLT transformation + service I have no way of specifying what mime-type to request. I get no chance to tweak the + services <code>Accept:</code> header. +</p> + +<p>Let's cover that again to clarify. If I hand you a URI only, and that URI supports conneg, + then I get no control over which representation you retrieve. In the cases where you are + passing a URI into a service that is later going to retrieve a represenation from that URI, you + really have no idea which representation it's going to get. That could mean that you end up + passing your RSS feed to the W3C HTML validator, or you end up passing XHTML instead of RSS into + an XSLT translator service, or you end up passing a 12MB PNG to a handheld instead of + that 20KB SVG file. You end up with a problem that is hard to debug and + one that wouldn't exist if each URI had only one mime-type.</p> + +<h3>Further Reading</h3> +<p><a href="http://norman.walsh.name/2003/07/02/conneg">Norman Walsh has also run into problems</a> with Content Negotiation.</p> +<p>The issue of using fragment identifiers with conneg has not only come up but was important enough to + merit mention in the W3C document <a href="http://www.w3.org/TR/webarch/#frag-conneg">Architecture of the World Wide Web</a>.</p> + + + </description> + + <dc:date>2003-09-06T21:54:43-05:00</dc:date> + <wfw:comment>http://bitworking.org/news/comments/WebServicesAndContentNegotiation</wfw:comment> + <wfw:commentRss>http://bitworking.org/news/WebServicesAndContentNegotiation?crss</wfw:commentRss> + </item> + <item> + <title>Google2Atom</title> + <link>http://wellformedweb.org/news/Google2Atom</link> + <description> +<p>Welcome to the Google2Atom web service. Just enter your + search and your <a href="http://www.google.com/apis/">Google key</a> + below. Once you press "Search" you will get an <a href="http://www.mnot.net/drafts/draft-nottingham-atom-format-00.html"> + Atom</a> feed of the search results. +</p> + +<form method="get" action="http://wellformedweb.org/cgi-bin/google2atom.cgi"> +<p><input size="50" name="q"/></p> +<p>Google Key: <input size="20" name="license_key"/></p> +<p><input type="submit" value=" Search "/></p> +</form> + +<hr /> + +<p><strong>Note:</strong> The Google Key is no longer mandatory, if it's not + supplied it will use my own key. In light of that please feel free to + use my key for experimentation, but if you start making heavy use + of this service please get your own Google API Key to avoid + limiting others use of this service.</p> + +<p>This is a REST based reformulation of the Google API. As such it uses + query parameters in a GET based HTTP request to do the search. That is, it works + just like the regular google web page, but this form returns + a well-formed XML document instead of a web page. Why is this better?</p> + +<dl> + <dt>Simplicity</dt> + <dd> + It works just like the google web page, so it is + conceptually easier to understand. + </dd> + + <dt>Composability</dt> + <dd>Since the request is just a simple GET the results of a query can be composed + with other web services. For example, the results could be transformed using + XSLT or fed into a validator. + </dd> +</dl> + +<h3>Bonus Features</h3> + +<p>One feature found in this interface that is not found + in the original Google API is the well-formedness of the + results content. + <a href="http://bitworking.org/news/Announcing_pyTidy">PyTidy</a> + is used to transform the HTML + snippets from the Google API into well-formed XML and place + those into 'content' elements with type='text/html' and + mode='xml'. +</p> + +<h3>Colophon</h3> + +<p>Google2Atom is written in <a href="http://www.python.org">Python</a> and uses + both the <a href="http://bitworking.org/news/Announcing_pyTidy"> + pyTidy</a> and <a href="http://www.diveintomark.org/projects/pygoogle/"> + pyGoogle</a> libraries.</p> + + </description> + + <dc:date>2003-11-22T01:18:42-05:00</dc:date> + <wfw:comment>http://wellformedweb.org/news/comments/Google2Atom</wfw:comment> + <wfw:commentRss>http://wellformedweb.org/news/Google2Atom?crss</wfw:commentRss> + </item> + <item> + <title>wfw namespace elements</title> + <link>http://wellformedweb.org/news/wfw_namespace_elements</link> + <description> + <p>The <code>wfw</code> namespace, http://wellformedweb.org/CommentAPI/ +contains multiple elements. As more are added in various places I will +endeavor to keep the list here updated.</p> + +<dl> + <dt>wfw:comment</dt> + <dd>The first element to appear in this namespace is <code>comment</code>. This element appears + in RSS feeds and contains the URI that comment entries are to be POSTed to. The details + of this are outlined in the <a href="http://wellformedweb.org/story/9">CommentAPI Specification</a>.<dd> + + <dt>wfw:commentRss</dt> + <dd>The second element to appear in the wfw namespace is <code>commentRss</code>. This element + also appears in RSS feeds and contains the URI of the RSS feed for comments on that Item. + This is documented in <a href="http://www.sellsbrothers.com/spout/default.aspx?content=archive.htm#exposingRssComments">Chris Sells' Specification</a>. Note that for quite a while this page has had a typo and erroneously referred to + this element as 'commentRSS' as opposed to the correct 'commentRss'. Feed consumers should be aware + that they may run into both spellings in the wild. Please see + <a href="http://www.intertwingly.net/blog/2006/04/16/commentRss">this page</a> for + more information. + </dd> +</dl> + </description> + + <dc:date>2003-10-10T13:11:46-05:00</dc:date> + <wfw:comment>http://wellformedweb.org/news/comments/wfw_namespace_elements</wfw:comment> + <wfw:commentRss>http://wellformedweb.org/news/wfw_namespace_elements?crss</wfw:commentRss> + </item> + <item> + <title>The HTTP verb PUT under Apache: Safe or Dangerous?</title> + <link>http://wellformedweb.org/news/PUT_SaferOrDangerous</link> + <description> + <p>"Is the HTTP verb PUT under Apache safe or dangerous?" This is a question I come across often, and have now + run into it twice in the work on Atom. So is it safe? The answer is maybe.</p> +<p>Here are two such examples:</p> + +<blockquote><p> + Using DELETE and PUT may be the "right thing to do" + in an ideal world, but the fact of the matter is that a + lot -- if not the vast majority -- of webservers do not allow these + operations. </p></blockquote> + +<blockquote><p>If anyone knows of a newer article describing + HTTP PUT with apache, I would be very interested in seeing it. Because, + due to my experience with PUT, you have to define a single PUTScript in + httpd.conf, and if you PUT something to an apache server at the URI + www.example.com/blog/entries/1 or something similar, apache passes all + of the information to the PUTScript, not to anything else.</p></blockquote> + +<p>Both of the above quotes are from the <a href="http://www.intertwingly.net/wiki/pie/RestEchoApiPutAndDelete">Atom Wiki discussion + of the use of PUT</a>. A little digging reveals that the ApacheWeek article + <a href="http://www.apacheweek.com/features/put">Publishing Pages with PUT</a> + is referenced most often when the danger of PUT is raised. <p> + +<p>That ApacheWeek article does talk about the dangers of PUT and + the cautions you need to follow when writing a script that + does content publishing via PUT. That key part of that phrase + is <strong>content publishing</strong>. That means that PUT is being + used to upload arbitrary content to the server and the client + is determining via the URI where the content should be stored. + Now you can imagine how this might be dangerous, for example + not correctly checking URI paths that include <code>../..</code> could + let a malicious agent re-write your <code>.bashrc</code>.</p> + +<p>Implementing a PUT script can be difficult and a security hazard + in the context of content publishing, but that's the case because + the client is choosing the target URI and the client could upload + any content type. In the case of Web Services in general, and + the AtomAPI in particular, PUT is used in a much narrower manner + and avoids those potential security problems.</p> + +<p>In the case of the AtomAPI PUT is only allowed on URIs that point + to a pre-existing resource. The + AtomAPI follows a general idiom for editing resources of doing + a GET to retrieve the original XML, then a PUT on the same URI + to upate that resource with the edited XML. No URIs are created + by doing a PUT. PUT is not accepted on arbitrary URIs. This makes + the use of PUT in the context of the AtomAPI just as safe as POST.</p> + +<p>There are quite a few ways to configure Apache to process + incoming requests. In particular it is possible to have a single + script that handles all PUT requests below a chosen directory. This + strategy, and all of the associated security concerns associated with + it, are covered fully in the <a href="http://www.apacheweek.com/features/put">Publishing Pages with PUT</a>.</p> + +<p>When processing request with a CGI script all the PUT requests + will come through. The verb is passed to the CGI program via the REQUEST_METHOD environment + variable, and the program decides what to do with the content.</p> + +<p>Using PUT propoerly has advantages in Web Service development. First, + Apache lets you control security based on the verb using the + <a href="http://httpd.apache.org/docs-2.0/mod/core.html#limit">Limit</a> + and <a href="http://httpd.apache.org/docs-2.0/mod/core.html#limitexcept">LimitExcept</a> + directives, which + let you restrict access controls based on the verb. Here is a sample + of one of my <code>.htaccess</code> files that restricts the use of + all verbs except GET to the CGI program <code>Bulu.cgi.</code></p> + +<pre class="example"><code>&lt;Files Bulu.cgi> +AuthType Basic +AuthName myrealm +AuthUserFile /path/to/my/password/file + &lt;LimitExcept GET> + Require valid-user + &lt;/LimitExcept> +&lt;/Files> +</code></pre> + +<p>In addition, the <a href="http://httpd.apache.org/docs-2.0/mod/mod_actions.html#script">Script</a> + directive can be used to dispatch to a CGI program based on the verb used:</p> + +<pre class="example"><code>Script PUT /cgi-bin/put.cgi</code></pre> + +<p>The second advantage using PUT brings is clarity. Given the idiom + of using GET/PUT in tandem on a URI to edit resources PUT + clearly signals what the interface is doing.</p> + +<h4>Resources</h4> + +<p><a href="http://www.apacheweek.com">ApacheWeek</a>: <a href="http://www.apacheweek.com/features/put">Publishing Pages with PUT</a></p> +<p><a href="http://www.intertwingly.net/wiki/pie/RestEchoApiPutAndDelete">RestEchoApiPutAndDelete</a>: Discussion on the use of PUT + and DELETE in the AtomAPI.</p> +<p><a href="http://httpd.apache.org/docs-2.0/mod/mod_actions.html">mod_actions</a>: An Apache module for + controlling dispatching based on verb or content-type.</p> +<p><a href="http://www.w3.org/Amaya/User/Put.html">Configuring your WWW server to understand the PUT method</a>, from the W3Cs Amaya project documentation.</p> +<p><a href="http://www.webdav.org/">WebDAV</a> is also something you may be interested in if you + are looking for ways to publish your content using HTTP. WebDAV stands for + "Web-based Distributed Authoring and Versioning". It is a set of extensions to the HTTP + protocol which allows users to collaboratively edit and manage files on remote web servers. + <a href="http://httpd.apache.org/docs-2.0/mod/mod_dav.html"> + Mod_dav</a> in an Apache module that implements WebDAV.</p> + + + + </description> + + <dc:date>2003-08-23T00:45:25-05:00</dc:date> + <wfw:comment>http://wellformedweb.org/news/comments/PUT_SaferOrDangerous</wfw:comment> + <wfw:commentRss>http://wellformedweb.org/news/PUT_SaferOrDangerous?crss</wfw:commentRss> + </item> + <item> + <title>Six Plus One</title> + <link>http://wellformedweb.org/news/SixPlusOne</link> + <description> + <p>Previously I talked about the <a href="http://bitworking.org/news/Six_Places">six different places</a> there are to + store information in an HTTP transaction. This is slightly misleading. +</p> + +<p> To review, the six places are:</p> +<ol> + <li>Request URI</li> + <li>Request Headers</li> + <li>Request Content</li> + <li>Response Status Code</li> + <li>Response Headers</li> + <li>Response Content</li> +</ol> + +<p>This is slightly misleading because the URI is listed as a single + storage location. This isn't the best characterization, as it really + contains two different sets of information: the path, and the query parameters.</p> + +<p>Now the path part of a URI usually corresponds to the directory structure on the server. + But remember that the path structure of a server is completely controlled + by that server and it need not corresponse to any file or directory strucure. + While it is at times convenient to map it to a directory structure, this isn't required, + and it is possible to pass path information to a + CGI program. For example, if you do a GET on the following URL:</p> + +<pre class="example"><code>http://example.org/cgi-bin/test.py/fred/12 +</code></pre> + +<p>and there exists a program named <code>test.py</code> in the <code>cgi-bin</code> directory + then that program will be executed. The remaining path after the program is passed + to the CGI program in the PATH_INFO environment variable. In contrast, if query + parameters are passed in, they are passed to the CGI program + via the QUERY_STRING environment variable.</p> + +<p>For example, if this is the script <code>test.py</code>:</p> + +<pre class="example"><code>import os +print "Content-type: text/plain\n\n" +print "PATH_INFO = %s" % os.environ['PATH_INFO'] +print "QUERY_STRING = %s" % os.environ['QUERY_STRING']</code></pre> + +<p>And it handles the GET for this URI:</p> + +<pre class="example"><code>http://localhost/cgi-bin/test.py/reilly/12?id=234454</code></pre> + +<p>It will display:</p> + +<pre class="example"><code>PATH_INFO = /reilly/12 +QUERY_STRING = id=234454 +</code></pre> + +<p>Note how the piece of the path below test.py has been stripped off and made + available via <code>PATH_INFO</code>, while the query parameters are + stored in the QUERY_STRING environment variable. +</p> + +<p>So HTTP, via the structure of a URI, gives you two distinct places + to store information, one in the path and the second in the query parameters. + This isn't even the full story, because if you are running Apache and have + the ability to use .htaccess files you can use + <a href="http://httpd.apache.org/docs/mod/mod_rewrite.html">mod_rewrite</a> and map URIs so that they appear + as paths but show up in the CGI as query parameters, but we won't cover that + now. +</p> + + + </description> + + <dc:date>2003-08-03T01:34:49-05:00</dc:date> + <wfw:comment>http://wellformedweb.org/news/comments/SixPlusOne</wfw:comment> + <wfw:commentRss>http://wellformedweb.org/news/SixPlusOne?crss</wfw:commentRss> + </item> + </channel> +</rss> + + + diff --git a/akregator/src/librss/test_data/dublincore.xml b/akregator/src/librss/test_data/dublincore.xml new file mode 100644 index 00000000..075822bb --- /dev/null +++ b/akregator/src/librss/test_data/dublincore.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<rss xmlns:media="http://search.yahoo.com/mrss/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="2.0"> + <channel> + <title>The Guardian</title> + <link>https://www.theguardian.com/us</link> + <description>Latest US news, world news, sports, business, opinion, analysis and reviews from the Guardian, the world's leading liberal voice</description> + <copyright>Guardian News and Media Limited or its affiliated companies. All rights reserved. 2025</copyright> + <language>en-gb</language> + <!-- pubDate has been modified so we can assure dc:date is chosen. --> + <pubDate>Thu, 13 Mar 2020 10:38:39 GMT</pubDate> + <dc:date>2025-03-13T07:28:39Z</dc:date> + <dc:language>en-gb</dc:language> + <dc:rights>Guardian News and Media Limited or its affiliated companies. All rights reserved. 2025</dc:rights> + <image> + <title>The Guardian</title> + <url>https://assets.guim.co.uk/images/guardian-logo-rss.c45beb1bafa34b347ac333af2e6fe23f.png</url> + <link>https://www.theguardian.com</link> + </image> + <item> + <title>Judge orders Elon Musk and Doge to produce records about cost-cutting operations</title> + <link>https://www.theguardian.com/us-news/2025/mar/13/elon-musk-doge-court-ruling-records</link> + <description><p>The documents would ultimately inform whether Musk has been operating unconstitutionally to the extent Doge’s activities should be halted</p><p>Elon Musk and his so-called “department of government efficiency”, or Doge, have been ordered by <a href="https://www.theguardian.com/us-news/2025/mar/12/judge-blocks-trump-order-perkins-coie">a federal judge</a> to turn over a wide array of records that would reveal the identities of staffers and internal records related to efforts to aggressively cut federal government spending and programs.</p><p>US district judge Tanya Chutkan’s order forces Musk to produce documents related to Doge’s activities <a href="https://storage.courtlistener.com/recap/gov.uscourts.dcd.277463/gov.uscourts.dcd.277463.61.0_1.pdf">as part of a lawsuit</a> brought by 14 Democratic state attorneys general that alleges Musk violated the constitution by wielding powers that only Senate-confirmed officials should possess.</p> <a href="https://www.theguardian.com/us-news/2025/mar/13/elon-musk-doge-court-ruling-records">Continue reading...</a></description> + <category domain="https://www.theguardian.com/us-news/trump-administration">Trump administration</category> + <category domain="https://www.theguardian.com/us-news/donaldtrump">Donald Trump</category> + <category domain="https://www.theguardian.com/law/law-us">Law (US)</category> + <category domain="https://www.theguardian.com/us-news/us-politics">US politics</category> + <category domain="https://www.theguardian.com/us-news/us-news">US news</category> + <!-- pubDate has been modified so we can assure dc:date is chosen. --> + <pubDate>Thu, 13 Mar 2020 10:38:39 GMT</pubDate> + <guid>https://www.theguardian.com/us-news/2025/mar/13/elon-musk-doge-court-ruling-records</guid> + <media:content width="140" url="https://i.guim.co.uk/img/media/8570e3094dfad7e268555097158aa8085221d48f/0_72_5221_3132/master/5221.jpg?width=140&quality=85&auto=format&fit=max&s=8677942b4c15d93e73d6bd18a13a12c0"> + <media:credit scheme="urn:ebu">Photograph: Alex Brandon/AP</media:credit> + </media:content> + <media:content width="460" url="https://i.guim.co.uk/img/media/8570e3094dfad7e268555097158aa8085221d48f/0_72_5221_3132/master/5221.jpg?width=460&quality=85&auto=format&fit=max&s=bcd596d741b8c9e4be82c602e5105122"> + <media:credit scheme="urn:ebu">Photograph: Alex Brandon/AP</media:credit> + </media:content> + <dc:creator>Hugo Lowell in Washington</dc:creator> + <dc:date>2025-03-13T05:22:00Z</dc:date> + </item> + </channel> +</rss> + diff --git a/akregator/src/librss/test_data/rdf.xml b/akregator/src/librss/test_data/rdf.xml new file mode 100644 index 00000000..dadcde6d --- /dev/null +++ b/akregator/src/librss/test_data/rdf.xml @@ -0,0 +1,64 @@ +<?xml version="1.0"?> +<rdf:RDF + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://purl.org/rss/1.0/" +> + + <channel rdf:about="http://www.xml.com/xml/news.rss"> + <title>XML.com</title> + <link>http://xml.com/pub</link> + + <description> + XML.com features a rich mix of information and services + for the XML community. + </description> + + <image rdf:resource="http://xml.com/universal/images/xml_tiny.gif" /> + + <items> + <rdf:Seq> + + <rdf:li resource="http://xml.com/pub/2000/08/09/xslt/xslt.html" /> + <rdf:li resource="http://xml.com/pub/2000/08/09/rdfdb/index.html" /> + </rdf:Seq> + </items> + + <textinput rdf:resource="http://search.xml.com" /> + + </channel> + <image rdf:about="http://xml.com/universal/images/xml_tiny.gif"> + <title>XML.com</title> + <link>http://www.xml.com</link> + <url>http://xml.com/universal/images/xml_tiny.gif</url> + + </image> + <item rdf:about="http://xml.com/pub/2000/08/09/xslt/xslt.html"> + <title>Processing Inclusions with XSLT</title> + <link>http://xml.com/pub/2000/08/09/xslt/xslt.html</link> + <description> + + Processing document inclusions with general XML tools can be + problematic. This article proposes a way of preserving inclusion + information through SAX-based processing. + </description> + </item> + <item rdf:about="http://xml.com/pub/2000/08/09/rdfdb/index.html"> + <title>Putting RDF to Work</title> + <link>http://xml.com/pub/2000/08/09/rdfdb/index.html</link> + + <description> + Tool and API support for the Resource Description Framework + is slowly coming of age. Edd Dumbill takes a look at RDFDB, + one of the most exciting new RDF toolkits. + </description> + </item> + + <textinput rdf:about="http://search.xml.com"> + <title>Search XML.com</title> + + <description>Search XML.com's XML collection</description> + <name>s</name> + <link>http://search.xml.com</link> + </textinput> + +</rdf:RDF> diff --git a/akregator/src/librss/test_data/rss091.xml b/akregator/src/librss/test_data/rss091.xml new file mode 100644 index 00000000..65788c3d --- /dev/null +++ b/akregator/src/librss/test_data/rss091.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<rss version="0.91"> + <channel> + <title>WriteTheWeb</title> + <link>http://writetheweb.com</link> + <description>News for web users that write back</description> + <language>en-us</language> + <copyright>Copyright 2000, WriteTheWeb team.</copyright> + <managingEditor>editor@writetheweb.com</managingEditor> + <webMaster>webmaster@writetheweb.com</webMaster> + <image> + <title>WriteTheWeb</title> + <url>http://writetheweb.com/images/mynetscape88.gif</url> + <link>http://writetheweb.com</link> + <width>88</width> + <height>31</height> + <description>News for web users that write back</description> + </image> + <item> + <title>Giving the world a pluggable Gnutella</title> + <link>http://writetheweb.com/read.php?item=24</link> + <description>WorldOS is a framework on which to build programs that work like Freenet or Gnutella -allowing distributed applications using peer-to-peer routing.</description> + </item> + <item> + <title>Syndication discussions hot up</title> + <link>http://writetheweb.com/read.php?item=23</link> + <description>After a period of dormancy, the Syndication mailing list has become active again, with contributions from leaders in traditional media and Web syndication.</description> + </item> + <item> + <title>Personal web server integrates file sharing and messaging</title> + <link>http://writetheweb.com/read.php?item=22</link> + <description>The Magi Project is an innovative project to create a combined personal web server and messaging system that enables the sharing and synchronization of information across desktop, laptop and palmtop devices.</description> + </item> + <item> + <title>Syndication and Metadata</title> + <link>http://writetheweb.com/read.php?item=21</link> + <description>RSS is probably the best known metadata format around. RDF is probably one of the least understood. In this essay, published on my O'Reilly Network weblog, I argue that the next generation of RSS should be based on RDF.</description> + </item> + <item> + <title>UK bloggers get organised</title> + <link>http://writetheweb.com/read.php?item=20</link> + <description>Looks like the weblogs scene is gathering pace beyond the shores of the US. There's now a UK-specific page on weblogs.com, and a mailing list at egroups.</description> + </item> + <item> + <title>Yournamehere.com more important than anything</title> + <link>http://writetheweb.com/read.php?item=19</link> + <description>Whatever you're publishing on the web, your site name is the most valuable asset you have, according to Carl Steadman.</description> + </item> + </channel> + </rss> diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp index bef989c6..5e298ea3 100644 --- a/akregator/src/librss/testlibrss.cpp +++ b/akregator/src/librss/testlibrss.cpp @@ -1,67 +1,268 @@ #include "testlibrss.h" -#include "image.h" +#include <tqdatetime.h> +#include <tqfile.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <tdeapplication.h> #include <kdebug.h> +#include <krfcdate.h> + +#include "image.h" +#include "enclosure.h" + +#include <cstdlib> using namespace RSS; + +TestRetriever::TestRetriever() + : m_errorCode(0) +{ +} + +TestRetriever::~TestRetriever() +{ +} + +void TestRetriever::retrieveData(const KURL &url) +{ + // Test files are local paths + TQFile file(url.path()); + if (file.open(IO_ReadOnly)) + { + TQStringList lines; + TQTextStream stream(&file); + + while (!stream.atEnd()) + { + lines += stream.readLine(); + } + file.close(); + + TQCString content = lines.join("\n").local8Bit(); + TQByteArray data; + data.duplicate(content, content.length()); + emit dataRetrieved(data, true); + } + else + { + kdError() << "Failed to retrieveData: " << file.errorString() << endl; + m_errorCode = file.status(); + emit dataRetrieved(TQByteArray{}, false); + } +} + static const TDECmdLineOptions options[] = { { "+url", I18N_NOOP("URL of feed"), 0 }, TDECmdLineLastOption }; +template<typename ActualType, typename ExpectedType> +static void assertEquals(const ActualType& actual, const ExpectedType& expected) +{ + if (actual != expected) + { + kdError() << "Assertion failed: actual == expected\n" + << " actual: " << actual << "\n" + << " expected: " << expected << endl; + tdeApp->exit(1); + } +} + +static void checkRSS091(const Document& document) +{ + assertEquals(document.title(), "WriteTheWeb"); + assertEquals(document.link().url(), "http://writetheweb.com"); + assertEquals(document.description(), "News for web users that write back"); + assertEquals(document.language(), Language::en_us); + assertEquals(document.copyright(), "Copyright 2000, WriteTheWeb team."); + assertEquals(document.managingEditor(), "editor@writetheweb.com"); + assertEquals(document.webMaster(), "webmaster@writetheweb.com"); + + const Image* image = document.image(); + if (!image) + { + kdError() << "Expected an <image> element to be found" << endl; + tdeApp->exit(1); + } + + assertEquals(image->title(), "WriteTheWeb"); + assertEquals(image->url().url(), "http://writetheweb.com/images/mynetscape88.gif"); + assertEquals(image->link().url(), "http://writetheweb.com"); + assertEquals(image->description(), "News for web users that write back"); + assertEquals(image->width(), 88); + assertEquals(image->height(), 31); + + assertEquals(document.articles().count(), 6); + + Article article = document.articles().first(); + assertEquals(article.title(), "Giving the world a pluggable Gnutella"); + assertEquals(article.link().url(), "http://writetheweb.com/read.php?item=24"); + assertEquals(article.description(), "WorldOS is a framework on which to build programs that work like Freenet or Gnutella -allowing distributed applications using peer-to-peer routing."); +} + +static void checkWFW(const Document& document) +{ + assertEquals(document.link().url(), "http://wellformedweb.org/news/"); + assertEquals(document.description(), "Exploring the limits of XML and HTTP"); + + assertEquals(document.articles().count(), 5); + + Article article = document.articles().front(); + assertEquals(article.title(), "Should you use Content Negotiation in your Web Services?"); + assertEquals(article.commentsLink().url(), "http://bitworking.org/news/comments/WebServicesAndContentNegotiation"); +} + +static void checkDC(const Document& document) +{ + // librss will use dc:date if it is provided, otherwise it will use pubDate + assertEquals(document.link().url(), "https://www.theguardian.com/us"); + + TQDateTime expectedTime; + time_t time = KRFCDate::parseDateISO8601("2025-03-13T07:28:39Z"); + expectedTime.setTime_t(time); + assertEquals(document.pubDate(), expectedTime); + + assertEquals(document.articles().count(), 1); + + Article article = document.articles().first(); + time = KRFCDate::parseDateISO8601("2025-03-13T05:22:00Z"); + expectedTime.setTime_t(time); + assertEquals(article.pubDate(), expectedTime); + + assertEquals(article.author(), "Hugo Lowell in Washington"); +} + +static void checkRDF(const Document& document) +{ + assertEquals(document.title(), "XML.com"); + assertEquals(document.link().url(), "http://xml.com/pub"); + + assertEquals(document.articles().count(), 2); + + Article article = document.articles().first(); + + assertEquals(article.title(), "Processing Inclusions with XSLT"); + assertEquals(article.link().url(), "http://xml.com/pub/2000/08/09/xslt/xslt.html"); + assertEquals(article.guid(), "http://xml.com/pub/2000/08/09/xslt/xslt.html"); + assertEquals(article.guidIsPermaLink(), false); +} + +static void checkAtom10(const Document& document) +{ + assertEquals(document.title(), "dive into mark"); + assertEquals(document.description(), "A <em>lot</em> of effort went into making this effortless"); + kdWarning() << "Skipping check for Atom \"rights\" (Document::copyright) -- not implemented." << endl; + // assertEquals(document.copyright(), "Copyright (c) 2003, Mark Pilgrim"); + assertEquals(document.language(), Language::en_us); + + // 2005-07-31T12:29:29Z + // TQDateTime compTime; + // time_t time = KRFCDate::parseDateISO8601("2005-07-31T12:29:29Z"); + // compTime.setTime_t(time); + // assertEquals(document.pubDate(), compTime); + kdWarning() << "Skipping check for Atom \"updated\" (Document::pubDate/lastBuildDate) -- not implemented." << endl; + + assertEquals(document.link().url(), "http://example.org/"); + + assertEquals(document.articles().count(), 1); + + Article article = document.articles().first(); + + assertEquals(article.title(), "Atom draft-07 snapshot"); + assertEquals(article.link().url(), "http://example.org/2005/04/02/atom"); + + if (article.description().isNull()) + { + kdError() << "Empty Atom article description." << endl; + tdeApp->exit(1); + } + + // Enclosure enclosure = article.enclosure(); + // assertEquals(enclosure.url(), "http://example.org/audio/ph34r_my_podcast.mp3"); + // assertEquals(enclosure.length(), 1337); + // assertEquals(enclosure.type(), "audio/mpeg"); + kdWarning() << "Skipping check for Atom \"enclosure\" links -- not implemented." << endl; + + assertEquals(article.guid(), "tag:example.org,2003:3.2397"); + + // 2005-07-31T12:29:29Z + // Need a little workaround since librss converts the timestamp to local time. + // NOTE: Atom provides both 'published' and 'updated'; librss uses 'updated'. + TQDateTime articlePublishedDate; + time_t publishedTime = KRFCDate::parseDateISO8601("2005-07-31T12:29:29Z"); + articlePublishedDate.setTime_t(publishedTime); + assertEquals(article.pubDate(), articlePublishedDate); + + assertEquals(article.author(), "<a href=\"mailto:f8dy@example.com\">Mark Pilgrim</a>"); +} void Tester::test( const TQString &url ) { Loader *loader = Loader::create(); - connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ), - this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); - loader->loadFrom( url, new FileRetriever ); + connect( loader, TQ_SIGNAL( loadingComplete( Loader *, Document, Status ) ), + this, TQ_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); + loader->loadFrom( url, new TestRetriever ); } void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status ) { - if ( status == Success ) + if (status != Success) { - kdDebug() << "Successfully retrieved '" << doc.title() << "'" << endl; - kdDebug() << doc.description() << endl; - - if ( doc.image() ) { - kdDebug() << "Image: "; - kdDebug() << " Title: " << doc.image()->title() << endl; - kdDebug() << " URL: " << doc.image()->url() << endl; - kdDebug() << " Link: " << doc.image()->link() << endl; - } - - kdDebug() << "Articles:" << endl; - - Article::List list = doc.articles(); - Article::List::ConstIterator it; - Article::List::ConstIterator en=list.end(); - for (it = list.begin(); it != en; ++it) + kdError() << "Failed to load Document: ec=" << loader->errorCode() << " status=" << status << endl; + exit(1); + } + + switch (doc.version()) + { + case RSS::v0_91: { - kdDebug() << "\tTitle: " << (*it).title() << endl; - kdDebug() << "\tText: " << (*it).description() << endl; + checkRSS091(doc); + break; + } + case RSS::v2_0: + { + if (doc.title() == "The Well-Formed Web") + { + checkWFW(doc); + break; + } + else if (doc.title() == "The Guardian") + { + checkDC(doc); + break; + } + else if (doc.title() == "XML.com") + { + checkRDF(doc); + break; + } + kdError() << "Unknown RSS 2.0 document '" << doc.title() << "'" << endl; + exit(1); + } + case RSS::vAtom_1_0: + { + checkAtom10(doc); + break; + } + default: + { + break; } } - if ( status != Success ) - kdDebug() << "ERROR " << loader->errorCode() << endl; - - kapp->quit(); + exit(0); } int main( int argc, char **argv ) { TDEAboutData aboutData( "testlibrss", "testlibrss", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); - TDECmdLineArgs::addCmdLineOptions( options ); - TDEApplication app; + TDECmdLineArgs::addCmdLineOptions( options ); + TDEApplication app(false, false); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() != 1 ) args->usage(); diff --git a/akregator/src/librss/testlibrss.h b/akregator/src/librss/testlibrss.h index 2a918a5b..fdbccbd1 100644 --- a/akregator/src/librss/testlibrss.h +++ b/akregator/src/librss/testlibrss.h @@ -15,7 +15,7 @@ using RSS::Status; class Tester : public TQObject { TQ_OBJECT - + public: void test( const TQString &url ); @@ -23,4 +23,22 @@ class Tester : public TQObject void slotLoadingComplete( Loader *loader, Document doc, Status status ); }; +class TestRetriever : public RSS::DataRetriever +{ + TQ_OBJECT + +public: + TestRetriever(); + ~TestRetriever() override; + + void retrieveData(const KURL &url) override; + + int errorCode() const override { return m_errorCode; } + + void abort() override { /* no-op */ } + +private: + int m_errorCode; +}; + #endif diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp index 9303bdf5..04dc570b 100644 --- a/akregator/src/librss/tools_p.cpp +++ b/akregator/src/librss/tools_p.cpp @@ -117,6 +117,59 @@ static TQString extractAtomContent(const TQDomElement& e) return TQString(); } +TQDomElement extractElementNS(const TQDomNode &parent, const TQString &nameSpace, const TQString &localName) +{ + TQDomElement element; + + if (parent.isNull()) + { + return element; + } + + TQDomNodeList children = parent.childNodes(); + for (size_t i = 0; i < children.count(); ++i) + { + TQDomNode node = children.item(i); + if (node.isElement() && node.namespaceURI() == nameSpace && node.localName() == localName) + { + element = node.toElement(); + break; + } + } + + return element; +} + +TQString extractElementTextNS(const TQDomNode &parent, const TQString &namespaceURI, const TQString &localName, bool isInlined) +{ + TQDomElement element = extractElementNS(parent, namespaceURI, localName); + + if (element.isNull()) + { + return TQString::null; + } + + TQString result = element.text().stripWhiteSpace(); + if (localName == "content") + { + // Atom content + result = extractAtomContent(element); + } + else + { + // Check for HTML; not necessary for atom:content + // Taken from extractNode below + bool hasPre = result.contains("<pre>", false) || result.contains("<pre ", false); + bool hasHtml = hasPre || result.contains("<"); + if (!isInlined && !hasHtml) + result = result = result.replace(TQChar('\n'), "<br />"); + if (!hasPre) + result = result.simplifyWhiteSpace(); + } + + return result.isEmpty() ? TQString::null : result; +} + TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined) { TQDomNode node = parent.namedItem(elemName); @@ -208,25 +261,25 @@ TQString parseItemAuthor(const TQDomElement& element, Format format, Version ver TQString name; TQString email; - TQDomElement dcCreator = element.namedItem("dc:creator").toElement(); - + TQDomElement dcCreator = extractElementNS(element, DublinCoreNamespace, "creator"); + if (!dcCreator.isNull()) authorFromString(dcCreator.text(), name, email); else if (format == AtomFeed) { TQDomElement atomAuthor = element.namedItem("author").toElement(); if (atomAuthor.isNull()) - atomAuthor = element.namedItem("atom:author").toElement(); + atomAuthor = extractElementNS(element, AtomNamespace, "author"); if (!atomAuthor.isNull()) { TQDomElement atomName = atomAuthor.namedItem("name").toElement(); if (atomName.isNull()) - atomName = atomAuthor.namedItem("atom:name").toElement(); + atomName = extractElementNS(atomAuthor, AtomNamespace, "name"); name = atomName.text().stripWhiteSpace(); TQDomElement atomEmail = atomAuthor.namedItem("email").toElement(); if (atomEmail.isNull()) - atomEmail = atomAuthor.namedItem("atom:email").toElement(); + atomEmail = extractElementNS(atomAuthor, AtomNamespace, "email"); email = atomEmail.text().stripWhiteSpace(); } } diff --git a/akregator/src/librss/tools_p.h b/akregator/src/librss/tools_p.h index 0ec9013f..1b89fc85 100644 --- a/akregator/src/librss/tools_p.h +++ b/akregator/src/librss/tools_p.h @@ -29,6 +29,8 @@ namespace RSS unsigned int count; }; + TQDomElement extractElementNS(const TQDomNode& parent, const TQString& namespaceURI, const TQString& localName); + TQString extractElementTextNS(const TQDomNode& parent, const TQString& namespaceURI, const TQString& localName, bool isInlined = true); TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined=true); TQString extractTitle(const TQDomNode &parent); TQString childNodesAsXML(const TQDomNode& parent); 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/main.cpp b/akregator/src/main.cpp index 4c4b31ec..9f6e466e 100644 --- a/akregator/src/main.cpp +++ b/akregator/src/main.cpp @@ -28,7 +28,7 @@ #include <tdecmdlineargs.h> #include <tdelocale.h> #include <knotifyclient.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include "aboutdata.h" #include "mainwindow.h" @@ -36,7 +36,7 @@ namespace Akregator { -class Application : public KUniqueApplication { +class Application : public TDEUniqueApplication { public: Application() : mMainWindow( ) {} ~Application() {} @@ -80,7 +80,7 @@ int Application::newInstance() args->clear(); } - return KUniqueApplication::newInstance(); + return TDEUniqueApplication::newInstance(); } } // namespace Akregator @@ -90,7 +90,7 @@ int main(int argc, char **argv) Akregator::AboutData about; TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( Akregator::akregator_options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); Akregator::Application app; diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index f5654d9b..b236d001 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -43,7 +43,7 @@ #include <tdemessagebox.h> #include <tdeparts/partmanager.h> #include <ksqueezedtextlabel.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstatusbar.h> #include <kstdaction.h> #include <kurl.h> @@ -55,14 +55,14 @@ #include <tqmetaobject.h> #include <tqpen.h> #include <tqpainter.h> -#include <tqucomextra_p.h> +#include <private/tqucomextra_p.h> #include <tqtimer.h> namespace Akregator { BrowserInterface::BrowserInterface( MainWindow *shell, const char *name ) - : KParts::BrowserInterface( TQT_TQOBJECT(shell), name ) + : KParts::BrowserInterface( shell, name ) { m_shell = shell; } @@ -104,16 +104,16 @@ bool MainWindow::loadPart() { // now that the Part is loaded, we cast it to a Part to get // our hands on it - m_part = static_cast<Akregator::Part*>(factory->create(TQT_TQOBJECT(this), "akregator_part", "KParts::ReadOnlyPart" )); + m_part = static_cast<Akregator::Part*>(factory->create(this, "akregator_part", "KParts::ReadOnlyPart" )); if (m_part) { // tell the KParts::MainWindow that this is indeed the main widget setCentralWidget(m_part->widget()); - connect(m_part, TQT_SIGNAL(setWindowCaption (const TQString &)), this, TQT_SLOT(setCaption (const TQString &))); + connect(m_part, TQ_SIGNAL(setWindowCaption (const TQString &)), this, TQ_SLOT(setCaption (const TQString &))); - connect(TrayIcon::getInstance(), TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotQuit())); + connect(TrayIcon::getInstance(), TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotQuit())); // and integrate the part's GUI with the shell's connectActionCollection(m_part->actionCollection()); createGUI(m_part); @@ -154,13 +154,13 @@ void MainWindow::setupActions() { connectActionCollection(actionCollection()); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); setStandardToolBarMenuEnabled(true); createStandardStatusBarAction(); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void MainWindow::saveProperties(TDEConfig* config) @@ -203,8 +203,8 @@ void MainWindow::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } @@ -226,16 +226,16 @@ KParts::BrowserExtension *MainWindow::browserExtension(KParts::ReadOnlyPart *p) void MainWindow::connectActionCollection( TDEActionCollection *coll ) { if (!coll) return; - connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), - m_statusLabel, TQT_SLOT( setText( const TQString & ) ) ); - connect( coll, TQT_SIGNAL( clearStatusText() ), - this, TQT_SLOT( slotClearStatusText() ) ); + connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ), + m_statusLabel, TQ_SLOT( setText( const TQString & ) ) ); + connect( coll, TQ_SIGNAL( clearStatusText() ), + this, TQ_SLOT( slotClearStatusText() ) ); } bool MainWindow::queryExit() { kdDebug() << "MainWindow::queryExit()" << endl; - if ( !kapp->sessionSaving() ) + if ( !tdeApp->sessionSaving() ) { delete m_part; // delete that here instead of dtor to ensure nested tdehtmlparts are deleted before singleton objects like TDEHTMLPageCache m_part = 0; @@ -250,12 +250,12 @@ void MainWindow::slotQuit() { if (TrayIcon::getInstance()) TrayIcon::getInstance()->hide(); - kapp->quit(); + tdeApp->quit(); } bool MainWindow::queryClose() { - if (kapp->sessionSaving() || TrayIcon::getInstance() == 0 || TrayIcon::getInstance()->isHidden() ) + if (tdeApp->sessionSaving() || TrayIcon::getInstance() == 0 || TrayIcon::getInstance()->isHidden() ) { return true; } diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp index 501b8b26..8a4af99c 100644 --- a/akregator/src/mk4storage/feedstoragemk4impl.cpp +++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp @@ -36,7 +36,7 @@ #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> namespace Akregator { namespace Backend { diff --git a/akregator/src/mk4storage/metakit/README b/akregator/src/mk4storage/metakit/README index 21edd0fc..5538acc0 100644 --- a/akregator/src/mk4storage/metakit/README +++ b/akregator/src/mk4storage/metakit/README @@ -55,9 +55,7 @@ INSTALLATION All platform builds and language bindings are designed to work from a single common "builds/" directory. Where possible, that is - it turns out to be -impossible to keep build side-effects limited to *just* this directory -(CodeWarrior can't be told where to place its temp data, and Visual C++ still -alters a few files next to the project ".dsw" file, to name two offenders). +impossible to keep build side-effects limited to *just* this directory. UNIX @@ -86,7 +84,7 @@ WINDOWS There is a "win/" directory which contains subdirectories for a number of compiler systems. Metakit has been built with many different compilers - in the past (Microsoft, Borland, Watcom, Symantec, Metrowerks, Optima), + in the past (Microsoft, Watcom, Symantec, Optima), only a few are maintained (there are 12 configurations for MSVC6 alone!). The MS Visual C++ 6.0 project is "win/msvc60/mksrc.dsw", with subprojects @@ -98,14 +96,6 @@ WINDOWS To build with STL containers and strings under MSVC, define "q4_STD". To build with MFC containers and strings under MSVC, define "q4_MFC". - The Metrowerks Codewarrior project is in the "mac/" directory, and can be - used to build both Mac and Windows versions (on either Mac *or* Windows). - The core libraries are built with "mac/cw5.mcp", demos / tests are built - with "cw5apps.mcp", Tcl is "cw5tcl.mcp", and Python is "cw5python.mcp". - - The Borland C++ Builder projects have not yet been incorporated in this - release, but the "KitViewer" application is an example of how to use BCB. - The Cygwin build (B20.1 / gcc 2.95.2) is different, because it uses the unix autoconf system, and must be launched as described above for UNIX. I have upgraded to the latest development of libtool to be able to build @@ -116,14 +106,6 @@ WINDOWS efficiency on x86 hardware: "-O2 -m486 -malign-loops=2 -malign-jumps=2". I have not yet tried this myself, but am passing on the tip. -MACINTOSH CLASSIC - - The Mac version requires Metrowerks CodeWarrior 6. See the info above - in the Windows section (MWCW is multi-platform). The projects are all - located in the "mac/" folder, which is also where MWCW will place its own - "... Data" folders with intermediate results. As with all other setups, - final results are made to end up in the "builds/" directory. - LICENSE AND COPYRIGHT STATEMENT =============================== diff --git a/akregator/src/mk4storage/metakit/include/mk4.h b/akregator/src/mk4storage/metakit/include/mk4.h index 33016dba..2b311246 100644 --- a/akregator/src/mk4storage/metakit/include/mk4.h +++ b/akregator/src/mk4storage/metakit/include/mk4.h @@ -114,19 +114,6 @@ //--------------------------------------------------------------------------- - // Borland C++ and C++ Builder -#if defined (__BORLANDC__) - // by default, if runtime is linked as a DLL, then so is Metakit -#if defined (_RTLDLL) && !defined (q4_KITDLL) -#define q4_KITDLL 1 -#endif - - // Borland 5.0 supports the bool datatype -#if __BORLANDC__ >= 0x500 -#define q4_BOOL 1 -#endif -#endif // __BORLANDC__ - // IRIX supports the bool datatype // define before gcc to cover both the gcc and MipsPRO compiler #if defined (sgi) @@ -153,17 +140,6 @@ #endif #endif - // Metrowerks CodeWarrior -#if defined (__MWERKS__) -#if __option(bool) -#define q4_BOOL 1 // bool datatype is optionally supported - // undef, these conflict with c4_Storage::c4_Storage overloading -#undef bool -#undef true -#undef false -#endif -#endif - // Microsoft Visual C++ #if defined (_MSC_VER) // MSVC 5.0 supports the bool datatype, MSVC 4.x has no namespaces diff --git a/akregator/src/mk4storage/metakit/src/Makefile.am b/akregator/src/mk4storage/metakit/src/Makefile.am index e428fe93..acd0db89 100644 --- a/akregator/src/mk4storage/metakit/src/Makefile.am +++ b/akregator/src/mk4storage/metakit/src/Makefile.am @@ -2,8 +2,8 @@ INCLUDES = -I$(srcdir)/../include noinst_LTLIBRARIES = libmetakitlocal.la -noinst_HEADERS = borc.h column.h column.inl custom.h derived.h field.h field.inl format.h gnuc.h handler.h handler.inl header.h mfc.h \ - msvc.h mwcw.h persist.h remap.h std.h store.h store.inl univ.h univ.inl win.h +noinst_HEADERS = column.h column.inl custom.h derived.h field.h field.inl format.h gnuc.h handler.h handler.inl header.h mfc.h \ + msvc.h persist.h remap.h std.h store.h store.inl univ.h univ.inl win.h libmetakitlocal_la_SOURCES = column.cpp custom.cpp derived.cpp field.cpp fileio.cpp format.cpp handler.cpp persist.cpp remap.cpp std.cpp store.cpp \ string.cpp table.cpp univ.cpp view.cpp viewx.cpp diff --git a/akregator/src/mk4storage/metakit/src/borc.h b/akregator/src/mk4storage/metakit/src/borc.h deleted file mode 100644 index 2b881fc9..00000000 --- a/akregator/src/mk4storage/metakit/src/borc.h +++ /dev/null @@ -1,33 +0,0 @@ -// borc.h -- -// $Id$ -// This is part of Metakit, see http://www.equi4.com/metakit/ - -/** @file - * Configuration header for Borland C++ - */ - -#define q4_BORC 1 - - // get rid of several common warning messages -#if !q4_STRICT -#pragma warn -aus // 'identifier' is assigned a value that is never used -#pragma warn -par // Parameter 'parameter' is never used. -#pragma warn -sig // Conversion may lose significant digits -#pragma warn -use // 'identifier' declared but never used -#endif - -#if __BORLANDC__ >= 0x500 -#define q4_BOOL 1 // supports the bool datatype - // undo previous defaults, because q4_BOOL is not set early enough -#undef false -#undef true -#undef bool -#endif - -#if !defined (q4_EXPORT) -#define q4_EXPORT 1 // requires export/import specifiers -#endif - -#if defined (__MT__) -#define q4_MULTI 1 // uses multi-threading -#endif diff --git a/akregator/src/mk4storage/metakit/src/column.cpp b/akregator/src/mk4storage/metakit/src/column.cpp index 2e8f24d1..1e4efb44 100644 --- a/akregator/src/mk4storage/metakit/src/column.cpp +++ b/akregator/src/mk4storage/metakit/src/column.cpp @@ -1212,8 +1212,6 @@ void c4_ColOfInts::SetAccessWidth(int bits_) if (l2bp1 > 4 && (_mustFlip || ((Persist() != 0) && Strategy()._bytesFlipped))) l2bp1 += 3; // switch to the trailing entries for byte flipping - // Metrowerks Codewarrior 11 is dumb, it requires the "&c4_ColOfInts::" - static tGetter gTab [] = { &c4_ColOfInts::Get_0b, // 0: 0 bits/entry diff --git a/akregator/src/mk4storage/metakit/src/fileio.cpp b/akregator/src/mk4storage/metakit/src/fileio.cpp index 28ff7dca..8e69ede7 100644 --- a/akregator/src/mk4storage/metakit/src/fileio.cpp +++ b/akregator/src/mk4storage/metakit/src/fileio.cpp @@ -41,127 +41,6 @@ #endif ///////////////////////////////////////////////////////////////////////////// -// -// The "Carbon" version of a build on Macintosh supports running under -// either MacOS 7..9 (which has no mmap), or MacOS X (which has mmap). -// The logic below was adapted from a contribution by Paul Snively, it -// decides at run time which case it is, and switches I/O calls to match. - -#if defined (q4_CARBON) && q4_CARBON -//#if q4_MAC && !defined (__MACH__) && (!q4_MWCW || __MWERKS__ >= 0x3000) -#undef HAVE_MMAP -#define HAVE_MMAP 1 - -#include <CFBundle.h> -#include <Folders.h> - -#define PROT_NONE 0x00 -#define PROT_READ 0x01 -#define PROT_WRITE 0x02 -#define PROT_EXEC 0x04 - -#define MAP_SHARED 0x0001 -#define MAP_PRIVATE 0x0002 - -#define MAP_FIXED 0x0010 -#define MAP_RENAME 0x0020 -#define MAP_NORESERVE 0x0040 -#define MAP_INHERIT 0x0080 -#define MAP_NOEXTEND 0x0100 -#define MAP_HASSEMAPHORE 0x0200 - -typedef unsigned long t4_u32; - -static t4_u32 sfwRefCount = 0; -static CFBundleRef systemFramework = NULL; - -static char* fake_mmap(char*, t4_u32, int, int, int, long long) - { return (char*) -1L; } -static int fake_munmap(char*, t4_u32) - { return 0; } - -static FILE* (*my_fopen)(const char*,const char*) = fopen; -static int (*my_fclose)(FILE*) = fclose; -static long (*my_ftell)(FILE*) = ftell; -static int (*my_fseek)(FILE*,long,int) = fseek; -static t4_u32 (*my_fread)(void* ptr,t4_u32,t4_u32,FILE*) = fread; -static t4_u32 (*my_fwrite)(const void* ptr,t4_u32,t4_u32,FILE*) = fwrite; -static int (*my_ferror)(FILE*) = ferror; -static int (*my_fflush)(FILE*) = fflush; -static int (*my_fileno)(FILE*) = fileno; -static char* (*my_mmap)(char*,t4_u32,int,int,int,long long) = fake_mmap; -static int (*my_munmap)(char*,t4_u32) = fake_munmap; - -static void InitializeIO() -{ - if (sfwRefCount++) return; // race condition, infinitesimal risk - - FSRef theRef; - if (FSFindFolder(kOnAppropriateDisk, kFrameworksFolderType, - false, &theRef) == noErr) { - CFURLRef fw = CFURLCreateFromFSRef(kCFAllocatorSystemDefault, &theRef); - if (fw) { - CFURLRef bd = - CFURLCreateCopyAppendingPathComponent(kCFAllocatorSystemDefault, - fw, CFSTR("System.framework"), false); - CFRelease(fw); - if (bd) { - systemFramework = CFBundleCreate(kCFAllocatorSystemDefault, bd); - CFRelease(bd); - } - } - if (!systemFramework || !CFBundleLoadExecutable(systemFramework)) - return; -#define F(x) CFBundleGetFunctionPointerForName(systemFramework, CFSTR(#x)) - my_fopen = (FILE* (*)(const char*,const char*)) F(fopen); - my_fclose = (int (*)(FILE*)) F(fclose); - my_ftell = (long (*)(FILE*)) F(ftell); - my_fseek = (int (*)(FILE*,long,int)) F(fseek); - my_fread = (t4_u32 (*)(void* ptr,t4_u32,t4_u32,FILE*)) F(fread); - my_fwrite = (t4_u32 (*)(const void* ptr,t4_u32,t4_u32,FILE*)) F(fwrite); - my_ferror = (int (*)(FILE*)) F(ferror); - my_fflush = (int (*)(FILE*)) F(fflush); - my_fileno = (int (*)(FILE*)) F(fileno); - my_mmap = (char* (*)(char*,t4_u32,int,int,int,long long)) F(mmap); - my_munmap = (int (*)(char*,t4_u32)) F(munmap); -#undef F - d4_assert(my_fopen && my_fclose && my_ftell && my_fseek && - my_fread && my_fwrite && my_ferror && my_fflush && - my_fileno && my_mmap && my_munmap); - } -} - -static void FinalizeIO() -{ - if (--sfwRefCount) return; // race condition, infinitesimal risk - - if (systemFramework) { - CFBundleUnloadExecutable(systemFramework); - CFRelease(systemFramework); - systemFramework = 0; - } -} - -#define fopen my_fopen -#define fclose my_fclose -#define ftell my_ftell -#define fseek my_fseek -#define fread my_fread -#define fwrite my_fwrite -#define ferror my_ferror -#define fflush my_fflush -#define fileno my_fileno -#define mmap my_mmap -#define munmap my_munmap - -#else - -#define InitializeIO() -#define FinalizeIO() - -#endif - -///////////////////////////////////////////////////////////////////////////// #if q4_CHECK #include <stdlib.h> @@ -209,7 +88,6 @@ bool c4_FileStream::Write(const void* buffer_, int length_) c4_FileStrategy::c4_FileStrategy (FILE* file_) : _file (file_), _cleanup (0) { - InitializeIO(); ResetFileMapping(); } @@ -222,7 +100,6 @@ c4_FileStrategy::~c4_FileStrategy () fclose(_cleanup); d4_assert(_mapStart == 0); - FinalizeIO(); } bool c4_FileStrategy::IsValid() const @@ -319,7 +196,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_) { d4_assert(!_file); -#if q4_WIN32 && !q4_BORC && !q4_WINCE +#if q4_WIN32 && !q4_WINCE int flags = _O_BINARY | _O_NOINHERIT | (mode_ > 0 ? _O_RDWR : _O_RDONLY); int fd = _open(fname_, flags); if (fd != -1) @@ -330,7 +207,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_) if (_file != 0) fcntl(fileno(_file), F_SETFD, FD_CLOEXEC); #endif //q4_UNIX -#endif //q4_WIN32 && !q4_BORC && !q4_WINCE +#endif //q4_WIN32 && !q4_WINCE if (_file != 0) { ResetFileMapping(); @@ -338,7 +215,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_) } if (mode_ > 0) { -#if q4_WIN32 && !q4_BORC && !q4_WINCE +#if q4_WIN32 && !q4_WINCE fd = _open(fname_, flags | _O_CREAT, _S_IREAD | _S_IWRITE); if (fd != -1) _cleanup = _file = _fdopen(fd, "w+b"); @@ -348,7 +225,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_) if (_file != 0) fcntl(fileno(_file), F_SETFD, FD_CLOEXEC); #endif //q4_UNIX -#endif //q4_WIN32 && !q4_BORC && !q4_WINCE +#endif //q4_WIN32 && !q4_WINCE } //d4_assert(_file != 0); diff --git a/akregator/src/mk4storage/metakit/src/header.h b/akregator/src/mk4storage/metakit/src/header.h index 2f8648b8..4f62551f 100644 --- a/akregator/src/mk4storage/metakit/src/header.h +++ b/akregator/src/mk4storage/metakit/src/header.h @@ -91,14 +91,8 @@ // Use '#define q4_xxx 1' to flag the choice of an IDE, and optionally also // add '#include "file.h"' to force inclusion of a header file right here. -#if defined (__BORLANDC__) // Borland C++ -#include "borc.h" -#elif defined (__DECCXX) // DEC C++ -#define q4_DECC 1 -#elif defined (__GNUC__) // GNU C++ +#if defined (__GNUC__) // GNU C++ #include "gnuc.h" -#elif defined (__MWERKS__) // Metrowerks CodeWarrior C++ -#include "mwcw.h" #elif defined (_MSC_VER) // Microsoft Visual C++ #include "msvc.h" #elif defined (__SC__) // Symantec C++ diff --git a/akregator/src/mk4storage/metakit/src/mwcw.h b/akregator/src/mk4storage/metakit/src/mwcw.h deleted file mode 100644 index 1c863b96..00000000 --- a/akregator/src/mk4storage/metakit/src/mwcw.h +++ /dev/null @@ -1,31 +0,0 @@ -// mwcw.h -- -// $Id$ -// This is part of Metakit, see http://www.equi4.com/metakit/ - -/** @file - * Configuration header for Metrowerks CodeWarrior - */ - -#define q4_MWCW 1 - -///////////////////////////////////////////////////////////////////////////// - -#if q4_68K -#if !__option(IEEEdoubles) -#error Cannot build Metakit with 10-byte doubles -#endif -#endif - -#if __option(bool) -#define q4_BOOL 1 - // undo previous defaults, because q4_BOOL is not set early enough -#undef false -#undef true -#undef bool -#endif - -#undef _MSC_VER - -#pragma export on - -///////////////////////////////////////////////////////////////////////////// diff --git a/akregator/src/mk4storage/metakit/src/string.cpp b/akregator/src/mk4storage/metakit/src/string.cpp index 33c8836c..e5d140ab 100644 --- a/akregator/src/mk4storage/metakit/src/string.cpp +++ b/akregator/src/mk4storage/metakit/src/string.cpp @@ -34,7 +34,7 @@ ///////////////////////////////////////////////////////////////////////////// -#if q4_MSVC || q4_WATC || q4_BORC || (q4_MWCW && __MWERKS__ < 0x3000) +#if q4_MSVC || q4_WATC #define strcasecmp stricmp #elif q4_WINCE diff --git a/akregator/src/mk4storage/metakit/src/univ.cpp b/akregator/src/mk4storage/metakit/src/univ.cpp index 81a73015..08a4ba1a 100644 --- a/akregator/src/mk4storage/metakit/src/univ.cpp +++ b/akregator/src/mk4storage/metakit/src/univ.cpp @@ -21,8 +21,7 @@ #if q4_UNIX || __MINGW32__ #define _strdup strdup -#elif !q4_BORC && !q4_MSVC && !q4_WATC && !(q4_MWCW && defined(_WIN32)) && \ - !(q4_MWCW && __MWERKS__ >= 0x3000) +#elif !q4_MSVC && !q4_WATC static char* _strdup(const char* p) { @@ -35,34 +34,6 @@ #endif - // The Borland C++ RTL does not want file handle objects to cross - // DLL boundaries, so we add special fopen/fclose hooks to this DLL. - -#if q4_BORC - #include <stdio.h> - -#if q4_WIN32 - __declspec(dllexport) FILE* -#else - FILE* __export -#endif - f4_FileOpenInDLL(const char* name_, const char* mode_) - { - return fopen(name_, mode_); - } - -#if q4_WIN32 - __declspec(dllexport) -#else - int __export -#endif - f4_FileCloseInDLL(FILE* file_) - { - return fclose(file_); - } - -#endif - ///////////////////////////////////////////////////////////////////////////// // c4_BaseArray diff --git a/akregator/src/mk4storage/metakit/tests/regress.cpp b/akregator/src/mk4storage/metakit/tests/regress.cpp index 0725f57f..6724d338 100644 --- a/akregator/src/mk4storage/metakit/tests/regress.cpp +++ b/akregator/src/mk4storage/metakit/tests/regress.cpp @@ -15,11 +15,6 @@ #endif #endif -#if __profile__ - #define q4_MWCW_PROFILER 1 - #include <profiler.h> -#endif - #if q4_NOTHROW const char* msg; #endif @@ -56,10 +51,6 @@ main() DebugNewForgetLeaks(); #endif -#if q4_MWCW_PROFILER - if (!ProfilerInit(collectDetailed, bestTimeBase, 20, 5)) - { -#endif TestBasics1(); TestBasics2(); TestNotify(); @@ -77,12 +68,6 @@ main() TestMapped(); TestLimits(); -#if q4_MWCW_PROFILER - ProfilerDump("\pRegress.prof"); - ProfilerTerm(); - } -#endif - #if defined (_DEBUG) fputs("\nPress return... ", stderr); getchar(); @@ -226,18 +211,14 @@ int StartTest(int mask_, const char* name_, const char* desc_) #if q4_MFC && defined(_DEBUG) TRACE("%s - %-40s *** DISABLED ***\n", name_, desc_); #endif - #if !q4_MWCW_PROFILER - fprintf(stderr, "%s - %-40s *** DISABLED ***\n", name_, desc_); - #endif + fprintf(stderr, "%s - %-40s *** DISABLED ***\n", name_, desc_); return false; } #if q4_MFC && defined(_DEBUG) TRACE("%s - %s\n", name_, desc_); #endif - #if !q4_MWCW_PROFILER - fprintf(stderr, "%s - %s\n", name_, desc_); - #endif + fprintf(stderr, "%s - %s\n", name_, desc_); char buffer [50]; sprintf(buffer, "%s%s.txt", TESTDIR, name_); @@ -254,16 +235,12 @@ int StartTest(int mask_, const char* name_, const char* desc_) void CatchMsg(const char* msg) { - #if !q4_MWCW_PROFILER - fprintf(stderr, "\t%s\n", msg); - #endif + fprintf(stderr, "\t%s\n", msg); printf("*** %s ***\n", msg); } void CatchOther() { - #if !q4_MWCW_PROFILER - fputs("\tException!\n", stderr); - #endif + fputs("\tException!\n", stderr); printf("*** Exception ***\n"); } diff --git a/akregator/src/mk4storage/metakit/tests/regress.h b/akregator/src/mk4storage/metakit/tests/regress.h index b5611e57..1574bc0d 100644 --- a/akregator/src/mk4storage/metakit/tests/regress.h +++ b/akregator/src/mk4storage/metakit/tests/regress.h @@ -132,14 +132,3 @@ extern void TestStores2(); extern void TestStores3(); extern void TestStores4(); extern void TestStores5(); - - // The Borland C++ RTL does not want file handle objects to cross - // DLL boundaries, so we use special fopen/fclose hooks in the DLL. - -#if defined (__BORLANDC__) // this assumes Metakit is in a DLL! -extern FILE* f4_FileOpenInDLL(const char*, const char*); -extern int f4_FileCloseInDLL(FILE*); - -#define fopen f4_FileOpenInDLL -#define fclose f4_FileCloseInDLL -#endif diff --git a/akregator/src/mk4storage/mk4confwidget.cpp b/akregator/src/mk4storage/mk4confwidget.cpp index c028b156..09b4c2de 100644 --- a/akregator/src/mk4storage/mk4confwidget.cpp +++ b/akregator/src/mk4storage/mk4confwidget.cpp @@ -52,7 +52,7 @@ MK4ConfWidget::MK4ConfWidget() : MK4ConfWidgetBase() label->setEnabled(true); } filereq->setURL(MK4Config::archivePath()); - connect(cbUseDefault, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChkBoxUseDefault(bool))); + connect(cbUseDefault, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChkBoxUseDefault(bool))); } diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp index 1e104bd3..9c504c2f 100644 --- a/akregator/src/mk4storage/storagemk4impl.cpp +++ b/akregator/src/mk4storage/storagemk4impl.cpp @@ -33,7 +33,7 @@ #include <tqtimer.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> namespace Akregator { namespace Backend { @@ -263,7 +263,7 @@ void StorageMK4Impl::markDirty() { d->modified = true; // commit changes after 3 seconds - TQTimer::singleShot(3000, this, TQT_SLOT(slotCommit())); + TQTimer::singleShot(3000, this, TQ_SLOT(slotCommit())); } } diff --git a/akregator/src/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/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/pageviewer.cpp b/akregator/src/pageviewer.cpp index 859bb1a3..03d8a4db 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -40,7 +40,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdestdaccel.h> #include <tdeparts/browserinterface.h> @@ -53,7 +53,7 @@ #include <tqscrollview.h> #include <tqstring.h> #include <tqvaluelist.h> -#include <tqucomextra_p.h> +#include <private/tqucomextra_p.h> #include <cstdlib> using std::abs; @@ -109,44 +109,44 @@ PageViewer::PageViewer(TQWidget *parent, const char *name) d->backAction = new TDEToolBarPopupAction(backForward.first, TDEStdAccel::shortcut(TDEStdAccel::Back), this, - TQT_SLOT(slotBack()), actionCollection(), + TQ_SLOT(slotBack()), actionCollection(), "pageviewer_back"); - connect(d->backAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotBackAboutToShow())); - connect(d->backAction->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPopupActivated(int))); + connect(d->backAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotBackAboutToShow())); + connect(d->backAction->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPopupActivated(int))); d->forwardAction = new TDEToolBarPopupAction(backForward.second, TDEStdAccel::shortcut(TDEStdAccel::Forward),this, - TQT_SLOT(slotForward()), actionCollection(), + TQ_SLOT(slotForward()), actionCollection(), "pageviewer_forward"); - connect(d->forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotForwardAboutToShow())); - connect(d->forwardAction->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPopupActivated(int))); + connect(d->forwardAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotForwardAboutToShow())); + connect(d->forwardAction->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPopupActivated(int))); d->reloadAction = new TDEAction(i18n("Reload"), "reload", 0, - this, TQT_SLOT(slotReload()), + this, TQ_SLOT(slotReload()), actionCollection(), "pageviewer_reload"); d->stopAction = new TDEAction(KStdGuiItem::guiItem(KStdGuiItem::Stop), 0, - this, TQT_SLOT(slotStop()), + this, TQ_SLOT(slotStop()), actionCollection(), "pageviewer_stop"); - //connect( this, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(slotPopupMenu(const TQString &, const TQPoint &))); + //connect( this, TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQ_SLOT(slotPopupMenu(const TQString &, const TQPoint &))); d->backAction->setEnabled(false); d->forwardAction->setEnabled(false); d->stopAction->setEnabled(false); - connect( this, TQT_SIGNAL(setWindowCaption (const TQString &)), - this, TQT_SLOT(slotSetCaption (const TQString &)) ); + connect( this, TQ_SIGNAL(setWindowCaption (const TQString &)), + this, TQ_SLOT(slotSetCaption (const TQString &)) ); - connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(slotStarted(TDEIO::Job* ))); - connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted())); - connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &))); + connect(this, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(slotStarted(TDEIO::Job* ))); + connect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted())); + connect(this, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotCancelled(const TQString &))); d->current = d->history.end(); @@ -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/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/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp index b8d318e8..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() diff --git a/akregator/src/propertieswidgetbase.ui b/akregator/src/propertieswidgetbase.ui index fae011b0..073c46b4 100644 --- a/akregator/src/propertieswidgetbase.ui +++ b/akregator/src/propertieswidgetbase.ui @@ -452,10 +452,10 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">slotUpdateComboBoxActivated( int )</slot> <slot access="protected" specifier="pure virtual">slotUpdateCheckBoxToggled( bool )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp index ff163993..a43f8bcd 100644 --- a/akregator/src/searchbar.cpp +++ b/akregator/src/searchbar.cpp @@ -31,7 +31,7 @@ #include <kiconloader.h> #include <klineedit.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqapplication.h> #include <tqhbox.h> @@ -75,8 +75,8 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name), searchLabel->setText( i18n("S&earch:") ); d->searchLine = new KLineEdit(this, "searchline"); - connect(d->searchLine, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotSearchStringChanged(const TQString &))); + connect(d->searchLine, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotSearchStringChanged(const TQString &))); searchLabel->setBuddy(d->searchLine); @@ -98,13 +98,13 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name), TQToolTip::add( d->searchLine, i18n( "Enter space-separated terms to filter article list" ) ); TQToolTip::add( d->searchCombo, i18n( "Choose what kind of articles to show in article list" ) ); - connect(clearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT(slotClearSearch()) ); + connect(clearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT(slotClearSearch()) ); - connect(d->searchCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSearchComboChanged(int))); + connect(d->searchCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSearchComboChanged(int))); - connect(&(d->timer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotActivateSearch())); + connect(&(d->timer), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotActivateSearch())); } SearchBar::~SearchBar() diff --git a/akregator/src/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/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/tabwidget.cpp b/akregator/src/tabwidget.cpp index eadab090..f1f1bb89 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -70,15 +70,15 @@ TabWidget::TabWidget(TQWidget * parent, const char *name) d->currentItem = 0; setMinimumSize(250,150); setTabReorderingEnabled(false); - connect( this, TQT_SIGNAL( currentChanged(TQWidget *) ), this, - TQT_SLOT( slotTabChanged(TQWidget *) ) ); - connect(this, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(slotCloseRequest(TQWidget*))); + connect( this, TQ_SIGNAL( currentChanged(TQWidget *) ), this, + TQ_SLOT( slotTabChanged(TQWidget *) ) ); + connect(this, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(slotCloseRequest(TQWidget*))); setHoverCloseButton(Settings::closeButtonOnTabs()); d->tabsClose = new TQToolButton(this); d->tabsClose->setAccel(TQKeySequence("Ctrl+W")); - connect( d->tabsClose, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotRemoveCurrentFrame() ) ); + connect( d->tabsClose, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotRemoveCurrentFrame() ) ); d->tabsClose->setIconSet( SmallIconSet( "tab_remove" ) ); d->tabsClose->adjustSize(); @@ -117,7 +117,7 @@ void TabWidget::addFrame(Frame *f) return; d->frames.insert(f->widget(), f); addTab(f->widget(), f->title()); - connect(f, TQT_SIGNAL(titleChanged(Frame*, const TQString& )), this, TQT_SLOT(slotSetTitle(Frame*, const TQString& ))); + connect(f, TQ_SIGNAL(titleChanged(Frame*, const TQString& )), this, TQ_SLOT(slotSetTitle(Frame*, const TQString& ))); slotSetTitle(f, f->title()); } @@ -269,7 +269,7 @@ void TabWidget::slotDetachTab() url = view->part()->url(); - kapp->invokeBrowser(url.url(), "0"); + tdeApp->invokeBrowser(url.url(), "0"); slotCloseTab(); } @@ -288,8 +288,8 @@ void TabWidget::slotCopyLinkAddress() url = view->part()->url(); - kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection); - kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard); + tdeApp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection); + tdeApp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard); } void TabWidget::slotCloseTab() diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp index f987409c..b4a252a5 100644 --- a/akregator/src/tagaction.cpp +++ b/akregator/src/tagaction.cpp @@ -49,8 +49,8 @@ TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, : TDEToggleAction(tag.name(), TDEShortcut(), 0, 0, parent), d(new TagActionPrivate) { d->tag = tag; - connect(this, TQT_SIGNAL(toggled(const Tag&, bool)), receiver, slot); - connect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled(bool))); + connect(this, TQ_SIGNAL(toggled(const Tag&, bool)), receiver, slot); + connect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled(bool))); } TagAction::~TagAction() @@ -86,14 +86,14 @@ int TagAction::plug(TQWidget* widget, int index) kdWarning() << "Can not plug TDEToggleAction in " << widget->className() << endl; return -1; } - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; TagMenuItem* item = new TagMenuItem(d->tag); int id = popup->insertItem(TagMenuItem::checkBoxIconSet(isChecked(), popup->colorGroup()), item, -1, index); - popup->connectItem (id, this, TQT_SLOT(slotActivated())); + popup->connectItem (id, this, TQ_SLOT(slotActivated())); d->popupToId[popup] = id; d->idToPopup[id] = popup; diff --git a/akregator/src/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/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/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/trayicon.cpp b/akregator/src/trayicon.cpp index bbf0d990..fe816d19 100644 --- a/akregator/src/trayicon.cpp +++ b/akregator/src/trayicon.cpp @@ -85,8 +85,8 @@ void TrayIcon::mousePressEvent(TQMouseEvent *e) { TQPixmap TrayIcon::takeScreenshot() const { TQPoint g = mapToGlobal(pos()); - int desktopWidth = kapp->desktop()->width(); - int desktopHeight = kapp->desktop()->height(); + int desktopWidth = tdeApp->desktop()->width(); + int desktopHeight = tdeApp->desktop()->height(); int tw = width(); int th = height(); int w = desktopWidth / 4; @@ -200,7 +200,7 @@ void TrayIcon::setUnread(int unread, bool force) void TrayIcon::viewButtonClicked() { - TQWidget *p=TQT_TQWIDGET(parent()); + TQWidget *p=static_cast<TQWidget*>(parent()); KWin::forceActiveWindow(p->winId()); } diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index 202175dc..da06562d 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -31,7 +31,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <tdepopupmenu.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krun.h> #include <kshell.h> #include <kurl.h> @@ -57,28 +57,28 @@ Viewer::Viewer(TQWidget *parent, const char *name) setStatusMessagesEnabled(true); // change the cursor when loading stuff... - connect( this, TQT_SIGNAL(started(TDEIO::Job *)), - this, TQT_SLOT(slotStarted(TDEIO::Job *))); - connect( this, TQT_SIGNAL(completed()), - this, TQT_SLOT(slotCompleted())); + connect( this, TQ_SIGNAL(started(TDEIO::Job *)), + this, TQ_SLOT(slotStarted(TDEIO::Job *))); + connect( this, TQ_SIGNAL(completed()), + this, TQ_SLOT(slotCompleted())); - connect( browserExtension(), TQT_SIGNAL(popupMenu (KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t)), this, TQT_SLOT(slotPopupMenu(KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t))); + connect( browserExtension(), TQ_SIGNAL(popupMenu (KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t)), this, TQ_SLOT(slotPopupMenu(KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t))); - KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection(), "viewer_print"); - KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection(), "viewer_copy"); + KStdAction::print(this, TQ_SLOT(slotPrint()), actionCollection(), "viewer_print"); + KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection(), "viewer_copy"); - new TDEAction( i18n("&Increase Font Sizes"), "zoom-in", "Ctrl+Plus", this, TQT_SLOT(slotZoomIn()), actionCollection(), "incFontSizes" ); - new TDEAction( i18n("&Decrease Font Sizes"), "zoom-out", "Ctrl+Minus", this, TQT_SLOT(slotZoomOut()), actionCollection(), "decFontSizes" ); + new TDEAction( i18n("&Increase Font Sizes"), "zoom-in", "Ctrl+Plus", this, TQ_SLOT(slotZoomIn()), actionCollection(), "incFontSizes" ); + new TDEAction( i18n("&Decrease Font Sizes"), "zoom-out", "Ctrl+Minus", this, TQ_SLOT(slotZoomOut()), actionCollection(), "decFontSizes" ); - connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); - connect( browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), this, TQT_SLOT(slotOpenURLRequest(const KURL&, const KParts::URLArgs& )) ); + connect( browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), this, TQ_SLOT(slotOpenURLRequest(const KURL&, const KParts::URLArgs& )) ); new TDEAction(i18n("Copy &Link Address"), "", 0, - this, TQT_SLOT(slotCopyLinkAddress()), + this, TQ_SLOT(slotCopyLinkAddress()), actionCollection(), "copylinkaddress"); new TDEAction(i18n("&Save Link As..."), "", 0, - this, TQT_SLOT(slotSaveLinkAs()), + this, TQ_SLOT(slotSaveLinkAs()), actionCollection(), "savelinkas"); } @@ -104,7 +104,7 @@ void Viewer::displayInExternalBrowser(const KURL &url, const TQString &mimetype) if (Settings::externalBrowserUseTdeDefault()) { if (mimetype.isEmpty()) - kapp->invokeBrowser(url.url(), "0"); + tdeApp->invokeBrowser(url.url(), "0"); else KRun::runURL(url, mimetype, false, false); } @@ -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() diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp index 79b02b24..f0d738a5 100644 --- a/certmanager/certificateinfowidgetimpl.cpp +++ b/certmanager/certificateinfowidgetimpl.cpp @@ -51,7 +51,7 @@ #include <kdialogbase.h> #include <tdemessagebox.h> #include <kdebug.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <tdeglobalsettings.h> // TQt @@ -84,17 +84,17 @@ CertificateInfoWidgetImpl::CertificateInfoWidgetImpl( const GpgME::Key & key, bo listView->header()->setClickEnabled( false ); listView->setSorting( -1 ); - connect( listView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotShowInfo( TQListViewItem* ) ) ); + connect( listView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotShowInfo( TQListViewItem* ) ) ); pathView->setColumnWidthMode( 0, TQListView::Maximum ); pathView->header()->hide(); - connect( pathView, TQT_SIGNAL( doubleClicked( TQListViewItem* ) ), - this, TQT_SLOT( slotShowCertPathDetails( TQListViewItem* ) ) ); - connect( pathView, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), - this, TQT_SLOT( slotShowCertPathDetails( TQListViewItem* ) ) ); - connect( importButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotImportCertificate() ) ); + connect( pathView, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), + this, TQ_SLOT( slotShowCertPathDetails( TQListViewItem* ) ) ); + connect( pathView, TQ_SIGNAL( returnPressed( TQListViewItem* ) ), + this, TQ_SLOT( slotShowCertPathDetails( TQListViewItem* ) ) ); + connect( importButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotImportCertificate() ) ); dumpView->setFont( TDEGlobalSettings::fixedFont() ); @@ -232,10 +232,10 @@ void CertificateInfoWidgetImpl::startCertificateChainListing() { Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( false ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotCertificateChainListingResult(const GpgME::KeyListResult&)) ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotCertificateChainListingResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + TQ_SLOT(slotNextKey(const GpgME::Key&)) ); kdDebug() << "Going to fetch" << endl << " issuer : \"" << mChain.front().issuerName() << "\"" << endl @@ -253,17 +253,17 @@ void CertificateInfoWidgetImpl::startCertificateChainListing() { } void CertificateInfoWidgetImpl::startCertificateDump() { - TDEProcess* proc = new TDEProcess( TQT_TQOBJECT(this) ); + TDEProcess* proc = new TDEProcess( this ); (*proc) << "gpgsm"; // must be in the PATH (*proc) << "--dump-keys"; (*proc) << mChain.front().primaryFingerprint(); - TQObject::connect( proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int) ), - this, TQT_SLOT( slotCollectStdout(TDEProcess *, char *, int) ) ); - TQObject::connect( proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int) ), - this, TQT_SLOT( slotCollectStderr(TDEProcess *, char *, int) ) ); - TQObject::connect( proc, TQT_SIGNAL( processExited(TDEProcess*) ), - this, TQT_SLOT( slotDumpProcessExited(TDEProcess*) ) ); + TQObject::connect( proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int) ), + this, TQ_SLOT( slotCollectStdout(TDEProcess *, char *, int) ) ); + TQObject::connect( proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int) ), + this, TQ_SLOT( slotCollectStderr(TDEProcess *, char *, int) ) ); + TQObject::connect( proc, TQ_SIGNAL( processExited(TDEProcess*) ), + this, TQ_SLOT( slotDumpProcessExited(TDEProcess*) ) ); if ( !proc->start( TDEProcess::NotifyOnExit, (TDEProcess::Communication)(TDEProcess::Stdout | TDEProcess::Stderr) ) ) { TQString wmsg = i18n("Failed to execute gpgsm:\n%1").arg( i18n( "program not found" ) ); @@ -274,12 +274,12 @@ void CertificateInfoWidgetImpl::startCertificateDump() { void CertificateInfoWidgetImpl::slotCollectStdout(TDEProcess *, char *buffer, int buflen) { - mDumpOutput += TQCString(buffer, buflen+1); // like KProcIO does + mDumpOutput += TQCString(buffer, buflen+1); // like TDEProcIO does } void CertificateInfoWidgetImpl::slotCollectStderr(TDEProcess *, char *buffer, int buflen) { - mDumpError += TQCString(buffer, buflen+1); // like KProcIO does + mDumpError += TQCString(buffer, buflen+1); // like TDEProcIO does } void CertificateInfoWidgetImpl::slotDumpProcessExited(TDEProcess* proc) { @@ -383,8 +383,8 @@ void CertificateInfoWidgetImpl::slotShowCertPathDetails( TQListViewItem * item ) new CertificateInfoWidgetImpl( mChain[itemIndex], mExternal, dialog ); dialog->setMainWidget( top ); // proxy the signal to our receiver: - connect( top, TQT_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)), - TQT_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)) ); + connect( top, TQ_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)), + TQ_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)) ); dialog->show(); } @@ -415,10 +415,10 @@ void CertificateInfoWidgetImpl::startKeyExistanceCheck() { Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( false ); assert( job ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - TQT_SLOT(slotKeyExistanceCheckNextCandidate(const GpgME::Key&)) ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyExistanceCheckFinished()) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + TQ_SLOT(slotKeyExistanceCheckNextCandidate(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyExistanceCheckFinished()) ); // nor to check for errors: job->start( fingerprint ); } diff --git a/certmanager/certificatewizard.ui b/certmanager/certificatewizard.ui index 6eddb9cb..3fdeb600 100644 --- a/certmanager/certificatewizard.ui +++ b/certmanager/certificatewizard.ui @@ -546,10 +546,10 @@ If you want to change anything, press Back and make your changes; otherwise, pre <tabstop>certificateTE</tabstop> <tabstop>generatePB</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotEmailAddressChanged(const TQString&)</slot> <slot access="protected">slotGenerateCertificate()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index 38352db9..a52c2e52 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -112,7 +112,7 @@ static bool availForMod( const TQLineEdit * le ) { * name 'name' and widget flags set to 'f' * * The wizard will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal wizard. + * true to construct a modal wizard. */ CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent, const char* name, bool modal, WFlags fl ) : CertificateWizard( parent, name, modal, fl ) @@ -126,16 +126,16 @@ CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent, const char* nam // Allow to select remote URLs storeUR->setMode( KFile::File ); storeUR->setFilter( "application/pkcs10" ); - connect( storeUR, TQT_SIGNAL( urlSelected( const TQString& ) ), - this, TQT_SLOT( slotURLSelected( const TQString& ) ) ); + connect( storeUR, TQ_SIGNAL( urlSelected( const TQString& ) ), + this, TQ_SLOT( slotURLSelected( const TQString& ) ) ); const TDEConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" ); caEmailED->setText( config.readEntry( "CAEmailAddress" ) ); - connect( this, TQT_SIGNAL( helpClicked() ), - this, TQT_SLOT( slotHelpClicked() ) ); - connect( insertAddressButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSetValuesFromWhoAmI() ) ); + connect( this, TQ_SIGNAL( helpClicked() ), + this, TQ_SLOT( slotHelpClicked() ) ); + connect( insertAddressButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSetValuesFromWhoAmI() ) ); for ( unsigned int i = 0 ; i < numKeyLengths ; ++i ) keyLengthCB->insertItem( i18n("%n bit", "%n bits", keyLengths[i] ) ); @@ -246,8 +246,8 @@ void CertificateWizardImpl::slotGenerateCertificate() Kleo::CryptoBackendFactory::instance()->smime()->keyGenerationJob(); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)), - TQT_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)), + TQ_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) ); certificateTE->setText( certParms ); @@ -290,7 +290,7 @@ void CertificateWizardImpl::slotResult( const GpgME::KeyGenerationResult & res, void CertificateWizardImpl::slotHelpClicked() { - kapp->invokeHelp( "newcert" ); + tdeApp->invokeHelp( "newcert" ); } void CertificateWizardImpl::slotSetValuesFromWhoAmI() @@ -364,8 +364,8 @@ void CertificateWizardImpl::createPersonalDataPage() _attrPairList.append(qMakePair(key, le)); - connect( le, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotEnablePersonalDataPageExit()) ); + connect( le, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotEnablePersonalDataPageExit()) ); } // enable button only if administrator wants to allow it @@ -441,16 +441,16 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte TQCString dummy; // OK, so kmail (or kontact) is running. Now ensure the object we want is available. // [that's not the case when kontact was already running, but kmail not loaded into it... in theory.] - if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { - DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper + if ( !tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { + DCOPRef ref( dcopService, dcopService ); // talk to the TDEUniqueApplication or its kontact wrapper DCOPReply reply = ref.call( "load()" ); if ( reply.isValid() && (bool)reply ) { - Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); + Q_ASSERT( tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); } else kdWarning() << "Error loading " << dcopService << endl; } - DCOPClient* dcopClient = kapp->dcopClient(); + DCOPClient* dcopClient = tdeApp->dcopClient(); TQByteArray data; TQDataStream arg( data, IO_WriteOnly ); arg << email; @@ -490,8 +490,8 @@ void CertificateWizardImpl::accept() TDEIO::Job* uploadJob = TDEIOext::put( _keyData, url, -1, overwrite, false /*resume*/ ); uploadJob->setWindow( this ); - connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) ); + connect( uploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotUploadResult( TDEIO::Job* ) ) ); // Can't press finish again during the upload setFinishEnabled( finishPage, false ); } diff --git a/certmanager/certificatewizardimpl.h b/certmanager/certificatewizardimpl.h index 844f39ed..d5430005 100644 --- a/certmanager/certificatewizardimpl.h +++ b/certmanager/certificatewizardimpl.h @@ -52,7 +52,7 @@ class CertificateWizardImpl : public CertificateWizard public: - CertificateWizardImpl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CertificateWizardImpl( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~CertificateWizardImpl(); bool sendToCA() const; diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index a972ce9b..f7467391 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -72,7 +72,7 @@ // KDE #include <tdefiledialog.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeaction.h> #include <tdeapplication.h> #include <tdelocale.h> @@ -80,7 +80,7 @@ #include <dcopclient.h> #include <tdetoolbar.h> #include <kstatusbar.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <kdialogbase.h> #include <kkeydialog.h> @@ -96,11 +96,11 @@ // other #include <algorithm> #include <assert.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <kinputdialog.h> namespace { - class KDE_EXPORT DisplayStrategy : public Kleo::KeyListView::DisplayStrategy{ + class TDE_EXPORT DisplayStrategy : public Kleo::KeyListView::DisplayStrategy{ public: ~DisplayStrategy() {} @@ -122,7 +122,7 @@ namespace { } }; - class KDE_EXPORT ColumnStrategy : public Kleo::KeyListView::ColumnStrategy { + class TDE_EXPORT ColumnStrategy : public Kleo::KeyListView::ColumnStrategy { public: ~ColumnStrategy() {} @@ -187,17 +187,17 @@ CertManager::CertManager( bool remote, const TQString& query, const TQString & i mKeyListView->setSelectionMode( TQListView::Extended ); setCentralWidget( mKeyListView ); - connect( mKeyListView, TQT_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotViewDetails(Kleo::KeyListViewItem*)) ); - connect( mKeyListView, TQT_SIGNAL(returnPressed(Kleo::KeyListViewItem*)), - TQT_SLOT(slotViewDetails(Kleo::KeyListViewItem*)) ); - connect( mKeyListView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotSelectionChanged()) ); - connect( mKeyListView, TQT_SIGNAL(contextMenu(Kleo::KeyListViewItem*, const TQPoint&)), - TQT_SLOT(slotContextMenu(Kleo::KeyListViewItem*, const TQPoint&)) ); + connect( mKeyListView, TQ_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotViewDetails(Kleo::KeyListViewItem*)) ); + connect( mKeyListView, TQ_SIGNAL(returnPressed(Kleo::KeyListViewItem*)), + TQ_SLOT(slotViewDetails(Kleo::KeyListViewItem*)) ); + connect( mKeyListView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotSelectionChanged()) ); + connect( mKeyListView, TQ_SIGNAL(contextMenu(Kleo::KeyListViewItem*, const TQPoint&)), + TQ_SLOT(slotContextMenu(Kleo::KeyListViewItem*, const TQPoint&)) ); - connect( mKeyListView, TQT_SIGNAL(dropped(const KURL::List&) ), - TQT_SLOT( slotDropped(const KURL::List&) ) ); + connect( mKeyListView, TQ_SIGNAL(dropped(const KURL::List&) ), + TQ_SLOT( slotDropped(const KURL::List&) ) ); mLineEditAction->setText(query); if ( !mRemote && !mNextFindRemote || !query.isEmpty() ) @@ -244,132 +244,132 @@ void CertManager::createStatusBar() { } static inline void connectEnableOperationSignal( TQObject * s, TQObject * d ) { - TQObject::connect( s, TQT_SIGNAL(enableOperations(bool)), - d, TQT_SLOT(setEnabled(bool)) ); + TQObject::connect( s, TQ_SIGNAL(enableOperations(bool)), + d, TQ_SLOT(setEnabled(bool)) ); } void CertManager::createActions() { TDEAction * action = 0; - (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() ); + (void)KStdAction::quit( this, TQ_SLOT(close()), actionCollection() ); - action = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(slotRedisplay()), actionCollection() ); + action = KStdAction::redisplay( this, TQ_SLOT(slotRedisplay()), actionCollection() ); // work around the fact that the stdaction has no shortcut TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload); reloadShortcut.append(KKey(CTRL + Key_R)); action->setShortcut( reloadShortcut ); - connectEnableOperationSignal( TQT_TQOBJECT(this), action ); + connectEnableOperationSignal( this, action ); action = new TDEAction( i18n("Stop Operation"), "process-stop", Key_Escape, - TQT_TQOBJECT(this), TQT_SIGNAL(stopOperations()), + this, TQ_SIGNAL(stopOperations()), actionCollection(), "view_stop_operations" ); action->setEnabled( false ); (void) new TDEAction( i18n("New Key Pair..."), "document-new", 0, - TQT_TQOBJECT(this), TQT_SLOT(newCertificate()), + this, TQ_SLOT(newCertificate()), actionCollection(), "file_new_certificate" ); connect( new TDEToggleAction( i18n("Hierarchical Key List"), 0, actionCollection(), "view_hierarchical" ), - TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleHierarchicalView(bool)) ); + TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggleHierarchicalView(bool)) ); action = new TDEAction( i18n("Expand All"), 0, CTRL+Key_Period, - TQT_TQOBJECT(this), TQT_SLOT(slotExpandAll()), + this, TQ_SLOT(slotExpandAll()), actionCollection(), "view_expandall" ); action = new TDEAction( i18n("Collapse All"), 0, CTRL+Key_Comma, - TQT_TQOBJECT(this), TQT_SLOT(slotCollapseAll()), + this, TQ_SLOT(slotCollapseAll()), actionCollection(), "view_collapseall" ); (void) new TDEAction( i18n("Refresh CRLs"), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotRefreshKeys()), + this, TQ_SLOT(slotRefreshKeys()), actionCollection(), "certificates_refresh_clr" ); #ifdef NOT_IMPLEMENTED_ANYWAY mRevokeCertificateAction = new TDEAction( i18n("Revoke"), 0, - TQT_TQOBJECT(this), TQT_SLOT(revokeCertificate()), + this, TQ_SLOT(revokeCertificate()), actionCollection(), "edit_revoke_certificate" ); connectEnableOperationSignal( this, mRevokeCertificateAction ); mExtendCertificateAction = new TDEAction( i18n("Extend"), 0, - TQT_TQOBJECT(this), TQT_SLOT(extendCertificate()), + this, TQ_SLOT(extendCertificate()), actionCollection(), "edit_extend_certificate" ); connectEnableOperationSignal( this, mExtendCertificateAction ); #endif mDeleteCertificateAction = new TDEAction( i18n("Delete"), "edit-delete", Key_Delete, - TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCertificate()), + this, TQ_SLOT(slotDeleteCertificate()), actionCollection(), "edit_delete_certificate" ); - connectEnableOperationSignal( TQT_TQOBJECT(this), mDeleteCertificateAction ); + connectEnableOperationSignal( this, mDeleteCertificateAction ); mValidateCertificateAction = new TDEAction( i18n("Validate"), "reload", SHIFT + Key_F5, - TQT_TQOBJECT(this), TQT_SLOT(slotValidate()), + this, TQ_SLOT(slotValidate()), actionCollection(), "certificates_validate" ); - connectEnableOperationSignal( TQT_TQOBJECT(this), mValidateCertificateAction ); + connectEnableOperationSignal( this, mValidateCertificateAction ); mImportCertFromFileAction = new TDEAction( i18n("Import Certificates..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotImportCertFromFile()), + this, TQ_SLOT(slotImportCertFromFile()), actionCollection(), "file_import_certificates" ); - connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCertFromFileAction ); + connectEnableOperationSignal( this, mImportCertFromFileAction ); mImportCRLFromFileAction = new TDEAction( i18n("Import CRLs..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(importCRLFromFile()), + this, TQ_SLOT(importCRLFromFile()), actionCollection(), "file_import_crls" ); - connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCRLFromFileAction ); + connectEnableOperationSignal( this, mImportCRLFromFileAction ); mExportCertificateAction = new TDEAction( i18n("Export Certificates..."), "export", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotExportCertificate()), + this, TQ_SLOT(slotExportCertificate()), actionCollection(), "file_export_certificate" ); mExportSecretKeyAction = new TDEAction( i18n("Export Secret Key..."), "export", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotExportSecretKey()), + this, TQ_SLOT(slotExportSecretKey()), actionCollection(), "file_export_secret_keys" ); - connectEnableOperationSignal( TQT_TQOBJECT(this), mExportSecretKeyAction ); + connectEnableOperationSignal( this, mExportSecretKeyAction ); mViewCertDetailsAction = new TDEAction( i18n("Certificate Details..."), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotViewDetails()), actionCollection(), + this, TQ_SLOT(slotViewDetails()), actionCollection(), "view_certificate_details" ); mDownloadCertificateAction = new TDEAction( i18n( "Download"), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotDownloadCertificate()), actionCollection(), + this, TQ_SLOT(slotDownloadCertificate()), actionCollection(), "download_certificate" ); const TQString dirmngr = TDEStandardDirs::findExe( "gpgsm" ); mDirMngrFound = !dirmngr.isEmpty(); action = new TDEAction( i18n("Dump CRL Cache..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotViewCRLs()), + this, TQ_SLOT(slotViewCRLs()), actionCollection(), "crl_dump_crl_cache" ); action->setEnabled( mDirMngrFound ); // we also need dirmngr for this action = new TDEAction( i18n("Clear CRL Cache..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotClearCRLs()), + this, TQ_SLOT(slotClearCRLs()), actionCollection(), "crl_clear_crl_cache" ); action->setEnabled( mDirMngrFound ); // we also need dirmngr for this - action = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); + action = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this, + TQ_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); // disable action if no kwatchgnupg binary is around if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) action->setEnabled(false); (void)new LabelAction( i18n("Search:"), actionCollection(), "label_action" ); - mLineEditAction = new LineEditAction( TQString(), actionCollection(), TQT_TQOBJECT(this), - TQT_SLOT(slotSearch()), + mLineEditAction = new LineEditAction( TQString(), actionCollection(), this, + TQ_SLOT(slotSearch()), "query_lineedit_action"); TQStringList lst; lst << i18n("In Local Certificates") << i18n("In External Certificates"); - mComboAction = new ComboAction( lst, actionCollection(), TQT_TQOBJECT(this), TQT_SLOT( slotToggleRemote(int) ), + mComboAction = new ComboAction( lst, actionCollection(), this, TQ_SLOT( slotToggleRemote(int) ), "location_combo_action", mNextFindRemote? 1 : 0 ); - mFindAction = new TDEAction( i18n("Find"), "edit-find", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()), + mFindAction = new TDEAction( i18n("Find"), "edit-find", 0, this, TQ_SLOT(slotSearch()), actionCollection(), "find" ); - KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotEditKeybindings()), actionCollection() ); - KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotShowConfigurationDialog()), actionCollection() ); + KStdAction::keyBindings( this, TQ_SLOT(slotEditKeybindings()), actionCollection() ); + KStdAction::preferences( this, TQ_SLOT(slotShowConfigurationDialog()), actionCollection() ); - new TDEAction( i18n( "Configure &GpgME Backend" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureGpgME()), + new TDEAction( i18n( "Configure &GpgME Backend" ), 0, 0, this, TQ_SLOT(slotConfigureGpgME()), actionCollection(), "configure_gpgme" ); createStandardStatusBarAction(); @@ -387,7 +387,7 @@ void CertManager::slotEditKeybindings() { void CertManager::slotShowConfigurationDialog() { ConfigureDialog dlg( this ); - connect( &dlg, TQT_SIGNAL( configCommitted() ), TQT_SLOT( slotRepaint() ) ); + connect( &dlg, TQ_SIGNAL( configCommitted() ), TQ_SLOT( slotRepaint() ) ); dlg.exec(); } @@ -405,7 +405,7 @@ void CertManager::slotConfigureGpgME() { if ( result == TQDialog::Accepted ) { // Tell other apps (e.g. kmail) that the gpgconf data might have changed - kapp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() ); + tdeApp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() ); } } } @@ -451,10 +451,10 @@ void CertManager::connectJobToStatusBarProgress( Kleo::Job * job, const TQString return; if ( !initialText.isEmpty() ) statusBar()->message( initialText ); - connect( job, TQT_SIGNAL(progress(const TQString&,int,int)), - mProgressBar, TQT_SLOT(slotProgress(const TQString&,int,int)) ); - connect( job, TQT_SIGNAL(done()), mProgressBar, TQT_SLOT(reset()) ); - connect( this, TQT_SIGNAL(stopOperations()), job, TQT_SLOT(slotCancel()) ); + connect( job, TQ_SIGNAL(progress(const TQString&,int,int)), + mProgressBar, TQ_SLOT(slotProgress(const TQString&,int,int)) ); + connect( job, TQ_SIGNAL(done()), mProgressBar, TQ_SLOT(reset()) ); + connect( this, TQ_SIGNAL(stopOperations()), job, TQ_SLOT(slotCancel()) ); action("view_stop_operations")->setEnabled( true ); emit enableOperations( false ); @@ -509,8 +509,8 @@ void CertManager::slotRefreshKeys() { Kleo::RefreshKeysJob * job = Kleo::CryptoBackendFactory::instance()->smime()->refreshKeysJob(); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&)), - this, TQT_SLOT(slotRefreshKeysResult(const GpgME::Error&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&)), + this, TQ_SLOT(slotRefreshKeysResult(const GpgME::Error&)) ); connectJobToStatusBarProgress( job, i18n("Refreshing keys...") ); if ( const GpgME::Error err = job->start( keys ) ) @@ -571,10 +571,10 @@ void CertManager::startKeyListing( bool validating, bool refresh, const TQString job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( mRemote, false, validating ); assert( job ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - mKeyListView, refresh ? TQT_SLOT(slotRefreshKey(const GpgME::Key&)) : TQT_SLOT(slotAddKey(const GpgME::Key&)) ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - this, TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + mKeyListView, refresh ? TQ_SLOT(slotRefreshKey(const GpgME::Key&)) : TQ_SLOT(slotAddKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + this, TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); connectJobToStatusBarProgress( job, i18n("Fetching keys...") ); @@ -685,7 +685,7 @@ void CertManager::slotImportCertFromFile( const KURL & certURL ) // Download the cert TDEIOext::StoredTransferJob* importJob = TDEIOext::storedGet( certURL ); importJob->setWindow( this ); - connect( importJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotImportResult(TDEIO::Job*)) ); + connect( importJob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotImportResult(TDEIO::Job*)) ); } void CertManager::slotImportResult( TDEIO::Job* job ) @@ -729,8 +729,8 @@ void CertManager::slotStartCertificateDownload( const TQString& fingerprint, con Kleo::CryptoBackendFactory::instance()->smime()->downloadJob( false /* no armor */ ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), - TQT_SLOT(slotCertificateDownloadResult(const GpgME::Error&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), + TQ_SLOT(slotCertificateDownloadResult(const GpgME::Error&,const TQByteArray&)) ); connectJobToStatusBarProgress( job, i18n("Fetching certificate from server...") ); @@ -782,8 +782,8 @@ void CertManager::startCertificateImport( const TQByteArray & keyData, const TQS Kleo::ImportJob * job = Kleo::CryptoBackendFactory::instance()->smime()->importJob(); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::ImportResult&)), - TQT_SLOT(slotCertificateImportResult(const GpgME::ImportResult&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::ImportResult&)), + TQ_SLOT(slotCertificateImportResult(const GpgME::ImportResult&)) ); connectJobToStatusBarProgress( job, i18n("Importing certificates...") ); @@ -906,8 +906,8 @@ void CertManager::importCRLFromFile() { destURL.setPath( tempFile.name() ); TDEIO::Job* copyJob = TDEIO::file_copy( url, destURL, 0600, true, false ); copyJob->setWindow( this ); - connect( copyJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotImportCRLJobFinished( TDEIO::Job * ) ) ); + connect( copyJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotImportCRLJobFinished( TDEIO::Job * ) ) ); } } } @@ -930,9 +930,9 @@ bool CertManager::connectAndStartDirmngr( const char * slot, const char * proces assert( processname ); assert( mDirmngrProc ); mErrorbuffer = TQString(); - connect( mDirmngrProc, TQT_SIGNAL(processExited(TDEProcess*)), slot ); - connect( mDirmngrProc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int) ), - this, TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); + connect( mDirmngrProc, TQ_SIGNAL(processExited(TDEProcess*)), slot ); + connect( mDirmngrProc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int) ), + this, TQ_SLOT(slotStderr(TDEProcess*,char*,int)) ); if( !mDirmngrProc->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) { delete mDirmngrProc; mDirmngrProc = 0; KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).arg( processname ), i18n( "Certificate Manager Error" ) ); @@ -947,7 +947,7 @@ void CertManager::startImportCRL( const TQString& filename, bool isTempFile ) mImportCRLTempFile = isTempFile ? filename : TQString(); mDirmngrProc = new TDEProcess(); *mDirmngrProc << "gpgsm" << "--call-dirmngr" << "loadcrl" << filename; - if ( !connectAndStartDirmngr( TQT_SLOT(slotDirmngrExited()), "gpgsm" ) ) { + if ( !connectAndStartDirmngr( TQ_SLOT(slotDirmngrExited()), "gpgsm" ) ) { updateImportActions( true ); if ( isTempFile ) TQFile::remove( mImportCRLTempFile ); // unlink tempfile @@ -959,7 +959,7 @@ void CertManager::startClearCRLs() { mDirmngrProc = new TDEProcess(); *mDirmngrProc << "dirmngr" << "--flush"; //*mDirmngrProc << "gpgsm" << "--call-dimngr" << "flush"; // use this once it's implemented! - connectAndStartDirmngr( TQT_SLOT(slotClearCRLsResult()), "dirmngr" ); + connectAndStartDirmngr( TQ_SLOT(slotClearCRLsResult()), "dirmngr" ); } void CertManager::slotStderr( TDEProcess*, char* buf, int len ) { @@ -1031,13 +1031,13 @@ void CertManager::slotDeleteCertificate() { return; if ( !mHierarchyAnalyser ) { - mHierarchyAnalyser = new HierarchyAnalyser( TQT_TQOBJECT(this), "mHierarchyAnalyser" ); + mHierarchyAnalyser = new HierarchyAnalyser( this, "mHierarchyAnalyser" ); Kleo::KeyListJob * job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob(); assert( job ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - mHierarchyAnalyser, TQT_SLOT(slotNextKey(const GpgME::Key&)) ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - this, TQT_SLOT(slotDeleteCertificate()) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + mHierarchyAnalyser, TQ_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + this, TQ_SLOT(slotDeleteCertificate()) ); connectJobToStatusBarProgress( job, i18n("Checking key dependencies...") ); if ( const GpgME::Error error = job->start( TQStringList() ) ) { showKeyListError( this, error ); @@ -1110,8 +1110,8 @@ void CertManager::slotDeleteCertificate() { Kleo::MultiDeleteJob * job = new Kleo::MultiDeleteJob( Kleo::CryptoBackendFactory::instance()->smime() ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const GpgME::Key&)), - TQT_SLOT(slotDeleteResult(const GpgME::Error&,const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const GpgME::Key&)), + TQ_SLOT(slotDeleteResult(const GpgME::Error&,const GpgME::Key&)) ); connectJobToStatusBarProgress( job, i18n("Deleting keys...") ); @@ -1156,8 +1156,8 @@ void CertManager::slotViewDetails( Kleo::KeyListViewItem * item ) { CertificateInfoWidgetImpl * top = new CertificateInfoWidgetImpl( item->key(), isRemote(), dialog ); dialog->setMainWidget( top ); // </UGH> - connect( top, TQT_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)), - TQT_SLOT(slotStartCertificateDownload(const TQString&, const TQString&)) ); + connect( top, TQ_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)), + TQ_SLOT(slotStartCertificateDownload(const TQString&, const TQString&)) ); dialog->show(); } @@ -1219,8 +1219,8 @@ void CertManager::startCertificateExport( const TQStringList & fingerprints ) { Kleo::ExportJob * job = Kleo::CryptoBackendFactory::instance()->smime()->publicKeyExportJob( true ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), - TQT_SLOT(slotCertificateExportResult(const GpgME::Error&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), + TQ_SLOT(slotCertificateExportResult(const GpgME::Error&,const TQByteArray&)) ); connectJobToStatusBarProgress( job, i18n("Exporting certificate...") ); @@ -1271,8 +1271,8 @@ void CertManager::slotCertificateExportResult( const GpgME::Error & err, const T TDEIO::Job* uploadJob = TDEIOext::put( data, url, -1, overwrite, false /*resume*/ ); uploadJob->setWindow( this ); - connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) ); + connect( uploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotUploadResult( TDEIO::Job* ) ) ); } @@ -1356,8 +1356,8 @@ void CertManager::startSecretKeyExport( const TQString & fingerprint ) { Kleo::ExportJob * job = Kleo::CryptoBackendFactory::instance()->smime()->secretKeyExportJob( false, charset ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), - TQT_SLOT(slotSecretKeyExportResult(const GpgME::Error&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), + TQ_SLOT(slotSecretKeyExportResult(const GpgME::Error&,const TQByteArray&)) ); connectJobToStatusBarProgress( job, i18n("Exporting secret key...") ); @@ -1390,8 +1390,8 @@ void CertManager::slotSecretKeyExportResult( const GpgME::Error & err, const TQB TDEIO::Job* uploadJob = TDEIOext::put( data, url, -1, overwrite, false /*resume*/ ); uploadJob->setWindow( this ); - connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) ); + connect( uploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotUploadResult( TDEIO::Job* ) ) ); } void CertManager::slotUploadResult( TDEIO::Job* job ) diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h index 8a893b36..1b9fe81e 100644 --- a/certmanager/certmanager.h +++ b/certmanager/certmanager.h @@ -36,7 +36,7 @@ //#include <gpgme.h> #include <tdemainwindow.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <kurl.h> #include <tqcstring.h> #include <tqptrlist.h> @@ -76,7 +76,7 @@ namespace GpgME { class Key; } -class KDE_EXPORT CertManager : public TDEMainWindow { +class TDE_EXPORT CertManager : public TDEMainWindow { TQ_OBJECT public: diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp index 087e237e..3ec3e1dd 100644 --- a/certmanager/conf/appearanceconfigpage.cpp +++ b/certmanager/conf/appearanceconfigpage.cpp @@ -36,7 +36,7 @@ #include <tdelocale.h> #include <kdebug.h> -#include <kdemacros.h> +#include <tdemacros.h> AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name ) : TDECModule( parent, name ) @@ -44,7 +44,7 @@ AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, con TQVBoxLayout* lay = new TQVBoxLayout( this ); mWidget = new Kleo::AppearanceConfigWidget( this ); lay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); + connect( mWidget, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) ); #ifndef HAVE_UNBROKEN_KCMULTIDIALOG load(); @@ -70,7 +70,7 @@ void AppearanceConfigurationPage::defaults() extern "C" { - KDE_EXPORT TDECModule *create_kleopatra_config_appear( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kleopatra_config_appear( TQWidget *parent, const char * ) { AppearanceConfigurationPage *page = new AppearanceConfigurationPage( parent, "kleopatra_config_appear" ); diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui index 57029201..462963f2 100644 --- a/certmanager/conf/appearanceconfigwidgetbase.ui +++ b/certmanager/conf/appearanceconfigwidgetbase.ui @@ -201,7 +201,7 @@ <tabstop>strikeoutCB</tabstop> <tabstop>defaultLookPB</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotForegroundClicked()</slot> <slot access="protected">slotBackgroundClicked()</slot> <slot access="protected">slotFontClicked()</slot> @@ -210,6 +210,6 @@ <slot access="protected">slotItalicClicked()</slot> <slot access="protected">slotBoldClicked()</slot> <slot access="protected">slotStrikeoutClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp index 4d0d1e68..cf6923f0 100644 --- a/certmanager/conf/configuredialog.cpp +++ b/certmanager/conf/configuredialog.cpp @@ -41,7 +41,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal ) : KCMultiDialog( KDialogBase::IconList, i18n( "Configure" ), parent, name, modal ) { - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() ); showButton( User1, true ); addModule( "kleopatra_config_dirserv", false ); diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index 43373e72..772dfd7d 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/certmanager/conf/dirservconfigpage.cpp @@ -47,7 +47,7 @@ #include <tqcheckbox.h> #include <tqlayout.h> -#include <kdemacros.h> +#include <tdemacros.h> #if 0 // disabled, since it is apparently confusing // For sync'ing kabldaprc @@ -146,7 +146,7 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget Kleo::CryptoConfigEntry::ArgType_LDAPURL, true ); mWidget = new Kleo::DirectoryServicesWidget( entry, this ); lay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); + connect( mWidget, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) ); // LDAP timeout TQHBox* box = new TQHBox( this ); @@ -155,7 +155,7 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget TQLabel* label = new TQLabel( i18n( "LDAP &timeout (minutes:seconds)" ), box ); mTimeout = new TQTimeEdit( box ); mTimeout->setDisplay( TQTimeEdit::Minutes | TQTimeEdit::Seconds ); - connect( mTimeout, TQT_SIGNAL( valueChanged( const TQTime& ) ), this, TQT_SLOT( slotChanged() ) ); + connect( mTimeout, TQ_SIGNAL( valueChanged( const TQTime& ) ), this, TQ_SLOT( slotChanged() ) ); label->setBuddy( mTimeout ); TQWidget* stretch = new TQWidget( box ); box->setStretchFactor( stretch, 2 ); @@ -167,13 +167,13 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget mMaxItems = new KIntNumInput( box ); mMaxItems->setLabel( i18n( "&Maximum number of items returned by query" ), TQt::AlignLeft | TQt::AlignVCenter ); mMaxItems->setMinValue( 0 ); - connect( mMaxItems, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) ); + connect( mMaxItems, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotChanged() ) ); stretch = new TQWidget( box ); box->setStretchFactor( stretch, 2 ); #ifdef NOT_USEFUL_CURRENTLY mAddNewServersCB = new TQCheckBox( i18n( "Automatically add &new servers discovered in CRL distribution points" ), this ); - connect( mAddNewServersCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); + connect( mAddNewServersCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) ); lay->addWidget( mAddNewServersCB ); #endif @@ -259,7 +259,7 @@ void DirectoryServicesConfigurationPage::defaults() extern "C" { - KDE_EXPORT TDECModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * ) { DirectoryServicesConfigurationPage *page = new DirectoryServicesConfigurationPage( parent, "kleopatra_config_dirserv" ); diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h index b717b4eb..81bf3b8e 100644 --- a/certmanager/conf/dirservconfigpage.h +++ b/certmanager/conf/dirservconfigpage.h @@ -34,7 +34,7 @@ #include <tdecmodule.h> #include <kleo/cryptoconfig.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQCheckBox; class TQTimeEdit; @@ -50,7 +50,7 @@ namespace Kleo { * The user can configure LDAP servers in this page, to be used for listing/fetching * remote certificates in kleopatra. */ -class KDE_EXPORT DirectoryServicesConfigurationPage : public TDECModule { +class TDE_EXPORT DirectoryServicesConfigurationPage : public TDECModule { TQ_OBJECT public: diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp index 18668684..beaea7fa 100644 --- a/certmanager/conf/dnorderconfigpage.cpp +++ b/certmanager/conf/dnorderconfigpage.cpp @@ -34,7 +34,7 @@ #include <ui/dnattributeorderconfigwidget.h> #include <kleo/dn.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tqlayout.h> @@ -45,7 +45,7 @@ DNOrderConfigPage::DNOrderConfigPage( TQWidget * parent, const char * name ) mWidget = Kleo::DNAttributeMapper::instance()->configWidget( this, "mWidget" ); vlay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged()) ); + connect( mWidget, TQ_SIGNAL(changed()), TQ_SLOT(slotChanged()) ); #ifndef HAVE_UNBROKEN_KCMULTIDIALOG load(); @@ -70,7 +70,7 @@ void DNOrderConfigPage::slotChanged() { emit changed(true); } -extern "C" KDE_EXPORT TDECModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) { +extern "C" TDE_EXPORT TDECModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) { return new DNOrderConfigPage( parent, "kleopatra_config_dnorder" ); } diff --git a/certmanager/crlview.cpp b/certmanager/crlview.cpp index f94a4557..4055b137 100644 --- a/certmanager/crlview.cpp +++ b/certmanager/crlview.cpp @@ -37,7 +37,7 @@ #include "crlview.h" #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdemessagebox.h> #include <kpushbutton.h> #include <kstdguiitem.h> @@ -71,16 +71,16 @@ CRLView::CRLView( TQWidget* parent, const char* name, bool modal ) hbLayout->addWidget( _closeButton ); // connections: - connect( _updateButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotUpdateView() ) ); - connect( _closeButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( close() ) ); + connect( _updateButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotUpdateView() ) ); + connect( _closeButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( close() ) ); resize( _textView->fontMetrics().width( 'M' ) * 80, _textView->fontMetrics().lineSpacing() * 25 ); _timer = new TQTimer( this ); - connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotAppendBuffer()) ); + connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotAppendBuffer()) ); } CRLView::~CRLView() @@ -101,10 +101,10 @@ void CRLView::slotUpdateView() if( _process == 0 ) { _process = new TDEProcess(); *_process << "gpgsm" << "--call-dirmngr" << "listcrls"; - connect( _process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int) ), - this, TQT_SLOT( slotReadStdout( TDEProcess*, char*, int ) ) ); - connect( _process, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotProcessExited() ) ); + connect( _process, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int) ), + this, TQ_SLOT( slotReadStdout( TDEProcess*, char*, int ) ) ); + connect( _process, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotProcessExited() ) ); } if( _process->isRunning() ) _process->kill(); if( !_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) ) { diff --git a/certmanager/customactions.cpp b/certmanager/customactions.cpp index bf637538..2db64ebb 100644 --- a/certmanager/customactions.cpp +++ b/certmanager/customactions.cpp @@ -47,7 +47,7 @@ LabelAction::LabelAction( const TQString & text, TDEActionCollection * parent, } int LabelAction::plug( TQWidget * widget, int index ) { - if ( kapp && !kapp->authorizeTDEAction( name() ) ) + if ( tdeApp && !tdeApp->authorizeTDEAction( name() ) ) return -1; if ( widget->inherits( "TDEToolBar" ) ) { TDEToolBar * bar = (TDEToolBar *)widget; @@ -55,7 +55,7 @@ int LabelAction::plug( TQWidget * widget, int index ) { TQLabel* label = new TQLabel( text(), bar, "tde toolbar widget" ); bar->insertWidget( id_, label->width(), label, index ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -71,7 +71,7 @@ LineEditAction::LineEditAction( const TQString & text, TDEActionCollection * par } int LineEditAction::plug( TQWidget * widget, int index ) { - if ( kapp && !kapp->authorizeTDEAction( name() ) ) + if ( tdeApp && !tdeApp->authorizeTDEAction( name() ) ) return -1; if ( widget->inherits( "TDEToolBar" ) ) { TDEToolBar *bar = (TDEToolBar *)widget; @@ -82,8 +82,8 @@ int LineEditAction::plug( TQWidget * widget, int index ) { bar->insertWidget( id_, _le->width(), _le, index ); bar->setStretchableWidget( _le ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); - connect( _le, TQT_SIGNAL( returnPressed() ), _receiver, _member ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); + connect( _le, TQ_SIGNAL( returnPressed() ), _receiver, _member ); return containerCount() - 1; } @@ -118,15 +118,15 @@ ComboAction::ComboAction( const TQStringList & lst, TDEActionCollection * paren } int ComboAction::plug( TQWidget * widget, int index ) { - if ( kapp && !kapp->authorizeTDEAction( name() ) ) + if ( tdeApp && !tdeApp->authorizeTDEAction( name() ) ) return -1; if ( widget->inherits( "TDEToolBar" ) ) { TDEToolBar *bar = (TDEToolBar *)widget; int id_ = getToolButtonID(); - bar->insertCombo( _lst, id_, false, TQT_SIGNAL( highlighted(int) ), _receiver, _member ); + bar->insertCombo( _lst, id_, false, TQ_SIGNAL( highlighted(int) ), _receiver, _member ); bar->setCurrentComboItem( id_,_selectedId ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp index 6b186178..f92960bb 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp @@ -93,13 +93,13 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name ) mExeED = new KURLRequester( w ); glay->addWidget( new TQLabel( mExeED, i18n("&Executable:"), w ), row, 0 ); glay->addWidget( mExeED, row, 1 ); - connect( mExeED, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()) ); + connect( mExeED, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()) ); ++row; mSocketED = new KURLRequester( w ); glay->addWidget( new TQLabel( mSocketED, i18n("&Socket:"), w ), row, 0 ); glay->addWidget( mSocketED, row, 1 ); - connect( mSocketED, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()) ); + connect( mSocketED, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()) ); ++row; mLogLevelCB = new TQComboBox( false, w ); @@ -110,7 +110,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name ) mLogLevelCB->insertItem( i18n("Guru") ); glay->addWidget( new TQLabel( mLogLevelCB, i18n("Default &log level:"), w ), row, 0 ); glay->addWidget( mLogLevelCB, row, 1 ); - connect( mLogLevelCB, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()) ); + connect( mLogLevelCB, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged()) ); vlay->addWidget( group ); @@ -134,21 +134,21 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name ) TQPushButton * button = new TQPushButton( i18n("Set &Unlimited"), w ); glay->addWidget( button, row, 2 ); - connect( mLoglenSB, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()) ); - connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetHistorySizeUnlimited()) ); + connect( mLoglenSB, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged()) ); + connect( button, TQ_SIGNAL(clicked()), TQ_SLOT(slotSetHistorySizeUnlimited()) ); ++row; mWordWrapCB = new TQCheckBox( i18n("Enable &word wrapping"), w ); mWordWrapCB->hide(); // TQTextEdit doesn't support word wrapping in LogText mode glay->addMultiCellWidget( mWordWrapCB, row, row, 0, 2 ); - connect( mWordWrapCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()) ); + connect( mWordWrapCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()) ); vlay->addWidget( group ); vlay->addStretch( 1 ); - connect( this, TQT_SIGNAL(applyClicked()), TQT_SLOT(slotSave()) ); - connect( this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotSave()) ); + connect( this, TQ_SIGNAL(applyClicked()), TQ_SLOT(slotSave()) ); + connect( this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotSave()) ); } void KWatchGnuPGConfig::slotSetHistorySizeUnlimited() { @@ -157,7 +157,7 @@ void KWatchGnuPGConfig::slotSetHistorySizeUnlimited() { void KWatchGnuPGConfig::loadConfig() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("WatchGnuPG"); mExeED->setURL( config->readEntry( "Executable", "watchgnupg" ) ); mSocketED->setURL( config->readEntry( "Socket", TQDir::home().canonicalPath() @@ -175,7 +175,7 @@ void KWatchGnuPGConfig::loadConfig() void KWatchGnuPGConfig::saveConfig() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("WatchGnuPG"); config->writeEntry( "Executable", mExeED->url() ); config->writeEntry( "Socket", mSocketED->url() ); diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index 62f08218..647056ab 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp @@ -43,7 +43,7 @@ #include <tdeapplication.h> #include <tdeaction.h> #include <kstdaction.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <tdeconfig.h> #include <tdefiledialog.h> #include <kedittoolbar.h> @@ -68,17 +68,17 @@ KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* parent, const char* name mCentralWidget->setTextFormat( TQTextEdit::LogText ); setCentralWidget( mCentralWidget ); - mWatcher = new KProcIO( TQTextCodec::codecForMib( 106 /*utf-8*/ ) ); - connect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ), - this, TQT_SLOT( slotWatcherExited() ) ); - connect( mWatcher, TQT_SIGNAL( readReady(KProcIO*) ), - this, TQT_SLOT( slotReadStdout() ) ); + mWatcher = new TDEProcIO( TQTextCodec::codecForMib( 106 /*utf-8*/ ) ); + connect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ), + this, TQ_SLOT( slotWatcherExited() ) ); + connect( mWatcher, TQ_SIGNAL( readReady(TDEProcIO*) ), + this, TQ_SLOT( slotReadStdout() ) ); slotReadConfig(); mSysTray = new KWatchGnuPGTray( this ); mSysTray->show(); - connect( mSysTray, TQT_SIGNAL( quitSelected() ), - this, TQT_SLOT( slotQuit() ) ); + connect( mSysTray, TQ_SIGNAL( quitSelected() ), + this, TQ_SLOT( slotQuit() ) ); setAutoSaveSettings(); } @@ -96,18 +96,18 @@ void KWatchGnuPGMainWindow::slotClear() void KWatchGnuPGMainWindow::createActions() { (void)new TDEAction( i18n("C&lear History"), "history_clear", CTRL+Key_L, - TQT_TQOBJECT(this), TQT_SLOT( slotClear() ), + this, TQ_SLOT( slotClear() ), actionCollection(), "clear_log" ); - (void)KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection() ); - (void)KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() ); - (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection() ); - (void)KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection() ); - (void)KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureShortcuts()), actionCollection()); - (void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection()); + (void)KStdAction::saveAs( this, TQ_SLOT(slotSaveAs()), actionCollection() ); + (void)KStdAction::close( this, TQ_SLOT(close()), actionCollection() ); + (void)KStdAction::quit( this, TQ_SLOT(slotQuit()), actionCollection() ); + (void)KStdAction::preferences( this, TQ_SLOT(slotConfigure()), actionCollection() ); + (void)KStdAction::keyBindings(this, TQ_SLOT(configureShortcuts()), actionCollection()); + (void)KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbars()), actionCollection()); #if 0 (void)new TDEAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"), - 0, this, TQT_SLOT( slotConfigure() ), + 0, this, TQ_SLOT( slotConfigure() ), actionCollection(), "configure" ); #endif @@ -127,18 +127,18 @@ void KWatchGnuPGMainWindow::slotConfigureToolbars() void KWatchGnuPGMainWindow::startWatcher() { - disconnect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ), - this, TQT_SLOT( slotWatcherExited() ) ); + disconnect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ), + this, TQ_SLOT( slotWatcherExited() ) ); if( mWatcher->isRunning() ) { mWatcher->kill(); while( mWatcher->isRunning() ) { - kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); + tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); } mCentralWidget->append(i18n("[%1] Log stopped") .arg( TQDateTime::currentDateTime().toString(TQt::ISODate))); } mWatcher->clearArguments(); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("WatchGnuPG"); *mWatcher << config->readEntry("Executable", WATCHGNUPGBINARY); *mWatcher << "--force"; @@ -150,8 +150,8 @@ void KWatchGnuPGMainWindow::startWatcher() mCentralWidget->append( i18n("[%1] Log started") .arg( TQDateTime::currentDateTime().toString(TQt::ISODate) ) ); } - connect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ), - this, TQT_SLOT( slotWatcherExited() ) ); + connect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ), + this, TQ_SLOT( slotWatcherExited() ) ); } void KWatchGnuPGMainWindow::setGnuPGConfig() @@ -162,7 +162,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig() if ( !cconfig ) return; //Q_ASSERT( cconfig ); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("WatchGnuPG"); TQStringList comps = cconfig->componentList(); for( TQStringList::const_iterator it = comps.begin(); it != comps.end(); ++it ) { @@ -213,7 +213,7 @@ void KWatchGnuPGMainWindow::slotReadStdout() mSysTray->setAttention(true); } } - TQTimer::singleShot( 0, this, TQT_SLOT(slotAckRead()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAckRead()) ); } void KWatchGnuPGMainWindow::slotAckRead() { @@ -251,18 +251,18 @@ void KWatchGnuPGMainWindow::slotSaveAs() void KWatchGnuPGMainWindow::slotQuit() { - disconnect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ), - this, TQT_SLOT( slotWatcherExited() ) ); + disconnect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ), + this, TQ_SLOT( slotWatcherExited() ) ); mWatcher->kill(); - kapp->quit(); + tdeApp->quit(); } void KWatchGnuPGMainWindow::slotConfigure() { if( !mConfig ) { mConfig = new KWatchGnuPGConfig( this, "config dialog" ); - connect( mConfig, TQT_SIGNAL( reconfigure() ), - this, TQT_SLOT( slotReadConfig() ) ); + connect( mConfig, TQ_SIGNAL( reconfigure() ), + this, TQ_SLOT( slotReadConfig() ) ); } mConfig->loadConfig(); mConfig->exec(); @@ -270,7 +270,7 @@ void KWatchGnuPGMainWindow::slotConfigure() void KWatchGnuPGMainWindow::slotReadConfig() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("LogWindow"); mCentralWidget->setWordWrap( config->readBoolEntry("WordWrap", false) ?TQTextEdit::WidgetWidth @@ -282,7 +282,7 @@ void KWatchGnuPGMainWindow::slotReadConfig() bool KWatchGnuPGMainWindow::queryClose() { - if ( !kapp->sessionSaving() ) { + if ( !tdeApp->sessionSaving() ) { hide(); return false; } diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h index 6d08fe05..da0a1586 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h @@ -37,7 +37,7 @@ class KWatchGnuPGTray; class KWatchGnuPGConfig; -class KProcIO; +class TDEProcIO; class TQTextEdit; class KWatchGnuPGMainWindow : public TDEMainWindow { @@ -68,7 +68,7 @@ private: void startWatcher(); void setGnuPGConfig(); - KProcIO* mWatcher; + TDEProcIO* mWatcher; TQTextEdit* mCentralWidget; KWatchGnuPGTray* mSysTray; diff --git a/certmanager/kwatchgnupg/main.cpp b/certmanager/kwatchgnupg/main.cpp index 975b45c7..b9f6237a 100644 --- a/certmanager/kwatchgnupg/main.cpp +++ b/certmanager/kwatchgnupg/main.cpp @@ -37,7 +37,7 @@ #include "aboutdata.h" #include "kwatchgnupgmainwin.h" -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tdecmdlineargs.h> #include <tdemessagebox.h> #include <tdelocale.h> @@ -45,7 +45,7 @@ #include <kiconloader.h> #include <kdebug.h> -class KWatchGnuPGApplication : public KUniqueApplication { +class KWatchGnuPGApplication : public TDEUniqueApplication { public: KWatchGnuPGApplication(); ~KWatchGnuPGApplication(); @@ -55,7 +55,7 @@ private: }; KWatchGnuPGApplication::KWatchGnuPGApplication() - : KUniqueApplication(), mMainWin(0) + : TDEUniqueApplication(), mMainWin(0) { } @@ -71,7 +71,7 @@ int KWatchGnuPGApplication::newInstance() setMainWidget( mMainWin ); } mMainWin->show(); - return KUniqueApplication::newInstance(); + return TDEUniqueApplication::newInstance(); } int main( int argc, char** argv ) diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index e89070f3..d5083b96 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp @@ -442,7 +442,7 @@ bool Kleo::ChiasmusBackend::checkForSMIME( TQString * reason ) const { bool Kleo::ChiasmusBackend::checkForChiasmus( TQString * reason ) const { // kills the protocol instance when we return false: - std::auto_ptr<Protocol> tmp( mProtocol ); + std::unique_ptr<Protocol> tmp( mProtocol ); mProtocol = 0; const CryptoConfigEntry * path = config()->entry( "Chiasmus", "General", "path" ); diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp index 265d759b..5c49478e 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp @@ -90,7 +90,7 @@ GpgME::Error Kleo::ChiasmusJob::setup() { : SymCryptRunProcessBase::Decrypt, this, "symcryptrun" ); TQTimer::singleShot( timeoutEntry->uintValue() * 1000, this, - TQT_SLOT( slotTimeout() ) ); + TQ_SLOT( slotTimeout() ) ); return 0; } @@ -110,8 +110,8 @@ GpgME::Error Kleo::ChiasmusJob::start() { if ( const GpgME::Error err = setup() ) return mError = err; - connect( mSymCryptRun, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mSymCryptRun, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); if ( !mSymCryptRun->launch( mInput ) ) return mError = gpg_error( GPG_ERR_ENOENT ); // what else? diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp index d7ae22c1..90f51243 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp @@ -70,7 +70,7 @@ Kleo::ObtainKeysJob::ObtainKeysJob() Kleo::ObtainKeysJob::~ObtainKeysJob() {} GpgME::Error Kleo::ObtainKeysJob::start() { - TQTimer::singleShot( 0, this, TQT_SLOT(slotPerform()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotPerform()) ); return mError = 0; } @@ -109,7 +109,7 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) { ++mIndex; if ( async ) - TQTimer::singleShot( 0, this, TQT_SLOT(slotPerform()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotPerform()) ); else slotPerform( false ); } diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp index 9391f023..34ac1d66 100644 --- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp +++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp @@ -58,10 +58,10 @@ Kleo::SymCryptRunProcessBase::SymCryptRunProcessBase( const TQString & class_, c Kleo::SymCryptRunProcessBase::~SymCryptRunProcessBase() {} bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm ) { - connect( this, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) ); - connect( this, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) ); + connect( this, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) ); + connect( this, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) ); if ( rm == Block ) { KTempFile tempfile; tempfile.setAutoDelete( true ); @@ -80,7 +80,7 @@ bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm return ok; mInput = input.copy(); writeStdin( mInput.begin(), mInput.size() ); - connect( this, TQT_SIGNAL(wroteStdin(TDEProcess*)), this, TQT_SLOT(closeStdin()) ); + connect( this, TQ_SIGNAL(wroteStdin(TDEProcess*)), this, TQ_SLOT(closeStdin()) ); return true; } } diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h index 5f0c69a3..b5b60fe5 100644 --- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h +++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h @@ -33,7 +33,7 @@ #ifndef __KLEO_BACKEND_CHIASMUS__SYMCRYPTRUNPROCESSBASE_H__ #define __KLEO_BACKEND_CHIASMUS__SYMCRYPTRUNPROCESSBASE_H__ -#include <kprocess.h> +#include <tdeprocess.h> #include <tqcstring.h> diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp index 3d28ac4b..5ab83715 100644 --- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp +++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp @@ -264,7 +264,7 @@ GpgME::Error Kleo::KpgpKeyListJob::start( const TQStringList & patterns, bool secretOnly ) { mPatterns = patterns; mSecretOnly = secretOnly; - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoIt() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoIt() ) ); return GpgME::Error( 0 ); } diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp index bfd00ac9..e0da7eca 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp @@ -113,7 +113,7 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() { if ( d->usetStatusFD ) { ::close( d->statusFD[1] ); // close the input end of the pipe, we're the reader d->statnot = new TQSocketNotifier( d->statusFD[0], TQSocketNotifier::Read, this ); - connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildStatus(int)) ); + connect( d->statnot, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChildStatus(int)) ); } return TDEProcess::commSetupDoneP(); } diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h index 639c25ed..d894884e 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h @@ -33,7 +33,7 @@ #ifndef __KLEO_GNUPGPROCESSBASE_H__ #define __KLEO_GNUPGPROCESSBASE_H__ -#include <kprocess.h> +#include <tdeprocess.h> namespace Kleo { diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp index ee4128bf..86439bb9 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp @@ -43,7 +43,7 @@ #include <gpgmepp/engineinfo.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqstring.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp index e73b4363..c77dcb20 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp @@ -32,7 +32,7 @@ #include "qgpgmecryptoconfig.h" #include <kdebug.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <errno.h> #include <tdemessagebox.h> #include <tdelocale.h> @@ -71,12 +71,12 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors ) { // Run gpgconf --list-components to make the list of components - KProcIO proc( TQTextCodec::codecForName( "utf8" ) ); + TDEProcIO proc( TQTextCodec::codecForName( "utf8" ) ); proc << "gpgconf"; // must be in the PATH proc << "--list-components"; - TQObject::connect( &proc, TQT_SIGNAL( readReady(KProcIO*) ), - this, TQT_SLOT( slotCollectStdOut(KProcIO*) ) ); + TQObject::connect( &proc, TQ_SIGNAL( readReady(TDEProcIO*) ), + this, TQ_SLOT( slotCollectStdOut(TDEProcIO*) ) ); // run the process: int rc = 0; @@ -100,7 +100,7 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors ) mParsed = true; } -void QGpgMECryptoConfig::slotCollectStdOut( KProcIO* proc ) +void QGpgMECryptoConfig::slotCollectStdOut( TDEProcIO* proc ) { TQString line; int result; @@ -166,15 +166,15 @@ void QGpgMECryptoConfigComponent::runGpgConf() { // Run gpgconf --list-options <component>, and create all groups and entries for that component - KProcIO proc( TQTextCodec::codecForName( "utf8" ) ); + TDEProcIO proc( TQTextCodec::codecForName( "utf8" ) ); proc << "gpgconf"; // must be in the PATH proc << "--list-options"; proc << mName; //kdDebug(5150) << "Running gpgconf --list-options " << mName << endl; - TQObject::connect( &proc, TQT_SIGNAL( readReady(KProcIO*) ), - this, TQT_SLOT( slotCollectStdOut(KProcIO*) ) ); + TQObject::connect( &proc, TQ_SIGNAL( readReady(TDEProcIO*) ), + this, TQ_SLOT( slotCollectStdOut(TDEProcIO*) ) ); mCurrentGroup = 0; // run the process: @@ -192,7 +192,7 @@ void QGpgMECryptoConfigComponent::runGpgConf() } } -void QGpgMECryptoConfigComponent::slotCollectStdOut( KProcIO* proc ) +void QGpgMECryptoConfigComponent::slotCollectStdOut( TDEProcIO* proc ) { TQString line; int result; @@ -265,7 +265,7 @@ void QGpgMECryptoConfigComponent::sync( bool runtime ) line += ":16:"; } line += '\n'; - TQCString line8bit = line.utf8(); // encode with utf8, and KProcIO uses utf8 when reading. + TQCString line8bit = line.utf8(); // encode with utf8, and TDEProcIO uses utf8 when reading. tmpFile.file()->writeBlock( line8bit.data(), line8bit.size()-1 /*no 0*/ ); dirtyEntries.append( it.current() ); } diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h index 710fa168..5fbc9f63 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h @@ -38,7 +38,7 @@ #include <tqstringlist.h> #include <tqobject.h> #include <tqvariant.h> -class KProcIO; +class TDEProcIO; class QGpgMECryptoConfigComponent; class QGpgMECryptoConfigEntry; @@ -65,7 +65,7 @@ public: virtual void sync( bool runtime ); private slots: - void slotCollectStdOut( KProcIO* proc ); + void slotCollectStdOut( TDEProcIO* proc ); private: /// @param showErrors if true, a messagebox will be shown if e.g. gpgconf wasn't found void runGpgConf( bool showErrors ); @@ -95,7 +95,7 @@ public: void sync( bool runtime ); private slots: - void slotCollectStdOut( KProcIO* proc ); + void slotCollectStdOut( TDEProcIO* proc ); private: void runGpgConf(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h index 67cdf357..255e3fdd 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h @@ -38,7 +38,7 @@ #include "qgpgmejob.h" #include <tqcstring.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Error; @@ -47,7 +47,7 @@ namespace GpgME { namespace Kleo { - class KDE_EXPORT QGpgMEDecryptVerifyJob : public DecryptVerifyJob, private QGpgMEJob { + class TDE_EXPORT QGpgMEDecryptVerifyJob : public DecryptVerifyJob, private QGpgMEJob { TQ_OBJECT TQGPGME_JOB public: diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp index 947a5258..8c378536 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp @@ -47,7 +47,7 @@ #include <gpgmepp/data.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqstring.h> #include <tqstringlist.h> @@ -96,8 +96,8 @@ Kleo::QGpgMEJob::QGpgMEJob( Kleo::Job * _this, GpgME::Context * context ) { InvarianceChecker check( this ); assert( context ); - TQObject::connect( QGpgME::EventLoopInteractor::instance(), TQT_SIGNAL(aboutToDestroy()), - _this, TQT_SLOT(slotCancel()) ); + TQObject::connect( QGpgME::EventLoopInteractor::instance(), TQ_SIGNAL(aboutToDestroy()), + _this, TQ_SLOT(slotCancel()) ); context->setProgressProvider( this ); // (mmutz) work around a gpgme bug in versions at least <= 0.9.0. // These versions will return GPG_ERR_NOT_IMPLEMENTED from @@ -153,8 +153,8 @@ void Kleo::QGpgMEJob::deleteAllPatterns() { void Kleo::QGpgMEJob::hookupContextToEventLoopInteractor() { mCtx->setManagedByEventLoopInteractor( true ); TQObject::connect( QGpgME::EventLoopInteractor::instance(), - TQT_SIGNAL(operationDoneEventSignal(GpgME::Context*,const GpgME::Error&)), - mThis, TQT_SLOT(slotOperationDoneEvent(GpgME::Context*,const GpgME::Error&)) ); + TQ_SIGNAL(operationDoneEventSignal(GpgME::Context*,const GpgME::Error&)), + mThis, TQ_SLOT(slotOperationDoneEvent(GpgME::Context*,const GpgME::Error&)) ); } void Kleo::QGpgMEJob::setPatterns( const TQStringList & sl, bool allowEmpty ) { diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h index 64ce36bc..aabfb701 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h @@ -43,7 +43,7 @@ #include <tqstring.h> #include <vector> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Data; @@ -75,7 +75,7 @@ namespace Kleo { signal there. Pass "this" as the first argument this QGpgMEJOb's ctor. The rest is dealt with automatically. */ - class KDE_EXPORT QGpgMEJob : public GpgME::ProgressProvider, public GpgME::PassphraseProvider { + class TDE_EXPORT QGpgMEJob : public GpgME::ProgressProvider, public GpgME::PassphraseProvider { public: QGpgMEJob( Kleo::Job * _this, GpgME::Context * context ); ~QGpgMEJob(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h index 6b3e6716..f5f46669 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h @@ -36,7 +36,7 @@ #include <kleo/keygenerationjob.h> #include "qgpgmejob.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Error; @@ -51,7 +51,7 @@ namespace QGpgME { namespace Kleo { - class KDE_EXPORT QGpgMEKeyGenerationJob : public KeyGenerationJob, private QGpgMEJob { + class TDE_EXPORT QGpgMEKeyGenerationJob : public KeyGenerationJob, private QGpgMEJob { TQ_OBJECT TQGPGME_JOB public: diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp index 5561625c..25edaf84 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp @@ -79,8 +79,8 @@ GpgME::Error Kleo::QGpgMEKeyListJob::start( const TQStringList & pats, bool secr hookupContextToEventLoopInteractor(); connect( QGpgME::EventLoopInteractor::instance(), - TQT_SIGNAL(nextKeyEventSignal(GpgME::Context*,const GpgME::Key&)), - TQT_SLOT(slotNextKeyEvent(GpgME::Context*,const GpgME::Key&)) ); + TQ_SIGNAL(nextKeyEventSignal(GpgME::Context*,const GpgME::Key&)), + TQ_SLOT(slotNextKeyEvent(GpgME::Context*,const GpgME::Key&)) ); // The communication channel between gpgme and gpgsm is limited in // the number of patterns that can be transported, but they won't @@ -100,7 +100,7 @@ GpgME::Error Kleo::QGpgMEKeyListJob::start( const TQStringList & pats, bool secr } } else if ( err.code() == GPG_ERR_EOF ) { kdDebug(5150) << "QGpgMEKeyListJob::start(): early end of keylisting, trying to fake an empty result" << endl; - TQTimer::singleShot( 10, this, TQT_SLOT(slotFakeOperationDoneEvent()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(slotFakeOperationDoneEvent()) ); return GpgME::Error(); } deleteLater(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp index 6d05e1ec..8088d28a 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp @@ -107,12 +107,12 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() { mProcess->setUsetStatusFD( true ); - connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotProcessExited(TDEProcess*)) ); - connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQ_SLOT(slotStderr(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), + TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp index f553c703..af72a539 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp @@ -88,14 +88,14 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern mProcess->setUsetStatusFD( true ); - connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotProcessExited(TDEProcess*)) ); - connect( mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - TQT_SLOT(slotStdout(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + TQ_SLOT(slotStdout(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQ_SLOT(slotStderr(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), + TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h index f259d754..216faeb5 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h @@ -44,7 +44,7 @@ #include <utility> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Error; class Context; @@ -53,7 +53,7 @@ namespace GpgME { namespace Kleo { - class KDE_EXPORT QGpgMESignEncryptJob : public SignEncryptJob, private QGpgMEJob { + class TDE_EXPORT QGpgMESignEncryptJob : public SignEncryptJob, private QGpgMEJob { TQ_OBJECT TQGPGME_JOB public: diff --git a/certmanager/lib/cryptplug.cpp b/certmanager/lib/cryptplug.cpp index 20747457..24ded795 100644 --- a/certmanager/lib/cryptplug.cpp +++ b/certmanager/lib/cryptplug.cpp @@ -696,8 +696,8 @@ GpgME::ImportResult CryptPlug::importCertificateFromMem( const char* data, size_ { using namespace GpgME; - std::auto_ptr<Context> context( Context::createForProtocol( mProtocol ) ); - if ( !context.get() ) + std::unique_ptr<Context> context( Context::createForProtocol( mProtocol ) ); + if ( !context ) return ImportResult(); Data keydata( data, length, false ); diff --git a/certmanager/lib/cryptplug.h b/certmanager/lib/cryptplug.h index fce71937..9b281101 100644 --- a/certmanager/lib/cryptplug.h +++ b/certmanager/lib/cryptplug.h @@ -25,7 +25,7 @@ #include <gpgmepp/context.h> #include <gpgme.h> // need it for gpgme_protocol_t :( -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class ImportResult; @@ -295,7 +295,7 @@ typedef unsigned long SigStatusFlags; class CryptPlugWrapper; -class KDE_EXPORT CryptPlug { +class TDE_EXPORT CryptPlug { friend class CryptPlugWrapper; protected: CryptPlug(); @@ -418,12 +418,12 @@ bool hasFeature( ::Feature ); and/or encrypted content (or to build a text frame around your flat non-MIME message body, resp.) - <b>If</b> value returned in \c makeMimeObject is <b>TRUE</b> the + <b>If</b> value returned in \c makeMimeObject is <b>true</b> the text strings returned in \c contentTypeMain and \c contentDispMain and \c contentTEncMain (and, if required, \c content[..]Version and \c bodyTextVersion and \c content[..]Sig) should be used to compose a respective MIME object.<br> - If <b>FALSE</b> the texts returned in \c flatTextPrefix and + If <b>false</b> the texts returned in \c flatTextPrefix and \c flatTextSeparator and \c flatTextPostfix are to be used instead.<br> Allways <b>either</b> the \c content[..] and \c bodyTextVersion parameters <b>or</b> the \c flatText[..] parameters are holding @@ -451,16 +451,16 @@ bool hasFeature( ::Feature ); you could report the missing MIME header information to the address returned by the \c bugURL() function. - If \c makeMultiMime returns FALSE the \c contentTypeMain returned must + If \c makeMultiMime returns false the \c contentTypeMain returned must not be altered but used to specify a single part mime object holding the code bloc, e.g. this is used for 'enveloped-data' single part MIME objects. In this case you should ignore both the \c content[..]Version and \c content[..]Code parameters. - If \c makeMultiMime returns TRUE also the following rules apply: - \li If \c includeCleartext is TRUE you should include the cleartext - as first part of our multipart MIME object, typically this is TRUE - when signing mails but FALSE when encrypting. + If \c makeMultiMime returns true also the following rules apply: + \li If \c includeCleartext is true you should include the cleartext + as first part of our multipart MIME object, typically this is true + when signing mails but false when encrypting. \li The \c contentTypeMain returned typically starts with "multipart/" while providing a "protocol" and a "micalg" parameter: just add an appropriate \c "; boundary=[your \c boundary \c string]" to get @@ -486,16 +486,16 @@ bool hasFeature( ::Feature ); unaltered value to specify the Content-Transfer-Encoding header of the respective MIME part. - <b>If</b> value returned in \c makeMimeObject is <b>FALSE</b> the + <b>If</b> value returned in \c makeMimeObject is <b>false</b> the text strings returned in \c flatTextPrefix and \c flatTextPostfix should be used to build a frame around the cleartext and the code bloc holding the signature (or - in case of encrypting - the encoded data bloc, resp.).<br> - If \c includeCleartext is TRUE this frame should also include the + If \c includeCleartext is true this frame should also include the cleartext as first bloc, this bloc should be divided from the code bloc by the contents of \c flatTextSeparator - typically this is used for signing but not when encrypting.<br> - If \c includeCleartext is FALSE you should ignore both the cleartext + If \c includeCleartext is false you should ignore both the cleartext and the \c flatTextSeparator parameter. <b>How to use StructuringInfo data in your program:</b> @@ -624,48 +624,48 @@ struct StructuringInfo { MIME object (or - for non-MIME messages - as flat text to be set before the ciphertext, resp.), typically this - is TRUE when signing mails but FALSE + is true when signing mails but false when encrypting<br> (this parameter is relevant no matter - whether \c makeMimeObject is TRUE or - FALSE) */ + whether \c makeMimeObject is true or + false) */ bool makeMimeObject; /*!< specifies whether we should create a MIME object or a flat text message body */ /* the following are used for MIME messages only */ bool makeMultiMime; /*!< specifies whether we should create a 'Multipart' MIME object or a single part - object, if FALSE only \c contentTypeMain, + object, if false only \c contentTypeMain, \c contentDispMain and \c contentTEncMain may be used and all other parameters have to be ignored<br> (ignore this parameter if \c makeMimeObject - is FALSE) */ + is false) */ char* contentTypeMain; /*!< value of the main 'Content-Type' header<br> (ignore this parameter if \c makeMimeObject - is FALSE) */ + is false) */ char* contentDispMain; /*!< value of the main 'Content-Disposition' header<br> (ignore this parameter if \c makeMimeObject - is FALSE) */ + is false) */ char* contentTEncMain; /*!< value of the main 'Content-TransferEncoding' header<br> (ignore this parameter if \c makeMimeObject - is FALSE) */ + is false) */ char* contentTypeVersion; /*!< 'Content-Type' of the additional version part that might preceed the code part - if NULL or zero length no version part must be created<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE) */ + is false) */ char* contentDispVersion; /*!< 'Content-Disposition' of the additional preceeding the code part (only valid if \c contentTypeVersion holds a non-zero-length string)<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE or if \c contentTypeVersion does + is false or if \c contentTypeVersion does not return a non-zero-length string) */ char* contentTEncVersion; /*!< 'Content-Transfer-Encoding' of the additional version part (only valid if @@ -673,47 +673,47 @@ struct StructuringInfo { non-zero-length string)<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE or if \c contentTypeVersion does + is false or if \c contentTypeVersion does not return a non-zero-length string) */ char* bodyTextVersion; /*!< body text of the additional version part (only valid if \c contentTypeVersion holds a non-zero-length string)<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE or if \c contentTypeVersion does + is false or if \c contentTypeVersion does not return a non-zero-length string) */ char* contentTypeCode; /*!< 'Content-Type' of the code part holding the signature code (or the encrypted data, resp.)<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE) */ + is false) */ char* contentDispCode; /*!< 'Content-Disposition' of the code part<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE or if \c contentTypeCode does + is false or if \c contentTypeCode does not return a non-zero-length string) */ char* contentTEncCode; /*!< 'Content-Type' of the code part<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE or if \c contentTypeCode does + is false or if \c contentTypeCode does not return a non-zero-length string) */ /* the following are used for flat non-MIME messages only */ char* flatTextPrefix; /*!< text to preceed the main text (or the code bloc containing the encrypted main text, resp.)<br> (ignore this parameter if - \c makeMimeObject is TRUE) */ + \c makeMimeObject is true) */ char* flatTextSeparator; /*!< text to be put between the main text and the signature code bloc (not used when encrypting)<br> (ignore this parameter if - \c makeMimeObject is TRUE or if - \c includeCleartext is FALSE) */ + \c makeMimeObject is true or if + \c includeCleartext is false) */ char* flatTextPostfix; /*!< text to follow the signature code bloc (or the encrypted data bloc, resp.)<br> (ignore this parameter if - \c makeMimeObject is TRUE) */ + \c makeMimeObject is true) */ }; diff --git a/certmanager/lib/cryptplugfactory.h b/certmanager/lib/cryptplugfactory.h index 4a0a7a3d..a45c82fc 100644 --- a/certmanager/lib/cryptplugfactory.h +++ b/certmanager/lib/cryptplugfactory.h @@ -35,11 +35,11 @@ #include "kleo/cryptobackendfactory.h" -#include <kdemacros.h> +#include <tdemacros.h> #ifndef LIBKLEOPATRA_NO_COMPAT namespace Kleo { - //typedef CryptoBackendFactory CryptPlugFactory KDE_DEPRECATED; + //typedef CryptoBackendFactory CryptPlugFactory TDE_DEPRECATED; } class CryptPlugWrapper; @@ -47,7 +47,7 @@ class CryptPlugWrapperList; namespace KMail { - class KDE_EXPORT CryptPlugFactory : public Kleo::CryptoBackendFactory { + class TDE_EXPORT CryptPlugFactory : public Kleo::CryptoBackendFactory { TQ_OBJECT protected: diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp index 5bd5675b..f1246f39 100644 --- a/certmanager/lib/cryptplugwrapper.cpp +++ b/certmanager/lib/cryptplugwrapper.cpp @@ -569,7 +569,7 @@ bool CryptPlugWrapper::checkMessageSignature( char** cleartext, int signatureLen, CryptPlug::SignatureMetaData* sigmeta ) { - DNBeautifier dnBeautifier( kapp->config(), + DNBeautifier dnBeautifier( tdeApp->config(), "DN", "AttributeOrder", "UnknownAttributes" ); @@ -607,7 +607,7 @@ bool CryptPlugWrapper::decryptAndCheckMessage( int* errId, char** errTxt ) { - DNBeautifier dnBeautifier( kapp->config(), + DNBeautifier dnBeautifier( tdeApp->config(), "DN", "AttributeOrder", "UnknownAttributes" ); diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h index 2be5cd56..41a9fc2b 100644 --- a/certmanager/lib/cryptplugwrapper.h +++ b/certmanager/lib/cryptplugwrapper.h @@ -54,7 +54,7 @@ #include <tqpair.h> #include <tqstringlist.h> #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEConfigBase; @@ -240,12 +240,12 @@ class CryptPlugWrapper; any of it's members - just ignore the advise given in the cryptplug.h documentation! - <b>If</b> value returned in \c makeMimeObject is <b>TRUE</b> the + <b>If</b> value returned in \c makeMimeObject is <b>true</b> the text strings returned in \c contentTypeMain and \c contentDispMain and \c contentTEncMain (and, if required, \c content[..]Version and \c bodyTextVersion and \c content[..]Sig) should be used to compose a respective MIME object.<br> - If <b>FALSE</b> the texts returned in \c flatTextPrefix and + If <b>false</b> the texts returned in \c flatTextPrefix and \c flatTextSeparator and \c flatTextPostfix are to be used instead.<br> Always <b>either</b> the \c content[..] and \c bodyTextVersion parameters <b>or</b> the \c flatText[..] parameters are holding @@ -273,16 +273,16 @@ class CryptPlugWrapper; you could report the missing MIME header information to the address returned by the \c bugURL() function. - If \c makeMultiMime returns FALSE the \c contentTypeMain returned must + If \c makeMultiMime returns false the \c contentTypeMain returned must not be altered but used to specify a single part mime object holding the code bloc, e.g. this is used for 'enveloped-data' single part MIME objects. In this case you should ignore both the \c content[..]Version and \c content[..]Code parameters. - If \c makeMultiMime returns TRUE also the following rules apply: - \li If \c includeCleartext is TRUE you should include the cleartext - as first part of our multipart MIME object, typically this is TRUE - when signing mails but FALSE when encrypting. + If \c makeMultiMime returns true also the following rules apply: + \li If \c includeCleartext is true you should include the cleartext + as first part of our multipart MIME object, typically this is true + when signing mails but false when encrypting. \li The \c contentTypeMain returned typically starts with "multipart/" while providing a "protocol" and a "micalg" parameter: just add an appropriate \c "; boundary=[your \c boundary \c string]" to get @@ -308,16 +308,16 @@ class CryptPlugWrapper; unaltered value to specify the Content-Transfer-Encoding header of the respective MIME part. - <b>If</b> value returned in \c makeMimeObject is <b>FALSE</b> the + <b>If</b> value returned in \c makeMimeObject is <b>false</b> the text strings returned in \c flatTextPrefix and \c flatTextPostfix should be used to build a frame around the cleartext and the code bloc holding the signature (or - in case of encrypting - the encoded data bloc, resp.).<br> - If \c includeCleartext is TRUE this frame should also include the + If \c includeCleartext is true this frame should also include the cleartext as first bloc, this bloc should be divided from the code bloc by the contents of \c flatTextSeparator - typically this is used for signing but not when encrypting.<br> - If \c includeCleartext is FALSE you should ignore both the cleartext + If \c includeCleartext is false you should ignore both the cleartext and the \c flatTextSeparator parameter. <b>How to use StructuringInfoWrapper data in your program:</b> @@ -450,7 +450,7 @@ private: /*! \brief This class provides C++ access to the CRYPTPLUG API. */ -class KDE_EXPORT CryptPlugWrapper : public Kleo::CryptoBackend::Protocol { +class TDE_EXPORT CryptPlugWrapper : public Kleo::CryptoBackend::Protocol { public: static TQString errorIdToText( int errId, bool & isPassphraseError ); diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h index 03dea6b2..d8b1dd6c 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.h +++ b/certmanager/lib/kleo/cryptobackendfactory.h @@ -36,7 +36,7 @@ #include <tqobject.h> #include "cryptobackend.h" -#include <kdemacros.h> +#include <tdemacros.h> #include <vector> #include <map> @@ -56,7 +56,7 @@ namespace Kleo { } }; - class KDE_EXPORT CryptoBackendFactory : public TQObject { + class TDE_EXPORT CryptoBackendFactory : public TQObject { TQ_OBJECT protected: diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp index d4ed1301..d6db7d18 100644 --- a/certmanager/lib/kleo/dn.cpp +++ b/certmanager/lib/kleo/dn.cpp @@ -484,7 +484,7 @@ Kleo::DNAttributeMapper::Private::Private() Kleo::DNAttributeMapper::DNAttributeMapper() { d = new Private(); - const TDEConfigGroup config( kapp->config(), "DN" ); + const TDEConfigGroup config( tdeApp->config(), "DN" ); d->attributeOrder = config.readListEntry( "AttributeOrder" ); if ( d->attributeOrder.empty() ) std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder, @@ -529,7 +529,7 @@ void Kleo::DNAttributeMapper::setAttributeOrder( const TQStringList & order ) { if ( order.empty() ) std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder, std::back_inserter( d->attributeOrder ) ); - TDEConfigGroup config( kapp->config(), "DN" ); + TDEConfigGroup config( tdeApp->config(), "DN" ); config.writeEntry( "AttributeOrder", order ); } diff --git a/certmanager/lib/kleo/dn.h b/certmanager/lib/kleo/dn.h index c194d58e..493a61a0 100644 --- a/certmanager/lib/kleo/dn.h +++ b/certmanager/lib/kleo/dn.h @@ -35,7 +35,7 @@ #include <tqstring.h> #include <tqvaluevector.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQStringList; class TQWidget; @@ -49,7 +49,7 @@ namespace Kleo { /** @short DN Attribute mapper */ - class KDE_EXPORT DNAttributeMapper { + class TDE_EXPORT DNAttributeMapper { DNAttributeMapper(); ~DNAttributeMapper(); public: @@ -73,7 +73,7 @@ namespace Kleo { /** @short DN parser and reorderer */ - class KDE_EXPORT DN { + class TDE_EXPORT DN { public: class Attribute; typedef TQValueVector<Attribute> AttributeList; @@ -110,7 +110,7 @@ namespace Kleo { Private * d; }; - class KDE_EXPORT DN::Attribute { + class TDE_EXPORT DN::Attribute { public: typedef DN::AttributeList List; diff --git a/certmanager/lib/kleo/enum.h b/certmanager/lib/kleo/enum.h index 723f65ae..a10bc592 100644 --- a/certmanager/lib/kleo/enum.h +++ b/certmanager/lib/kleo/enum.h @@ -33,7 +33,7 @@ #ifndef __KLEO_ENUM_H__ #define __KLEO_ENUM_H__ -#include <kdemacros.h> +#include <tdemacros.h> class TQString; class TQStringList; @@ -50,12 +50,12 @@ namespace Kleo { AutoFormat = AnyOpenPGP|AnySMIME }; - KDE_EXPORT TQString cryptoMessageFormatToLabel( CryptoMessageFormat f ); + TDE_EXPORT TQString cryptoMessageFormatToLabel( CryptoMessageFormat f ); - KDE_EXPORT const char * cryptoMessageFormatToString( CryptoMessageFormat f ); - KDE_EXPORT TQStringList cryptoMessageFormatsToStringList( unsigned int f ); - KDE_EXPORT CryptoMessageFormat stringToCryptoMessageFormat( const TQString & s ); - KDE_EXPORT unsigned int stringListToCryptoMessageFormats( const TQStringList & sl ); + TDE_EXPORT const char * cryptoMessageFormatToString( CryptoMessageFormat f ); + TDE_EXPORT TQStringList cryptoMessageFormatsToStringList( unsigned int f ); + TDE_EXPORT CryptoMessageFormat stringToCryptoMessageFormat( const TQString & s ); + TDE_EXPORT unsigned int stringListToCryptoMessageFormats( const TQStringList & sl ); enum Action { Conflict, DoIt, DontDoIt, Ask, AskOpportunistic, Impossible @@ -71,9 +71,9 @@ namespace Kleo { MaxEncryptionPreference = AskWheneverPossible }; - KDE_EXPORT TQString encryptionPreferenceToLabel( EncryptionPreference pref ); - KDE_EXPORT const char* encryptionPreferenceToString( EncryptionPreference pref ); - KDE_EXPORT EncryptionPreference stringToEncryptionPreference( const TQString& str ); + TDE_EXPORT TQString encryptionPreferenceToLabel( EncryptionPreference pref ); + TDE_EXPORT const char* encryptionPreferenceToString( EncryptionPreference pref ); + TDE_EXPORT EncryptionPreference stringToEncryptionPreference( const TQString& str ); enum SigningPreference { UnknownSigningPreference = 0, @@ -85,9 +85,9 @@ namespace Kleo { MaxSigningPreference = AskSigningWheneverPossible }; - KDE_EXPORT TQString signingPreferenceToLabel( SigningPreference pref ) KDE_EXPORT; - KDE_EXPORT const char* signingPreferenceToString( SigningPreference pref ) KDE_EXPORT; - KDE_EXPORT SigningPreference stringToSigningPreference( const TQString& str ); + TDE_EXPORT TQString signingPreferenceToLabel( SigningPreference pref ); + TDE_EXPORT const char* signingPreferenceToString( SigningPreference pref ); + TDE_EXPORT SigningPreference stringToSigningPreference( const TQString& str ); } #endif // __KLEO_CRYPTOBACKEND_H__ diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp index 65b59725..03bb267f 100644 --- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp +++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp @@ -142,8 +142,8 @@ GpgME::Error Kleo::HierarchicalKeyListJob::startAJob() { assert( mJob ); // FIXME: we need a way to generate errors ourselves, // but I don't like the dependency on gpg-error :/ - connect( mJob, TQT_SIGNAL(nextKey(const GpgME::Key&)), TQT_SLOT(slotNextKey(const GpgME::Key&)) ); - connect( mJob, TQT_SIGNAL(result(const GpgME::KeyListResult&)), TQT_SLOT(slotResult(const GpgME::KeyListResult&)) ); + connect( mJob, TQ_SIGNAL(nextKey(const GpgME::Key&)), TQ_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( mJob, TQ_SIGNAL(result(const GpgME::KeyListResult&)), TQ_SLOT(slotResult(const GpgME::KeyListResult&)) ); TQStringList patterns; for ( std::set<TQString>::const_iterator it = mNextSet.begin() ; it != mNextSet.end() ; ++it ) diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.h b/certmanager/lib/kleo/hierarchicalkeylistjob.h index cb971bd0..6920bec9 100644 --- a/certmanager/lib/kleo/hierarchicalkeylistjob.h +++ b/certmanager/lib/kleo/hierarchicalkeylistjob.h @@ -35,7 +35,7 @@ #include <kleo/keylistjob.h> #include <kleo/cryptobackend.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <gpgmepp/keylistresult.h> @@ -68,7 +68,7 @@ namespace Kleo { After result() is emitted, the HierarchicalKeyListJob will schedule its own destruction by calling TQObject::deleteLater(). */ - class KDE_EXPORT HierarchicalKeyListJob : public KeyListJob { + class TDE_EXPORT HierarchicalKeyListJob : public KeyListJob { TQ_OBJECT public: diff --git a/certmanager/lib/kleo/job.cpp b/certmanager/lib/kleo/job.cpp index 907a7448..eb638592 100644 --- a/certmanager/lib/kleo/job.cpp +++ b/certmanager/lib/kleo/job.cpp @@ -63,7 +63,7 @@ Kleo::Job::Job( TQObject * parent, const char * name ) : TQObject( parent, name ) { if ( tqApp ) - connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) ); + connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(slotCancel()) ); } Kleo::Job::~Job() { diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp index 1aa2b170..2c5b5a35 100644 --- a/certmanager/lib/kleo/keyfiltermanager.cpp +++ b/certmanager/lib/kleo/keyfiltermanager.cpp @@ -73,7 +73,7 @@ Kleo::KeyFilterManager::KeyFilterManager( TQObject * parent, const char * name ) d = new Private(); // ### DF: doesn't a KStaticDeleter work more reliably? if ( tqApp ) - connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) ); + connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(deleteLater()) ); reload(); } diff --git a/certmanager/lib/kleo/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h index d0022fc0..40f3687d 100644 --- a/certmanager/lib/kleo/keyfiltermanager.h +++ b/certmanager/lib/kleo/keyfiltermanager.h @@ -34,7 +34,7 @@ #define __KLEO_KEYFILTERMANAGER_H__ #include <tqobject.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Key; } @@ -45,7 +45,7 @@ namespace Kleo { namespace Kleo { - class KDE_EXPORT KeyFilterManager : public TQObject { + class TDE_EXPORT KeyFilterManager : public TQObject { TQ_OBJECT protected: diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp index 7c83c24b..9aafdd79 100644 --- a/certmanager/lib/kleo/multideletejob.cpp +++ b/certmanager/lib/kleo/multideletejob.cpp @@ -102,7 +102,7 @@ GpgME::Error Kleo::MultiDeleteJob::startAJob() { assert( mJob ); // FIXME: we need a way to generate errors ourselves, // but I don't like the dependency on gpg-error :/ - connect( mJob, TQT_SIGNAL(result(const GpgME::Error&)), TQT_SLOT(slotResult(const GpgME::Error&)) ); + connect( mJob, TQ_SIGNAL(result(const GpgME::Error&)), TQ_SLOT(slotResult(const GpgME::Error&)) ); return mJob->start( *mIt, mAllowSecretKeyDeletion ); } diff --git a/certmanager/lib/kleo/multideletejob.h b/certmanager/lib/kleo/multideletejob.h index 67ec7492..0bc8d329 100644 --- a/certmanager/lib/kleo/multideletejob.h +++ b/certmanager/lib/kleo/multideletejob.h @@ -36,7 +36,7 @@ #include <kleo/job.h> #include <kleo/cryptobackend.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tqguardedptr.h> #include <vector> @@ -64,7 +64,7 @@ namespace Kleo { After result() is emitted, the MultiDeleteJob will schedule it's own destruction by calling TQObject::deleteLater(). */ - class KDE_EXPORT MultiDeleteJob : public Job { + class TDE_EXPORT MultiDeleteJob : public Job { TQ_OBJECT public: diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp index 01e5d109..3fdc9938 100644 --- a/certmanager/lib/tests/test_gnupgprocessbase.cpp +++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp @@ -62,14 +62,14 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) { if ( !process ) return; mProcess = process; - connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotProcessExited(TDEProcess*)) ); - connect( mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - TQT_SLOT(slotStdout(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + TQ_SLOT(slotStdout(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQ_SLOT(slotStderr(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), + TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); } static TQStringList split( char * buffer, int buflen, TQString & old ) { diff --git a/certmanager/lib/tests/test_jobs.cpp b/certmanager/lib/tests/test_jobs.cpp index ba26bfb5..661e07da 100644 --- a/certmanager/lib/tests/test_jobs.cpp +++ b/certmanager/lib/tests/test_jobs.cpp @@ -61,8 +61,8 @@ static void testSign() std::vector<GpgME::Key> signingKeys; - std::auto_ptr<Kleo::KeyListJob> listJob( proto->keyListJob( false, false, true ) ); // use validating keylisting - if ( listJob.get() ) { + std::unique_ptr<Kleo::KeyListJob> listJob( proto->keyListJob( false, false, true ) ); // use validating keylisting + if ( listJob ) { // ##### Adjust this to your own identity listJob->exec( "faure@kde.org", true /*secret*/, signingKeys ); assert( !signingKeys.empty() ); diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp index b678e29d..ef8f8878 100644 --- a/certmanager/lib/tests/test_keygen.cpp +++ b/certmanager/lib/tests/test_keygen.cpp @@ -96,7 +96,7 @@ KeyGenerator::KeyGenerator( TQWidget * parent, const char * name, WFlags ) glay->setRowStretch( row, 1 ); glay->setColStretch( 1, 1 ); - connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotStartKeyGeneration()) ); + connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotStartKeyGeneration()) ); } KeyGenerator::~KeyGenerator() {} @@ -118,8 +118,8 @@ void KeyGenerator::slotStartKeyGeneration() { Kleo::KeyGenerationJob * job = proto->keyGenerationJob(); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)), - TQT_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)), + TQ_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) ); const GpgME::Error err = job->start( params ); if ( err ) diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp index 0e357b59..38b9085b 100644 --- a/certmanager/lib/tests/test_keylister.cpp +++ b/certmanager/lib/tests/test_keylister.cpp @@ -115,10 +115,10 @@ void CertListView::slotStart() { kdDebug() << "CertListView::slotStart()" << endl; Kleo::KeyListJob * job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( false ); assert( job ); - TQObject::connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - this, TQT_SLOT(slotAddKey(const GpgME::Key&)) ); - TQObject::connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - this, TQT_SLOT(slotResult(const GpgME::KeyListResult&)) ); + TQObject::connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + this, TQ_SLOT(slotAddKey(const GpgME::Key&)) ); + TQObject::connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + this, TQ_SLOT(slotResult(const GpgME::KeyListResult&)) ); #if 0 TQStringList l; l << "Marc"; @@ -138,7 +138,7 @@ int main( int argc, char** argv ) { app.setMainWidget( clv ); clv->show(); - TQTimer::singleShot( 5000, clv, TQT_SLOT(slotStart()) ); + TQTimer::singleShot( 5000, clv, TQ_SLOT(slotStart()) ); return app.exec(); } diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp index 1c548c5b..ed1a3317 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp @@ -44,12 +44,12 @@ * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* parent, const char* name, bool modal, WFlags fl ) : AddDirectoryServiceDialog( parent, name, modal, fl ) { - portED->setValidator( new TQIntValidator( 0, 65535, TQT_TQOBJECT(portED) ) ); + portED->setValidator( new TQIntValidator( 0, 65535, portED ) ); } /* diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.h b/certmanager/lib/ui/adddirectoryservicedialogimpl.h index c422c3a4..bc6af010 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.h +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.h @@ -40,7 +40,7 @@ class AddDirectoryServiceDialogImpl : public AddDirectoryServiceDialog public: - AddDirectoryServiceDialogImpl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + AddDirectoryServiceDialogImpl( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~AddDirectoryServiceDialogImpl(); }; diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index 9d8f4d40..43b1c13f 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -215,8 +215,8 @@ Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, hlay->addWidget( d->listView, 1 ); - connect( d->listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( d->listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); TQVBoxLayout * vlay = new TQVBoxLayout( hlay ); // inherits spacing @@ -224,15 +224,15 @@ Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, d->configureButton->setAutoDefault( false ); vlay->addWidget( d->configureButton ); - connect( d->configureButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotConfigureButtonClicked()) ); + connect( d->configureButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotConfigureButtonClicked()) ); d->rescanButton = new TQPushButton( i18n("Rescan"), this ); d->rescanButton->setAutoDefault( false ); vlay->addWidget( d->rescanButton ); - connect( d->rescanButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotRescanButtonClicked()) ); + connect( d->rescanButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotRescanButtonClicked()) ); vlay->addStretch( 1 ); } @@ -304,9 +304,9 @@ void Kleo::BackendConfigWidget::slotConfigureButtonClicked() { int result = dlg.exec(); if ( result == TQDialog::Accepted ) { // Tell other users of gpgconf (e.g. the s/mime page) that the gpgconf data might have changed - kapp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() ); + tdeApp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() ); // and schedule a rescan, in case the updates make a backend valid - TQTimer::singleShot( 0, this, TQT_SLOT(slotRescanButtonClicked()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotRescanButtonClicked()) ); } } else // shouldn't happen, button is disabled diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h index 041177a2..7f965773 100644 --- a/certmanager/lib/ui/backendconfigwidget.h +++ b/certmanager/lib/ui/backendconfigwidget.h @@ -35,7 +35,7 @@ #define __KLEO_UI_BACKENDCONFIGWIDGET_H__ #include <tqwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace Kleo { class CryptoBackendFactory; @@ -45,7 +45,7 @@ class TQListViewItem; namespace Kleo { - class KDE_EXPORT BackendConfigWidget : public TQWidget { + class TDE_EXPORT BackendConfigWidget : public TQWidget { TQ_OBJECT public: diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp index 4ec32cbb..40608ee1 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.cpp +++ b/certmanager/lib/ui/cryptoconfigdialog.cpp @@ -44,7 +44,7 @@ Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidg { mMainWidget = new CryptoConfigModule( config, this ); setMainWidget( mMainWidget ); - connect( mMainWidget, TQT_SIGNAL( changed() ), TQT_SLOT( slotChanged() ) ); + connect( mMainWidget, TQ_SIGNAL( changed() ), TQ_SLOT( slotChanged() ) ); enableButton( Apply, false ); if ( mMainWidget->hasError() ) { showButton( Default, false ); diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h index 9ed30c9e..f16ff948 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.h +++ b/certmanager/lib/ui/cryptoconfigdialog.h @@ -33,7 +33,7 @@ #define CRYPTOCONFIGDIALOG_H #include <kdialogbase.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace Kleo { @@ -43,7 +43,7 @@ namespace Kleo { /** * Simple KDialogBase wrapper around CryptoConfigModule */ - class KDE_EXPORT CryptoConfigDialog : public KDialogBase + class TDE_EXPORT CryptoConfigDialog : public KDialogBase { TQ_OBJECT diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index cfe15442..c6e5594f 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -353,7 +353,7 @@ Kleo::CryptoConfigEntryGUI::CryptoConfigEntryGUI( const char* name ) : TQObject( module, name ), mEntry( entry ), mName( entryName ), mChanged( false ) { - connect( this, TQT_SIGNAL( changed() ), module, TQT_SIGNAL( changed() ) ); + connect( this, TQ_SIGNAL( changed() ), module, TQ_SIGNAL( changed() ) ); } TQString Kleo::CryptoConfigEntryGUI::description() const @@ -387,7 +387,7 @@ Kleo::CryptoConfigEntryLineEdit::CryptoConfigEntryLineEdit( label->setEnabled( false ); mLineEdit->setEnabled( false ); } else { - connect( mLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mLineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -419,7 +419,7 @@ Kleo::CryptoConfigEntryPath::CryptoConfigEntryPath( label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -453,7 +453,7 @@ Kleo::CryptoConfigEntryDirPath::CryptoConfigEntryDirPath( label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -488,7 +488,7 @@ Kleo::CryptoConfigEntryURL::CryptoConfigEntryURL( label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -532,7 +532,7 @@ Kleo::CryptoConfigEntrySpinBox::CryptoConfigEntrySpinBox( } else { if ( mKind == UInt || mKind == ListOfNone ) mNumInput->setMinValue( 0 ); - connect( mNumInput, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotChanged() ) ); + connect( mNumInput, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( slotChanged() ) ); } } @@ -584,7 +584,7 @@ Kleo::CryptoConfigEntryCheckBox::CryptoConfigEntryCheckBox( if ( entry->isReadOnly() ) { mCheckBox->setEnabled( false ); } else { - connect( mCheckBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotChanged() ) ); + connect( mCheckBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotChanged() ) ); } } @@ -619,7 +619,7 @@ Kleo::CryptoConfigEntryLDAPURL::CryptoConfigEntryLDAPURL( mLabel->setEnabled( false ); mPushButton->hide(); } else { - connect( mPushButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenDialog() ) ); + connect( mPushButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenDialog() ) ); } } @@ -644,7 +644,7 @@ void Kleo::CryptoConfigEntryLDAPURL::slotOpenDialog() DirectoryServicesWidget* dirserv = new DirectoryServicesWidget( mEntry, &dialog ); dirserv->load(); dialog.setMainWidget( dirserv ); - connect( &dialog, TQT_SIGNAL( defaultClicked() ), dirserv, TQT_SLOT( defaults() ) ); + connect( &dialog, TQ_SIGNAL( defaultClicked() ), dirserv, TQ_SLOT( defaults() ) ); if ( dialog.exec() ) { // Note that we just grab the urls from the dialog, we don't call its save method, // since the user hasn't confirmed the big config dialog yet. diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h index 5514e877..9a97c680 100644 --- a/certmanager/lib/ui/directoryserviceswidget.h +++ b/certmanager/lib/ui/directoryserviceswidget.h @@ -34,14 +34,14 @@ #define DIRECTORYSERVICESWIDGET_H #include "directoryserviceswidgetbase.h" #include <kurl.h> -#include <kdemacros.h> +#include <tdemacros.h> class CryptPlugWrapper; namespace Kleo { class CryptoConfigEntry; -class KDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase +class TDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase { TQ_OBJECT diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui index fcc7d493..c34b16f1 100644 --- a/certmanager/lib/ui/directoryserviceswidgetbase.ui +++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui @@ -330,13 +330,13 @@ By clicking this button, you can remove the currently selected directory service <slot>slotMoveDown()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">slotAddService()</slot> <slot access="protected">slotDeleteService()</slot> <slot access="protected">slotServiceChanged( TQListViewItem* )</slot> <slot access="protected">slotServiceSelected( TQListViewItem* )</slot> <slot access="protected">slotMoveUp()</slot> <slot access="protected">slotMoveDown()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index 874ba0fa..38c4df9d 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp @@ -105,10 +105,10 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap d->currentLV->setSorting( -1 ); glay->addWidget( d->currentLV, row, 2 ); - connect( d->availableLV, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotAvailableSelectionChanged(TQListViewItem*)) ); - connect( d->currentLV, TQT_SIGNAL(clicked(TQListViewItem*)), - TQT_SLOT(slotCurrentOrderSelectionChanged(TQListViewItem*)) ); + connect( d->availableLV, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotAvailableSelectionChanged(TQListViewItem*)) ); + connect( d->currentLV, TQ_SIGNAL(clicked(TQListViewItem*)), + TQ_SLOT(slotCurrentOrderSelectionChanged(TQListViewItem*)) ); d->placeHolderItem = new TQListViewItem( d->availableLV, "_X_", i18n("All others") ); @@ -123,12 +123,12 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap const char * tooltip; const char * slot; } navButtons[] = { - { "2uparrow", 0, 1, I18N_NOOP( "Move to top" ), TQT_SLOT(slotDoubleUpButtonClicked()) }, - { "1uparrow", 1, 1, I18N_NOOP( "Move one up" ), TQT_SLOT(slotUpButtonClicked()) }, - { "1leftarrow", 2, 0, I18N_NOOP( "Remove from current attribute order" ), TQT_SLOT(slotLeftButtonClicked()) }, - { "1rightarrow", 2, 2, I18N_NOOP( "Add to current attribute order" ), TQT_SLOT(slotRightButtonClicked()) }, - { "1downarrow", 3, 1, I18N_NOOP( "Move one down" ), TQT_SLOT(slotDownButtonClicked()) }, - { "2downarrow", 4, 1, I18N_NOOP( "Move to bottom" ), TQT_SLOT(slotDoubleDownButtonClicked()) } + { "2uparrow", 0, 1, I18N_NOOP( "Move to top" ), TQ_SLOT(slotDoubleUpButtonClicked()) }, + { "1uparrow", 1, 1, I18N_NOOP( "Move one up" ), TQ_SLOT(slotUpButtonClicked()) }, + { "1leftarrow", 2, 0, I18N_NOOP( "Remove from current attribute order" ), TQ_SLOT(slotLeftButtonClicked()) }, + { "1rightarrow", 2, 2, I18N_NOOP( "Add to current attribute order" ), TQ_SLOT(slotRightButtonClicked()) }, + { "1downarrow", 3, 1, I18N_NOOP( "Move one down" ), TQ_SLOT(slotDownButtonClicked()) }, + { "2downarrow", 4, 1, I18N_NOOP( "Move to bottom" ), TQ_SLOT(slotDoubleDownButtonClicked()) } }; for ( unsigned int i = 0 ; i < sizeof navButtons / sizeof *navButtons ; ++i ) { @@ -137,7 +137,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap tb->setEnabled( false ); TQToolTip::add( tb, i18n( navButtons[i].tooltip ) ); xlay->addWidget( tb, navButtons[i].row, navButtons[i].col ); - connect( tb, TQT_SIGNAL(clicked()), navButtons[i].slot ); + connect( tb, TQ_SIGNAL(clicked()), navButtons[i].slot ); } glay->addLayout( xlay, row, 1 ); diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h index 70c093d4..a8fcf934 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.h +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h @@ -34,7 +34,7 @@ #define __KLEO_UI_DNATTRIBUTEORDERCONFIGWIDGET_H__ #include <tqwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace Kleo { class DNAttributeMapper; } @@ -43,7 +43,7 @@ class TQListViewItem; namespace Kleo { - class KDE_EXPORT DNAttributeOrderConfigWidget : public TQWidget { + class TDE_EXPORT DNAttributeOrderConfigWidget : public TQWidget { TQ_OBJECT public: diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index 6b873c0b..fd796b8d 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -163,7 +163,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients cb->insertStringList( prefs ); glay->addWidget( cb, row, 1 ); cb->setCurrentItem( pref2cb( it->pref ) ); - connect( cb, TQT_SIGNAL(activated(int)), TQT_SLOT(slotPrefsChanged()) ); + connect( cb, TQ_SIGNAL(activated(int)), TQ_SLOT(slotPrefsChanged()) ); d->preferences.push_back( cb ); } diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h index d6a59b09..25c82fcf 100644 --- a/certmanager/lib/ui/keyapprovaldialog.h +++ b/certmanager/lib/ui/keyapprovaldialog.h @@ -40,7 +40,7 @@ #include <kleo/enum.h> #include <kdialogbase.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <kpgpkey.h> // for EncryptPref #include <gpgmepp/key.h> @@ -55,7 +55,7 @@ class TQStringList; namespace Kleo { - class KDE_EXPORT KeyApprovalDialog : public KDialogBase { + class TDE_EXPORT KeyApprovalDialog : public KDialogBase { TQ_OBJECT public: diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp index 00f69500..af067b1e 100644 --- a/certmanager/lib/ui/keylistview.cpp +++ b/certmanager/lib/ui/keylistview.cpp @@ -123,14 +123,14 @@ static const struct { const char * source; const char * target; } signalReplacements[] = { - { TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotEmitDoubleClicked(TQListViewItem*,const TQPoint&,int)) }, - { TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(slotEmitReturnPressed(TQListViewItem*)) }, - { TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotEmitSelectionChanged(TQListViewItem*)) }, - { TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)), - TQT_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) }, + { TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotEmitDoubleClicked(TQListViewItem*,const TQPoint&,int)) }, + { TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(slotEmitReturnPressed(TQListViewItem*)) }, + { TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotEmitSelectionChanged(TQListViewItem*)) }, + { TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)), + TQ_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) }, }; static const int numSignalReplacements = sizeof signalReplacements / sizeof *signalReplacements; @@ -146,7 +146,7 @@ Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const Dis d = new Private(); d->updateTimer = new TQTimer( this ); - connect( d->updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdateTimeout()) ); + connect( d->updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdateTimeout()) ); if ( !columnStrategy ) { kdWarning(5150) << "Kleo::KeyListView: need a column strategy to work with!" << endl; diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index 414e4dea..0db1b1e3 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -36,7 +36,7 @@ #include <tdelistview.h> #include <gpgmepp/key.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQPainter; class TQColorGroup; @@ -62,7 +62,7 @@ namespace Kleo { class KeyListView; - class KDE_EXPORT KeyListViewItem : public TQListViewItem { + class TDE_EXPORT KeyListViewItem : public TQListViewItem { public: KeyListViewItem( KeyListView * parent, const GpgME::Key & key ); KeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Key & key ); @@ -101,7 +101,7 @@ namespace Kleo { GpgME::Key mKey; }; - class KDE_EXPORT SubkeyKeyListViewItem : public KeyListViewItem { + class TDE_EXPORT SubkeyKeyListViewItem : public KeyListViewItem { public: SubkeyKeyListViewItem( KeyListView * parent, const GpgME::Subkey & subkey ); SubkeyKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Subkey & subkey ); @@ -133,7 +133,7 @@ namespace Kleo { GpgME::Subkey mSubkey; }; - class KDE_EXPORT UserIDKeyListViewItem : public KeyListViewItem { + class TDE_EXPORT UserIDKeyListViewItem : public KeyListViewItem { public: UserIDKeyListViewItem( KeyListView * parent, const GpgME::UserID & userid ); UserIDKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID & userid ); @@ -165,7 +165,7 @@ namespace Kleo { GpgME::UserID mUserID; }; - class KDE_EXPORT SignatureKeyListViewItem : public KeyListViewItem { + class TDE_EXPORT SignatureKeyListViewItem : public KeyListViewItem { public: SignatureKeyListViewItem( KeyListView * parent, const GpgME::UserID::Signature & sig ); SignatureKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID::Signature & sig ); @@ -198,13 +198,13 @@ namespace Kleo { }; - class KDE_EXPORT KeyListView : public TDEListView { + class TDE_EXPORT KeyListView : public TDEListView { TQ_OBJECT friend class KeyListViewItem; public: - class KDE_EXPORT ColumnStrategy { + class TDE_EXPORT ColumnStrategy { public: virtual ~ColumnStrategy(); virtual TQString title( int column ) const = 0; @@ -232,7 +232,7 @@ namespace Kleo { virtual int signatureCompare( const GpgME::UserID::Signature & sig1, const GpgME::UserID::Signature & sig2, const int column ) const; }; - class KDE_EXPORT DisplayStrategy { + class TDE_EXPORT DisplayStrategy { public: virtual ~DisplayStrategy(); //font diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index e245898e..6dd1b05e 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -130,8 +130,8 @@ void Kleo::KeyRequester::init() hlay->addWidget( mEraseButton ); hlay->addWidget( mDialogButton ); - connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) ); - connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) ); + connect( mEraseButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEraseButtonClicked()) ); + connect( mDialogButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDialogButtonClicked()) ); setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); @@ -264,10 +264,10 @@ void Kleo::KeyRequester::startKeyListJob( const TQStringList & fingerprints ) { "Check your installation."), i18n("Key Listing Failed") ); } else { - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + TQ_SLOT(slotNextKey(const GpgME::Key&)) ); const GpgME::Error err = job->start( fingerprints, mKeyUsage & Kleo::KeySelectionDialog::SecretKeys && @@ -288,10 +288,10 @@ void Kleo::KeyRequester::startKeyListJob( const TQStringList & fingerprints ) { "Check your installation."), i18n("Key Listing Failed") ); } else { - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + TQ_SLOT(slotNextKey(const GpgME::Key&)) ); const GpgME::Error err = job->start( fingerprints, mKeyUsage & Kleo::KeySelectionDialog::SecretKeys && diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h index 2f7b3b26..ba383335 100644 --- a/certmanager/lib/ui/keyrequester.h +++ b/certmanager/lib/ui/keyrequester.h @@ -53,7 +53,7 @@ #include <kleo/cryptobackend.h> #include <vector> -#include <kdemacros.h> +#include <tdemacros.h> namespace Kleo { class KeyListView; @@ -73,7 +73,7 @@ class TQLabel; namespace Kleo { /// Base class for SigningKeyRequester and EncryptionKeyRequester - class KDE_EXPORT KeyRequester : public TQWidget { + class TDE_EXPORT KeyRequester : public TQWidget { TQ_OBJECT public: @@ -159,7 +159,7 @@ namespace Kleo { }; - class KDE_EXPORT EncryptionKeyRequester : public KeyRequester { + class TDE_EXPORT EncryptionKeyRequester : public KeyRequester { TQ_OBJECT public: @@ -187,7 +187,7 @@ namespace Kleo { }; - class KDE_EXPORT SigningKeyRequester : public KeyRequester { + class TDE_EXPORT SigningKeyRequester : public KeyRequester { TQ_OBJECT public: diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index 25a1a225..78bb441d 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -60,7 +60,7 @@ #include <twin.h> #include <tdeconfig.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kactivelabel.h> #include <kurl.h> @@ -377,8 +377,8 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection if ( !text.isEmpty() ) { if ( text.startsWith( "<qt>" ) ) { KActiveLabel *textLabel = new KActiveLabel( text, page ); - disconnect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), textLabel, TQT_SLOT(openLink(const TQString&)) ); - connect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotStartCertificateManager(const TQString&)) ); + disconnect( textLabel, TQ_SIGNAL(linkClicked(const TQString&)), textLabel, TQ_SLOT(openLink(const TQString&)) ); + connect( textLabel, TQ_SIGNAL(linkClicked(const TQString&)), TQ_SLOT(slotStartCertificateManager(const TQString&)) ); textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak ); mTopLayout->addWidget( textLabel ); } else { @@ -391,7 +391,7 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection TQPushButton * const searchExternalPB = new TQPushButton( i18n("Search for &External Certificates"), page ); mTopLayout->addWidget( searchExternalPB, 0, TQt::AlignLeft ); - connect( searchExternalPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartSearchForExternalCertificates()) ); + connect( searchExternalPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStartSearchForExternalCertificates()) ); if ( initialQuery.isEmpty() ) searchExternalPB->hide(); @@ -406,10 +406,10 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection hlay->addWidget( le, 1 ); le->setFocus(); - connect( clearButton, TQT_SIGNAL( clicked() ), le, TQT_SLOT( clear() ) ); - connect( le, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotSearch(const TQString&)) ); - connect( mStartSearchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFilter()) ); + connect( clearButton, TQ_SIGNAL( clicked() ), le, TQ_SLOT( clear() ) ); + connect( le, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotSearch(const TQString&)) ); + connect( mStartSearchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFilter()) ); mKeyListView = new KeyListView( new ColumnStrategy( mKeyUsage ), 0, page, "mKeyListView" ); mKeyListView->setResizeMode( TQListView::LastColumn ); @@ -430,27 +430,27 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection "</p></qt>") ); } - connect( mCheckSelectionTimer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotCheckSelection()) ); + connect( mCheckSelectionTimer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotCheckSelection()) ); connectSignals(); connect( mKeyListView, - TQT_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotTryOk()) ); + TQ_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotTryOk()) ); connect( mKeyListView, - TQT_SIGNAL(contextMenu(Kleo::KeyListViewItem*,const TQPoint&)), - TQT_SLOT(slotRMB(Kleo::KeyListViewItem*,const TQPoint&)) ); + TQ_SIGNAL(contextMenu(Kleo::KeyListViewItem*,const TQPoint&)), + TQ_SLOT(slotRMB(Kleo::KeyListViewItem*,const TQPoint&)) ); setButtonText( KDialogBase::Default, i18n("&Reread Keys") ); setButtonGuiItem( KDialogBase::Help, i18n("&Start Certificate Manager") ); - connect( this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(slotRereadKeys()) ); - connect( this, TQT_SIGNAL(helpClicked()), this, TQT_SLOT(slotStartCertificateManager()) ); + connect( this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(slotRereadKeys()) ); + connect( this, TQ_SIGNAL(helpClicked()), this, TQ_SLOT(slotStartCertificateManager()) ); slotRereadKeys(); mTopLayout->activate(); - if ( kapp ) { - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + if ( tdeApp ) { + KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() ); TQSize dialogSize( 500, 400 ); TDEConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" ); @@ -468,20 +468,20 @@ Kleo::KeySelectionDialog::~KeySelectionDialog() { void Kleo::KeySelectionDialog::connectSignals() { if ( mKeyListView->isMultiSelection() ) - connect( mKeyListView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotSelectionChanged()) ); + connect( mKeyListView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotSelectionChanged()) ); else - connect( mKeyListView, TQT_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), - TQT_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); + connect( mKeyListView, TQ_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), + TQ_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); } void Kleo::KeySelectionDialog::disconnectSignals() { if ( mKeyListView->isMultiSelection() ) - disconnect( mKeyListView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged()) ); + disconnect( mKeyListView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged()) ); else - disconnect( mKeyListView, TQT_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), - this, TQT_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); + disconnect( mKeyListView, TQ_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), + this, TQ_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); } const GpgME::Key & Kleo::KeySelectionDialog::selectedKey() const { @@ -593,12 +593,12 @@ void Kleo::KeySelectionDialog::startKeyListJobForBackend( const CryptoBackend::P return; } - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), mKeyListView, validate ? - TQT_SLOT(slotRefreshKey(const GpgME::Key&)) : - TQT_SLOT(slotAddKey(const GpgME::Key&)) ); + TQ_SLOT(slotRefreshKey(const GpgME::Key&)) : + TQ_SLOT(slotAddKey(const GpgME::Key&)) ); TQStringList fprs; std::transform( keys.begin(), keys.end(), std::back_inserter( fprs ), ExtractFingerprint() ); @@ -756,7 +756,7 @@ void Kleo::KeySelectionDialog::slotRMB( Kleo::KeyListViewItem * item, const TQPo mCurrentContextMenuItem = item; TQPopupMenu menu; - menu.insertItem( i18n( "Recheck Key" ), this, TQT_SLOT(slotRecheckKey()) ); + menu.insertItem( i18n( "Recheck Key" ), this, TQ_SLOT(slotRecheckKey()) ); menu.exec( p ); } diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h index c8c833dd..60442558 100644 --- a/certmanager/lib/ui/keyselectiondialog.h +++ b/certmanager/lib/ui/keyselectiondialog.h @@ -41,7 +41,7 @@ #include <kleo/cryptobackend.h> #include <gpgmepp/key.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <vector> class TQVBoxLayout; @@ -63,7 +63,7 @@ namespace GpgME { namespace Kleo { - class KDE_EXPORT KeySelectionDialog : public KDialogBase { + class TDE_EXPORT KeySelectionDialog : public KDialogBase { TQ_OBJECT public: diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp index f2771201..68837d38 100644 --- a/certmanager/lib/ui/passphrasedialog.cpp +++ b/certmanager/lib/ui/passphrasedialog.cpp @@ -90,7 +90,7 @@ Kleo::PassphraseDialog::PassphraseDialog( const TQString & msg, const TQString & vlay->addWidget( d->lineedit ); - connect( d->lineedit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOk()) ); + connect( d->lineedit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotOk()) ); disableResize(); } diff --git a/certmanager/lib/ui/progressbar.cpp b/certmanager/lib/ui/progressbar.cpp index 6fe2f531..8c530a56 100644 --- a/certmanager/lib/ui/progressbar.cpp +++ b/certmanager/lib/ui/progressbar.cpp @@ -44,7 +44,7 @@ Kleo::ProgressBar::ProgressBar( TQWidget * parent, const char * name, WFlags f ) mRealProgress( -1 ) { mBusyTimer = new TQTimer( this ); - connect( mBusyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotBusyTimerTick()) ); + connect( mBusyTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotBusyTimerTick()) ); fixup( true ); } diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h index ead5b12c..4119a1d7 100644 --- a/certmanager/lib/ui/progressbar.h +++ b/certmanager/lib/ui/progressbar.h @@ -34,7 +34,7 @@ #define __KLEO_PROGRESSBAR_H__ #include <tqprogressbar.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQTimer; namespace Kleo { @@ -42,7 +42,7 @@ namespace Kleo { /** @short A TQProgressBar with self-powered busy indicator */ - class KDE_EXPORT ProgressBar : public TQProgressBar { + class TDE_EXPORT ProgressBar : public TQProgressBar { TQ_OBJECT public: diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp index 692ee4cb..b99db7cb 100644 --- a/certmanager/lib/ui/progressdialog.cpp +++ b/certmanager/lib/ui/progressdialog.cpp @@ -56,13 +56,13 @@ Kleo::ProgressDialog::ProgressDialog( Job * job, const TQString & baseText, setLabelText( baseText ); setProgress( 0, 0 ); // activate busy indicator - connect( job, TQT_SIGNAL(progress(const TQString&,int,int)), - TQT_SLOT(slotProgress(const TQString&,int,int)) ); - connect( job, TQT_SIGNAL(done()), TQT_SLOT(slotDone()) ); - connect( this, TQT_SIGNAL(canceled()), - job, TQT_SLOT(slotCancel()) ); + connect( job, TQ_SIGNAL(progress(const TQString&,int,int)), + TQ_SLOT(slotProgress(const TQString&,int,int)) ); + connect( job, TQ_SIGNAL(done()), TQ_SLOT(slotDone()) ); + connect( this, TQ_SIGNAL(canceled()), + job, TQ_SLOT(slotCancel()) ); - TQTimer::singleShot( minimumDuration(), this, TQT_SLOT(forceShow()) ); + TQTimer::singleShot( minimumDuration(), this, TQ_SLOT(forceShow()) ); } Kleo::ProgressDialog::~ProgressDialog() { @@ -71,7 +71,7 @@ Kleo::ProgressDialog::~ProgressDialog() { void Kleo::ProgressDialog::setMinimumDuration( int ms ) { if ( 0 < ms && ms < minimumDuration() ) - TQTimer::singleShot( ms, this, TQT_SLOT(forceShow()) ); + TQTimer::singleShot( ms, this, TQ_SLOT(forceShow()) ); TQProgressDialog::setMinimumDuration( ms ); } diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h index 35b1886d..7414cb08 100644 --- a/certmanager/lib/ui/progressdialog.h +++ b/certmanager/lib/ui/progressdialog.h @@ -35,7 +35,7 @@ #include <tqprogressdialog.h> #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace Kleo { class Job; @@ -43,7 +43,7 @@ namespace Kleo { /** @short A progress dialog for Kleo::Jobs */ - class KDE_EXPORT ProgressDialog : public TQProgressDialog { + class TDE_EXPORT ProgressDialog : public TQProgressDialog { TQ_OBJECT public: diff --git a/certmanager/storedtransferjob.cpp b/certmanager/storedtransferjob.cpp index b9816c89..3803502d 100644 --- a/certmanager/storedtransferjob.cpp +++ b/certmanager/storedtransferjob.cpp @@ -30,10 +30,10 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command, : TDEIO::TransferJob( url, command, packedArgs, _staticData, showProgressInfo ), m_uploadOffset( 0 ) { - connect( this, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( this, TQT_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ), - TQT_SLOT( slotDataReq( TDEIO::Job *, TQByteArray & ) ) ); + connect( this, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( this, TQ_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ), + TQ_SLOT( slotDataReq( TDEIO::Job *, TQByteArray & ) ) ); } void StoredTransferJob::setData( const TQByteArray& arr ) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 493b1b46..17255caf 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,13 +1,17 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -tde_auto_add_subdirectories() - +tde_conditional_add_subdirectory( BUILD_AKREGATOR akregator ) +tde_conditional_add_subdirectory( BUILD_KADDRESSBOOK kaddressbook ) +tde_conditional_add_subdirectory( BUILD_KALARM kalarm ) +tde_conditional_add_subdirectory( BUILD_KANDY kandy ) +tde_conditional_add_subdirectory( BUILD_KARM karm ) +tde_conditional_add_subdirectory( BUILD_CERTMANAGER kleopatra ) +tde_conditional_add_subdirectory( BUILD_KMAIL kmail ) +tde_conditional_add_subdirectory( BUILD_KMOBILE kmobile ) +tde_conditional_add_subdirectory( BUILD_KNODE knode ) +tde_conditional_add_subdirectory( BUILD_KNOTES knotes ) +tde_conditional_add_subdirectory( BUILD_KONSOLEKALENDAR konsolekalendar ) +tde_conditional_add_subdirectory( BUILD_KONTACT kontact ) +tde_conditional_add_subdirectory( BUILD_KORGANIZER korganizer ) +tde_conditional_add_subdirectory( BUILD_KORN korn ) +tde_conditional_add_subdirectory( BUILD_KTNEF ktnef ) +tde_conditional_add_subdirectory( BUILD_CERTMANAGER kwatchgnupg ) +tde_conditional_add_subdirectory( BUILD_TDEIOSLAVE tdeioslave ) diff --git a/doc/api/Doxyfile.pim b/doc/api/Doxyfile.pim index 62cf6790..2f238502 100644 --- a/doc/api/Doxyfile.pim +++ b/doc/api/Doxyfile.pim @@ -930,7 +930,7 @@ INCLUDE_FILE_PATTERNS = PREDEFINED = TQT_VERSION=320 \ __cplusplus \ - Q_WS_X11 + TQ_WS_X11 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/indexlib/CMakeLists.txt b/indexlib/CMakeLists.txt index f89e4f1a..6f5a42e5 100644 --- a/indexlib/CMakeLists.txt +++ b/indexlib/CMakeLists.txt @@ -13,7 +13,6 @@ project( indexlib ) include( ConfigureChecks.cmake ) -string( REPLACE "-include tqt.h" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include compat.h ${USE_EXCEPTIONS}" ) include_directories( diff --git a/indexlib/boost-compat/config/auto_link.h b/indexlib/boost-compat/config/auto_link.h index c6d9bc90..e3bdc41d 100644 --- a/indexlib/boost-compat/config/auto_link.h +++ b/indexlib/boost-compat/config/auto_link.h @@ -7,7 +7,7 @@ * LOCATION: see http://www.boost.org for most recent version. * FILE auto_link.h * VERSION see <boost/version.hpp> - * DESCRIPTION: Automatic library inclusion for Borland/Microsoft compilers. + * DESCRIPTION: Automatic library inclusion for Microsoft compilers. */ /************************************************************************* @@ -29,7 +29,7 @@ has no include guards - so be sure to include it only once from your library! Algorithm: ~~~~~~~~~~ -Libraries for Borland and Microsoft compilers are automatically +Libraries for Microsoft compilers are automatically selected here, the name of the lib is selected according to the following formula: @@ -70,7 +70,7 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y. # ifndef BOOST_CONFIG_H # include <boost/config.hpp> # endif -#elif defined(_MSC_VER) && !defined(__MWERKS__) && !defined(__EDG_VERSION__) +#elif defined(_MSC_VER) && !defined(__EDG_VERSION__) // // C language compatability (no, honestly) // @@ -82,8 +82,6 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y. // Only include what follows for known and supported compilers: // #if defined(BOOST_MSVC) \ - || defined(__BORLANDC__) \ - || (defined(__MWERKS__) && defined(_WIN32) && (__MWERKS__ >= 0x3000)) \ || (defined(__ICL) && defined(_MSC_EXTENSIONS) && (_MSC_VER >= 1200)) #ifndef BOOST_VERSION_H @@ -125,26 +123,11 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y. // vc80: # define BOOST_LIB_TOOLSET "vc80" -#elif defined(__BORLANDC__) - - // CBuilder 6: -# define BOOST_LIB_TOOLSET "bcb" - #elif defined(__ICL) // Intel C++, no version number: # define BOOST_LIB_TOOLSET "iw" -#elif defined(__MWERKS__) && (__MWERKS__ <= 0x31FF ) - - // Metrowerks CodeWarrior 8.x -# define BOOST_LIB_TOOLSET "cw8" - -#elif defined(__MWERKS__) && (__MWERKS__ <= 0x32FF ) - - // Metrowerks CodeWarrior 9.x -# define BOOST_LIB_TOOLSET "cw9" - #endif // @@ -156,7 +139,7 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y. # define BOOST_LIB_THREAD_OPT #endif -#if defined(_MSC_VER) || defined(__MWERKS__) +#if defined(_MSC_VER) # ifdef _DLL @@ -232,37 +215,6 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y. # endif -#elif defined(__BORLANDC__) - -// -// figure out whether we want the debug builds or not: -// -#pragma defineonoption BOOST_BORLAND_DEBUG -v -// -// sanity check: -// -#if defined(__STL_DEBUG) || defined(_STLP_DEBUG) -#error "Pre-built versions of the Boost libraries are not provided in STLPort-debug form" -#endif - -# ifdef _RTLDLL - -# ifdef BOOST_BORLAND_DEBUG -# define BOOST_LIB_RT_OPT "-d" -# else -# define BOOST_LIB_RT_OPT -# endif - -# else - -# ifdef BOOST_BORLAND_DEBUG -# define BOOST_LIB_RT_OPT "-sd" -# else -# define BOOST_LIB_RT_OPT "-s" -# endif - -# endif - #endif // @@ -296,7 +248,7 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y. #endif -#endif // _MSC_VER || __BORLANDC__ +#endif // _MSC_VER // // finally undef any macros we may have set: diff --git a/indexlib/boost-compat/config/compiler/borland.h b/indexlib/boost-compat/config/compiler/borland.h deleted file mode 100644 index 531691ef..00000000 --- a/indexlib/boost-compat/config/compiler/borland.h +++ /dev/null @@ -1,177 +0,0 @@ -// (C) Copyright John Maddock 2001 - 2003. -// (C) Copyright David Abrahams 2002 - 2003. -// (C) Copyright Aleksey Gurtovoy 2002. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -// See http://www.boost.org for most recent version. - -// Borland C++ compiler setup: - -// Version 5.0 and below: -# if __BORLANDC__ <= 0x0550 -// Borland C++Builder 4 and 5: -# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS -# if __BORLANDC__ == 0x0550 -// Borland C++Builder 5, command-line compiler 5.5: -# define BOOST_NO_OPERATORS_IN_NAMESPACE -# endif -# endif - -// Version 5.51 and below: -#if (__BORLANDC__ <= 0x551) -# define BOOST_NO_CV_SPECIALIZATIONS -# define BOOST_NO_CV_VOID_SPECIALIZATIONS -# define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS -# define BOOST_NO_DEDUCED_TYPENAME -// workaround for missing WCHAR_MAX/WCHAR_MIN: -#include <climits> -#include <cwchar> -#ifndef WCHAR_MAX -# define WCHAR_MAX 0xffff -#endif -#ifndef WCHAR_MIN -# define WCHAR_MIN 0 -#endif -#endif - -#if (__BORLANDC__ <= 0x564) -# define BOOST_NO_SFINAE -#endif - -// Version 7.0 (Kylix) and below: -#if (__BORLANDC__ <= 0x570) -# define BOOST_NO_INTEGRAL_INT64_T -# define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS -# define BOOST_NO_PRIVATE_IN_AGGREGATE -# define BOOST_NO_USING_TEMPLATE -# define BOOST_BCB_PARTIAL_SPECIALIZATION_BUG -# define BOOST_NO_TEMPLATE_TEMPLATES -# define BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE -# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS - // we shouldn't really need this - but too many things choke - // without it, this needs more investigation: -# define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS -# define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL -# ifdef NDEBUG - // fix broken <cstring> so that Boost.test works: -# include <cstring> -# undef strcmp -# endif - -// -// new bug in 5.61: -#if (__BORLANDC__ >= 0x561) && (__BORLANDC__ <= 0x570) - // this seems to be needed by the command line compiler, but not the IDE: -# define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS -#endif - -# ifdef _WIN32 -# define BOOST_NO_SWPRINTF -# elif defined(linux) || defined(__linux__) || defined(__linux) - // we should really be able to do without this - // but the wcs* functions aren't imported into std:: -# define BOOST_NO_STDC_NAMESPACE - // _CPPUNWIND doesn't get automatically set for some reason: -# pragma defineonoption BOOST_CPPUNWIND -x -# endif -#endif - -// -// Post 0x561 we have long long and stdint.h: -#if __BORLANDC__ >= 0x561 -# ifndef __NO_LONG_LONG -# define BOOST_HAS_LONG_LONG -# endif - // On non-Win32 platforms let the platform config figure this out: -# ifdef _WIN32 -# define BOOST_HAS_STDINT_H -# endif -#endif - -// Borland C++Builder 6 defaults to using STLPort. If _USE_OLD_RW_STL is -// defined, then we have 0x560 or greater with the Rogue Wave implementation -// which presumably has the std::DBL_MAX bug. -#if ((__BORLANDC__ >= 0x550) && (__BORLANDC__ < 0x560)) || defined(_USE_OLD_RW_STL) -// <climits> is partly broken, some macros define symbols that are really in -// namespace std, so you end up having to use illegal constructs like -// std::DBL_MAX, as a fix we'll just include float.h and have done with: -#include <float.h> -#endif -// -// __int64: -// -#if (__BORLANDC__ >= 0x530) && !defined(__STRICT_ANSI__) -# define BOOST_HAS_MS_INT64 -#endif -// -// check for exception handling support: -// -#if !defined(_CPPUNWIND) && !defined(BOOST_CPPUNWIND) && !defined(__EXCEPTIONS) -# define BOOST_NO_EXCEPTIONS -#endif -// -// all versions have a <dirent.h>: -// -#ifndef __STRICT_ANSI__ -# define BOOST_HAS_DIRENT_H -#endif -// -// all versions support __declspec: -// -#ifndef __STRICT_ANSI__ -# define BOOST_HAS_DECLSPEC -#endif -// -// ABI fixing headers: -// -#if __BORLANDC__ < 0x600 // not implemented for version 6 compiler yet -#ifndef BOOST_ABI_PREFIX -# define BOOST_ABI_PREFIX "boost/config/abi/borland_prefix.hpp" -#endif -#ifndef BOOST_ABI_SUFFIX -# define BOOST_ABI_SUFFIX "boost/config/abi/borland_suffix.hpp" -#endif -#endif -// -// Disable Win32 support in ANSI mode: -// -#if __BORLANDC__ < 0x600 -# pragma defineonoption BOOST_DISABLE_WIN32 -A -#elif defined(__STRICT_ANSI__) -# define BOOST_DISABLE_WIN32 -#endif -// -// MSVC compatibility mode does some nasty things: -// -#if defined(_MSC_VER) && (_MSC_VER <= 1200) -# define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP -# define BOOST_NO_VOID_RETURNS -#endif - -#define BOOST_COMPILER "Borland C++ version " BOOST_STRINGIZE(__BORLANDC__) - -// -// versions check: -// we don't support Borland prior to version 5.4: -#if __BORLANDC__ < 0x540 -# error "Compiler not supported or configured - please reconfigure" -#endif -// -// last known and checked version is 1536 (Builder X preview): -#if (__BORLANDC__ > 1536) -# if defined(BOOST_ASSERT_CONFIG) -# error "Unknown compiler version - please run the configure tests and report the results" -# else -# pragma message( "Unknown compiler version - please run the configure tests and report the results") -# endif -#endif - - - - - - - - diff --git a/indexlib/boost-compat/config/compiler/gcc.h b/indexlib/boost-compat/config/compiler/gcc.h index 2c5ad198..4be7f408 100644 --- a/indexlib/boost-compat/config/compiler/gcc.h +++ b/indexlib/boost-compat/config/compiler/gcc.h @@ -13,10 +13,6 @@ // GNU C++ compiler setup: -# if __GNUC__ == 2 && __GNUC_MINOR__ == 91 - // egcs 1.1 won't parse shared_ptr.h without this: -# define BOOST_NO_AUTO_PTR -# endif # if __GNUC__ == 2 && __GNUC_MINOR__ < 95 // // Prior to gcc 2.95 member templates only partly diff --git a/indexlib/boost-compat/config/compiler/metrowerks.h b/indexlib/boost-compat/config/compiler/metrowerks.h deleted file mode 100644 index a74cadef..00000000 --- a/indexlib/boost-compat/config/compiler/metrowerks.h +++ /dev/null @@ -1,97 +0,0 @@ -// (C) Copyright John Maddock 2001. -// (C) Copyright Darin Adler 2001. -// (C) Copyright Peter Dimov 2001. -// (C) Copyright David Abrahams 2001 - 2002. -// (C) Copyright Beman Dawes 2001 - 2003. -// (C) Copyright Stefan Slapeta 2004. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -// See http://www.boost.org for most recent version. - -// Metrowerks C++ compiler setup: - -// locale support is disabled when linking with the dynamic runtime -# ifdef _MSL_NO_LOCALE -# define BOOST_NO_STD_LOCALE -# endif - -# if __MWERKS__ <= 0x2301 // 5.3 -# define BOOST_NO_FUNCTION_TEMPLATE_ORDERING -# define BOOST_NO_POINTER_TO_MEMBER_CONST -# define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS -# define BOOST_NO_MEMBER_TEMPLATE_KEYWORD -# endif - -# if __MWERKS__ <= 0x2401 // 6.2 -//# define BOOST_NO_FUNCTION_TEMPLATE_ORDERING -# endif - -# if(__MWERKS__ <= 0x2407) // 7.x -# define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS -# define BOOST_NO_UNREACHABLE_RETURN_DETECTION -# endif - -# if(__MWERKS__ <= 0x3003) // 8.x -# define BOOST_NO_SFINAE -# endif - -# if(__MWERKS__ <= 0x3204) // 9.3 -# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS -# endif - -#if !__option(wchar_type) -# define BOOST_NO_INTRINSIC_WCHAR_T -#endif - -#if !__option(exceptions) -# define BOOST_NO_EXCEPTIONS -#endif - -#if (__INTEL__ && _WIN32) || (__POWERPC__ && macintosh) -# if __MWERKS__ == 0x3000 -# define BOOST_COMPILER_VERSION 8.0 -# elif __MWERKS__ == 0x3001 -# define BOOST_COMPILER_VERSION 8.1 -# elif __MWERKS__ == 0x3002 -# define BOOST_COMPILER_VERSION 8.2 -# elif __MWERKS__ == 0x3003 -# define BOOST_COMPILER_VERSION 8.3 -# elif __MWERKS__ == 0x3200 -# define BOOST_COMPILER_VERSION 9.0 -# elif __MWERKS__ == 0x3201 -# define BOOST_COMPILER_VERSION 9.1 -# elif __MWERKS__ == 0x3202 -# define BOOST_COMPILER_VERSION 9.2 -# elif __MWERKS__ == 0x3204 -# define BOOST_COMPILER_VERSION 9.3 -# else -# define BOOST_COMPILER_VERSION __MWERKS__ -# endif -#else -# define BOOST_COMPILER_VERSION __MWERKS__ -#endif - -#define BOOST_COMPILER "Metrowerks CodeWarrior C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION) - -// -// versions check: -// we don't support Metrowerks prior to version 5.3: -#if __MWERKS__ < 0x2301 -# error "Compiler not supported or configured - please reconfigure" -#endif -// -// last known and checked version: -#if (__MWERKS__ > 0x3204) -# if defined(BOOST_ASSERT_CONFIG) -# error "Unknown compiler version - please run the configure tests and report the results" -# endif -#endif - - - - - - - diff --git a/indexlib/boost-compat/config/requires_threads.h b/indexlib/boost-compat/config/requires_threads.h index 03259ae9..ffa75e9d 100644 --- a/indexlib/boost-compat/config/requires_threads.h +++ b/indexlib/boost-compat/config/requires_threads.h @@ -50,18 +50,6 @@ // SGI MIPSpro C++ # error "Compiler threading support is not turned on. Please set the correct command line options for threading: -D_SGI_MP_SOURCE" -#elif defined __DECCXX -// Compaq Tru64 Unix cxx -# error "Compiler threading support is not turned on. Please set the correct command line options for threading: -pthread" - -#elif defined __BORLANDC__ -// Borland -# error "Compiler threading support is not turned on. Please set the correct command line options for threading: -tWM" - -#elif defined __MWERKS__ -// Metrowerks CodeWarrior -# error "Compiler threading support is not turned on. Please set the correct command line options for threading: either -runtime sm, -runtime smd, -runtime dm, or -runtime dmd" - #elif defined __SUNPRO_CC // Sun Workshop Compiler C++ # error "Compiler threading support is not turned on. Please set the correct command line options for threading: -mt" @@ -77,8 +65,7 @@ #elif defined _MSC_VER // Microsoft Visual C++ // -// Must remain the last #elif since some other vendors (Metrowerks, for -// example) also #define _MSC_VER +// Must remain the last #elif since some other vendors may also #define _MSC_VER # error "Compiler threading support is not turned on. Please set the correct command line options for threading: either /MT /MTd /MD or /MDd" #else diff --git a/indexlib/boost-compat/config/select_compiler_config.h b/indexlib/boost-compat/config/select_compiler_config.h index 3453f1a3..00b4de96 100644 --- a/indexlib/boost-compat/config/select_compiler_config.h +++ b/indexlib/boost-compat/config/select_compiler_config.h @@ -36,22 +36,10 @@ // SGI MIPSpro C++ # define BOOST_COMPILER_CONFIG "boost/config/compiler/sgi_mipspro.hpp" -#elif defined __DECCXX -// Compaq Tru64 Unix cxx -# define BOOST_COMPILER_CONFIG "boost/config/compiler/compaq_cxx.hpp" - #elif defined __ghs // Greenhills C++ # define BOOST_COMPILER_CONFIG "boost/config/compiler/greenhills.hpp" -#elif defined __BORLANDC__ -// Borland -# define BOOST_COMPILER_CONFIG "boost/config/compiler/borland.hpp" - -#elif defined __MWERKS__ -// Metrowerks CodeWarrior -# define BOOST_COMPILER_CONFIG "boost/config/compiler/metrowerks.hpp" - #elif defined __SUNPRO_CC // Sun Workshop Compiler C++ # define BOOST_COMPILER_CONFIG "boost/config/compiler/sunpro_cc.hpp" @@ -71,8 +59,7 @@ #elif defined _MSC_VER // Microsoft Visual C++ // -// Must remain the last #elif since some other vendors (Metrowerks, for -// example) also #define _MSC_VER +// Must remain the last #elif since some other vendors may also #define _MSC_VER # define BOOST_COMPILER_CONFIG "boost/config/compiler/visualc.hpp" #elif defined (BOOST_ASSERT_CONFIG) diff --git a/indexlib/boost-compat/config/select_stdlib_config.h b/indexlib/boost-compat/config/select_stdlib_config.h index b7bf5914..a061c5be 100644 --- a/indexlib/boost-compat/config/select_stdlib_config.h +++ b/indexlib/boost-compat/config/select_stdlib_config.h @@ -41,10 +41,6 @@ // generic SGI STL # define BOOST_STDLIB_CONFIG "boost/config/stdlib/sgi.hpp" -#elif defined(__MSL_CPP__) -// MSL standard lib: -# define BOOST_STDLIB_CONFIG "boost/config/stdlib/msl.hpp" - #elif defined(__IBMCPP__) // take the default VACPP std lib # define BOOST_STDLIB_CONFIG "boost/config/stdlib/vacpp.hpp" diff --git a/indexlib/boost-compat/config/stdlib/dinkumware.h b/indexlib/boost-compat/config/stdlib/dinkumware.h index aa214fc1..a3c4f091 100644 --- a/indexlib/boost-compat/config/stdlib/dinkumware.h +++ b/indexlib/boost-compat/config/stdlib/dinkumware.h @@ -22,7 +22,7 @@ #if defined(_CPPLIB_VER) && (_CPPLIB_VER >= 306) // full dinkumware 3.06 and above // fully conforming provided the compiler supports it: -# if !(defined(_GLOBAL_USING) && (_GLOBAL_USING+0 > 0)) && !defined(__BORLANDC__) && !defined(_STD) && !(defined(__ICC) && (__ICC >= 700)) // can be defined in yvals.h +# if !(defined(_GLOBAL_USING) && (_GLOBAL_USING+0 > 0)) && !defined(_STD) && !(defined(__ICC) && (__ICC >= 700)) // can be defined in yvals.h # define BOOST_NO_STDC_NAMESPACE # endif # if !(defined(_HAS_MEMBER_TEMPLATES_REBIND) && (_HAS_MEMBER_TEMPLATES_REBIND+0 > 0)) && !(defined(_MSC_VER) && (_MSC_VER > 1300)) && defined(BOOST_MSVC) @@ -66,12 +66,12 @@ // the same applies to other compilers that sit on top // of vc7.1 (Intel and Comeau): // -#if defined(_MSC_VER) && (_MSC_VER >= 1310) && !defined(__BORLANDC__) +#if defined(_MSC_VER) && (_MSC_VER >= 1310) # define BOOST_STD_EXTENSION_NAMESPACE stdext #endif -#if (defined(_MSC_VER) && (_MSC_VER <= 1300) && !defined(__BORLANDC__)) || !defined(_CPPLIB_VER) || (_CPPLIB_VER < 306) +#if (defined(_MSC_VER) && (_MSC_VER <= 1300)) || !defined(_CPPLIB_VER) || (_CPPLIB_VER < 306) // if we're using a dinkum lib that's // been configured for VC6/7 then there is // no iterator traits (true even for icl) diff --git a/indexlib/boost-compat/config/stdlib/libstdcpp3.h b/indexlib/boost-compat/config/stdlib/libstdcpp3.h index 99e711ce..bbf29559 100644 --- a/indexlib/boost-compat/config/stdlib/libstdcpp3.h +++ b/indexlib/boost-compat/config/stdlib/libstdcpp3.h @@ -22,12 +22,6 @@ # define BOOST_NO_STD_WSTREAMBUF #endif -#if defined(__osf__) && !defined(_REENTRANT) && defined(_GLIBCXX_HAVE_GTHR_DEFAULT) -// GCC 3.4 on Tru64 forces the definition of _REENTRANT when any std lib header -// file is included, therefore for consistency we define it here as well. -# define _REENTRANT -#endif - #ifdef __GLIBCXX__ // gcc 3.4 and greater: # ifdef _GLIBCXX_HAVE_GTHR_DEFAULT // diff --git a/indexlib/boost-compat/config/stdlib/msl.h b/indexlib/boost-compat/config/stdlib/msl.h deleted file mode 100644 index f8ad3d9a..00000000 --- a/indexlib/boost-compat/config/stdlib/msl.h +++ /dev/null @@ -1,54 +0,0 @@ -// (C) Copyright John Maddock 2001. -// (C) Copyright Darin Adler 2001. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -// See http://www.boost.org for most recent version. - -// Metrowerks standard library: - -#ifndef __MSL_CPP__ -# include <utility> -# ifndef __MSL_CPP__ -# error This is not the MSL standard library! -# endif -#endif - -#if __MSL_CPP__ >= 0x6000 // Pro 6 -# define BOOST_HAS_HASH -# define BOOST_STD_EXTENSION_NAMESPACE Metrowerks -#endif -#define BOOST_HAS_SLIST - -#if __MSL_CPP__ < 0x6209 -# define BOOST_NO_STD_MESSAGES -#endif - -// check C lib version for <stdint.h> -#include <cstddef> - -#if defined(__MSL__) && (__MSL__ >= 0x5000) -# define BOOST_HAS_STDINT_H -# if !defined(__PALMOS_TRAPS__) -# define BOOST_HAS_UNISTD_H -# endif - // boilerplate code: -# include <boost/config/posix_features.hpp> -#endif - -#if defined(_MWMT) || _MSL_THREADSAFE -# define BOOST_HAS_THREADS -#endif - - -#define BOOST_STDLIB "Metrowerks Standard Library version " BOOST_STRINGIZE(__MSL_CPP__) - - - - - - - - - diff --git a/indexlib/boost-compat/config/stdlib/roguewave.h b/indexlib/boost-compat/config/stdlib/roguewave.h index ec3d881b..2e116ff1 100644 --- a/indexlib/boost-compat/config/stdlib/roguewave.h +++ b/indexlib/boost-compat/config/stdlib/roguewave.h @@ -48,13 +48,6 @@ # endif // -// Borland version of numeric_limits lacks __int64 specialisation: -// -#ifdef __BORLANDC__ -# define BOOST_NO_MS_INT64_NUMERIC_LIMITS -#endif - -// // No std::iterator if it can't figure out default template args: // #if defined(_RWSTD_NO_SIMPLE_DEFAULT_TEMPLATES) || defined(RWSTD_NO_SIMPLE_DEFAULT_TEMPLATES) || (BOOST_RWSTD_VER < 0x020000) @@ -73,7 +66,6 @@ // new-style iostreams, and no conformant std::allocator: // #if (BOOST_RWSTD_VER < 0x020000) -# define BOOST_NO_AUTO_PTR # define BOOST_NO_STRINGSTREAM # define BOOST_NO_STD_ALLOCATOR # define BOOST_NO_STD_LOCALE diff --git a/indexlib/boost-compat/config/stdlib/stlport.h b/indexlib/boost-compat/config/stdlib/stlport.h index 4843ea59..8bc5c1d0 100644 --- a/indexlib/boost-compat/config/stdlib/stlport.h +++ b/indexlib/boost-compat/config/stdlib/stlport.h @@ -52,11 +52,11 @@ // then the io stream facets are not available in namespace std:: // #ifdef _STLPORT_VERSION -# if !defined(_STLP_OWN_IOSTREAMS) && defined(_STLP_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE) && !defined(__BORLANDC__) +# if !defined(_STLP_OWN_IOSTREAMS) && defined(_STLP_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE) # define BOOST_NO_STD_LOCALE # endif #else -# if !defined(__SGI_STL_OWN_IOSTREAMS) && defined(__STL_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE) && !defined(__BORLANDC__) +# if !defined(__SGI_STL_OWN_IOSTREAMS) && defined(__STL_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE) # define BOOST_NO_STD_LOCALE # endif #endif @@ -106,13 +106,7 @@ // but doesn't always get them all, define BOOST_NO_STDC_NAMESPACE, since our // workaround does not conflict with STLports: // -// -// Harold Howe says: -// Borland switched to STLport in BCB6. Defining BOOST_NO_STDC_NAMESPACE with -// BCB6 does cause problems. If we detect C++ Builder, then don't define -// BOOST_NO_STDC_NAMESPACE -// -#if !defined(__BORLANDC__) && !defined(__DMC__) +#if !defined(__DMC__) // // If STLport is using it's own namespace, and the real names are in // the global namespace, then we duplicate STLport's using declarations @@ -127,21 +121,6 @@ # define BOOST_NO_STDC_NAMESPACE # define BOOST_NO_EXCEPTION_STD_NAMESPACE # endif -#elif defined(__BORLANDC__) && __BORLANDC__ < 0x560 -// STLport doesn't import std::abs correctly: -#include <stdlib.h> -namespace std { using ::abs; } -// and strcmp/strcpy don't get imported either ('cos they are macros) -#include <string.h> -#ifdef strcpy -# undef strcpy -#endif -#ifdef strcmp -# undef strcmp -#endif -#ifdef _STLP_VENDOR_CSTD -namespace std{ using _STLP_VENDOR_CSTD::strcmp; using _STLP_VENDOR_CSTD::strcpy; } -#endif #endif // @@ -173,14 +152,6 @@ namespace std{ using _STLP_VENDOR_CSTD::strcmp; using _STLP_VENDOR_CSTD::strcpy; #endif // -// Borland ships a version of STLport with C++ Builder 6 that lacks -// hashtables and the like: -// -#if defined(__BORLANDC__) && (__BORLANDC__ == 0x560) -# undef BOOST_HAS_HASH -#endif - -// // gcc-2.95.3/STLPort does not like the using declarations we use to get ADL with std::min/max // #if defined(__GNUC__) && (__GNUC__ < 3) diff --git a/indexlib/boost-compat/config/suffix.h b/indexlib/boost-compat/config/suffix.h index 313faea9..db64f87a 100644 --- a/indexlib/boost-compat/config/suffix.h +++ b/indexlib/boost-compat/config/suffix.h @@ -31,8 +31,8 @@ // no namespace issues from this. // #include <limits.h> -# if !defined(BOOST_HAS_LONG_LONG) \ - && !(defined(BOOST_MSVC) && BOOST_MSVC <=1300) && !defined(__BORLANDC__) \ +# if !defined(BOOST_HAS_LONG_LONG) \ + && !(defined(BOOST_MSVC) && BOOST_MSVC <=1300) \ && (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || defined(ULONGLONG_MAX)) # define BOOST_HAS_LONG_LONG #endif diff --git a/indexlib/boost-compat/intrusive_ptr.h b/indexlib/boost-compat/intrusive_ptr.h index 39b4b7b2..a2af559b 100644 --- a/indexlib/boost-compat/intrusive_ptr.h +++ b/indexlib/boost-compat/intrusive_ptr.h @@ -127,14 +127,6 @@ public: return p_ != 0; } -#elif defined(__MWERKS__) && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) - typedef T * (this_type::*unspecified_bool_type)() const; - - operator unspecified_bool_type() const // never throws - { - return p_ == 0? 0: &this_type::get; - } - #else typedef T * this_type::*unspecified_bool_type; @@ -146,7 +138,6 @@ public: #endif - // operator! is a Borland-specific workaround bool operator! () const { return p_ == 0; diff --git a/indexlib/boost-compat/scoped_ptr.h b/indexlib/boost-compat/scoped_ptr.h index 60078bf1..41d4f9b8 100644 --- a/indexlib/boost-compat/scoped_ptr.h +++ b/indexlib/boost-compat/scoped_ptr.h @@ -15,7 +15,7 @@ #include "checked_delete.h" -#include <memory> // for std::auto_ptr +#include <memory> #include <assert.h> namespace boost @@ -25,7 +25,7 @@ namespace boost // scoped_ptr mimics a built-in pointer except that it guarantees deletion // of the object pointed to, either on destruction of the scoped_ptr or via // an explicit reset(). scoped_ptr is a simple solution for simple needs; -// use shared_ptr or std::auto_ptr if your needs are more complex. +// use shared_ptr or std::unique_ptr if your needs are more complex. template<class T> class scoped_ptr // noncopyable { @@ -46,11 +46,6 @@ public: { } - - explicit scoped_ptr(std::auto_ptr<T> p): ptr(p.release()) // never throws - { - } - ~scoped_ptr() // never throws { boost::checked_delete(ptr); diff --git a/indexlib/boost-compat/shared_ptr.h b/indexlib/boost-compat/shared_ptr.h index c236e3bd..a369dc0f 100644 --- a/indexlib/boost-compat/shared_ptr.h +++ b/indexlib/boost-compat/shared_ptr.h @@ -26,11 +26,11 @@ #include <boost/detail/shared_count.hpp> #include <boost/detail/workaround.hpp> -#include <memory> // for std::auto_ptr -#include <algorithm> // for std::swap -#include <functional> // for std::less -#include <typeinfo> // for std::bad_cast -#include <iosfwd> // for std::basic_ostream +#include <memory> +#include <algorithm> +#include <functional> +#include <typeinfo> +#include <iosfwd> #ifdef BOOST_MSVC // moved here to work around VC++ compiler crash # pragma warning(push) @@ -106,7 +106,6 @@ template<class T> class shared_ptr { private: - // Borland 5.5.1 specific workaround typedef shared_ptr<T> this_type; public: @@ -139,8 +138,8 @@ public: // generated copy constructor, assignment, destructor are fine... -// except that Borland C++ has a bug, and g++ with -Wsynth warns -#if defined(__BORLANDC__) || defined(__GNUC__) +// except that g++ with -Wsynth warns +#if defined(__GNUC__) shared_ptr & operator=(shared_ptr const & r) // never throws { @@ -191,18 +190,6 @@ public: } } -#ifndef BOOST_NO_AUTO_PTR - - template<class Y> - explicit shared_ptr(std::auto_ptr<Y> & r): px(r.get()), pn() - { - Y * tmp = r.get(); - pn = detail::shared_count(r); - detail::sp_enable_shared_from_this( pn, tmp, tmp ); - } - -#endif - #if !defined(BOOST_MSVC) || (BOOST_MSVC > 1200) template<class Y> @@ -215,17 +202,6 @@ public: #endif -#ifndef BOOST_NO_AUTO_PTR - - template<class Y> - shared_ptr & operator=(std::auto_ptr<Y> & r) - { - this_type(r).swap(*this); - return *this; - } - -#endif - void reset() // never throws in 1.30+ { this_type().swap(*this); @@ -268,14 +244,6 @@ public: return px != 0; } -#elif defined(__MWERKS__) && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) - typedef T * (this_type::*unspecified_bool_type)() const; - - operator unspecified_bool_type() const // never throws - { - return px == 0? 0: &this_type::get; - } - #else typedef T * this_type::*unspecified_bool_type; diff --git a/indexlib/boost-compat/weak_ptr.h b/indexlib/boost-compat/weak_ptr.h index 338e5221..56d7ad6b 100644 --- a/indexlib/boost-compat/weak_ptr.h +++ b/indexlib/boost-compat/weak_ptr.h @@ -27,7 +27,6 @@ template<class T> class weak_ptr { private: - // Borland 5.5.1 specific workarounds typedef weak_ptr<T> this_type; public: diff --git a/indexlib/compressed.cpp b/indexlib/compressed.cpp index a60c3f06..9c73c304 100644 --- a/indexlib/compressed.cpp +++ b/indexlib/compressed.cpp @@ -53,7 +53,7 @@ memory_manager* get_comp_p() { compressed_file::compressed_file( std::string base ): auxdata_( path_concat( base, "table" ) ), - data_( std::auto_ptr<memory_manager>( new mmap_manager( path_concat( base, "data" ) ) ) ) + data_( std::unique_ptr<memory_manager>( new mmap_manager( path_concat( base, "data" ) ) ) ) { if ( auxdata_.empty() ) auxdata_.push_back( 0 ); } diff --git a/indexlib/create.cpp b/indexlib/create.cpp index e47d116a..c64e2158 100644 --- a/indexlib/create.cpp +++ b/indexlib/create.cpp @@ -56,41 +56,41 @@ indexlib::index_type::type type_of( const char* basename ) { } } -std::auto_ptr<indexlib::index> indexlib::create( const char* basename, indexlib::index_type::type flags ) { +std::unique_ptr<indexlib::index> indexlib::create( const char* basename, indexlib::index_type::type flags ) { using namespace indexlib::version; - if ( type_of( basename ) != indexlib::index_type::none ) return std::auto_ptr<indexlib::index>( 0 ); + if ( type_of( basename ) != indexlib::index_type::none ) return std::unique_ptr<indexlib::index>(); try { if ( basename[ strlen( basename ) - 1 ] == '/' && !isdir( basename ) ) { - if ( !indexlib::detail::mkdir_trailing( basename ) ) return std::auto_ptr<indexlib::index>( 0 ); + if ( !indexlib::detail::mkdir_trailing( basename ) ) return std::unique_ptr<indexlib::index>(); } std::ofstream info( path_concat( basename, "info" ).c_str() ); info << marker << std::endl; info << "version " << major << '.' << minor << "\n"; if ( flags == index_type::quotes ) { info << "quotes" << std::endl; - return std::auto_ptr<indexlib::index>( new quotes( basename ) ); + return std::unique_ptr<indexlib::index>( new quotes( basename ) ); } if ( flags == index_type::ifile ) { info << "ifile" << std::endl; - return std::auto_ptr<indexlib::index>( new ifile( basename ) ); + return std::unique_ptr<indexlib::index>( new ifile( basename ) ); } } catch ( const std::exception& e ) { std::cerr << "index creation failed: " << e.what() << std::endl; } - return std::auto_ptr<indexlib::index>( 0 ); + return std::unique_ptr<indexlib::index>(); } -std::auto_ptr<indexlib::index> indexlib::open( const char* basename, unsigned flags ) { +std::unique_ptr<indexlib::index> indexlib::open( const char* basename, unsigned flags ) { using namespace indexlib; switch ( type_of( basename ) ) { - case index_type::ifile: return std::auto_ptr<indexlib::index>( new ifile( basename ) ); - case index_type::quotes: return std::auto_ptr<indexlib::index>( new quotes( basename ) ); + case index_type::ifile: return std::unique_ptr<indexlib::index>( new ifile( basename ) ); + case index_type::quotes: return std::unique_ptr<indexlib::index>( new quotes( basename ) ); case index_type::none: - if ( flags == open_flags::fail_if_nonexistant ) return std::auto_ptr<indexlib::index>(); + if ( flags == open_flags::fail_if_nonexistant ) return std::unique_ptr<indexlib::index>(); return create( basename, index_type::type( flags ) ); } logfile() << format( "%s:%s: Unexpected code reached!\n" ) % __FILE__ % __LINE__; - return std::auto_ptr<indexlib::index>( 0 ); + return std::unique_ptr<indexlib::index>(); } bool indexlib::exists( const char* basename ) { diff --git a/indexlib/create.h b/indexlib/create.h index e865728e..18e9929b 100644 --- a/indexlib/create.h +++ b/indexlib/create.h @@ -57,14 +57,14 @@ namespace indexlib { * This will return something like "new quotes(basename)" but by using this, you do not need to include quotes.h * which needs boost headers also. */ - std::auto_ptr<index> create( const char* basename, index_type::type flags = index_type::quotes ); + std::unique_ptr<index> create( const char* basename, index_type::type flags = index_type::quotes ); namespace open_flags { enum type { none = 0, create_ifile = index_type::ifile, create_quotes = index_type::quotes, fail_if_nonexistant }; } - std::auto_ptr<index> open( const char* basename, unsigned flags = open_flags::fail_if_nonexistant ); + std::unique_ptr<index> open( const char* basename, unsigned flags = open_flags::fail_if_nonexistant ); /** * Removes the index. diff --git a/indexlib/ifile.cpp b/indexlib/ifile.cpp index 5709bb41..43057433 100644 --- a/indexlib/ifile.cpp +++ b/indexlib/ifile.cpp @@ -83,10 +83,10 @@ void ifile::remove_doc( const char* doc ) { // TODO: remove from words_ too if that's the case } -std::auto_ptr<indexlib::result> ifile::everything() const { +std::unique_ptr<indexlib::result> ifile::everything() const { std::vector<unsigned> res( ndocs() ); for ( unsigned i = 0; i != ndocs(); ++i ) res[ i ] = i; - return std::auto_ptr<indexlib::result>( new indexlib::detail::simple_result( res ) ); + return std::unique_ptr<indexlib::result>( new indexlib::detail::simple_result( res ) ); } namespace { @@ -94,13 +94,13 @@ inline bool word_too_small( std::string str ) { return str.size() < 3; } } -std::auto_ptr<indexlib::result> ifile::search( const char* str ) const { +std::unique_ptr<indexlib::result> ifile::search( const char* str ) const { using namespace indexlib::detail; using indexlib::result; assert( str ); if ( !*str ) return everything(); std::vector<std::string> words = break_clean( str ); - if ( words.empty() ) return std::auto_ptr<result>( new empty_result ); + if ( words.empty() ) return std::unique_ptr<result>( new empty_result ); words.erase( std::remove_if( words.begin(), words.end(), &word_too_small ), words.end() ); if ( words.empty() ) return everything(); std::set<unsigned> values = find_word( words[ 0 ] ); @@ -113,7 +113,7 @@ std::auto_ptr<indexlib::result> ifile::search( const char* str ) const { std::set_intersection( now.begin(), now.end(), values.begin(), values.end(), std::inserter( next, next.begin() ) ); next.swap( values ); } - std::auto_ptr<result> r(new simple_result( std::vector<unsigned>( values.begin(), values.end() ) ) ); + std::unique_ptr<result> r(new simple_result( std::vector<unsigned>( values.begin(), values.end() ) ) ); return r; } @@ -169,7 +169,7 @@ std::vector<std::string> ifile::break_clean( const char* complete ) const { std::sort( words.begin(), words.end() ); words.erase( std::unique( words.begin(), words.end() ), words.end() ); words.erase( std::remove_if( words.begin(), words.end(), &ifile::invalid_word ), words.end() ); - words.erase( std::remove_if( words.begin(), words.end(), std::bind1st( std::mem_fun( &ifile::is_stop_word ), this ) ), words.end() ); + words.erase( std::remove_if( words.begin(), words.end(), std::bind( std::mem_fn( &ifile::is_stop_word ), this, std::placeholders::_1 ) ), words.end() ); return words; } diff --git a/indexlib/ifile.h b/indexlib/ifile.h index 4cfcf585..3fcf772e 100644 --- a/indexlib/ifile.h +++ b/indexlib/ifile.h @@ -43,8 +43,10 @@ struct ifile : public indexlib::index { public: ifile( std::string ); + ifile(ifile const &) = delete; + ifile& operator=(ifile const &) = delete; virtual void add( const char* str, const char* doc ); - virtual std::auto_ptr<indexlib::result> search( const char* ) const; + virtual std::unique_ptr<indexlib::result> search( const char* ) const; virtual unsigned ndocs() const { return docnames_.size(); } virtual std::string lookup_docname( unsigned idx ) const { return docnames_.get( idx ); } @@ -56,7 +58,7 @@ struct ifile : public indexlib::index { private: std::set<unsigned> find_word( std::string ) const; std::vector<std::string> break_clean( const char* ) const; - virtual std::auto_ptr<indexlib::result> everything() const; + virtual std::unique_ptr<indexlib::result> everything() const; static bool invalid_word( std::string ); bool is_stop_word( std::string ) const; @@ -67,7 +69,7 @@ struct ifile : public indexlib::index { stringset words_; stringset stopwords_; leafdatavector files_; - std::auto_ptr<indexlib::detail::tokenizer> tokenizer_; + std::unique_ptr<indexlib::detail::tokenizer> tokenizer_; }; #endif /* _IFILE_INCLUDE_GUARD_LPC_56465465798732 */ diff --git a/indexlib/index.h b/indexlib/index.h index b7c68375..5ffab2d4 100644 --- a/indexlib/index.h +++ b/indexlib/index.h @@ -61,7 +61,7 @@ struct result { * @return null if the type does not support this or the particular search string makes it impossible to * fulfill the search request. */ - virtual std::auto_ptr<result> search( const char* ) = 0; + virtual std::unique_ptr<result> search( const char* ) = 0; }; struct index { @@ -96,7 +96,7 @@ struct index { /** * Returns all documents matching \param pattern. */ - virtual std::auto_ptr<result> search( const char* pattern ) const = 0; + virtual std::unique_ptr<result> search( const char* pattern ) const = 0; /** * Returns the number of docs indexed. diff --git a/indexlib/leafdatavector.cpp b/indexlib/leafdatavector.cpp index 0dae6555..89b95ab9 100644 --- a/indexlib/leafdatavector.cpp +++ b/indexlib/leafdatavector.cpp @@ -45,7 +45,7 @@ typedef mmap_manager leafdatavector_manager; #endif leafdatavector::leafdatavector( std::string name ): - leafs_( std::auto_ptr<memory_manager>( new leafdatavector_manager( path_concat( name, "leafs" ) ) ) ), + leafs_( std::unique_ptr<memory_manager>( new leafdatavector_manager( path_concat( name, "leafs" ) ) ) ), table_( path_concat( name, "table" ) ) { } diff --git a/indexlib/main.cpp b/indexlib/main.cpp index b8685153..dcedbe1c 100644 --- a/indexlib/main.cpp +++ b/indexlib/main.cpp @@ -46,7 +46,7 @@ #include <memory> #include <string.h> -typedef std::auto_ptr<indexlib::index> index_smart; +typedef std::unique_ptr<indexlib::index> index_smart; index_smart get_index( std::string name ) { return indexlib::open( name.c_str(), indexlib::open_flags::create_quotes ); @@ -92,8 +92,8 @@ int debug( int argc, char* argv[] ) { std::cout << "compressed_file:\n"; file.print( std::cout ); } else if ( type == "break_up" ) { - std::auto_ptr<tokenizer> tok = get_tokenizer( "latin-1:european" ); - if ( !tok.get() ) { + std::unique_ptr<tokenizer> tok = get_tokenizer( "latin-1:european" ); + if ( !tok ) { std::cerr << "Could not get tokenizer\n"; return 1; } diff --git a/indexlib/mempool.h b/indexlib/mempool.h index acf62494..08be8857 100644 --- a/indexlib/mempool.h +++ b/indexlib/mempool.h @@ -55,7 +55,9 @@ struct mempool /* : boost::noncopyable */ { typedef Traits traits_type; typedef typename traits_type::value_type data_type; typedef typename traits_type::pointer data_typeptr; - explicit mempool( std::auto_ptr<memory_manager> source ); + explicit mempool( std::unique_ptr<memory_manager> &&source ); + mempool(mempool const &) = delete; + mempool& operator=(mempool const &) = delete; /** * Returns a memory block of size \param s. @@ -151,7 +153,7 @@ struct mempool /* : boost::noncopyable */ { bool join( data_typeptr&, unsigned order ); void deallocate( data_typeptr, unsigned order ); - std::auto_ptr<memory_manager> manager_; + std::unique_ptr<memory_manager> manager_; memory_reference<uint32_t> max_order_; }; diff --git a/indexlib/mempool.tcc b/indexlib/mempool.tcc index a130bffe..750209a2 100644 --- a/indexlib/mempool.tcc +++ b/indexlib/mempool.tcc @@ -33,8 +33,8 @@ */ template <typename Traits> -mempool<Traits>::mempool( std::auto_ptr<memory_manager> source ): - manager_( source ), +mempool<Traits>::mempool( std::unique_ptr<memory_manager> &&source ): + manager_( std::move(source) ), max_order_( 0 ) { if ( !manager_->size() ) init_memory(); diff --git a/indexlib/quotes.cpp b/indexlib/quotes.cpp index e4c35db4..abf8915c 100644 --- a/indexlib/quotes.cpp +++ b/indexlib/quotes.cpp @@ -68,12 +68,12 @@ void quotes::remove_doc( const char* doc ) { impl_.remove_doc( doc ); } -std::auto_ptr<indexlib::result> quotes::search( const char* cstr ) const { +std::unique_ptr<indexlib::result> quotes::search( const char* cstr ) const { std::string str = cstr; if ( str[ 0 ] != '\"' ) return impl_.search( cstr ); str = cstr + 1; // cut " if ( str.size() && str[ str.size() - 1 ] == '\"' ) str.erase( str.size() - 1 ); - std::auto_ptr<indexlib::result> prev = impl_.search( str.c_str() ); + std::unique_ptr<indexlib::result> prev = impl_.search( str.c_str() ); if ( str.find( ' ' ) != std::string::npos ) { indexlib::Match m( str ); std::vector<unsigned> candidates = prev->list(); @@ -86,7 +86,7 @@ std::auto_ptr<indexlib::result> quotes::search( const char* cstr ) const { res.push_back( *first ); } } - return std::auto_ptr<indexlib::result>( new indexlib::detail::simple_result( res ) ); + return std::unique_ptr<indexlib::result>( new indexlib::detail::simple_result( res ) ); } else { return prev; } } diff --git a/indexlib/quotes.h b/indexlib/quotes.h index 7852d0dd..6604e9a9 100644 --- a/indexlib/quotes.h +++ b/indexlib/quotes.h @@ -42,7 +42,7 @@ struct quotes : public indexlib::index { quotes( std::string ); virtual void add( const char* str, const char* doc ); virtual void remove_doc( const char* doc ); - virtual std::auto_ptr<indexlib::result> search( const char* ) const; + virtual std::unique_ptr<indexlib::result> search( const char* ) const; virtual unsigned ndocs() const { return impl_.ndocs(); } virtual std::string lookup_docname( unsigned d ) const { return impl_.lookup_docname( d ); } diff --git a/indexlib/result.h b/indexlib/result.h index 4cad40d7..dd23f25d 100644 --- a/indexlib/result.h +++ b/indexlib/result.h @@ -42,7 +42,7 @@ struct simple_result : indexlib::result { simple_result( std::vector<unsigned> r ):res( r ) { } std::vector<unsigned> list() const { return res; } - std::auto_ptr<result> search( const char* ) { return std::auto_ptr<result>( 0 ); } + std::unique_ptr<result> search( const char* ) { return std::unique_ptr<result>(); } private: std::vector<unsigned> res; }; @@ -50,7 +50,7 @@ struct simple_result : indexlib::result { struct empty_result : indexlib::result { public: std::vector<unsigned> list() const { return std::vector<unsigned>(); } - std::auto_ptr<result> search( const char* ) { return std::auto_ptr<result>(); } + std::unique_ptr<result> search( const char* ) { return std::unique_ptr<result>(); } }; } //namespace detail } //namespace indexlib diff --git a/indexlib/tests/create-test.cpp b/indexlib/tests/create-test.cpp index beeb7d5f..da3c91ca 100644 --- a/indexlib/tests/create-test.cpp +++ b/indexlib/tests/create-test.cpp @@ -14,8 +14,8 @@ void cleanup() { void simple() { cleanup(); - std::auto_ptr<indexlib::index> ptr = indexlib::create( fname ); - BOOST_CHECK( ptr.get() ); + std::unique_ptr<indexlib::index> ptr = indexlib::create( fname ); + BOOST_CHECK( ptr ); } test_suite* get_suite() { diff --git a/indexlib/tests/mempool-test.cpp b/indexlib/tests/mempool-test.cpp index a0895243..1c9a4eb6 100644 --- a/indexlib/tests/mempool-test.cpp +++ b/indexlib/tests/mempool-test.cpp @@ -11,7 +11,7 @@ void cleanup() { void deallocate() { cleanup(); - mempool<leaf_data_pool_traits> pool( std::auto_ptr<memory_manager>( new mmap_manager( fname ) ) ); + mempool<leaf_data_pool_traits> pool( std::unique_ptr<memory_manager>( new mmap_manager( fname ) ) ); std::vector<leafdataptr> pointers; for ( int i = 0; i != 32; ++i ) { @@ -33,7 +33,7 @@ void deallocate() { void large() { cleanup(); - mempool<leaf_data_pool_traits> pool( std::auto_ptr<memory_manager>( new mmap_manager( fname ) ) ); + mempool<leaf_data_pool_traits> pool( std::unique_ptr<memory_manager>( new mmap_manager( fname ) ) ); pool.allocate( 4095 ); pool.allocate( 4097 ); diff --git a/indexlib/tests/tokenizer-test.cpp b/indexlib/tests/tokenizer-test.cpp index 372859d9..1354ddcd 100644 --- a/indexlib/tests/tokenizer-test.cpp +++ b/indexlib/tests/tokenizer-test.cpp @@ -9,8 +9,8 @@ using indexlib::detail::tokenizer; using indexlib::detail::get_tokenizer; void simple() { - std::auto_ptr<tokenizer> tokenizer = get_tokenizer( "latin-1:european" ); - assert(tokenizer.get()); + std::unique_ptr<tokenizer> tokenizer = get_tokenizer( "latin-1:european" ); + assert(tokenizer); std::vector<std::string> tokens = tokenizer->string_to_words( "one ,as, ''#`:ThReE, " ); std::vector<std::string> expected; expected.push_back( "ONE" ); @@ -26,8 +26,8 @@ void simple() { } void with_newlines() { - std::auto_ptr<tokenizer> tokenizer = get_tokenizer( "latin-1:european" ); - assert(tokenizer.get()); + std::unique_ptr<tokenizer> tokenizer = get_tokenizer( "latin-1:european" ); + assert(tokenizer); std::vector<std::string> tokens = tokenizer->string_to_words( "one\ntwo\nthree" ); std::vector<std::string> expected; expected.push_back( "ONE" ); @@ -42,8 +42,8 @@ void with_newlines() { } void with_numbers() { - std::auto_ptr<tokenizer> tokenizer = get_tokenizer( "latin-1:european" ); - assert(tokenizer.get()); + std::unique_ptr<tokenizer> tokenizer = get_tokenizer( "latin-1:european" ); + assert(tokenizer); std::vector<std::string> tokens = tokenizer->string_to_words( "one 012 123 four" ); std::vector<std::string> expected; expected.push_back( "ONE" ); diff --git a/indexlib/tokenizer.cpp b/indexlib/tokenizer.cpp index b069c748..1c1243a7 100644 --- a/indexlib/tokenizer.cpp +++ b/indexlib/tokenizer.cpp @@ -294,7 +294,7 @@ class latin1_tokenizer : public indexlib::detail::tokenizer { } -std::auto_ptr<indexlib::detail::tokenizer> indexlib::detail::get_tokenizer( std::string name ) { - if ( name == "latin-1:european" ) return std::auto_ptr<indexlib::detail::tokenizer>( new latin1_tokenizer ); - return std::auto_ptr<indexlib::detail::tokenizer>( 0 ); +std::unique_ptr<indexlib::detail::tokenizer> indexlib::detail::get_tokenizer( std::string name ) { + if ( name == "latin-1:european" ) return std::unique_ptr<indexlib::detail::tokenizer>( new latin1_tokenizer ); + return std::unique_ptr<indexlib::detail::tokenizer>(); } diff --git a/indexlib/tokenizer.h b/indexlib/tokenizer.h index 2494f297..9916df66 100644 --- a/indexlib/tokenizer.h +++ b/indexlib/tokenizer.h @@ -20,7 +20,7 @@ class tokenizer { virtual std::vector<std::string> do_string_to_words( const char* ) = 0; }; -std::auto_ptr<tokenizer> get_tokenizer( std::string ); +std::unique_ptr<tokenizer> get_tokenizer( std::string ); }} diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index bfe47132..97b01d08 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -86,8 +86,8 @@ AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name ) layout->setSpacing( KDialog::spacingHint() ); mTypeCombo = new AddressTypeCombo( mAddressList, this ); - connect( mTypeCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( updateAddressEdit() ) ); + connect( mTypeCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( updateAddressEdit() ) ); layout->addWidget( mTypeCombo ); mAddressField = new KActiveLabel( this ); @@ -98,7 +98,7 @@ AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name ) layout->addWidget( mAddressField ); mEditButton = new TQPushButton( i18n( "street/postal", "&Edit Addresses..." ), this ); - connect( mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( edit() ) ); layout->addWidget( mEditButton ); } @@ -281,7 +281,7 @@ AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list, label->setBuddy( mStreetTextEdit ); topLayout->addWidget( mStreetTextEdit, 1, 1 ); - TabPressEater *eater = new TabPressEater( TQT_TQOBJECT(this) ); + TabPressEater *eater = new TabPressEater( this ); mStreetTextEdit->installEventFilter( eater ); label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( TDEABC::Address::postOfficeBoxLabel() ), page ); @@ -317,7 +317,7 @@ AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list, #if KDE_IS_VERSION(3,3,0) TQPushButton *labelButton = new TQPushButton( i18n( "Edit Label..." ), page ); topLayout->addMultiCellWidget( labelButton, 7, 7, 0, 1 ); - connect( labelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editLabel() ) ); + connect( labelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editLabel() ) ); #endif fillCountryCombo(); @@ -335,28 +335,28 @@ AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list, topLayout->addMultiCellWidget( buttonBox, 10, 10, 0, 1 ); TQPushButton *addButton = new TQPushButton( i18n( "New..." ), buttonBox ); - connect( addButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addAddress() ) ); + connect( addButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addAddress() ) ); mRemoveButton = new TQPushButton( i18n( "Remove" ), buttonBox ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeAddress() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeAddress() ) ); mChangeTypeButton = new TQPushButton( i18n( "Change Type..." ), buttonBox ); - connect( mChangeTypeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeType() ) ); + connect( mChangeTypeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeType() ) ); mTypeCombo->updateTypes(); mTypeCombo->setCurrentItem( selected ); updateAddressEdits(); - connect( mTypeCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( updateAddressEdits() ) ); - connect( mStreetTextEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( modified() ) ); - connect( mPOBoxEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mLocalityEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mRegionEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mPostalCodeEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mCountryCombo, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mPreferredCheckBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); + connect( mTypeCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( updateAddressEdits() ) ); + connect( mStreetTextEdit, TQ_SIGNAL( textChanged() ), TQ_SLOT( modified() ) ); + connect( mPOBoxEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mLocalityEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mRegionEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mPostalCodeEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mCountryCombo, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mPreferredCheckBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) ); TDEAcceleratorManager::manage( this ); diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp index 77d7bcbe..202dd9f1 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp @@ -55,7 +55,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core, } else { mEditorWidget = new AddresseeEditorWidget( page ); } - connect( mEditorWidget, TQT_SIGNAL( modified() ), TQT_SLOT( widgetModified() ) ); + connect( mEditorWidget, TQ_SIGNAL( modified() ), TQ_SLOT( widgetModified() ) ); layout->addWidget( mEditorWidget ); enableButton( KDialogBase::Apply, false ); diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp index 5ff8a3f1..d271399d 100644 --- a/kaddressbook/addresseeeditorextension.cpp +++ b/kaddressbook/addresseeeditorextension.cpp @@ -58,7 +58,7 @@ void AddresseeEditorExtension::contactsSelectionChanged() mAddresseeEditor->save(); addressees.append( mAddresseeEditor->addressee() ); modifiedAddress = addressees; - TQTimer::singleShot(0, this, TQT_SLOT(emitModifiedAddresses())); + TQTimer::singleShot(0, this, TQ_SLOT(emitModifiedAddresses())); } mAddresseeEditor->setAddressee( selectedAddressees[ 0 ] ); diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index b83e0ad7..d2b79a92 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -47,7 +47,7 @@ #include <tdemessagebox.h> #include <kseparator.h> #include <ksqueezedtextlabel.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <libtdepim/addresseelineedit.h> #include <libtdepim/categoryeditdialog.h> @@ -135,8 +135,8 @@ void AddresseeEditorWidget::initGUI() setupAdditionalTabs(); setupCustomFieldsTabs(); - connect( mTabWidget, TQT_SIGNAL( currentChanged(TQWidget*) ), - TQT_SLOT( pageChanged(TQWidget*) ) ); + connect( mTabWidget, TQ_SIGNAL( currentChanged(TQWidget*) ), + TQ_SLOT( pageChanged(TQWidget*) ) ); } void AddresseeEditorWidget::setupTab1() @@ -165,9 +165,9 @@ void AddresseeEditorWidget::setupTab1() button = new TQPushButton( i18n( "Edit Name..." ), tab1 ); TQToolTip::add( button, i18n( "Edit the contact's name" ) ); mNameEdit = new KLineEdit( tab1, "mNameEdit" ); - connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( nameTextChanged( const TQString& ) ) ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( nameButtonClicked() ) ); + connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( nameTextChanged( const TQString& ) ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( nameButtonClicked() ) ); mNameLabel = new KSqueezedTextLabel( tab1 ); if ( KABPrefs::instance()->automaticNameParsing() ) { @@ -183,8 +183,8 @@ void AddresseeEditorWidget::setupTab1() layout->addWidget( mNameLabel, 0, 2 ); label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( TDEABC::Addressee::roleLabel() ), tab1 ); mRoleEdit = new KLineEdit( tab1 ); - connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mRoleEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mRoleEdit ); layout->addWidget( label, 1, 1 ); layout->addWidget( mRoleEdit, 1, 2 ); @@ -193,8 +193,8 @@ void AddresseeEditorWidget::setupTab1() label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( TDEABC::Addressee::organizationLabel() ), tab1 ); mOrgEdit = new KLineEdit( tab1 ); label->setBuddy( mOrgEdit ); - connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( organizationTextChanged( const TQString& ) ) ); + connect( mOrgEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( organizationTextChanged( const TQString& ) ) ); layout->addWidget( label, 2, 1 ); layout->addWidget( mOrgEdit, 2, 2 ); @@ -217,7 +217,7 @@ void AddresseeEditorWidget::setupTab1() layout->addMultiCellWidget( label, 0, 1, 3, 3 ); mPhoneEditWidget = new PhoneEditWidget( tab1 ); - connect( mPhoneEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); + connect( mPhoneEditWidget, TQ_SIGNAL( modified() ), TQ_SLOT( emitModified() ) ); layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 ); bar = new KSeparator( KSeparator::HLine, tab1 ); @@ -231,7 +231,7 @@ void AddresseeEditorWidget::setupTab1() layout->addMultiCellWidget( label, 5, 6, 0, 0 ); mAddressEditWidget = new AddressEditWidget( tab1 ); - connect( mAddressEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); + connect( mAddressEditWidget, TQ_SIGNAL( modified() ), TQ_SLOT( emitModified() ) ); layout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 ); ////////////////////////////////////// @@ -242,7 +242,7 @@ void AddresseeEditorWidget::setupTab1() layout->addMultiCellWidget( label, 5, 6, 3, 3 ); mEmailWidget = new EmailEditWidget( tab1 ); - connect( mEmailWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); + connect( mEmailWidget, TQ_SIGNAL( modified() ), TQ_SLOT( emitModified() ) ); layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 ); // add the separator @@ -258,8 +258,8 @@ void AddresseeEditorWidget::setupTab1() label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( TDEABC::Addressee::urlLabel() ), tab1 ); mURLEdit = new KLineEdit( tab1 ); - connect( mURLEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mURLEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mURLEdit ); homePageLayout->addWidget( label ); homePageLayout->addWidget( mURLEdit ); @@ -270,13 +270,13 @@ void AddresseeEditorWidget::setupTab1() blogLayout->addWidget( label ); mBlogEdit = new KLineEdit( tab1 ); blogLayout->addWidget( mBlogEdit ); - connect( mBlogEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( textChanged( const TQString & ) ) ); + connect( mBlogEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( textChanged( const TQString & ) ) ); label->setBuddy( mBlogEdit ); layout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 ); mIMWidget = new IMEditWidget( tab1, mAddressee ); - connect( mIMWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); + connect( mIMWidget, TQ_SIGNAL( modified() ), TQ_SLOT( emitModified() ) ); layout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 ); layout->addColSpacing( 6, 50 ); @@ -290,15 +290,15 @@ void AddresseeEditorWidget::setupTab1() // Categories mCategoryButton = new TQPushButton( i18n( "Select Categories..." ), categoryBox ); - connect( mCategoryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectCategories() ) ); + connect( mCategoryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectCategories() ) ); mCategoryEdit = new KLineEdit( categoryBox ); mCategoryEdit->setReadOnly( true ); - connect( mCategoryEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mCategoryEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); mSecrecyWidget = new SecrecyWidget( categoryBox ); - connect( mSecrecyWidget, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) ); + connect( mSecrecyWidget, TQ_SIGNAL( changed() ), TQ_SLOT( emitModified() ) ); layout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 ); @@ -332,48 +332,48 @@ void AddresseeEditorWidget::setupTab2() label = new TQLabel( i18n( "Department:" ), tab2 ); layout->addWidget( label, 0, 1 ); mDepartmentEdit = new KLineEdit( tab2 ); - connect( mDepartmentEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mDepartmentEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mDepartmentEdit ); layout->addWidget( mDepartmentEdit, 0, 2 ); label = new TQLabel( i18n( "Office:" ), tab2 ); layout->addWidget( label, 1, 1 ); mOfficeEdit = new KLineEdit( tab2 ); - connect( mOfficeEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mOfficeEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mOfficeEdit ); layout->addWidget( mOfficeEdit, 1, 2 ); label = new TQLabel( i18n( "Profession:" ), tab2 ); layout->addWidget( label, 2, 1 ); mProfessionEdit = new KLineEdit( tab2 ); - connect( mProfessionEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mProfessionEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mProfessionEdit ); layout->addWidget( mProfessionEdit, 2, 2 ); label = new TQLabel( i18n( "Manager\'s name:" ), tab2 ); layout->addWidget( label, 0, 3 ); mManagerEdit = new KPIM::AddresseeLineEdit( tab2 ); - connect( mManagerEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mManagerEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mManagerEdit ); layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 ); label = new TQLabel( i18n( "Assistant's name:" ), tab2 ); layout->addWidget( label, 1, 3 ); mAssistantEdit = new KPIM::AddresseeLineEdit( tab2 ); - connect( mAssistantEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mAssistantEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mAssistantEdit ); layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 ); label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( TDEABC::Addressee::titleLabel() ), tab2 ); layout->addWidget( label, 2, 3 ); mTitleEdit = new KLineEdit( tab2 ); - connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mTitleEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mTitleEdit ); layout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 ); @@ -391,36 +391,36 @@ void AddresseeEditorWidget::setupTab2() label = new TQLabel( i18n( "Nickname:" ), tab2 ); layout->addWidget( label, 4, 1 ); mNicknameEdit = new KLineEdit( tab2 ); - connect( mNicknameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mNicknameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mNicknameEdit ); layout->addWidget( mNicknameEdit, 4, 2 ); label = new TQLabel( i18n( "Partner's name:" ), tab2 ); layout->addWidget( label, 5, 1 ); mSpouseEdit = new KPIM::AddresseeLineEdit( tab2 ); - connect( mSpouseEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mSpouseEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mSpouseEdit ); layout->addWidget( mSpouseEdit, 5, 2 ); label = new TQLabel( i18n( "Birthdate:" ), tab2 ); layout->addWidget( label, 4, 3 ); mBirthdayPicker = new KDateEdit( tab2 ); - connect( mBirthdayPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ), - TQT_SLOT( dateChanged( const TQDate& ) ) ); - connect( mBirthdayPicker, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( emitModified() ) ); + connect( mBirthdayPicker, TQ_SIGNAL( dateChanged( const TQDate& ) ), + TQ_SLOT( dateChanged( const TQDate& ) ) ); + connect( mBirthdayPicker, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( emitModified() ) ); label->setBuddy( mBirthdayPicker ); layout->addWidget( mBirthdayPicker, 4, 4 ); label = new TQLabel( i18n( "Anniversary:" ), tab2 ); layout->addWidget( label, 5, 3 ); mAnniversaryPicker = new KDateEdit( tab2 ); - connect( mAnniversaryPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ), - TQT_SLOT( dateChanged( const TQDate& ) ) ); - connect( mAnniversaryPicker, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( emitModified() ) ); + connect( mAnniversaryPicker, TQ_SIGNAL( dateChanged( const TQDate& ) ), + TQ_SLOT( dateChanged( const TQDate& ) ) ); + connect( mAnniversaryPicker, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( emitModified() ) ); label->setBuddy( mAnniversaryPicker ); layout->addWidget( mAnniversaryPicker, 5, 4 ); @@ -435,7 +435,7 @@ void AddresseeEditorWidget::setupTab2() mNoteEdit = new TQTextEdit( tab2 ); mNoteEdit->setWordWrap( TQTextEdit::WidgetWidth ); mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() ); - connect( mNoteEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( emitModified() ) ); + connect( mNoteEdit, TQ_SIGNAL( textChanged() ), TQ_SLOT( emitModified() ) ); label->setBuddy( mNoteEdit ); layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 ); @@ -464,7 +464,7 @@ void AddresseeEditorWidget::setupAdditionalTabs() mTabWidget->addTab( page, pageTitle ); - connect( page, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) ); + connect( page, TQ_SIGNAL( changed() ), TQ_SLOT( emitModified() ) ); } KAB::ContactEditorWidget *widget @@ -498,7 +498,7 @@ void AddresseeEditorWidget::setupCustomFieldsTabs() page->addWidget( wdg ); page->updateLayout(); - connect( page, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) ); + connect( page, TQ_SIGNAL( changed() ), TQ_SLOT( emitModified() ) ); } else delete page; } @@ -798,10 +798,10 @@ void AddresseeEditorWidget::selectCategories() // Show the category dialog if ( mCategorySelectDialog == 0 ) { mCategorySelectDialog = new KPIM::CategorySelectDialog( KABPrefs::instance(), this ); - connect( mCategorySelectDialog, TQT_SIGNAL( categoriesSelected( const TQStringList& ) ), - this, TQT_SLOT( categoriesSelected( const TQStringList& ) ) ); - connect( mCategorySelectDialog, TQT_SIGNAL( editCategories() ), - this, TQT_SLOT( editCategories() ) ); + connect( mCategorySelectDialog, TQ_SIGNAL( categoriesSelected( const TQStringList& ) ), + this, TQ_SLOT( categoriesSelected( const TQStringList& ) ) ); + connect( mCategorySelectDialog, TQ_SIGNAL( editCategories() ), + this, TQ_SLOT( editCategories() ) ); } mCategorySelectDialog->setSelected( TQStringList::split( ",", mCategoryEdit->text() ) ); @@ -817,8 +817,8 @@ void AddresseeEditorWidget::editCategories() { if ( mCategoryEditDialog == 0 ) { mCategoryEditDialog = new KPIM::CategoryEditDialog( KABPrefs::instance(), this ); - connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ), - mCategorySelectDialog, TQT_SLOT( updateCategoryConfig() ) ); + connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ), + mCategorySelectDialog, TQ_SLOT( updateCategoryConfig() ) ); } mCategoryEditDialog->exec(); diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp index 010ac72f..70841834 100644 --- a/kaddressbook/addviewdialog.cpp +++ b/kaddressbook/addviewdialog.cpp @@ -53,12 +53,12 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, layout->addWidget( label, 0, 0 ); mViewNameEdit = new TQLineEdit( page ); - connect( mViewNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mViewNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); layout->addWidget( mViewNameEdit, 0, 1 ); mTypeGroup = new TQButtonGroup( 0, TQt::Horizontal, i18n( "View Type" ), page ); - connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( clicked( int ) ) ); + connect( mTypeGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( clicked( int ) ) ); layout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 ); TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->layout(), 3, 2 ); groupLayout->setSpacing( spacingHint() ); diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp index d5b53479..994a348b 100644 --- a/kaddressbook/advancedcustomfields.cpp +++ b/kaddressbook/advancedcustomfields.cpp @@ -37,7 +37,7 @@ #include <kdatetimewidget.h> #include <kdialog.h> #include <klineedit.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <libtdepim/designerfields.h> @@ -132,7 +132,7 @@ void AdvancedCustomFields::initGUI( const TQString &uiFile ) mFields = new KPIM::DesignerFields( uiFile, this ); layout->addWidget( mFields ); - connect( mFields, TQT_SIGNAL( modified() ), TQT_SLOT( setModified() ) ); + connect( mFields, TQ_SIGNAL( modified() ), TQ_SLOT( setModified() ) ); } TQString AdvancedCustomFields::pageIdentifier() const diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h index 49350be4..d8b2bddd 100644 --- a/kaddressbook/common/kabprefs.h +++ b/kaddressbook/common/kabprefs.h @@ -25,12 +25,12 @@ #define KABPREFS_H #include <tqstringlist.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "kabprefs_base.h" class TDEConfig; -class KDE_EXPORT KABPrefs : public KABPrefsBase +class TDE_EXPORT KABPrefs : public KABPrefsBase { public: virtual ~KABPrefs(); diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp index 0f6bcdb8..63ed10ac 100644 --- a/kaddressbook/common/locationmap.cpp +++ b/kaddressbook/common/locationmap.cpp @@ -58,7 +58,7 @@ void LocationMap::showAddress( const TDEABC::Address &addr ) if ( url.isEmpty() ) return; - kapp->invokeBrowser( url.url() ); + tdeApp->invokeBrowser( url.url() ); } TQString LocationMap::createUrl( const TDEABC::Address &addr ) diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp index a88a9554..100c6268 100644 --- a/kaddressbook/contacteditorwidgetmanager.cpp +++ b/kaddressbook/contacteditorwidgetmanager.cpp @@ -53,7 +53,7 @@ ContactEditorWidgetManager::~ContactEditorWidgetManager() ContactEditorWidgetManager *ContactEditorWidgetManager::self() { - kdWarning( !kapp, 7520 ) << "No TQApplication object available!" << endl; + kdWarning( !tdeApp, 7520 ) << "No TQApplication object available!" << endl; if ( !mSelf ) mSelf = new ContactEditorWidgetManager(); @@ -118,7 +118,7 @@ void ContactEditorTabPage::addWidget( KAB::ContactEditorWidget *widget ) { if ( widget->logicalWidth() == 2 ) { mWidgets.prepend( widget ); - connect( widget, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) ); + connect( widget, TQ_SIGNAL( changed() ), TQ_SIGNAL( changed() ) ); return; } @@ -133,7 +133,7 @@ void ContactEditorTabPage::addWidget( KAB::ContactEditorWidget *widget ) } mWidgets.insert( ++it, widget ); - connect( widget, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) ); + connect( widget, TQ_SIGNAL( changed() ), TQ_SIGNAL( changed() ) ); } void ContactEditorTabPage::loadContact( TDEABC::Addressee *addr ) diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp index f597c065..39867b0e 100644 --- a/kaddressbook/customfieldswidget.cpp +++ b/kaddressbook/customfieldswidget.cpp @@ -54,7 +54,7 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name ) layout->addWidget( label, 0, 0 ); mTitle = new KLineEdit( page ); - mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), TQT_TQOBJECT(mTitle) ) ); + mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), mTitle ) ); label->setBuddy( mTitle ); layout->addWidget( mTitle, 0, 1 ); @@ -69,8 +69,8 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name ) mGlobal->setChecked( true ); layout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 ); - connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( nameChanged( const TQString& ) ) ); + connect( mTitle, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( nameChanged( const TQString& ) ) ); TDEAcceleratorManager::manage( this ); @@ -151,33 +151,33 @@ void FieldWidget::addField( const TQString &identifier, const TQString &title, if ( type == "integer" ) { TQSpinBox *wdg = new TQSpinBox( 0, 1000, 1, this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SIGNAL( changed() ) ); } else if ( type == "boolean" ) { TQCheckBox *wdg = new TQCheckBox( this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); } else if ( type == "date" ) { TQDateEdit *wdg = new TQDateEdit( this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( valueChanged( const TQDate& ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( valueChanged( const TQDate& ) ), + this, TQ_SIGNAL( changed() ) ); } else if ( type == "time" ) { TQTimeEdit *wdg = new TQTimeEdit( this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( valueChanged( const TQTime& ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( valueChanged( const TQTime& ) ), + this, TQ_SIGNAL( changed() ) ); } else if ( type == "datetime" ) { TQDateTimeEdit *wdg = new TQDateTimeEdit( this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( valueChanged( const TQDateTime& ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( valueChanged( const TQDateTime& ) ), + this, TQ_SIGNAL( changed() ) ); } else if ( type == "text" ) { TQLineEdit *wdg = new TQLineEdit( this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SIGNAL( changed() ) ); } record.mLabel->show(); @@ -382,10 +382,10 @@ CustomFieldsWidget::CustomFieldsWidget( TDEABC::AddressBook *ab, { initGUI(); - connect( mAddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addField() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeField() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addField() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeField() ) ); - connect( mFieldWidget, TQT_SIGNAL( changed() ), this, TQT_SLOT( setModified() ) ); + connect( mFieldWidget, TQ_SIGNAL( changed() ), this, TQ_SLOT( setModified() ) ); } void CustomFieldsWidget::loadContact( TDEABC::Addressee *addr ) diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp index 3f7b7353..e0711b64 100644 --- a/kaddressbook/distributionlisteditor.cpp +++ b/kaddressbook/distributionlisteditor.cpp @@ -70,14 +70,14 @@ KPIM::DistributionListEditor::Line::Line( TDEABC::AddressBook* book, TQWidget* p TQBoxLayout* layout = new TQHBoxLayout( this ); layout->setSpacing( KDialog::spacingHint() ); m_lineEdit = new KPIM::DistributionListEditor::LineEdit( this ); - connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( textChanged( const TQString& ) ) ); + connect( m_lineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( textChanged( const TQString& ) ) ); layout->addWidget( m_lineEdit ); m_clearButton = new TQToolButton( this ); m_clearButton->setIconSet( TDEApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) ); m_clearButton->setEnabled( false ); layout->addWidget( m_clearButton ); - connect( m_clearButton, TQT_SIGNAL( clicked() ), m_lineEdit, TQT_SLOT( clear() ) ); + connect( m_clearButton, TQ_SIGNAL( clicked() ), m_lineEdit, TQ_SLOT( clear() ) ); } void KPIM::DistributionListEditor::Line::textChanged( const TQString& text ) @@ -159,9 +159,9 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( TDEABC::AddressBook* b d->addressBook = book; Q_ASSERT( d->addressBook ); d->lastLineId = 0; - d->mapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( d->mapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( lineTextChanged( int ) ) ); + d->mapper = new TQSignalMapper( this ); + connect( d->mapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( lineTextChanged( int ) ) ); setCaption( i18n( "Edit Distribution List" ) ); TQWidget* main = new TQWidget( this ); TQVBoxLayout* mainLayout = new TQVBoxLayout( main ); @@ -248,9 +248,9 @@ KPIM::DistributionListEditor::Line* KPIM::DistributionListEditor::EditorWidgetPr line->setEntry( entry ); addresseeLayout->addWidget( line ); addressees.append( line ); - TQObject::connect( line, TQT_SIGNAL( textChanged() ), - mapper, TQT_SLOT( map() ) ); - mapper->setMapping( TQT_TQOBJECT(line), ++lastLineId ); + TQObject::connect( line, TQ_SIGNAL( textChanged() ), + mapper, TQ_SLOT( map() ) ); + mapper->setMapping( line, ++lastLineId ); line->setShown( true ); return line; } diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp index b09d8c97..811e5167 100644 --- a/kaddressbook/distributionlistentryview.cpp +++ b/kaddressbook/distributionlistentryview.cpp @@ -49,8 +49,8 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi m_distListLabel = new KURLLabel( this ); distLabel->setBuddy( m_distListLabel ); - connect( m_distListLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SIGNAL( distributionListClicked( const TQString& ) ) ); + connect( m_distListLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SIGNAL( distributionListClicked( const TQString& ) ) ); distLayout->addWidget( m_distListLabel ); distLayout->addStretch(); m_mainLayout->addItem( distLayout ); @@ -129,8 +129,8 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis button->setChecked( true ); button->setShown( true ); } - connect( m_emailGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( emailButtonClicked( int ) ) ); + connect( m_emailGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( emailButtonClicked( int ) ) ); m_radioLayout->addWidget( m_emailGroup, 0, 0 ); m_emailGroup->setShown( true ); m_mainLayout->invalidate(); diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp index 272a6200..b7295ad8 100644 --- a/kaddressbook/distributionlistpicker.cpp +++ b/kaddressbook/distributionlistpicker.cpp @@ -54,10 +54,10 @@ KPIM::DistributionListPickerDialog::DistributionListPickerDialog( TDEABC::Addres layout->addWidget( m_label, 0, 0 ); m_listBox = new TDEListBox( main ); layout->addWidget( m_listBox, 1, 0 ); - connect( m_listBox, TQT_SIGNAL( highlighted( const TQString& ) ), - this, TQT_SLOT( entrySelected( const TQString& ) ) ); - connect( m_listBox, TQT_SIGNAL( selected( const TQString& ) ), - this, TQT_SLOT( entrySelected( const TQString& ) ) ); + connect( m_listBox, TQ_SIGNAL( highlighted( const TQString& ) ), + this, TQ_SLOT( entrySelected( const TQString& ) ) ); + connect( m_listBox, TQ_SIGNAL( selected( const TQString& ) ), + this, TQ_SLOT( entrySelected( const TQString& ) ) ); setMainWidget( main ); #ifdef TDEPIM_NEW_DISTRLISTS typedef TQValueList<KPIM::DistributionList> DistListList; diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp index fc7bef17..f7849d7c 100644 --- a/kaddressbook/editors/cryptowidget.cpp +++ b/kaddressbook/editors/cryptowidget.cpp @@ -83,7 +83,7 @@ CryptoWidget::CryptoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const cha for ( uint i = 0 ; i < NumberOfProtocols ; ++i ) { Kleo::CryptoMessageFormat f = static_cast<Kleo::CryptoMessageFormat>( msgFormat ); mProtocolCB[ i ] = new TQCheckBox( Kleo::cryptoMessageFormatToLabel( f ), protGB ); - connect( mProtocolCB[i], TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) ); + connect( mProtocolCB[i], TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) ); // Iterating over a bitfield means *2 every time msgFormat *= 2; @@ -126,13 +126,13 @@ CryptoWidget::CryptoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const cha static_cast<Kleo::EncryptionPreference>( i ) ) ); // Emit "changed()" signal - connect( mSignPref, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( setModified() ) ); - connect( mCryptPref, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( setModified() ) ); + connect( mSignPref, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( setModified() ) ); + connect( mCryptPref, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( setModified() ) ); // Not optimal, but KeyRequester doesn't emit any signals when the key changes - connect( mPgpKey->eraseButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) ); - connect( mPgpKey->dialogButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) ); - connect( mSmimeCert->eraseButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) ); - connect( mSmimeCert->dialogButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) ); + connect( mPgpKey->eraseButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) ); + connect( mPgpKey->dialogButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) ); + connect( mSmimeCert->eraseButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) ); + connect( mSmimeCert->dialogButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) ); } CryptoWidget::~CryptoWidget() diff --git a/kaddressbook/editors/imaddressbase.ui b/kaddressbook/editors/imaddressbase.ui index 77988764..f87bdff9 100644 --- a/kaddressbook/editors/imaddressbase.ui +++ b/kaddressbook/editors/imaddressbase.ui @@ -81,9 +81,9 @@ <tabstop>cmbProtocol</tabstop> <tabstop>edtAddress</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotProtocolChanged( const TQString & )</slot> <slot>slotProtocolChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaddressbook/editors/imaddresswidget.cpp b/kaddressbook/editors/imaddresswidget.cpp index 0a3336d6..4cd7813d 100644 --- a/kaddressbook/editors/imaddresswidget.cpp +++ b/kaddressbook/editors/imaddresswidget.cpp @@ -60,10 +60,10 @@ IMAddressWidget::IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> p void IMAddressWidget::init() { - connect( cmbProtocol, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( slotProtocolChanged() ) ); - connect( edtAddress, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotAddressChanged( const TQString& ) ) ); + connect( cmbProtocol, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( slotProtocolChanged() ) ); + connect( edtAddress, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotAddressChanged( const TQString& ) ) ); slotProtocolChanged(); } diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp index 38d641c4..9db30d9c 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -148,14 +148,14 @@ IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, c mWidget = new IMEditorBase( this ); setMainWidget( mWidget ); - connect( mWidget->btnAdd, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ) ); - connect( mWidget->btnEdit, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEdit() ) ); - connect( mWidget->btnDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDelete() ) ); - connect( mWidget->btnSetStandard, TQT_SIGNAL( clicked()), TQT_SLOT( slotSetStandard() ) ); - connect( mWidget->lvAddresses, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotUpdateButtons() ) ); + connect( mWidget->btnAdd, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() ) ); + connect( mWidget->btnEdit, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEdit() ) ); + connect( mWidget->btnDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDelete() ) ); + connect( mWidget->btnSetStandard, TQ_SIGNAL( clicked()), TQ_SLOT( slotSetStandard() ) ); + connect( mWidget->lvAddresses, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotUpdateButtons() ) ); - connect( mWidget->lvAddresses, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), - TQT_SLOT( slotEdit() ) ); + connect( mWidget->lvAddresses, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), + TQ_SLOT( slotEdit() ) ); setHelp( "managing-contacts-im-addresses" ); @@ -336,8 +336,8 @@ void IMEditorWidget::slotAdd() IMAddressWidget *addressWid = new IMAddressWidget( &addDialog, mProtocols ); addDialog.enableButtonOK( false ); - connect( addressWid, TQT_SIGNAL( inValidState( bool ) ), - &addDialog, TQT_SLOT( enableButtonOK( bool ) ) ); + connect( addressWid, TQ_SIGNAL( inValidState( bool ) ), + &addDialog, TQ_SLOT( enableButtonOK( bool ) ) ); addDialog.setMainWidget( addressWid ); if ( addDialog.exec() == TQDialog::Accepted ) { @@ -372,8 +372,8 @@ void IMEditorWidget::slotEdit() KDialogBase::Ok | KDialogBase::Cancel ); IMAddressWidget *addressWid = new IMAddressWidget( &editDialog, mProtocols, current->protocol(), current->address(), current->context() ) ; - connect( addressWid, TQT_SIGNAL( inValidState( bool ) ), - &editDialog, TQT_SLOT( enableButtonOK( bool ) ) ); + connect( addressWid, TQ_SIGNAL( inValidState( bool ) ), + &editDialog, TQ_SLOT( enableButtonOK( bool ) ) ); editDialog.setMainWidget( addressWid ); if ( editDialog.exec() == TQDialog::Accepted ) { diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp index d517f0b6..ead36a0c 100644 --- a/kaddressbook/emaileditwidget.cpp +++ b/kaddressbook/emaileditwidget.cpp @@ -97,15 +97,15 @@ EmailEditWidget::EmailEditWidget( TQWidget *parent, const char *name ) mEmailEdit = new KLineEdit( this ); mEmailEdit->setValidator( new EmailValidator ); - connect( mEmailEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); - connect( mEmailEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SIGNAL( modified() ) ); + connect( mEmailEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); + connect( mEmailEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SIGNAL( modified() ) ); label->setBuddy( mEmailEdit ); topLayout->addWidget( mEmailEdit, 0, 1 ); mEditButton = new TQPushButton( i18n( "Edit Email Addresses..." ), this); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) ); topLayout->addMultiCellWidget( mEditButton, 1, 1, 0, 1 ); topLayout->activate(); @@ -185,26 +185,26 @@ EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *parent, // Make sure there is room for the scrollbar mEmailListBox->setMinimumHeight( mEmailListBox->sizeHint().height() + 30 ); - connect( mEmailListBox, TQT_SIGNAL( highlighted( int ) ), - TQT_SLOT( selectionChanged( int ) ) ); - connect( mEmailListBox, TQT_SIGNAL( selected( int ) ), - TQT_SLOT( edit() ) ); + connect( mEmailListBox, TQ_SIGNAL( highlighted( int ) ), + TQ_SLOT( selectionChanged( int ) ) ); + connect( mEmailListBox, TQ_SIGNAL( selected( int ) ), + TQ_SLOT( edit() ) ); topLayout->addMultiCellWidget( mEmailListBox, 0, 3, 0, 1 ); mAddButton = new TQPushButton( i18n( "Add..." ), page ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) ); topLayout->addWidget( mAddButton, 0, 2 ); mEditButton = new TQPushButton( i18n( "Edit..." ), page ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) ); topLayout->addWidget( mEditButton, 1, 2 ); mRemoveButton = new TQPushButton( i18n( "Remove" ), page ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) ); topLayout->addWidget( mRemoveButton, 2, 2 ); mStandardButton = new TQPushButton( i18n( "Set Standard" ), page ); - connect( mStandardButton, TQT_SIGNAL( clicked() ), TQT_SLOT( standard() ) ); + connect( mStandardButton, TQ_SIGNAL( clicked() ), TQ_SLOT( standard() ) ); topLayout->addWidget( mStandardButton, 3, 2 ); topLayout->activate(); diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index 735ebe0c..bdc0801d 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -60,7 +60,7 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai mActionCollection = new TDEActionCollection( this, "ActionCollection" ); extensionBar->setShown( false ); - TQTimer::singleShot( 0, this, TQT_SLOT( createActions() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( createActions() ) ); } ExtensionManager::~ExtensionManager() @@ -162,13 +162,13 @@ void ExtensionManager::createActions() delete mMapper; mMapper = new TQSignalMapper( this, "SignalMapper" ); - connect( mMapper, TQT_SIGNAL( mapped( const TQString& ) ), - this, TQT_SLOT( activationToggled( const TQString& ) ) ); + connect( mMapper, TQ_SIGNAL( mapped( const TQString& ) ), + this, TQ_SLOT( activationToggled( const TQString& ) ) ); ExtensionData::List::ConstIterator it; for ( TQMap<TQString, ExtensionData>::Iterator it = mExtensionMap.begin(), end = mExtensionMap.end(); it != end; ++it ) { ExtensionData& data = it.data(); - data.action = new TDEToggleAction( data.title, 0, mMapper, TQT_SLOT( map() ), + data.action = new TDEToggleAction( data.title, 0, mMapper, TQ_SLOT( map() ), mActionCollection, TQString( data.identifier + "_extension" ).latin1() ); mMapper->setMapping( data.action, data.identifier ); @@ -202,10 +202,10 @@ void ExtensionManager::createExtensionWidgets() wdg = new AddresseeEditorExtension( mCore, mDetailsStack ); wdg->hide(); - connect( wdg, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ), - TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ) ); - connect( wdg, TQT_SIGNAL( deleted( const TQStringList& ) ), - TQT_SIGNAL( deleted( const TQStringList& ) ) ); + connect( wdg, TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ), + TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ) ); + connect( wdg, TQ_SIGNAL( deleted( const TQStringList& ) ), + TQ_SIGNAL( deleted( const TQStringList& ) ) ); ExtensionData data; data.identifier = wdg->identifier(); @@ -239,10 +239,10 @@ void ExtensionManager::createExtensionWidgets() if ( wdg->identifier() == "distribution_list_editor_ng" ) mSplitter->moveToFirst( wdg ); wdg->hide(); - connect( wdg, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ), - TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ) ); - connect( wdg, TQT_SIGNAL( deleted( const TQStringList& ) ), - TQT_SIGNAL( deleted( const TQStringList& ) ) ); + connect( wdg, TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ), + TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ) ); + connect( wdg, TQ_SIGNAL( deleted( const TQStringList& ) ), + TQ_SIGNAL( deleted( const TQStringList& ) ) ); ExtensionData data; data.identifier = wdg->identifier(); diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp index 4a4a20a2..181744ad 100644 --- a/kaddressbook/features/distributionlistngwidget.cpp +++ b/kaddressbook/features/distributionlistngwidget.cpp @@ -131,51 +131,51 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare mAddButton = new TQPushButton( this ); mAddButton->setIconSet( SmallIconSet( "add" ) ); TQToolTip::add( mAddButton, i18n( "Add distribution list" ) ); - connect( mAddButton, TQT_SIGNAL(clicked()), core, TQT_SLOT(newDistributionList()) ); + connect( mAddButton, TQ_SIGNAL(clicked()), core, TQ_SLOT(newDistributionList()) ); buttonLayout->addWidget( mAddButton ); mEditButton = new TQPushButton( this ); mEditButton->setIconSet( SmallIconSet( "edit" ) ); TQToolTip::add( mEditButton, i18n( "Edit distribution list" ) ); - connect( mEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editSelectedDistributionList()) ); + connect( mEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editSelectedDistributionList()) ); buttonLayout->addWidget( mEditButton ); mRemoveButton = new TQPushButton( this ); mRemoveButton->setIconSet( SmallIconSet( "remove" ) ); TQToolTip::add( mRemoveButton, i18n( "Remove distribution list" ) ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedDistributionList()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSelectedDistributionList()) ); buttonLayout->addWidget( mRemoveButton ); mListBox = new ListBox( this ); - connect( mListBox, TQT_SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ), - this, TQT_SLOT( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ) ); - connect( mListBox, TQT_SIGNAL( dropped( const TQString &, const TDEABC::Addressee::List & ) ), - this, TQT_SLOT( contactsDropped( const TQString &, const TDEABC::Addressee::List & ) ) ); - connect( mListBox, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SLOT( itemSelected( int ) ) ); - connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(editSelectedDistributionList()) ); + connect( mListBox, TQ_SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ), + this, TQ_SLOT( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ) ); + connect( mListBox, TQ_SIGNAL( dropped( const TQString &, const TDEABC::Addressee::List & ) ), + this, TQ_SLOT( contactsDropped( const TQString &, const TDEABC::Addressee::List & ) ) ); + connect( mListBox, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SLOT( itemSelected( int ) ) ); + connect( mListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), TQ_SLOT(editSelectedDistributionList()) ); layout->addWidget( mListBox ); - connect( core, TQT_SIGNAL( contactsUpdated() ), - this, TQT_SLOT( updateEntries() ) ); - connect( core->addressBook(), TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - this, TQT_SLOT( updateEntries() ) ); + connect( core, TQ_SIGNAL( contactsUpdated() ), + this, TQ_SLOT( updateEntries() ) ); + connect( core->addressBook(), TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + this, TQ_SLOT( updateEntries() ) ); // When contacts are changed, update both distr list combo and contents of displayed distr list - connect( core, TQT_SIGNAL( contactsUpdated() ), - this, TQT_SLOT( updateEntries() ) ); + connect( core, TQ_SIGNAL( contactsUpdated() ), + this, TQ_SLOT( updateEntries() ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( updateEntries() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateEntries() ) ); } void KAB::DistributionListNg::MainWidget::contextMenuRequested( TQListBoxItem *item, const TQPoint &point ) { TQGuardedPtr<TDEPopupMenu> menu = new TDEPopupMenu( this ); - menu->insertItem( i18n( "New Distribution List..." ), core(), TQT_SLOT( newDistributionList() ) ); + menu->insertItem( i18n( "New Distribution List..." ), core(), TQ_SLOT( newDistributionList() ) ); if ( item && ( item->text() !=i18n( "All Contacts" ) ) ) { - menu->insertItem( i18n( "Edit..." ), this, TQT_SLOT( editSelectedDistributionList() ) ); - menu->insertItem( i18n( "Delete" ), this, TQT_SLOT( deleteSelectedDistributionList() ) ); + menu->insertItem( i18n( "Edit..." ), this, TQ_SLOT( editSelectedDistributionList() ) ); + menu->insertItem( i18n( "Delete" ), this, TQ_SLOT( deleteSelectedDistributionList() ) ); } menu->exec( point ); delete menu; diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index 28a6f8ff..76324853 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -158,19 +158,19 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren mNameCombo = new TQComboBox( this ); topLayout->addWidget( mNameCombo, 0, 0 ); - connect( mNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateContactView() ) ); + connect( mNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateContactView() ) ); mCreateListButton = new TQPushButton( i18n( "New List..." ), this ); topLayout->addWidget( mCreateListButton, 0, 1 ); - connect( mCreateListButton, TQT_SIGNAL( clicked() ), TQT_SLOT( createList() ) ); + connect( mCreateListButton, TQ_SIGNAL( clicked() ), TQ_SLOT( createList() ) ); mEditListButton = new TQPushButton( i18n( "Rename List..." ), this ); topLayout->addWidget( mEditListButton, 0, 2 ); - connect( mEditListButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editList() ) ); + connect( mEditListButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editList() ) ); mRemoveListButton = new TQPushButton( i18n( "Remove List" ), this ); topLayout->addWidget( mRemoveListButton, 0, 3 ); - connect( mRemoveListButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeList() ) ); + connect( mRemoveListButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeList() ) ); mContactView = new DistributionListView( this ); mContactView->addColumn( i18n( "Name" ) ); @@ -180,40 +180,40 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren mContactView->setAllColumnsShowFocus( true ); mContactView->setFullWidth( true ); topLayout->addMultiCellWidget( mContactView, 1, 1, 0, 3 ); - connect( mContactView, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( selectionContactViewChanged() ) ); - connect( mContactView, TQT_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), - TQT_SLOT( dropped( TQDropEvent*, TQListViewItem* ) ) ); + connect( mContactView, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( selectionContactViewChanged() ) ); + connect( mContactView, TQ_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), + TQ_SLOT( dropped( TQDropEvent*, TQListViewItem* ) ) ); mAddContactButton = new TQPushButton( i18n( "Add Contact" ), this ); mAddContactButton->setEnabled( false ); topLayout->addWidget( mAddContactButton, 2, 0 ); - connect( mAddContactButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addContact() ) ); + connect( mAddContactButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addContact() ) ); mEntryCountLabel = new TQLabel( this ); topLayout->addWidget( mEntryCountLabel, 2, 1 ); mChangeEmailButton = new TQPushButton( i18n( "Change Email..." ), this ); topLayout->addWidget( mChangeEmailButton, 2, 2 ); - connect( mChangeEmailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeEmail() ) ); + connect( mChangeEmailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeEmail() ) ); mRemoveContactButton = new TQPushButton( i18n( "Remove Contact" ), this ); topLayout->addWidget( mRemoveContactButton, 2, 3 ); - connect( mRemoveContactButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeContact() ) ); + connect( mRemoveContactButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeContact() ) ); #ifdef TDEPIM_NEW_DISTRLISTS // When contacts are changed, update both distr list combo and contents of displayed distr list - connect( core, TQT_SIGNAL( contactsUpdated() ), - this, TQT_SLOT( updateNameCombo() ) ); + connect( core, TQ_SIGNAL( contactsUpdated() ), + this, TQ_SLOT( updateNameCombo() ) ); #else mManager = new TDEABC::DistributionListManager( core->addressBook() ); - connect( TDEABC::DistributionListWatcher::self(), TQT_SIGNAL( changed() ), - this, TQT_SLOT( updateNameCombo() ) ); + connect( TDEABC::DistributionListWatcher::self(), TQ_SIGNAL( changed() ), + this, TQ_SLOT( updateNameCombo() ) ); #endif - connect( core->addressBook(), TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - this, TQT_SLOT( updateNameCombo() ) ); + connect( core->addressBook(), TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + this, TQ_SLOT( updateNameCombo() ) ); updateNameCombo(); diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index 1d80c915..4a16c598 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -142,19 +142,19 @@ ResourceSelection::ResourceSelection( KAB::Core *core, TQWidget *parent, const c AddressBookWrapper *wrapper = static_cast<AddressBookWrapper*>( core->addressBook() ); mManager = wrapper->getResourceManager(); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) ); - connect( mListView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - TQT_SLOT( currentChanged( TQListViewItem* ) ) ); + connect( mListView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + TQ_SLOT( currentChanged( TQListViewItem* ) ) ); - connect( mListView, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, + connect( mListView, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &, + TQ_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( updateView() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateView() ) ); } ResourceSelection::~ResourceSelection() @@ -167,24 +167,24 @@ void ResourceSelection::contextMenuRequested ( TQListViewItem *i, ResourceItem *item = static_cast<ResourceItem *>( i ); TQPopupMenu *menu = new TQPopupMenu( this ); - connect( menu, TQT_SIGNAL( aboutToHide() ), menu, TQT_SLOT( deleteLater() ) ); + connect( menu, TQ_SIGNAL( aboutToHide() ), menu, TQ_SLOT( deleteLater() ) ); if ( item ) { int reloadId = menu->insertItem( i18n("Re&load"), this, - TQT_SLOT( reloadResource() ) ); + TQ_SLOT( reloadResource() ) ); menu->setItemEnabled( reloadId, item->resource()->isActive() ); int saveId = menu->insertItem( i18n("&Save"), this, - TQT_SLOT( saveResource() ) ); + TQ_SLOT( saveResource() ) ); menu->setItemEnabled( saveId, item->resource()->isActive() ); menu->insertSeparator(); -// menu->insertItem( i18n("Show &Info"), this, TQT_SLOT( showInfo() ) ); +// menu->insertItem( i18n("Show &Info"), this, TQ_SLOT( showInfo() ) ); - menu->insertItem( i18n("&Edit..."), this, TQT_SLOT( edit() ) ); - menu->insertItem( i18n("&Remove"), this, TQT_SLOT( remove() ) ); + menu->insertItem( i18n("&Edit..."), this, TQ_SLOT( edit() ) ); + menu->insertItem( i18n("&Remove"), this, TQ_SLOT( remove() ) ); menu->insertSeparator(); } - menu->insertItem( i18n("&Add..."), this, TQT_SLOT( add() ) ); + menu->insertItem( i18n("&Add..."), this, TQ_SLOT( add() ) ); menu->popup( pos ); } @@ -368,23 +368,23 @@ void ResourceSelection::updateView() KPIM::ResourceABC* resource = dynamic_cast<KPIM::ResourceABC *>( *it ); if ( resource ) { disconnect( resource, 0, this, 0 ); - connect( resource, TQT_SIGNAL( signalSubresourceAdded( KPIM::ResourceABC *, + connect( resource, TQ_SIGNAL( signalSubresourceAdded( KPIM::ResourceABC *, const TQString &, const TQString & ) ), - TQT_SLOT( slotSubresourceAdded( KPIM::ResourceABC *, + TQ_SLOT( slotSubresourceAdded( KPIM::ResourceABC *, const TQString &, const TQString & ) ) ); - connect( resource, TQT_SIGNAL( signalSubresourceRemoved( KPIM::ResourceABC *, + connect( resource, TQ_SIGNAL( signalSubresourceRemoved( KPIM::ResourceABC *, const TQString &, const TQString & ) ), - TQT_SLOT( slotSubresourceRemoved( KPIM::ResourceABC *, + TQ_SLOT( slotSubresourceRemoved( KPIM::ResourceABC *, const TQString &, const TQString & ) ) ); - connect( resource, TQT_SIGNAL( signalSubresourceChanged( KPIM::ResourceABC *, + connect( resource, TQ_SIGNAL( signalSubresourceChanged( KPIM::ResourceABC *, const TQString &, const TQString & ) ), - TQT_SLOT( slotSubresourceChanged( KPIM::ResourceABC *, + TQ_SLOT( slotSubresourceChanged( KPIM::ResourceABC *, const TQString &, const TQString & ) ) ); - //connect( resource, TQT_SIGNAL( resourceSaved( KPIM::ResourceABC * ) ), - // TQT_SLOT( closeResource( KPIM::ResourceABC * ) ) ); + //connect( resource, TQ_SIGNAL( resourceSaved( KPIM::ResourceABC * ) ), + // TQ_SLOT( closeResource( KPIM::ResourceABC * ) ) ); item->createSubresourceItems(); } } diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp index a42cc94c..5873ae18 100644 --- a/kaddressbook/filtereditdialog.cpp +++ b/kaddressbook/filtereditdialog.cpp @@ -124,8 +124,8 @@ void FilterEditDialog::initGUI() mNameEdit->setFocus(); topLayout->addWidget( label, 0, 0 ); topLayout->addWidget( mNameEdit, 0, 1 ); - connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( filterNameTextChanged( const TQString&) ) ); + connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( filterNameTextChanged( const TQString&) ) ); mCategoriesView = new TDEListView( page ); mCategoriesView->addColumn( i18n( "Category" ) ); @@ -158,7 +158,7 @@ void FilterEditDialog::filterNameTextChanged( const TQString &text ) void FilterEditDialog::slotHelp() { - kapp->invokeHelp( "using-filters" ); + tdeApp->invokeHelp( "using-filters" ); } FilterDialog::FilterDialog( TQWidget *parent, const char *name ) @@ -260,16 +260,16 @@ void FilterDialog::initGUI() mFilterListBox = new TDEListBox( page ); topLayout->addWidget( mFilterListBox, 0, 0 ); - connect( mFilterListBox, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ), - TQT_SLOT( selectionChanged( TQListBoxItem * ) ) ); - connect( mFilterListBox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ), - TQT_SLOT( edit() ) ); + connect( mFilterListBox, TQ_SIGNAL( selectionChanged( TQListBoxItem * ) ), + TQ_SLOT( selectionChanged( TQListBoxItem * ) ) ); + connect( mFilterListBox, TQ_SIGNAL( doubleClicked ( TQListBoxItem * ) ), + TQ_SLOT( edit() ) ); KButtonBox *buttonBox = new KButtonBox( page, TQt::Vertical ); - buttonBox->addButton( i18n( "&Add..." ), TQT_TQOBJECT(this), TQT_SLOT( add() ) ); - mEditButton = buttonBox->addButton( i18n( "&Edit..." ), TQT_TQOBJECT(this), TQT_SLOT( edit() ) ); + buttonBox->addButton( i18n( "&Add..." ), this, TQ_SLOT( add() ) ); + mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, TQ_SLOT( edit() ) ); mEditButton->setEnabled( false ); - mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) ); + mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQ_SLOT( remove() ) ); mRemoveButton->setEnabled( false ); buttonBox->layout(); diff --git a/kaddressbook/filterselectionwidget.cpp b/kaddressbook/filterselectionwidget.cpp index 7daca0a4..41619cc5 100644 --- a/kaddressbook/filterselectionwidget.cpp +++ b/kaddressbook/filterselectionwidget.cpp @@ -38,8 +38,8 @@ FilterSelectionWidget::FilterSelectionWidget( TQWidget *parent, const char *name mFilterCombo = new KComboBox( this ); label->setBuddy( mFilterCombo ); - connect( mFilterCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SIGNAL( filterActivated( int ) ) ); + connect( mFilterCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SIGNAL( filterActivated( int ) ) ); } FilterSelectionWidget::~FilterSelectionWidget() diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp index 491a9465..bf347272 100644 --- a/kaddressbook/freebusywidget.cpp +++ b/kaddressbook/freebusywidget.cpp @@ -26,7 +26,7 @@ #include <kdialog.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <libkcal/freebusyurlstore.h> @@ -45,8 +45,8 @@ FreeBusyWidget::FreeBusyWidget( TDEABC::AddressBook *ab, TQWidget *parent, const label->setBuddy( mURL ); layout->addWidget( mURL ); - connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( setModified() ) ); + connect( mURL, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( setModified() ) ); } FreeBusyWidget::~FreeBusyWidget() diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index b77a34f9..e1bd2b10 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -28,7 +28,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <knuminput.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqcheckbox.h> #include <tqfile.h> @@ -84,21 +84,21 @@ GeoWidget::GeoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *nam mExtendedButton->setEnabled( false ); topLayout->addMultiCellWidget( mExtendedButton, 3, 3, 1, 2 ); - connect( mLatitudeBox, TQT_SIGNAL( valueChanged( double ) ), - TQT_SLOT( setModified() ) ); - connect( mLongitudeBox, TQT_SIGNAL( valueChanged( double ) ), - TQT_SLOT( setModified() ) ); - connect( mExtendedButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( editGeoData() ) ); - - connect( mGeoIsValid, TQT_SIGNAL( toggled( bool ) ), - mLatitudeBox, TQT_SLOT( setEnabled( bool ) ) ); - connect( mGeoIsValid, TQT_SIGNAL( toggled( bool ) ), - mLongitudeBox, TQT_SLOT( setEnabled( bool ) ) ); - connect( mGeoIsValid, TQT_SIGNAL( toggled( bool ) ), - mExtendedButton, TQT_SLOT( setEnabled( bool ) ) ); - connect( mGeoIsValid, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( setModified() ) ); + connect( mLatitudeBox, TQ_SIGNAL( valueChanged( double ) ), + TQ_SLOT( setModified() ) ); + connect( mLongitudeBox, TQ_SIGNAL( valueChanged( double ) ), + TQ_SLOT( setModified() ) ); + connect( mExtendedButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( editGeoData() ) ); + + connect( mGeoIsValid, TQ_SIGNAL( toggled( bool ) ), + mLatitudeBox, TQ_SLOT( setEnabled( bool ) ) ); + connect( mGeoIsValid, TQ_SIGNAL( toggled( bool ) ), + mLongitudeBox, TQ_SLOT( setEnabled( bool ) ) ); + connect( mGeoIsValid, TQ_SIGNAL( toggled( bool ) ), + mExtendedButton, TQ_SLOT( setEnabled( bool ) ) ); + connect( mGeoIsValid, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( setModified() ) ); } GeoWidget::~GeoWidget() @@ -225,26 +225,26 @@ GeoDialog::GeoDialog( TQWidget *parent, const char *name ) loadCityList(); - connect( mMapWidget, TQT_SIGNAL( changed() ), - TQT_SLOT( geoMapChanged() ) ); - connect( mCityCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( cityInputChanged() ) ); - connect( mLatDegrees, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLatMinutes, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLatSeconds, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLatDirection, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLongDegrees, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLongMinutes, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLongSeconds, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLongDirection, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); + connect( mMapWidget, TQ_SIGNAL( changed() ), + TQ_SLOT( geoMapChanged() ) ); + connect( mCityCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( cityInputChanged() ) ); + connect( mLatDegrees, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLatMinutes, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLatSeconds, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLatDirection, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLongDegrees, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLongMinutes, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLongSeconds, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLongDirection, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); TDEAcceleratorManager::manage( this ); } diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index b20fbfd4..2ff5bdef 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -109,7 +109,7 @@ ImageButton::ImageButton( const TQString &title, TQWidget *parent ) { setAcceptDrops( true ); - connect( this, TQT_SIGNAL( clicked() ), TQT_SLOT( load() ) ); + connect( this, TQ_SIGNAL( clicked() ), TQ_SLOT( load() ) ); } void ImageButton::setReadOnly( bool readOnly ) @@ -216,7 +216,7 @@ void ImageButton::mouseMoveEvent( TQMouseEvent *event ) void ImageButton::contextMenuEvent( TQContextMenuEvent *event ) { TQPopupMenu menu( this ); - menu.insertItem( i18n( "Reset" ), this, TQT_SLOT( clear() ) ); + menu.insertItem( i18n( "Reset" ), this, TQ_SLOT( clear() ) ); menu.exec( event->globalPos() ); } @@ -264,7 +264,7 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title, topLayout->addWidget( box ); - connect( mImageButton, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) ); + connect( mImageButton, TQ_SIGNAL( changed() ), TQ_SIGNAL( changed() ) ); } ImageBaseWidget::~ImageBaseWidget() @@ -302,8 +302,8 @@ ImageWidget::ImageWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char mLogoWidget = new ImageBaseWidget( TDEABC::Addressee::logoLabel(), this ); layout->addWidget( mLogoWidget ); - connect( mPhotoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) ); - connect( mLogoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) ); + connect( mPhotoWidget, TQ_SIGNAL( changed() ), TQ_SLOT( setModified() ) ); + connect( mLogoWidget, TQ_SIGNAL( changed() ), TQ_SLOT( setModified() ) ); } void ImageWidget::loadContact( TDEABC::Addressee *addr ) diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp index b7f812db..6f7ebf29 100644 --- a/kaddressbook/imeditwidget.cpp +++ b/kaddressbook/imeditwidget.cpp @@ -53,15 +53,15 @@ IMEditWidget::IMEditWidget( TQWidget *parent, TDEABC::Addressee &addr, const cha topLayout->addWidget( label, 0, 0 ); mIMEdit = new KLineEdit( this ); - connect( mIMEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); - connect( mIMEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SIGNAL( modified() ) ); + connect( mIMEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); + connect( mIMEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SIGNAL( modified() ) ); label->setBuddy( mIMEdit ); topLayout->addWidget( mIMEdit, 0, 1 ); mEditButton = new TQPushButton( i18n( "Edit IM Addresses..." ), this); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) ); topLayout->addMultiCellWidget( mEditButton, 1, 1, 0, 1 ); topLayout->activate(); diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp index efd68ebd..96b655b4 100644 --- a/kaddressbook/incsearchwidget.cpp +++ b/kaddressbook/incsearchwidget.cpp @@ -73,18 +73,18 @@ IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name ) mInputTimer = new TQTimer( this ); - connect( mInputTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( timeout() ) ); - connect( mSearchText, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( announceDoSearch() ) ); - connect( mSearchText, TQT_SIGNAL( returnPressed() ), - TQT_SLOT( announceDoSearch() ) ); - connect( mFieldCombo, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( announceDoSearch() ) ); - connect( button, TQT_SIGNAL( clicked() ), - mSearchText, TQT_SLOT( clear() ) ); - connect( button, TQT_SIGNAL( clicked() ), - TQT_SLOT( announceDoSearch() ) ); + connect( mInputTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( timeout() ) ); + connect( mSearchText, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( announceDoSearch() ) ); + connect( mSearchText, TQ_SIGNAL( returnPressed() ), + TQ_SLOT( announceDoSearch() ) ); + connect( mFieldCombo, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( announceDoSearch() ) ); + connect( button, TQ_SIGNAL( clicked() ), + mSearchText, TQ_SLOT( clear() ) ); + connect( button, TQ_SIGNAL( clicked() ), + TQ_SLOT( announceDoSearch() ) ); initFields(); diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h index 5660fed9..bd6dc6ba 100644 --- a/kaddressbook/interfaces/configurewidget.h +++ b/kaddressbook/interfaces/configurewidget.h @@ -27,7 +27,7 @@ #include <tqwidget.h> #include <tdeconfig.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace TDEABC { class AddressBook; @@ -35,7 +35,7 @@ class AddressBook; namespace KAB { -class KDE_EXPORT ConfigureWidget : public TQWidget +class TDE_EXPORT ConfigureWidget : public TQWidget { public: ConfigureWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h index 5c44e3ec..c9dc07b1 100644 --- a/kaddressbook/interfaces/contacteditorwidget.h +++ b/kaddressbook/interfaces/contacteditorwidget.h @@ -28,13 +28,13 @@ #include <tdeabc/addressbook.h> #include <klibloader.h> -#include <kdemacros.h> +#include <tdemacros.h> #define KAB_CEW_PLUGIN_VERSION 1 namespace KAB { -class KDE_EXPORT ContactEditorWidget : public TQWidget +class TDE_EXPORT ContactEditorWidget : public TQWidget { TQ_OBJECT diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h index 05ab8d91..57a84d70 100644 --- a/kaddressbook/interfaces/core.h +++ b/kaddressbook/interfaces/core.h @@ -35,7 +35,7 @@ #include <tdeabc/field.h> #include <kcommand.h> #include <kxmlguiclient.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace TDEABC { class AddressBook; @@ -52,7 +52,7 @@ namespace KAB { class SearchManager; -class KDE_EXPORT Core : public TQObject +class TDE_EXPORT Core : public TQObject { TQ_OBJECT @@ -155,32 +155,32 @@ class KDE_EXPORT Core : public TQObject virtual void setContactSelected( const TQString &uid ) = 0; /** - DCOP METHOD: Adds the given email address to address book. + DCOP method: Adds the given email address to address book. */ virtual void addEmail( const TQString& addr ) = 0; /** - DCOP METHOD: Imports the vCard, located at the given url. + DCOP method: Imports the vCard, located at the given url. */ virtual void importVCard( const KURL& url ) = 0; /** - DCOP METHOD: Imports the given vCard. + DCOP method: Imports the given vCard. */ virtual void importVCardFromData( const TQString& vCard ) = 0; /** - DCOP METHOD: Opens contact editor to input a new contact. + DCOP method: Opens contact editor to input a new contact. */ virtual void newContact() = 0; /** - DCOP METHOD: Opens distribution list editor to input a new distribution list. + DCOP method: Opens distribution list editor to input a new distribution list. */ virtual void newDistributionList() = 0; /** - DCOP METHOD: Returns the name of the contact, that matches the given + DCOP method: Returns the name of the contact, that matches the given phone number. */ virtual TQString getNameByPhone( const TQString& phone ) = 0; diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h index 8422a3c2..43c29898 100644 --- a/kaddressbook/interfaces/extensionwidget.h +++ b/kaddressbook/interfaces/extensionwidget.h @@ -28,7 +28,7 @@ #include <tdeabc/addressbook.h> #include <klibloader.h> -#include <kdemacros.h> +#include <tdemacros.h> #define KAB_EXTENSIONWIDGET_PLUGIN_VERSION 1 @@ -36,7 +36,7 @@ namespace KAB { class Core; class ConfigureWidget; -class KDE_EXPORT ExtensionWidget : public TQWidget +class TDE_EXPORT ExtensionWidget : public TQWidget { TQ_OBJECT diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp index a2874e8c..19ab9b99 100644 --- a/kaddressbook/interfaces/xxport.cpp +++ b/kaddressbook/interfaces/xxport.cpp @@ -25,7 +25,7 @@ #include <tqsignalmapper.h> #include <tdeaction.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdemessagebox.h> #include <tdeapplication.h> #include "xxport.h" @@ -50,10 +50,10 @@ XXPort::XXPort( TDEABC::AddressBook *ab, TQWidget *parent, d->mExportMapper = new TQSignalMapper( this ); d->mImportMapper = new TQSignalMapper( this ); - connect( d->mExportMapper, TQT_SIGNAL( mapped( const TQString& ) ), - TQT_SLOT( slotExportActivated( const TQString& ) ) ); - connect( d->mImportMapper, TQT_SIGNAL( mapped( const TQString& ) ), - TQT_SLOT( slotImportActivated( const TQString& ) ) ); + connect( d->mExportMapper, TQ_SIGNAL( mapped( const TQString& ) ), + TQ_SLOT( slotExportActivated( const TQString& ) ) ); + connect( d->mImportMapper, TQ_SIGNAL( mapped( const TQString& ) ), + TQ_SLOT( slotImportActivated( const TQString& ) ) ); } XXPort::~XXPort() @@ -77,7 +77,7 @@ TDEABC::AddresseeList XXPort::importContacts( const TQString& ) const void XXPort::createImportAction( const TQString &label, const TQString &data ) { TQString id = "file_import_" + identifier() + ( data.isEmpty() ? TQString( "" ) : "_" + data ); - TDEAction *action = new TDEAction( label, 0, d->mImportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() ); + TDEAction *action = new TDEAction( label, 0, d->mImportMapper, TQ_SLOT( map() ), actionCollection(), id.latin1() ); d->mImportMapper->setMapping( action, ( data.isEmpty() ? TQString( "<empty>" ) : data ) ); @@ -87,7 +87,7 @@ void XXPort::createImportAction( const TQString &label, const TQString &data ) void XXPort::createExportAction( const TQString &label, const TQString &data ) { TQString id = "file_export_" + identifier() + ( data.isEmpty() ? TQString( "" ) : "_" + data ); - TDEAction *action = new TDEAction( label, 0, d->mExportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() ); + TDEAction *action = new TDEAction( label, 0, d->mExportMapper, TQ_SLOT( map() ), actionCollection(), id.latin1() ); d->mExportMapper->setMapping( action, ( data.isEmpty() ? TQString( "<empty>" ) : data ) ); diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index bed5b057..e46d8d5f 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -30,7 +30,7 @@ #include <tdeabc/addresseelist.h> #include <klibloader.h> #include <kxmlguiclient.h> -#include <kdemacros.h> +#include <tdemacros.h> #define KAB_XXPORT_PLUGIN_VERSION 1 @@ -44,7 +44,7 @@ class TDEApplication; @see: K_EXPORT_COMPONENT_FACTORY() */ #define K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libname, XXPortClass, catalog ) \ - class KDE_NO_EXPORT localXXPortFactory : public KAB::XXPortFactory { \ + class TDE_NO_EXPORT localXXPortFactory : public KAB::XXPortFactory { \ KAB::XXPort *xxportObject( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) \ { const char *cat = catalog; \ if (cat) TDEGlobal::locale()->insertCatalogue(cat); \ @@ -65,7 +65,7 @@ class TDEApplication; namespace KAB { -class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient +class TDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient { TQ_OBJECT diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index 1a1d249c..f58546ca 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -132,7 +132,7 @@ void JumpButtonBar::updateButtons() for ( uint i = 0; i < characters.count(); ++i ) { JumpButton *button = new JumpButton( characters[ i ], TQString(), mGroupBox ); - connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( letterClicked() ) ); + connect( button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( letterClicked() ) ); mButtons.append( button ); button->show(); } @@ -151,7 +151,7 @@ void JumpButtonBar::updateButtons() if ( characters.count() - current <= possibleButtons - i ) { JumpButton *button = new JumpButton( characters[ current ], TQString(), mGroupBox ); - connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( letterClicked() ) ); + connect( button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( letterClicked() ) ); mButtons.append( button ); button->show(); current++; @@ -163,7 +163,7 @@ void JumpButtonBar::updateButtons() range.append( characters[ j ] ); JumpButton *button = new JumpButton( characters[ current ], characters[ pos ], mGroupBox ); - connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( letterClicked() ) ); + connect( button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( letterClicked() ) ); mButtons.append( button ); button->show(); current = ( i + 1 ) * offset; diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index cdd0a7c7..00e6cfe5 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -59,7 +59,7 @@ #include <kprotocolinfo.h> #include <kpushbutton.h> #include <tderesources/selectdialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstatusbar.h> #include <kstdguiitem.h> #include <kxmlguiclient.h> @@ -94,7 +94,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, const TQString &file, const char *name ) - : KAB::Core( client, TQT_TQOBJECT(parent), name ), mStatusBar( 0 ), mViewManager( 0 ), + : KAB::Core( client, parent, name ), mStatusBar( 0 ), mViewManager( 0 ), mExtensionManager( 0 ), mJumpButtonBar( 0 ), mCategorySelectDialog( 0 ), mCategoryEditDialog( 0 ), mLdapSearchDialog( 0 ), mReadWrite( readWrite ), mModified( false ) @@ -104,8 +104,8 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, mIsPart = !parent->isA( "KAddressBookMain" ); mAddressBookChangedTimer = new TQTimer( this ); - connect( mAddressBookChangedTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( addressBookChanged() ) ); + connect( mAddressBookChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( addressBookChanged() ) ); if ( file.isEmpty() ) { mAddressBook = TDEABC::StdAddressBook::self( true ); @@ -140,51 +140,51 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, mAddressBook->addCustomField( i18n( "Blog" ), TDEABC::Field::Personal, "BlogFeed", "KADDRESSBOOK" ); - mSearchManager = new KAB::SearchManager( mAddressBook, TQT_TQOBJECT(parent) ); + mSearchManager = new KAB::SearchManager( mAddressBook, parent ); - connect( mSearchManager, TQT_SIGNAL( contactsUpdated() ), - this, TQT_SLOT( slotContactsUpdated() ) ); + connect( mSearchManager, TQ_SIGNAL( contactsUpdated() ), + this, TQ_SLOT( slotContactsUpdated() ) ); initGUI(); - connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - TQT_SLOT( delayedAddressBookChanged() ) ); - connect( mAddressBook, TQT_SIGNAL( loadingFinished( Resource* ) ), - TQT_SLOT( delayedAddressBookChanged() ) ); + connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + TQ_SLOT( delayedAddressBookChanged() ) ); + connect( mAddressBook, TQ_SIGNAL( loadingFinished( Resource* ) ), + TQ_SLOT( delayedAddressBookChanged() ) ); mIncSearchWidget->setFocus(); - connect( mViewManager, TQT_SIGNAL( selected( const TQString& ) ), - TQT_SLOT( setContactSelected( const TQString& ) ) ); - connect( mViewManager, TQT_SIGNAL( executed( const TQString& ) ), - TQT_SLOT( editContact( const TQString& ) ) ); - connect( mViewManager, TQT_SIGNAL( modified() ), - TQT_SLOT( setModified() ) ); - connect( mViewManager, TQT_SIGNAL( urlDropped( const KURL& ) ), - mXXPortManager, TQT_SLOT( importVCard( const KURL& ) ) ); - connect( mViewManager, TQT_SIGNAL( viewFieldsChanged() ), - TQT_SLOT( updateIncSearchWidget() ) ); - connect( mExtensionManager, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ), - this, TQT_SLOT( extensionModified( const TDEABC::Addressee::List& ) ) ); - connect( mExtensionManager, TQT_SIGNAL( deleted( const TQStringList& ) ), - this, TQT_SLOT( extensionDeleted( const TQStringList& ) ) ); - - connect( mXXPortManager, TQT_SIGNAL( modified() ), - TQT_SLOT( setModified() ) ); - - connect( mDetailsViewer, TQT_SIGNAL( highlightedMessage( const TQString& ) ), - TQT_SLOT( detailsHighlighted( const TQString& ) ) ); - - connect( mIncSearchWidget, TQT_SIGNAL( scrollUp() ), - mViewManager, TQT_SLOT( scrollUp() ) ); - connect( mIncSearchWidget, TQT_SIGNAL( scrollDown() ), - mViewManager, TQT_SLOT( scrollDown() ) ); + connect( mViewManager, TQ_SIGNAL( selected( const TQString& ) ), + TQ_SLOT( setContactSelected( const TQString& ) ) ); + connect( mViewManager, TQ_SIGNAL( executed( const TQString& ) ), + TQ_SLOT( editContact( const TQString& ) ) ); + connect( mViewManager, TQ_SIGNAL( modified() ), + TQ_SLOT( setModified() ) ); + connect( mViewManager, TQ_SIGNAL( urlDropped( const KURL& ) ), + mXXPortManager, TQ_SLOT( importVCard( const KURL& ) ) ); + connect( mViewManager, TQ_SIGNAL( viewFieldsChanged() ), + TQ_SLOT( updateIncSearchWidget() ) ); + connect( mExtensionManager, TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ), + this, TQ_SLOT( extensionModified( const TDEABC::Addressee::List& ) ) ); + connect( mExtensionManager, TQ_SIGNAL( deleted( const TQStringList& ) ), + this, TQ_SLOT( extensionDeleted( const TQStringList& ) ) ); + + connect( mXXPortManager, TQ_SIGNAL( modified() ), + TQ_SLOT( setModified() ) ); + + connect( mDetailsViewer, TQ_SIGNAL( highlightedMessage( const TQString& ) ), + TQ_SLOT( detailsHighlighted( const TQString& ) ) ); + + connect( mIncSearchWidget, TQ_SIGNAL( scrollUp() ), + mViewManager, TQ_SLOT( scrollUp() ) ); + connect( mIncSearchWidget, TQ_SIGNAL( scrollDown() ), + mViewManager, TQ_SLOT( scrollDown() ) ); mAddressBookService = new KAddressBookService( this ); mCommandHistory = new KCommandHistory( actionCollection(), true ); - connect( mCommandHistory, TQT_SIGNAL( commandExecuted() ), - mSearchManager, TQT_SLOT( reload() ) ); + connect( mCommandHistory, TQ_SIGNAL( commandExecuted() ), + mSearchManager, TQ_SLOT( reload() ) ); mSearchManager->reload(); @@ -192,7 +192,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, TDEAcceleratorManager::manage( mWidget ); - mKIMProxy = ::KIMProxy::instance( kapp->dcopClient() ); + mKIMProxy = ::KIMProxy::instance( tdeApp->dcopClient() ); } KABCore::~KABCore() @@ -453,7 +453,7 @@ void KABCore::sendMail() void KABCore::sendMail( const TQString& email ) { - kapp->invokeMailer( email, "" ); + tdeApp->invokeMailer( email, "" ); } void KABCore::mailVCard() @@ -477,7 +477,7 @@ void KABCore::startChat() void KABCore::browse( const TQString& url ) { - kapp->invokeBrowser( url ); + tdeApp->invokeBrowser( url ); } void KABCore::selectAllContacts() @@ -1026,10 +1026,10 @@ void KABCore::openLDAPDialog() if ( !mLdapSearchDialog ) { mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this, mWidget ); - connect( mLdapSearchDialog, TQT_SIGNAL( addresseesAdded() ), - TQT_SLOT( addressBookChanged() ) ); - connect( mLdapSearchDialog, TQT_SIGNAL( addresseesAdded() ), - TQT_SLOT( setModified() ) ); + connect( mLdapSearchDialog, TQ_SIGNAL( addresseesAdded() ), + TQ_SLOT( addressBookChanged() ) ); + connect( mLdapSearchDialog, TQ_SIGNAL( addresseesAdded() ), + TQ_SLOT( setModified() ) ); } else mLdapSearchDialog->restoreSettings(); @@ -1043,8 +1043,8 @@ void KABCore::configure() saveSettings(); KCMultiDialog dlg( mWidget, "", true ); - connect( &dlg, TQT_SIGNAL( configCommitted() ), - this, TQT_SLOT( configurationChanged() ) ); + connect( &dlg, TQ_SIGNAL( configCommitted() ), + this, TQ_SLOT( configurationChanged() ) ); dlg.addModule( "kabconfig.desktop" ); dlg.addModule( "kabldapconfig.desktop" ); @@ -1157,10 +1157,10 @@ AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( TQWidget *parent, { AddresseeEditorDialog *dialog = new AddresseeEditorDialog( this, parent, name ? name : "editorDialog" ); - connect( dialog, TQT_SIGNAL( contactModified( const TDEABC::Addressee& ) ), - TQT_SLOT( contactModified( const TDEABC::Addressee& ) ) ); - connect( dialog, TQT_SIGNAL( editorDestroyed( const TQString& ) ), - TQT_SLOT( slotEditorDestroyed( const TQString& ) ) ); + connect( dialog, TQ_SIGNAL( contactModified( const TDEABC::Addressee& ) ), + TQ_SLOT( contactModified( const TDEABC::Addressee& ) ) ); + connect( dialog, TQ_SIGNAL( editorDestroyed( const TQString& ) ), + TQ_SLOT( slotEditorDestroyed( const TQString& ) ) ); return dialog; } @@ -1199,8 +1199,8 @@ void KABCore::initGUI() searchTB->boxLayout()->setSpacing( KDialog::spacingHint() ); mIncSearchWidget = new IncSearchWidget( searchTB, "tde toolbar widget"); searchTB->setStretchableWidget( mIncSearchWidget ); - connect( mIncSearchWidget, TQT_SIGNAL( doSearch( const TQString& ) ), - TQT_SLOT( incrementalTextSearch( const TQString& ) ) ); + connect( mIncSearchWidget, TQ_SIGNAL( doSearch( const TQString& ) ), + TQ_SLOT( incrementalTextSearch( const TQString& ) ) ); mDetailsSplitter = new TQSplitter( mWidget ); @@ -1212,10 +1212,10 @@ void KABCore::initGUI() mDetailsStack = new TQWidgetStack( mDetailsSplitter ); mExtensionManager = new ExtensionManager( new TQWidget( mLeftSplitter ), mDetailsStack, this, this ); - connect( mExtensionManager, TQT_SIGNAL( detailsWidgetDeactivated( TQWidget* ) ), - this, TQT_SLOT( deactivateDetailsWidget( TQWidget* ) ) ); - connect( mExtensionManager, TQT_SIGNAL( detailsWidgetActivated( TQWidget* ) ), - this, TQT_SLOT( activateDetailsWidget( TQWidget* ) ) ); + connect( mExtensionManager, TQ_SIGNAL( detailsWidgetDeactivated( TQWidget* ) ), + this, TQ_SLOT( deactivateDetailsWidget( TQWidget* ) ) ); + connect( mExtensionManager, TQ_SIGNAL( detailsWidgetActivated( TQWidget* ) ), + this, TQ_SLOT( activateDetailsWidget( TQWidget* ) ) ); TQWidget *viewWidget = new TQWidget( mLeftSplitter ); if ( KABPrefs::instance()->contactListAboveExtensions() ) @@ -1244,8 +1244,8 @@ void KABCore::initGUI() i18n( "Click this button if you want to add more contacts to " "the current distribution list. You will be shown a dialog that allows " "to enter a list of existing contacts to this distribution list." ) ); - connect( mAddDistListButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( editSelectedDistributionList() ) ); + connect( mAddDistListButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( editSelectedDistributionList() ) ); buttonLayout->addWidget( mAddDistListButton ); mDistListButtonWidget->setShown( false ); viewLayout->addWidget( mDistListButtonWidget ); @@ -1257,16 +1257,16 @@ void KABCore::initGUI() TQWhatsThis::add( mRemoveDistListButton, i18n( "Click this button if you want to remove the selected contacts from " "the current distribution list." ) ); - connect( mRemoveDistListButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeSelectedContactsFromDistList() ) ); + connect( mRemoveDistListButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeSelectedContactsFromDistList() ) ); buttonLayout->addWidget( mRemoveDistListButton ); #endif mFilterSelectionWidget = new FilterSelectionWidget( searchTB , "tde toolbar widget" ); mViewManager->setFilterSelectionWidget( mFilterSelectionWidget ); - connect( mFilterSelectionWidget, TQT_SIGNAL( filterActivated( int ) ), - mViewManager, TQT_SLOT( setActiveFilter( int ) ) ); + connect( mFilterSelectionWidget, TQ_SIGNAL( filterActivated( int ) ), + mViewManager, TQ_SLOT( setActiveFilter( int ) ) ); mDetailsWidget = new TQWidget( mDetailsSplitter ); mDetailsLayout = new TQHBoxLayout( mDetailsWidget ); @@ -1280,19 +1280,19 @@ void KABCore::initGUI() detailsPageLayout->addWidget( mDetailsViewer ); mDistListEntryView = new KAB::DistributionListEntryView( this, mWidget ); - connect( mDistListEntryView, TQT_SIGNAL( distributionListClicked( const TQString& ) ), - this, TQT_SLOT( sendMailToDistributionList( const TQString& ) ) ); + connect( mDistListEntryView, TQ_SIGNAL( distributionListClicked( const TQString& ) ), + this, TQ_SLOT( sendMailToDistributionList( const TQString& ) ) ); mDetailsStack->addWidget( mDistListEntryView ); mDetailsStack->addWidget( mDetailsWidget ); mDetailsStack->raiseWidget( mDetailsWidget ); mDetailsSplitter->moveToLast( mDetailsStack ); - connect( mDetailsViewer, TQT_SIGNAL( addressClicked( const TQString&) ), - this, TQT_SLOT( showContactsAddress( const TQString& ) ) ); + connect( mDetailsViewer, TQ_SIGNAL( addressClicked( const TQString&) ), + this, TQ_SLOT( showContactsAddress( const TQString& ) ) ); topLayout->setStretchFactor( mDetailsSplitter, 1 ); - mXXPortManager = new XXPortManager( this, TQT_TQOBJECT(mWidget) ); + mXXPortManager = new XXPortManager( this, mWidget ); initActions(); } @@ -1303,62 +1303,62 @@ void KABCore::createJumpButtonBar() mDetailsLayout->addWidget( mJumpButtonBar ); mDetailsLayout->setStretchFactor( mJumpButtonBar, 1 ); - connect( mJumpButtonBar, TQT_SIGNAL( jumpToLetter( const TQString& ) ), - TQT_SLOT( incrementalJumpButtonSearch( const TQString& ) ) ); - connect( mViewManager, TQT_SIGNAL( sortFieldChanged() ), - mJumpButtonBar, TQT_SLOT( updateButtons() ) ); + connect( mJumpButtonBar, TQ_SIGNAL( jumpToLetter( const TQString& ) ), + TQ_SLOT( incrementalJumpButtonSearch( const TQString& ) ) ); + connect( mViewManager, TQ_SIGNAL( sortFieldChanged() ), + mJumpButtonBar, TQ_SLOT( updateButtons() ) ); } void KABCore::initActions() { - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - TQT_SLOT( clipboardDataChanged() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + TQ_SLOT( clipboardDataChanged() ) ); TDEAction *action; // file menu mActionMail = new TDEAction( i18n( "&Send Email to Contact..." ), "mail-send", 0, - this, TQT_SLOT( sendMail() ), actionCollection(), "file_mail" ); - action = KStdAction::print( this, TQT_SLOT( print() ), actionCollection() ); + this, TQ_SLOT( sendMail() ), actionCollection(), "file_mail" ); + action = KStdAction::print( this, TQ_SLOT( print() ), actionCollection() ); mActionMail->setWhatsThis( i18n( "Send a mail to all selected contacts." ) ); action->setWhatsThis( i18n( "Print a special number of contacts." ) ); mActionSave = KStdAction::save( this, - TQT_SLOT( save() ), actionCollection(), "file_sync" ); + TQ_SLOT( save() ), actionCollection(), "file_sync" ); mActionSave->setWhatsThis( i18n( "Save all changes of the address book to the storage backend." ) ); action = new TDEAction( i18n( "&New Contact..." ), "identity", CTRL+Key_N, this, - TQT_SLOT( newContact() ), actionCollection(), "file_new_contact" ); + TQ_SLOT( newContact() ), actionCollection(), "file_new_contact" ); action->setWhatsThis( i18n( "Create a new contact<p>You will be presented with a dialog where you can add all data about a person, including addresses and phone numbers." ) ); action = new TDEAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this, - TQT_SLOT( newDistributionList() ), actionCollection(), "file_new_distributionlist" ); + TQ_SLOT( newDistributionList() ), actionCollection(), "file_new_distributionlist" ); action->setWhatsThis( i18n( "Create a new distribution list<p>You will be presented with a dialog where you can create a new distribution list." ) ); mActionMailVCard = new TDEAction( i18n("Send &Contact..."), "mail_post_to", 0, - this, TQT_SLOT( mailVCard() ), + this, TQ_SLOT( mailVCard() ), actionCollection(), "file_mail_vcard" ); mActionMailVCard->setWhatsThis( i18n( "Send a mail with the selected contact as attachment." ) ); mActionChat = new TDEAction( i18n("Chat &With..."), 0, - this, TQT_SLOT( startChat() ), + this, TQ_SLOT( startChat() ), actionCollection(), "file_chat" ); mActionChat->setWhatsThis( i18n( "Start a chat with the selected contact." ) ); mActionEditAddressee = new TDEAction( i18n( "&Edit Contact..." ), "edit", 0, - this, TQT_SLOT( editContact() ), + this, TQ_SLOT( editContact() ), actionCollection(), "file_properties" ); mActionEditAddressee->setWhatsThis( i18n( "Edit a contact<p>You will be presented with a dialog where you can change all data about a person, including addresses and phone numbers." ) ); mActionMerge = new TDEAction( i18n( "&Merge Contacts" ), "", 0, - this, TQT_SLOT( mergeContacts() ), + this, TQ_SLOT( mergeContacts() ), actionCollection(), "edit_merge" ); // edit menu - mActionCopy = KStdAction::copy( this, TQT_SLOT( copyContacts() ), actionCollection() ); - mActionCut = KStdAction::cut( this, TQT_SLOT( cutContacts() ), actionCollection() ); - mActionPaste = KStdAction::paste( this, TQT_SLOT( pasteContacts() ), actionCollection() ); - action = KStdAction::selectAll( this, TQT_SLOT( selectAllContacts() ), actionCollection() ); + mActionCopy = KStdAction::copy( this, TQ_SLOT( copyContacts() ), actionCollection() ); + mActionCut = KStdAction::cut( this, TQ_SLOT( cutContacts() ), actionCollection() ); + mActionPaste = KStdAction::paste( this, TQ_SLOT( pasteContacts() ), actionCollection() ); + action = KStdAction::selectAll( this, TQ_SLOT( selectAllContacts() ), actionCollection() ); mActionCopy->setWhatsThis( i18n( "Copy the currently selected contact(s) to system clipboard in vCard format." ) ); mActionCut->setWhatsThis( i18n( "Cuts the currently selected contact(s) to system clipboard in vCard format." ) ); mActionPaste->setWhatsThis( i18n( "Paste the previously cut or copied contacts from clipboard." ) ); @@ -1367,19 +1367,19 @@ void KABCore::initActions() // mActionRedo->setWhatsThis( i18n( "Redoes the last <b>Cut</b>, <b>Copy</b> or <b>Paste</b>." ) ); mActionDelete = new TDEAction( i18n( "&Delete Contact" ), "edit-delete", - Key_Delete, this, TQT_SLOT( deleteContacts() ), + Key_Delete, this, TQ_SLOT( deleteContacts() ), actionCollection(), "edit_delete" ); mActionDelete->setWhatsThis( i18n( "Delete all selected contacts." ) ); mActionCopyAddresseeTo = new TDEAction( i18n( "&Copy Contact To..." ), "", 0, - this, TQT_SLOT( copySelectedContactToResource() ), + this, TQ_SLOT( copySelectedContactToResource() ), actionCollection(), "copy_contact_to" ); const TQString copyMoveWhatsThis = i18n( "Store a contact in a different Addressbook<p>You will be presented with a dialog where you can select a new storage place for this contact." ); mActionCopyAddresseeTo->setWhatsThis( copyMoveWhatsThis ); mActionMoveAddresseeTo = new TDEAction( i18n( "M&ove Contact To..." ), "", 0, - this, TQT_SLOT( moveSelectedContactToResource() ), + this, TQ_SLOT( moveSelectedContactToResource() ), actionCollection(), "move_contact_to" ); mActionMoveAddresseeTo->setWhatsThis( copyMoveWhatsThis ); @@ -1388,41 +1388,41 @@ void KABCore::initActions() actionCollection(), "options_show_jump_bar" ); mActionJumpBar->setWhatsThis( i18n( "Toggle whether the jump button bar shall be visible." ) ); mActionJumpBar->setCheckedState( i18n( "Hide Jump Bar") ); - connect( mActionJumpBar, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setJumpButtonBarVisible( bool ) ) ); + connect( mActionJumpBar, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( setJumpButtonBarVisible( bool ) ) ); mActionDetails = new TDEToggleAction( i18n( "Show Details" ), 0, 0, actionCollection(), "options_show_details" ); mActionDetails->setWhatsThis( i18n( "Toggle whether the details page shall be visible." ) ); mActionDetails->setCheckedState( i18n( "Hide Details") ); - connect( mActionDetails, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setDetailsVisible( bool ) ) ); + connect( mActionDetails, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( setDetailsVisible( bool ) ) ); if ( mIsPart ) action = new TDEAction( i18n( "&Configure Address Book..." ), "configure", 0, - this, TQT_SLOT( configure() ), actionCollection(), + this, TQ_SLOT( configure() ), actionCollection(), "kaddressbook_configure" ); else - action = KStdAction::preferences( this, TQT_SLOT( configure() ), actionCollection() ); + action = KStdAction::preferences( this, TQ_SLOT( configure() ), actionCollection() ); action->setWhatsThis( i18n( "You will be presented with a dialog, that offers you all possibilities to configure KAddressBook." ) ); // misc action = new TDEAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "edit-find", 0, - this, TQT_SLOT( openLDAPDialog() ), actionCollection(), "ldap_lookup" ); + this, TQ_SLOT( openLDAPDialog() ), actionCollection(), "ldap_lookup" ); action->setWhatsThis( i18n( "Search for contacts on a LDAP server<p>You will be presented with a dialog, where you can search for contacts and select the ones you want to add to your local address book." ) ); mActionWhoAmI = new TDEAction( i18n( "Set as Personal Contact Data" ), "preferences-desktop-personal", 0, this, - TQT_SLOT( setWhoAmI() ), actionCollection(), + TQ_SLOT( setWhoAmI() ), actionCollection(), "edit_set_personal" ); mActionWhoAmI->setWhatsThis( i18n( "Set the personal contact<p>The data of this contact will be used in many other TDE applications, so you do not have to input your personal data several times." ) ); mActionCategories = new TDEAction( i18n( "Select Categories..." ), 0, this, - TQT_SLOT( setCategories() ), actionCollection(), + TQ_SLOT( setCategories() ), actionCollection(), "edit_set_categories" ); mActionCategories->setWhatsThis( i18n( "Set the categories for all selected contacts." ) ); TDEAction *clearLocation = new TDEAction( i18n( "Clear Search Bar" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", - CTRL+Key_L, this, TQT_SLOT( slotClearSearchBar() ), actionCollection(), "clear_search" ); + CTRL+Key_L, this, TQ_SLOT( slotClearSearchBar() ), actionCollection(), "clear_search" ); clearLocation->setWhatsThis( i18n( "Clear Search Bar<p>" "Clears the content of the quick search bar." ) ); @@ -1490,9 +1490,9 @@ void KABCore::setCategories() // Show the category dialog if ( mCategorySelectDialog == 0 ) { mCategorySelectDialog = new KPIM::CategorySelectDialog( KABPrefs::instance(), mWidget ); - connect( mCategorySelectDialog, TQT_SIGNAL( categoriesSelected( const TQStringList& ) ), - TQT_SLOT( categoriesSelected( const TQStringList& ) ) ); - connect( mCategorySelectDialog, TQT_SIGNAL( editCategories() ), TQT_SLOT( editCategories() ) ); + connect( mCategorySelectDialog, TQ_SIGNAL( categoriesSelected( const TQStringList& ) ), + TQ_SLOT( categoriesSelected( const TQStringList& ) ) ); + connect( mCategorySelectDialog, TQ_SIGNAL( editCategories() ), TQ_SLOT( editCategories() ) ); } mCategorySelectDialog->show(); @@ -1537,8 +1537,8 @@ void KABCore::editCategories() { if ( mCategoryEditDialog == 0 ) { mCategoryEditDialog = new KPIM::CategoryEditDialog( KABPrefs::instance(), mWidget ); - connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ), - mCategorySelectDialog, TQT_SLOT( updateCategoryConfig() ) ); + connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ), + mCategorySelectDialog, TQ_SLOT( updateCategoryConfig() ) ); } mCategoryEditDialog->show(); diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 8661251a..0f818470 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -33,7 +33,7 @@ #include <tqwidget.h> #include "core.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace TDEABC { class AddressBook; @@ -80,7 +80,7 @@ typedef struct { int counter; } ResourceMapEntry; -class KDE_EXPORT KABCore : public KAB::Core +class TDE_EXPORT KABCore : public KAB::Core { TQ_OBJECT @@ -293,38 +293,38 @@ class KDE_EXPORT KABCore : public KAB::Core void contactModified( const TDEABC::Addressee &addr ); /** - DCOP METHOD: Adds the given email address to address book. + DCOP method: Adds the given email address to address book. */ virtual void addEmail( const TQString& addr ); /** - DCOP METHOD: Imports the vCard, located at the given url. + DCOP method: Imports the vCard, located at the given url. */ virtual void importVCard( const KURL& url ); /** - DCOP METHOD: Imports the given vCard. + DCOP method: Imports the given vCard. */ virtual void importVCardFromData( const TQString& vCard ); /** - DCOP METHOD: Opens contact editor to input a new contact. + DCOP method: Opens contact editor to input a new contact. */ virtual void newContact(); /** - DCOP METHOD: Opens distribution list editor to create a new distribution list + DCOP method: Opens distribution list editor to create a new distribution list */ virtual void newDistributionList(); /** - DCOP METHOD: Returns the name of the contact, that matches the given + DCOP method: Returns the name of the contact, that matches the given phone number. */ virtual TQString getNameByPhone( const TQString& phone ); /** - DCOP METHOD: Handle command line arguments, return true if handled + DCOP method: Handle command line arguments, return true if handled and false if no args was given. The iface is either the mainwin or the part. */ bool handleCommandLine( KAddressBookIface* iface ); diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp index ddebac13..6fd38387 100644 --- a/kaddressbook/kabtools.cpp +++ b/kaddressbook/kabtools.cpp @@ -97,7 +97,7 @@ void KABTools::mailVCards( const TQStringList &uids, TDEABC::AddressBook *ab ) } } - kapp->invokeMailer( TQString(), TQString(), TQString(), + tdeApp->invokeMailer( TQString(), TQString(), TQString(), TQString(), TQString(), TQString(), diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp index ec815ff6..1ae6e6b7 100644 --- a/kaddressbook/kaddressbook_part.cpp +++ b/kaddressbook/kaddressbook_part.cpp @@ -27,7 +27,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kiconloader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdeparts/genericfactory.h> #include <tdeparts/statusbarextension.h> diff --git a/kaddressbook/kaddressbookiface.h b/kaddressbook/kaddressbookiface.h index c02922d3..16033675 100644 --- a/kaddressbook/kaddressbookiface.h +++ b/kaddressbook/kaddressbookiface.h @@ -27,9 +27,9 @@ #include <dcopobject.h> #include <kurl.h> #include <tqstringlist.h> -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT KAddressBookIface : virtual public DCOPObject +class TDE_EXPORT KAddressBookIface : virtual public DCOPObject { K_DCOP diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp index bfcea2b6..ca6df18b 100644 --- a/kaddressbook/kaddressbookmain.cpp +++ b/kaddressbook/kaddressbookmain.cpp @@ -150,13 +150,13 @@ bool KAddressBookMain::queryClose() void KAddressBookMain::initActions() { - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); TDEAction *action; - action = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( configureKeyBindings() ), actionCollection() ); + action = KStdAction::keyBindings( this, TQ_SLOT( configureKeyBindings() ), actionCollection() ); action->setWhatsThis( i18n( "You will be presented with a dialog, where you can configure the application wide shortcuts." ) ); - KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( configureToolbars() ), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT( configureToolbars() ), actionCollection() ); } void KAddressBookMain::configureKeyBindings() @@ -177,8 +177,8 @@ void KAddressBookMain::configureToolbars() saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); KEditToolbar edit( factory() ); - connect( &edit, TQT_SIGNAL( newToolbarConfig() ), - this, TQT_SLOT( newToolbarConfig() ) ); + connect( &edit, TQ_SIGNAL( newToolbarConfig() ), + this, TQ_SLOT( newToolbarConfig() ) ); edit.exec(); } diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp index d86103db..07df33b6 100644 --- a/kaddressbook/kaddressbookview.cpp +++ b/kaddressbook/kaddressbookview.cpp @@ -43,8 +43,8 @@ KAddressBookView::KAddressBookView( KAB::Core *core, TQWidget *parent, { initGUI(); - connect( mCore->searchManager(), TQT_SIGNAL( contactsUpdated() ), - TQT_SLOT( updateView() ) ); + connect( mCore->searchManager(), TQ_SIGNAL( contactsUpdated() ), + TQ_SLOT( updateView() ) ); } KAddressBookView::~KAddressBookView() diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h index 668c5a1d..3ba9ebdc 100644 --- a/kaddressbook/kaddressbookview.h +++ b/kaddressbook/kaddressbookview.h @@ -31,7 +31,7 @@ #include <tdeabc/field.h> #include <klibloader.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "filter.h" #include "viewconfigurewidget.h" @@ -53,7 +53,7 @@ namespace TDEABC { class AddressBook; } @author Mike Pilone <mpilone@slac.com> */ -class KDE_EXPORT KAddressBookView : public TQWidget +class TDE_EXPORT KAddressBookView : public TQWidget { TQ_OBJECT @@ -273,7 +273,7 @@ class KDE_EXPORT KAddressBookView : public TQWidget TQWidget *mViewWidget; }; -class KDE_EXPORT ViewFactory : public KLibFactory +class TDE_EXPORT ViewFactory : public KLibFactory { public: virtual KAddressBookView *view( KAB::Core *core, TQWidget *parent, diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp index b446d56e..35bc17a1 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.cpp +++ b/kaddressbook/kcmconfigs/addresseewidget.cpp @@ -51,15 +51,15 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label, KDialog::spacingHint() ); mBox = new TQListBox( group ); - connect( mBox, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ), - TQT_SLOT( selectionChanged( TQListBoxItem* ) ) ); + connect( mBox, TQ_SIGNAL( selectionChanged( TQListBoxItem* ) ), + TQ_SLOT( selectionChanged( TQListBoxItem* ) ) ); groupLayout->addWidget( mBox, 0, 0 ); KButtonBox *bbox = new KButtonBox( group, TQt::Vertical ); - mAddButton = bbox->addButton( i18n( "Add..." ), TQT_TQOBJECT(this), TQT_SLOT( add() ) ); - mEditButton = bbox->addButton( i18n( "Edit..." ), TQT_TQOBJECT(this), TQT_SLOT( edit() ) ); + mAddButton = bbox->addButton( i18n( "Add..." ), this, TQ_SLOT( add() ) ); + mEditButton = bbox->addButton( i18n( "Edit..." ), this, TQ_SLOT( edit() ) ); mEditButton->setEnabled( false ); - mRemoveButton = bbox->addButton( i18n( "Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) ); + mRemoveButton = bbox->addButton( i18n( "Remove" ), this, TQ_SLOT( remove() ) ); mRemoveButton->setEnabled( false ); bbox->layout(); groupLayout->addWidget( bbox, 0, 1 ); @@ -157,10 +157,10 @@ AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name ) mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) ); layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 ); - connect( mPrefix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); - connect( mInclusion, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); - connect( mSuffix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); - connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( modified() ) ); + connect( mPrefix, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) ); + connect( mInclusion, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) ); + connect( mSuffix, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) ); + connect( mFormattedNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( modified() ) ); } AddresseeWidget::~AddresseeWidget() diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index 97e5c119..07574e56 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -141,22 +141,22 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) boxLayout->addWidget( mLocationMapURL ); layout->addWidget( groupBox ); - connect( mNameParsing, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); - connect( mViewsSingleClickBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); - connect( mTradeAsFamilyName, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); - connect( mLimitContactDisplay, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); - connect( mPhoneHook, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mSMSHook, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mFaxHook, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mLocationMapURL, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mEditorCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( modified() ) ); + connect( mNameParsing, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) ); + connect( mViewsSingleClickBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) ); + connect( mTradeAsFamilyName, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) ); + connect( mLimitContactDisplay, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) ); + connect( mPhoneHook, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mSMSHook, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mFaxHook, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mLocationMapURL, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mEditorCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( modified() ) ); tabWidget->addTab( generalPage, i18n( "General" ) ); // Addressee page mAddresseeWidget = new AddresseeWidget( this ); tabWidget->addTab( mAddresseeWidget, i18n( "Contact" ) ); - connect( mAddresseeWidget, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); + connect( mAddresseeWidget, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); } void KABConfigWidget::restoreSettings() diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index ce2c9973..733663ab 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -31,11 +31,11 @@ #include "kcmkabconfig.h" -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { - KDE_EXPORT TDECModule *create_kabconfig( TQWidget *parent, const char * ) { + TDE_EXPORT TDECModule *create_kabconfig( TQWidget *parent, const char * ) { return new KCMKabConfig( parent, "kcmkabconfig" ); } } @@ -47,7 +47,7 @@ KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name ) mConfigWidget = new KABConfigWidget( this, "mConfigWidget" ); layout->addWidget( mConfigWidget ); - connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); + connect( mConfigWidget, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) ); load(); diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp index 8905b899..ae420912 100644 --- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp +++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp @@ -25,15 +25,15 @@ #include "kabprefs.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqregexp.h> -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { - KDE_EXPORT TDECModule *create_kabcustomfields( TQWidget *parent, const char * ) { + TDE_EXPORT TDECModule *create_kabcustomfields( TQWidget *parent, const char * ) { return new KCMKabCustomFields( parent, "kcmkabcustomfields" ); } } diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index 0731ae57..a5495127 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -32,11 +32,11 @@ #include "kcmkabldapconfig.h" -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { - KDE_EXPORT TDECModule *create_kabldapconfig( TQWidget *parent, const char * ) { + TDE_EXPORT TDECModule *create_kabldapconfig( TQWidget *parent, const char * ) { return new KCMKabLdapConfig( parent, "kcmkabldapconfig" ); } } @@ -48,7 +48,7 @@ KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name ) mConfigWidget = new LDAPOptionsWidget( this ); layout->addWidget( mConfigWidget ); - connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); + connect( mConfigWidget, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) ); load(); diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp index 4e4b15a9..f8bcfdb9 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -80,14 +80,14 @@ LDAPOptionsWidget::LDAPOptionsWidget( TQWidget* parent, const char* name ) mHostListView->addColumn( TQString() ); mHostListView->header()->hide(); - connect( mHostListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); - connect( mHostListView, TQT_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(slotEditHost())); - connect( mHostListView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - TQT_SLOT( slotItemClicked( TQListViewItem* ) ) ); - - connect( mUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveUp() ) ); - connect( mDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveDown() ) ); + connect( mHostListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( mHostListView, TQ_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT(slotEditHost())); + connect( mHostListView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + TQ_SLOT( slotItemClicked( TQListViewItem* ) ) ); + + connect( mUpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUp() ) ); + connect( mDownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDown() ) ); } LDAPOptionsWidget::~LDAPOptionsWidget() @@ -288,10 +288,10 @@ void LDAPOptionsWidget::initGUI() layout->addWidget( groupBox ); KButtonBox *buttons = new KButtonBox( this ); - buttons->addButton( i18n( "&Add Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotAddHost() ) ); - mEditButton = buttons->addButton( i18n( "&Edit Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotEditHost() ) ); + buttons->addButton( i18n( "&Add Host..." ), this, TQ_SLOT( slotAddHost() ) ); + mEditButton = buttons->addButton( i18n( "&Edit Host..." ), this, TQ_SLOT( slotEditHost() ) ); mEditButton->setEnabled( false ); - mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), TQT_TQOBJECT(this), TQT_SLOT( slotRemoveHost() ) ); + mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), this, TQ_SLOT( slotRemoveHost() ) ); mRemoveButton->setEnabled( false ); buttons->layout(); diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp index c0417b7e..f2682261 100644 --- a/kaddressbook/keywidget.cpp +++ b/kaddressbook/keywidget.cpp @@ -61,9 +61,9 @@ KeyWidget::KeyWidget( TQWidget *parent, const char *name ) mExportButton->setEnabled( false ); layout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addKey() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeKey() ) ); - connect( mExportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( exportKey() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addKey() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeKey() ) ); + connect( mExportButton, TQ_SIGNAL( clicked() ), TQ_SLOT( exportKey() ) ); } KeyWidget::~KeyWidget() @@ -175,7 +175,7 @@ void KeyWidget::exportKey() (*s) << key.textData(); tempFile.close(); - TDEIO::NetAccess::upload( tempFile.name(), url, kapp->mainWidget() ); + TDEIO::NetAccess::upload( tempFile.name(), url, tdeApp->mainWidget() ); } void KeyWidget::updateKeyCombo() diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 8c2c7c6b..8b5b62e0 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -203,8 +203,8 @@ LDAPSearchDialog::LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core, topLayout->addWidget( mResultListView ); KButtonBox *buttons = new KButtonBox( page, TQt::Horizontal ); - buttons->addButton( i18n( "Select All" ), TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ) ); - buttons->addButton( i18n( "Unselect All" ), TQT_TQOBJECT(this), TQT_SLOT( slotUnselectAll() ) ); + buttons->addButton( i18n( "Select All" ), this, TQ_SLOT( slotSelectAll() ) ); + buttons->addButton( i18n( "Unselect All" ), this, TQ_SLOT( slotUnselectAll() ) ); topLayout->addWidget( buttons ); @@ -222,10 +222,10 @@ LDAPSearchDialog::LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core, mNumHosts = 0; mIsOK = false; - connect( mRecursiveCheckbox, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotSetScope( bool ) ) ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStartSearch() ) ); + connect( mRecursiveCheckbox, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotSetScope( bool ) ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStartSearch() ) ); setTabOrder(mSearchEdit, mFilterCombo); setTabOrder(mFilterCombo, mSearchButton); @@ -264,7 +264,7 @@ void LDAPSearchDialog::restoreSettings() } else { mIsOK = true; for ( int j = 0; j < mNumHosts; ++j ) { - KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, TQT_TQOBJECT(this), "ldapclient" ); + KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, this, "ldapclient" ); KPIM::LdapServer ldapServer; KPIM::LdapSearch::readConfig( ldapServer, config, j, true ); ldapClient->setServer( ldapServer ); @@ -275,12 +275,12 @@ void LDAPSearchDialog::restoreSettings() ldapClient->setAttrs( attrs ); - connect( ldapClient, TQT_SIGNAL( result( const KPIM::LdapObject& ) ), - this, TQT_SLOT( slotAddResult( const KPIM::LdapObject& ) ) ); - connect( ldapClient, TQT_SIGNAL( done() ), - this, TQT_SLOT( slotSearchDone() ) ); - connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( slotError( const TQString& ) ) ); + connect( ldapClient, TQ_SIGNAL( result( const KPIM::LdapObject& ) ), + this, TQ_SLOT( slotAddResult( const KPIM::LdapObject& ) ) ); + connect( ldapClient, TQ_SIGNAL( done() ), + this, TQ_SLOT( slotSearchDone() ) ); + connect( ldapClient, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( slotError( const TQString& ) ) ); mLdapClientList.append( ldapClient ); } @@ -387,10 +387,10 @@ void LDAPSearchDialog::slotStartSearch() TQApplication::setOverrideCursor( TQt::waitCursor ); mSearchButton->setText( i18n( "Stop" ) ); - disconnect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStartSearch() ) ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStopSearch() ) ); + disconnect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStartSearch() ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStopSearch() ) ); bool startsWith = (mSearchType->currentItem() == 1); @@ -419,10 +419,10 @@ void LDAPSearchDialog::slotSearchDone() return; } - disconnect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStopSearch() ) ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStartSearch() ) ); + disconnect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStopSearch() ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStartSearch() ) ); mSearchButton->setText( i18n( "&Search" ) ); TQApplication::restoreOverrideCursor(); @@ -468,7 +468,7 @@ TQString LDAPSearchDialog::selectedEMails() const void LDAPSearchDialog::slotHelp() { - kapp->invokeHelp( "ldap-queries" ); + tdeApp->invokeHelp( "ldap-queries" ); } void LDAPSearchDialog::slotUnselectAll() diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp index 2c88e89b..22af385d 100644 --- a/kaddressbook/main.cpp +++ b/kaddressbook/main.cpp @@ -29,18 +29,18 @@ #include <tdeabc/stdaddressbook.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <kcrash.h> +#include <tdecrash.h> #include <kdebug.h> #include <tdelocale.h> #include <tdestartupinfo.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <twin.h> #include "kaddressbookmain.h" #include "kaddressbook_options.h" #include "kabcore.h" -class KAddressBookApp : public KUniqueApplication { +class KAddressBookApp : public TDEUniqueApplication { public: KAddressBookApp() : mMainWin( 0 ), mDefaultIsOpen( false ) {} ~KAddressBookApp() {} @@ -95,13 +95,13 @@ int KAddressBookApp::newInstance() } // Handle startup notification and window activation - // We do it ourselves instead of calling KUniqueApplication::newInstance + // We do it ourselves instead of calling TDEUniqueApplication::newInstance // to avoid the show() call there. #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY static bool firstInstance = true; if ( !firstInstance ) - TDEStartupInfo::setNewStartupId( mMainWin, kapp->startupId() ); + TDEStartupInfo::setNewStartupId( mMainWin, tdeApp->startupId() ); firstInstance = false; #endif @@ -115,7 +115,7 @@ int main( int argc, char *argv[] ) TDECmdLineArgs::init( argc, argv, KABCore::createAboutData() ); TDECmdLineArgs::addCmdLineOptions( kaddressbook_options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); if ( !KAddressBookApp::start() ) return 0; diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp index 0d350ae7..122de250 100644 --- a/kaddressbook/nameeditdialog.cpp +++ b/kaddressbook/nameeditdialog.cpp @@ -105,7 +105,7 @@ NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type, mFormattedNameCombo = new KComboBox( page ); mFormattedNameCombo->setEnabled( !readOnly ); layout->addWidget( mFormattedNameCombo, 5, 1 ); - connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( typeChanged( int ) ) ); + connect( mFormattedNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( typeChanged( int ) ) ); mFormattedNameEdit = new KLineEdit( page ); mFormattedNameEdit->setEnabled( type == CustomName && !readOnly ); @@ -113,8 +113,8 @@ NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type, mParseBox = new TQCheckBox( i18n( "Parse name automatically" ), page ); mParseBox->setEnabled( !readOnly ); - connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( parseBoxChanged(bool) ) ); - connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( modified() ) ); + connect( mParseBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( parseBoxChanged(bool) ) ); + connect( mParseBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( modified() ) ); layout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 ); // Fill in the values @@ -159,24 +159,24 @@ NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type, TDEAcceleratorManager::manage( this ); - connect( mPrefixCombo, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mGivenNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mAdditionalNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mFamilyNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mSuffixCombo, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( modified() ) ); - connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( formattedNameTypeChanged() ) ); - connect( mFormattedNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mFormattedNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( formattedNameChanged( const TQString& ) ) ); + connect( mPrefixCombo, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mGivenNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mAdditionalNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mFamilyNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mSuffixCombo, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mFormattedNameCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( modified() ) ); + connect( mFormattedNameCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( formattedNameTypeChanged() ) ); + connect( mFormattedNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mFormattedNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( formattedNameChanged( const TQString& ) ) ); initTypeCombo(); mFormattedNameCombo->setCurrentItem( type ); @@ -315,7 +315,7 @@ void NameEditDialog::initTypeCombo() void NameEditDialog::slotHelp() { - kapp->invokeHelp( "managing-contacts-automatic-nameparsing" ); + tdeApp->invokeHelp( "managing-contacts-automatic-nameparsing" ); } #include "nameeditdialog.moc" diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index 963af05a..e4857ae7 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp @@ -56,10 +56,10 @@ PhoneTypeCombo::PhoneTypeCombo( TQWidget *parent ) update(); - connect( this, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( selected( int ) ) ); - connect( this, TQT_SIGNAL( activated( int ) ), - this, TQT_SIGNAL( modified() ) ); + connect( this, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( selected( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), + this, TQ_SIGNAL( modified() ) ); } PhoneTypeCombo::~PhoneTypeCombo() @@ -137,8 +137,8 @@ PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent ) layout->addWidget( mTypeCombo ); layout->addWidget( mNumberEdit ); - connect( mTypeCombo, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); - connect( mNumberEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( modified() ) ); + connect( mTypeCombo, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) ); + connect( mNumberEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( modified() ) ); } void PhoneNumberWidget::setNumber( const TDEABC::PhoneNumber &number ) @@ -183,11 +183,11 @@ PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name ) mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() ); layout->addWidget( mRemoveButton, 1, 1 ); - mMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) ); + mMapper = new TQSignalMapper( this ); + connect( mMapper, TQ_SIGNAL( mapped( int ) ), TQ_SLOT( changed( int ) ) ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) ); } PhoneEditWidget::~PhoneEditWidget() @@ -271,8 +271,8 @@ void PhoneEditWidget::recreateNumberWidgets() PhoneNumberWidget *wdg = new PhoneNumberWidget( this ); wdg->setNumber( *it ); - mMapper->setMapping( TQT_TQOBJECT(wdg), counter ); - connect( wdg, TQT_SIGNAL( modified() ), mMapper, TQT_SLOT( map() ) ); + mMapper->setMapping( wdg, counter ); + connect( wdg, TQ_SIGNAL( modified() ), mMapper, TQ_SLOT( map() ) ); mWidgetLayout->addWidget( wdg ); mWidgets.append( wdg ); diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp index 55ac89ca..ee702058 100644 --- a/kaddressbook/printing/detailledstyle.cpp +++ b/kaddressbook/printing/detailledstyle.cpp @@ -35,7 +35,7 @@ #include <tqpaintdevicemetrics.h> #include <tqpainter.h> #include <kprinter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "ds_appearance.h" #include "printingwizard.h" @@ -79,7 +79,7 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na addPage( mPageAppearance, i18n( "Detailed Print Style - Appearance" ) ); - config = kapp->config(); + config = tdeApp->config(); config->setGroup( ConfigSectionName ); kdeFonts = config->readBoolEntry( UseKDEFonts, true ); @@ -145,7 +145,7 @@ void DetailledPrintStyle::print( const TDEABC::Addressee::List &contacts, PrintP TQFont comment = TQFont("Helvetica", 10, TQFont::Normal); // store the configuration settings: - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( ConfigSectionName ); useKDEFonts = mPageAppearance->cbStandardFonts->isChecked(); config->writeEntry( UseKDEFonts, useKDEFonts ); diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp index 25b2e02e..e9ac5979 100644 --- a/kaddressbook/printing/mikesstyle.cpp +++ b/kaddressbook/printing/mikesstyle.cpp @@ -78,7 +78,7 @@ void MikesStyle::print( const TDEABC::Addressee::List &contacts, PrintProgress * for ( it = contacts.begin(); it != contacts.end(); ++it ) { progress->setProgress( (count++ * 100) / contacts.count() ); - kapp->processEvents(); + tdeApp->processEvents(); // Get the total height so we know if it will fit on the current page height = calcHeight( *it, mFont, mBoldFont ); diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp index eecf434c..85bbb6d0 100644 --- a/kaddressbook/printing/printingwizard.cpp +++ b/kaddressbook/printing/printingwizard.cpp @@ -62,7 +62,7 @@ PrintingWizard::PrintingWizard( KPrinter *printer, TDEABC::AddressBook* ab, mSelectionPage->setUseSelection( !selection.isEmpty() ); insertPage( mSelectionPage, i18n("Choose Contacts to Print"), -1 ); - mFilters = Filter::restore( kapp->config(), "Filter" ); + mFilters = Filter::restore( tdeApp->config(), "Filter" ); TQStringList filters; for ( Filter::List::ConstIterator it = mFilters.begin(); it != mFilters.end(); ++it ) filters.append( (*it).name() ); @@ -75,7 +75,7 @@ PrintingWizard::PrintingWizard( KPrinter *printer, TDEABC::AddressBook* ab, mStylePage = new StylePage( mAddressBook, this ); - connect( mStylePage, TQT_SIGNAL( styleChanged(int) ), TQT_SLOT( slotStyleSelected(int) ) ); + connect( mStylePage, TQ_SIGNAL( styleChanged(int) ), TQ_SLOT( slotStyleSelected(int) ) ); insertPage( mStylePage, i18n("Choose Printing Style"), -1 ); registerStyles(); @@ -153,7 +153,7 @@ void PrintingWizard::print() PrintProgress *progress = new PrintProgress( this ); insertPage( progress, i18n( "Print Progress" ), -1 ); showPage( progress ); - kapp->processEvents(); + tdeApp->processEvents(); // prepare list of contacts to print: diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp index 459cfbee..edc9b479 100644 --- a/kaddressbook/printing/printprogress.cpp +++ b/kaddressbook/printing/printprogress.cpp @@ -71,13 +71,13 @@ void PrintProgress::addMessage( const TQString &msg ) body.append( TQString( "<li>" ) + (*it) + TQString( "</li>" ) ); mLogBrowser->setText( head + body + foot ); - kapp->processEvents(); + tdeApp->processEvents(); } void PrintProgress::setProgress( int step ) { mProgressBar->setProgress( step ); - kapp->processEvents(); + tdeApp->processEvents(); } #include "printprogress.moc" diff --git a/kaddressbook/printing/printstyle.cpp b/kaddressbook/printing/printstyle.cpp index 33ef9ab5..ca3fafb9 100644 --- a/kaddressbook/printing/printstyle.cpp +++ b/kaddressbook/printing/printstyle.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tqwidget.h> diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp index 060f839c..5a42444b 100644 --- a/kaddressbook/printing/selectionpage.cpp +++ b/kaddressbook/printing/selectionpage.cpp @@ -90,8 +90,8 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name ) topLayout->addWidget( mButtonGroup ); - connect( mFiltersCombo, TQT_SIGNAL( activated(int) ), TQT_SLOT( filterChanged(int) ) ); - connect( mCategoriesView, TQT_SIGNAL( clicked(TQListViewItem*) ), TQT_SLOT( categoryClicked(TQListViewItem*) ) ); + connect( mFiltersCombo, TQ_SIGNAL( activated(int) ), TQ_SLOT( filterChanged(int) ) ); + connect( mCategoriesView, TQ_SIGNAL( clicked(TQListViewItem*) ), TQ_SLOT( categoryClicked(TQListViewItem*) ) ); } SelectionPage::~SelectionPage() diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp index fc66e147..2278b6b4 100644 --- a/kaddressbook/printing/stylepage.cpp +++ b/kaddressbook/printing/stylepage.cpp @@ -44,7 +44,7 @@ StylePage::StylePage( TDEABC::AddressBook *ab, TQWidget* parent, const char* na mSortTypeCombo->insertItem( i18n( "Ascending" ) ); mSortTypeCombo->insertItem( i18n( "Descending" ) ); - connect( mStyleCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( styleChanged( int ) ) ); + connect( mStyleCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( styleChanged( int ) ) ); } StylePage::~StylePage() diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp index ae2b9c49..56b888ca 100644 --- a/kaddressbook/secrecywidget.cpp +++ b/kaddressbook/secrecywidget.cpp @@ -42,8 +42,8 @@ SecrecyWidget::SecrecyWidget( TQWidget *parent, const char *name ) for ( it = list.begin(); it != list.end(); ++it ) mSecrecyCombo->insertItem( TDEABC::Secrecy::typeLabel( *it ), *it ); - connect( mSecrecyCombo, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SIGNAL( changed() ) ); + connect( mSecrecyCombo, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SIGNAL( changed() ) ); } SecrecyWidget::~SecrecyWidget() diff --git a/kaddressbook/simpleaddresseeeditor.cpp b/kaddressbook/simpleaddresseeeditor.cpp index 7d7914b9..3cfce3f8 100644 --- a/kaddressbook/simpleaddresseeeditor.cpp +++ b/kaddressbook/simpleaddresseeeditor.cpp @@ -72,16 +72,16 @@ void SimpleAddresseeEditor::initGui() mNameEdit = new KLineEdit( this ); topLayout->addWidget( mNameEdit, 0, 1 ); - connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( emitModified() ) ); + connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( emitModified() ) ); label = new TQLabel( i18n( "Email:" ), this ); topLayout->addWidget( label, 1, 0 ); mEmailEdit = new KLineEdit( this ); topLayout->addWidget( mEmailEdit, 1, 1 ); - connect( mEmailEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( emitModified() ) ); + connect( mEmailEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( emitModified() ) ); } void SimpleAddresseeEditor::load() diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp index dd10e211..ff2c2b38 100644 --- a/kaddressbook/soundwidget.cpp +++ b/kaddressbook/soundwidget.cpp @@ -62,20 +62,20 @@ SoundWidget::SoundWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char mUseSoundUrl->setEnabled( false ); topLayout->addWidget( mUseSoundUrl, 1, 2 ); - connect( mSoundUrl, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( setModified() ) ); - connect( mSoundUrl, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( urlChanged( const TQString& ) ) ); - connect( mUseSoundUrl, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( setModified() ) ); - connect( mUseSoundUrl, TQT_SIGNAL( toggled( bool ) ), - mPlayButton, TQT_SLOT( setDisabled( bool ) ) ); - connect( mSoundUrl, TQT_SIGNAL( urlSelected( const TQString& ) ), - TQT_SLOT( loadSound() ) ); - connect( mSoundUrl, TQT_SIGNAL( urlSelected( const TQString& ) ), - TQT_SLOT( updateGUI() ) ); - connect( mPlayButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( playSound() ) ); + connect( mSoundUrl, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( setModified() ) ); + connect( mSoundUrl, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( urlChanged( const TQString& ) ) ); + connect( mUseSoundUrl, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( setModified() ) ); + connect( mUseSoundUrl, TQ_SIGNAL( toggled( bool ) ), + mPlayButton, TQ_SLOT( setDisabled( bool ) ) ); + connect( mSoundUrl, TQ_SIGNAL( urlSelected( const TQString& ) ), + TQ_SLOT( loadSound() ) ); + connect( mSoundUrl, TQ_SIGNAL( urlSelected( const TQString& ) ), + TQ_SLOT( updateGUI() ) ); + connect( mPlayButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( playSound() ) ); TQWhatsThis::add( this, i18n( "This field stores a sound file which contains the name of the contact to clarify the pronunciation." ) ); TQWhatsThis::add( mUseSoundUrl, i18n( "Save only the URL to the sound file, not the whole object." ) ); diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp index 5c0314c3..35c05a21 100644 --- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp +++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp @@ -39,7 +39,7 @@ #include <tdeabc/ldifconverter.h> #include <tdeabc/vcardconverter.h> #include <kpixmapsplitter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobalsettings.h> #include "ldifvcardcreator.h" diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp index aff63dd3..f8163df8 100644 --- a/kaddressbook/undocmds.cpp +++ b/kaddressbook/undocmds.cpp @@ -262,7 +262,7 @@ void CutCommand::unexecute() mAddresseeList.clear(); TQClipboard *cb = TQApplication::clipboard(); - kapp->processEvents(); + tdeApp->processEvents(); cb->setText( mOldText ); } @@ -291,7 +291,7 @@ void CutCommand::execute() TQClipboard *cb = TQApplication::clipboard(); mOldText = cb->text(); - kapp->processEvents(); + tdeApp->processEvents(); #if defined(KABC_VCARD_ENCODING_FIX) cb->setText( TQString::fromUtf8( mClipText.data() ) ); #else diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp index 828825fa..537e2ced 100644 --- a/kaddressbook/viewconfigurefieldspage.cpp +++ b/kaddressbook/viewconfigurefieldspage.cpp @@ -214,7 +214,7 @@ void ViewConfigureFieldsPage::initGUI() mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Personal ) ); mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Organization ) ); mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::CustomCategory ) ); - connect( mCategoryCombo, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotShowFields(int) ) ); + connect( mCategoryCombo, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotShowFields(int) ) ); gl->addWidget( mCategoryCombo, 0, 0 ); TQLabel *label = new TQLabel( i18n( "&Selected fields:" ), this ); @@ -235,12 +235,12 @@ void ViewConfigureFieldsPage::initGUI() mAddButton = new TQToolButton( this ); mAddButton->setIconSet( TQApplication::reverseLayout() ? SmallIconSet( "1leftarrow" ) : SmallIconSet( "1rightarrow" ) ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelect() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSelect() ) ); vb1->addWidget( mAddButton ); mRemoveButton = new TQToolButton( this ); mRemoveButton->setIconSet( TQApplication::reverseLayout() ? SmallIconSet( "1rightarrow" ) : SmallIconSet( "1leftarrow" ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotUnSelect() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotUnSelect() ) ); vb1->addWidget( mRemoveButton ); vb1->addStretch(); @@ -251,12 +251,12 @@ void ViewConfigureFieldsPage::initGUI() mUpButton = new TQToolButton( this ); mUpButton->setIconSet( SmallIconSet( "1uparrow" ) ); - connect( mUpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveUp() ) ); + connect( mUpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotMoveUp() ) ); vb2->addWidget( mUpButton ); mDownButton = new TQToolButton( this ); mDownButton->setIconSet( SmallIconSet( "1downarrow" ) ); - connect( mDownButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveDown() ) ); + connect( mDownButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotMoveDown() ) ); vb2->addWidget( mDownButton ); vb2->addStretch(); @@ -275,9 +275,9 @@ void ViewConfigureFieldsPage::initGUI() gl->activate(); - connect( mUnSelectedBox, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotButtonsEnabled() ) ); - connect( mSelectedBox, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotButtonsEnabled() ) ); - connect( mSelectedBox, TQT_SIGNAL( currentChanged( TQListBoxItem * ) ), TQT_SLOT( slotButtonsEnabled() ) ); + connect( mUnSelectedBox, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotButtonsEnabled() ) ); + connect( mSelectedBox, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotButtonsEnabled() ) ); + connect( mSelectedBox, TQ_SIGNAL( currentChanged( TQListBoxItem * ) ), TQ_SLOT( slotButtonsEnabled() ) ); slotButtonsEnabled(); } diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp index c0d7fa7c..76a355ee 100644 --- a/kaddressbook/viewconfigurefilterpage.cpp +++ b/kaddressbook/viewconfigurefilterpage.cpp @@ -41,7 +41,7 @@ ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *parent, TQBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); mFilterGroup = new TQButtonGroup(); - connect( mFilterGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) ); + connect( mFilterGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( buttonClicked( int ) ) ); TQLabel *label = new TQLabel( i18n( "The default filter will be activated whenever" " this view is displayed. This feature allows you to configure views that only" diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp index cc60ce53..c1b3b85b 100644 --- a/kaddressbook/viewconfigurewidget.cpp +++ b/kaddressbook/viewconfigurewidget.cpp @@ -110,7 +110,7 @@ void ViewConfigureDialog::saveSettings( TDEConfig *config ) void ViewConfigureDialog::slotHelp() { - kapp->invokeHelp( "using-views" ); + tdeApp->invokeHelp( "using-views" ); } #include "viewconfigurewidget.moc" diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h index ad6c8e33..24077e64 100644 --- a/kaddressbook/viewconfigurewidget.h +++ b/kaddressbook/viewconfigurewidget.h @@ -25,7 +25,7 @@ #define VIEWCONFIGUREWIDGET_H #include <kdialogbase.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tqpixmap.h> #include "configurewidget.h" @@ -45,7 +45,7 @@ class ViewConfigureFilterPage; is to show a page with the select fields widget. For simple views this may be sufficient. */ -class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget +class TDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget { TQ_OBJECT diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 47ef542e..125b95c7 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -216,15 +216,15 @@ void ViewManager::setActiveView( const TQString &name ) view->readConfig( config ); // The manager just relays the signals - connect( view, TQT_SIGNAL( selected( const TQString& ) ), - TQT_SIGNAL( selected( const TQString & ) ) ); - connect( view, TQT_SIGNAL( executed( const TQString& ) ), - TQT_SIGNAL( executed( const TQString& ) ) ); - connect( view, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); - connect( view, TQT_SIGNAL( dropped( TQDropEvent* ) ), - TQT_SLOT( dropped( TQDropEvent* ) ) ); - connect( view, TQT_SIGNAL( startDrag() ), TQT_SLOT( startDrag() ) ); - connect( view, TQT_SIGNAL( sortFieldChanged() ), TQT_SIGNAL( sortFieldChanged() ) ); + connect( view, TQ_SIGNAL( selected( const TQString& ) ), + TQ_SIGNAL( selected( const TQString & ) ) ); + connect( view, TQ_SIGNAL( executed( const TQString& ) ), + TQ_SIGNAL( executed( const TQString& ) ) ); + connect( view, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) ); + connect( view, TQ_SIGNAL( dropped( TQDropEvent* ) ), + TQ_SLOT( dropped( TQDropEvent* ) ) ); + connect( view, TQ_SIGNAL( startDrag() ), TQ_SLOT( startDrag() ) ); + connect( view, TQ_SIGNAL( sortFieldChanged() ), TQ_SIGNAL( sortFieldChanged() ) ); } } @@ -568,33 +568,33 @@ void ViewManager::initActions() #if TDE_VERSION >= 309 mActionSelectView->setMenuAccelsEnabled( false ); #endif - connect( mActionSelectView, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( setActiveView( const TQString& ) ) ); + connect( mActionSelectView, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( setActiveView( const TQString& ) ) ); TDEAction *action; - action = new TDEAction( i18n( "Modify View..." ), "configure", 0, TQT_TQOBJECT(this), - TQT_SLOT( editView() ), mCore->actionCollection(), + action = new TDEAction( i18n( "Modify View..." ), "configure", 0, this, + TQ_SLOT( editView() ), mCore->actionCollection(), "view_modify" ); action->setWhatsThis( i18n( "By pressing this button a dialog opens that allows you to modify the view of the addressbook. There you can add or remove fields that you want to be shown or hidden in the addressbook like the name for example." ) ); - action = new TDEAction( i18n( "Add View..." ), "window-new", 0, TQT_TQOBJECT(this), - TQT_SLOT( addView() ), mCore->actionCollection(), + action = new TDEAction( i18n( "Add View..." ), "window-new", 0, this, + TQ_SLOT( addView() ), mCore->actionCollection(), "view_add" ); action->setWhatsThis( i18n( "You can add a new view by choosing one from the dialog that appears after pressing the button. You have to give the view a name, so that you can distinguish between the different views." ) ); mActionDeleteView = new TDEAction( i18n( "Delete View" ), "view_remove", 0, - TQT_TQOBJECT(this), TQT_SLOT( deleteView() ), + this, TQ_SLOT( deleteView() ), mCore->actionCollection(), "view_delete" ); mActionDeleteView->setWhatsThis( i18n( "By pressing this button you can delete the actual view, which you have added before." ) ); - action = new TDEAction( i18n( "Refresh View" ), "reload", 0, TQT_TQOBJECT(this), - TQT_SLOT( refreshView() ), mCore->actionCollection(), + action = new TDEAction( i18n( "Refresh View" ), "reload", 0, this, + TQ_SLOT( refreshView() ), mCore->actionCollection(), "view_refresh" ); action->setWhatsThis( i18n( "The view will be refreshed by pressing this button." ) ); - action = new TDEAction( i18n( "Edit &Filters..." ), "filter", 0, TQT_TQOBJECT(this), - TQT_SLOT( configureFilters() ), mCore->actionCollection(), + action = new TDEAction( i18n( "Edit &Filters..." ), "filter", 0, this, + TQ_SLOT( configureFilters() ), mCore->actionCollection(), "options_edit_filters" ); action->setWhatsThis( i18n( "Edit the contact filters<p>You will be presented with a dialog, where you can add, remove and edit filters." ) ); } diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index e77d66e0..749dc13f 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -590,7 +590,7 @@ CardView::CardView( TQWidget *parent, const char *name ) viewport()->setFocusPolicy(TQWidget::WheelFocus ); viewport()->setBackgroundMode( PaletteBase ); - connect( d->mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( tryShowFullText() ) ); + connect( d->mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( tryShowFullText() ) ); setBackgroundMode( PaletteBackground, PaletteBase ); diff --git a/kaddressbook/views/colorlistbox.cpp b/kaddressbook/views/colorlistbox.cpp index 54ad38b3..a72a644b 100644 --- a/kaddressbook/views/colorlistbox.cpp +++ b/kaddressbook/views/colorlistbox.cpp @@ -28,7 +28,7 @@ ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f ) :TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1) { - connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); + connect( this, TQ_SIGNAL(selected(int)), this, TQ_SLOT(newColor(int)) ); setAcceptDrops( true); } diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 30925303..cbe70109 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -246,7 +246,7 @@ void CardViewLookNFeelPage::initGUI() colorTab->setSpacing( spacing ); colorTab->setMargin( spacing ); cbEnableCustomColors = new TQCheckBox( i18n("&Enable custom colors"), colorTab ); - connect( cbEnableCustomColors, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableColors()) ); + connect( cbEnableCustomColors, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableColors()) ); lbColors = new ColorListBox( colorTab ); tabs->addTab( colorTab, i18n("&Colors") ); @@ -265,7 +265,7 @@ void CardViewLookNFeelPage::initGUI() fntTab->setMargin( spacing ); cbEnableCustomFonts = new TQCheckBox( i18n("&Enable custom fonts"), fntTab ); - connect( cbEnableCustomFonts, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableFonts()) ); + connect( cbEnableCustomFonts, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableFonts()) ); vbFonts = new TQWidget( fntTab ); TQGridLayout *gFnts = new TQGridLayout( vbFonts, 2, 3 ); @@ -277,14 +277,14 @@ void CardViewLookNFeelPage::initGUI() lTextFont->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); btnFont = new KPushButton( i18n("Choose..."), vbFonts ); lTFnt->setBuddy( btnFont ); - connect( btnFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setTextFont()) ); + connect( btnFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(setTextFont()) ); TQLabel *lHFnt = new TQLabel( i18n("&Header font:"), vbFonts ); lHeaderFont = new TQLabel( vbFonts ); lHeaderFont->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); btnHeaderFont = new KPushButton( i18n("Choose..."), vbFonts ); lHFnt->setBuddy( btnHeaderFont ); - connect( btnHeaderFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setHeaderFont()) ); + connect( btnHeaderFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(setHeaderFont()) ); fntTab->setStretchFactor( new TQWidget( fntTab ), 1 ); diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index c4e6cf7b..eb508b3d 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -128,8 +128,8 @@ void LookAndFeelPage::initGUI() mBackgroundBox = new TQCheckBox(i18n("Enable background image:"), this, "mBackgroundBox"); - connect(mBackgroundBox, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(enableBackgroundToggled(bool))); + connect(mBackgroundBox, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(enableBackgroundToggled(bool))); backgroundLayout->addWidget(mBackgroundBox); mBackgroundName = new KURLRequester(this, "mBackgroundName"); diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 715757e8..b23f415c 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -278,8 +278,8 @@ ContactListView::ContactListView(KAddressBookTableView *view, setSelectionModeExt( TDEListView::Extended ); setDropVisualizer(false); - connect(this, TQT_SIGNAL(dropped(TQDropEvent*)), - this, TQT_SLOT(itemDropped(TQDropEvent*))); + connect(this, TQ_SIGNAL(dropped(TQDropEvent*)), + this, TQ_SLOT(itemDropped(TQDropEvent*))); new DynamicTip( this ); } diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 9f169e24..a61ba3a9 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -156,16 +156,16 @@ KAddressBookCardView::KAddressBookCardView( KAB::Core *core, layout->addWidget( mCardView ); // Connect up the signals - connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) ); - connect( mCardView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( addresseeSelected() ) ); - connect( mCardView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ), - this, TQT_SIGNAL( dropped( TQDropEvent* ) ) ); - connect( mCardView, TQT_SIGNAL( startAddresseeDrag() ), - this, TQT_SIGNAL( startDrag() ) ); - connect( mCardView, TQT_SIGNAL( contextMenuRequested( CardViewItem*, const TQPoint& ) ), - this, TQT_SLOT( rmbClicked( CardViewItem*, const TQPoint& ) ) ); + connect( mCardView, TQ_SIGNAL( executed( CardViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) ); + connect( mCardView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( addresseeSelected() ) ); + connect( mCardView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ), + this, TQ_SIGNAL( dropped( TQDropEvent* ) ) ); + connect( mCardView, TQ_SIGNAL( startAddresseeDrag() ), + this, TQ_SIGNAL( startDrag() ) ); + connect( mCardView, TQ_SIGNAL( contextMenuRequested( CardViewItem*, const TQPoint& ) ), + this, TQ_SLOT( rmbClicked( CardViewItem*, const TQPoint& ) ) ); } KAddressBookCardView::~KAddressBookCardView() @@ -227,15 +227,15 @@ void KAddressBookCardView::readConfig( TDEConfig *config ) mCardView->setItemSpacing( config->readNumEntry( "ItemSpacing", 10 ) ); mCardView->setSeparatorWidth( config->readNumEntry( "SeparatorWidth", 2 ) ); - disconnect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) ); + disconnect( mCardView, TQ_SIGNAL( executed( CardViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) ); if ( KABPrefs::instance()->honorSingleClick() ) - connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) ); + connect( mCardView, TQ_SIGNAL( executed( CardViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) ); else - connect( mCardView, TQT_SIGNAL( doubleClicked( CardViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) ); + connect( mCardView, TQ_SIGNAL( doubleClicked( CardViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) ); } void KAddressBookCardView::writeConfig( TDEConfig *config ) diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index 3021f692..66aff6d1 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -70,8 +70,8 @@ AddresseeIconView::AddresseeIconView( TQWidget *parent, const char *name ) setSorting( true, true ); setMode( TDEIconView::Select ); - connect( this, TQT_SIGNAL( dropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ), - this, TQT_SLOT( itemDropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ) ); + connect( this, TQ_SIGNAL( dropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ), + this, TQ_SLOT( itemDropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ) ); } AddresseeIconView::~AddresseeIconView() @@ -145,16 +145,16 @@ KAddressBookIconView::KAddressBookIconView( KAB::Core *core, layout->addWidget( mIconView ); // Connect up the signals - connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); - connect( mIconView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( addresseeSelected() ) ); - connect( mIconView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ), - this, TQT_SIGNAL( dropped( TQDropEvent* ) ) ); - connect( mIconView, TQT_SIGNAL( startAddresseeDrag() ), - this, TQT_SIGNAL( startDrag() ) ); - connect( mIconView, TQT_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ), - this, TQT_SLOT( rmbClicked( TQIconViewItem*, const TQPoint& ) ) ); + connect( mIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); + connect( mIconView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( addresseeSelected() ) ); + connect( mIconView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ), + this, TQ_SIGNAL( dropped( TQDropEvent* ) ) ); + connect( mIconView, TQ_SIGNAL( startAddresseeDrag() ), + this, TQ_SIGNAL( startDrag() ) ); + connect( mIconView, TQ_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ), + this, TQ_SLOT( rmbClicked( TQIconViewItem*, const TQPoint& ) ) ); } KAddressBookIconView::~KAddressBookIconView() @@ -171,15 +171,15 @@ void KAddressBookIconView::readConfig( TDEConfig *config ) { KAddressBookView::readConfig( config ); - disconnect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); + disconnect( mIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); if ( KABPrefs::instance()->honorSingleClick() ) - connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); + connect( mIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); else - connect( mIconView, TQT_SIGNAL( doubleClicked( TQIconViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); + connect( mIconView, TQ_SIGNAL( doubleClicked( TQIconViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); } TQStringList KAddressBookIconView::selectedUids() diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index ad39eb64..a7d0d38b 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -103,16 +103,16 @@ KAddressBookTableView::~KAddressBookTableView() void KAddressBookTableView::reconstructListView() { if ( mListView ) { - disconnect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( addresseeSelected() ) ); - disconnect( mListView, TQT_SIGNAL( executed( TQListViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) ); - disconnect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) ); - disconnect( mListView, TQT_SIGNAL( startAddresseeDrag() ), - this, TQT_SIGNAL( startDrag() ) ); - disconnect( mListView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ), - this, TQT_SIGNAL( dropped( TQDropEvent* ) ) ); + disconnect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( addresseeSelected() ) ); + disconnect( mListView, TQ_SIGNAL( executed( TQListViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) ); + disconnect( mListView, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) ); + disconnect( mListView, TQ_SIGNAL( startAddresseeDrag() ), + this, TQ_SIGNAL( startDrag() ) ); + disconnect( mListView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ), + this, TQ_SIGNAL( dropped( TQDropEvent* ) ) ); delete mListView; } @@ -141,23 +141,23 @@ void KAddressBookTableView::reconstructListView() mListView->setFullWidth( true ); - connect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( addresseeSelected() ) ); - connect( mListView, TQT_SIGNAL( startAddresseeDrag() ), - this, TQT_SIGNAL( startDrag() ) ); - connect( mListView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ), - this, TQT_SIGNAL( dropped( TQDropEvent* ) ) ); - connect( mListView, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( rmbClicked( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); - connect( mListView->header(), TQT_SIGNAL( clicked( int ) ), - this, TQT_SIGNAL( sortFieldChanged() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( addresseeSelected() ) ); + connect( mListView, TQ_SIGNAL( startAddresseeDrag() ), + this, TQ_SIGNAL( startDrag() ) ); + connect( mListView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ), + this, TQ_SIGNAL( dropped( TQDropEvent* ) ) ); + connect( mListView, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( rmbClicked( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( mListView->header(), TQ_SIGNAL( clicked( int ) ), + this, TQ_SIGNAL( sortFieldChanged() ) ); if ( KABPrefs::instance()->honorSingleClick() ) - connect( mListView, TQT_SIGNAL( executed( TQListViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) ); + connect( mListView, TQ_SIGNAL( executed( TQListViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) ); else - connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) ); + connect( mListView, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) ); refresh(); @@ -186,14 +186,14 @@ void KAddressBookTableView::readConfig( TDEConfig *config ) if ( config->readBoolEntry( "InstantMessagingPresence", false ) ) { if ( !mIMProxy ) { - mIMProxy = KIMProxy::instance( kapp->dcopClient() ); - connect( mIMProxy, TQT_SIGNAL( sigContactPresenceChanged( const TQString& ) ), - this, TQT_SLOT( updatePresence( const TQString& ) ) ); + mIMProxy = KIMProxy::instance( tdeApp->dcopClient() ); + connect( mIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ), + this, TQ_SLOT( updatePresence( const TQString& ) ) ); } } else { if ( mIMProxy ) { - disconnect( mIMProxy, TQT_SIGNAL( sigContactPresenceChanged( const TQString& ) ), - this, TQT_SLOT( updatePresence( const TQString& ) ) ); + disconnect( mIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ), + this, TQ_SLOT( updatePresence( const TQString& ) ) ); mIMProxy = 0; } } diff --git a/kaddressbook/xxport/bookmark_xxport.cpp b/kaddressbook/xxport/bookmark_xxport.cpp index f2249526..0ab1bba8 100644 --- a/kaddressbook/xxport/bookmark_xxport.cpp +++ b/kaddressbook/xxport/bookmark_xxport.cpp @@ -27,7 +27,7 @@ #include <kbookmarkmenu.h> #include <kbookmarkdombuilder.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "bookmark_xxport.h" diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 63989199..4b0a1c9e 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -41,7 +41,7 @@ #include <kinputdialog.h> #include <tdemessagebox.h> #include <kprogress.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include "dateparser.h" @@ -121,33 +121,33 @@ CSVImportDialog::CSVImportDialog( TDEABC::AddressBook *ab, TQWidget *parent, reloadCodecs(); - connect( mDelimiterBox, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( delimiterClicked( int ) ) ); - connect( mDelimiterEdit, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( returnPressed() ) ); - connect( mDelimiterEdit, TQT_SIGNAL( textChanged ( const TQString& ) ), - this, TQT_SLOT( textChanged ( const TQString& ) ) ); - connect( mComboLine, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( lineSelected( const TQString& ) ) ); - connect( mComboQuote, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( textquoteSelected( const TQString& ) ) ); - connect( mIgnoreDuplicates, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( ignoreDuplicatesChanged( int ) ) ); - connect( mCodecCombo, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( codecChanged() ) ); - - connect( mUrlRequester, TQT_SIGNAL( returnPressed( const TQString& ) ), - this, TQT_SLOT( setFile( const TQString& ) ) ); - connect( mUrlRequester, TQT_SIGNAL( urlSelected( const TQString& ) ), - this, TQT_SLOT( setFile( const TQString& ) ) ); - connect( mUrlRequester->lineEdit(), TQT_SIGNAL( textChanged ( const TQString& ) ), - this, TQT_SLOT( urlChanged( const TQString& ) ) ); - - connect( this, TQT_SIGNAL( user1Clicked() ), - this, TQT_SLOT( applyTemplate() ) ); - - connect( this, TQT_SIGNAL( user2Clicked() ), - this, TQT_SLOT( saveTemplate() ) ); + connect( mDelimiterBox, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( delimiterClicked( int ) ) ); + connect( mDelimiterEdit, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( returnPressed() ) ); + connect( mDelimiterEdit, TQ_SIGNAL( textChanged ( const TQString& ) ), + this, TQ_SLOT( textChanged ( const TQString& ) ) ); + connect( mComboLine, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( lineSelected( const TQString& ) ) ); + connect( mComboQuote, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( textquoteSelected( const TQString& ) ) ); + connect( mIgnoreDuplicates, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( ignoreDuplicatesChanged( int ) ) ); + connect( mCodecCombo, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( codecChanged() ) ); + + connect( mUrlRequester, TQ_SIGNAL( returnPressed( const TQString& ) ), + this, TQ_SLOT( setFile( const TQString& ) ) ); + connect( mUrlRequester, TQ_SIGNAL( urlSelected( const TQString& ) ), + this, TQ_SLOT( setFile( const TQString& ) ) ); + connect( mUrlRequester->lineEdit(), TQ_SIGNAL( textChanged ( const TQString& ) ), + this, TQ_SLOT( urlChanged( const TQString& ) ) ); + + connect( this, TQ_SIGNAL( user1Clicked() ), + this, TQ_SLOT( applyTemplate() ) ); + + connect( this, TQ_SIGNAL( user2Clicked() ), + this, TQ_SLOT( saveTemplate() ) ); } CSVImportDialog::~CSVImportDialog() @@ -166,7 +166,7 @@ TDEABC::AddresseeList CSVImportDialog::contacts() const progressDialog.setLabel( i18n( "Importing contacts" ) ); progressDialog.show(); - kapp->processEvents(); + tdeApp->processEvents(); for ( int row = 1; row < mTable->numRows(); ++row ) { TDEABC::Addressee a; @@ -344,7 +344,7 @@ TDEABC::AddresseeList CSVImportDialog::contacts() const } } - kapp->processEvents(); + tdeApp->processEvents(); if ( progressDialog.wasCancelled() ) return TDEABC::AddresseeList(); @@ -792,12 +792,12 @@ void CSVImportDialog::applyTemplate() TQStringList templates; // load all template files - TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) + + TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( tdeApp->name() ) + "/csv-templates/*.desktop", true, true ); for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) { - KSimpleConfig config( *it, true ); + TDESimpleConfig config( *it, true ); if ( !config.hasGroup( "csv column map" ) ) continue; @@ -817,7 +817,7 @@ void CSVImportDialog::applyTemplate() if ( !ok ) return; - KSimpleConfig config( fileMap[ tmp ], true ); + TDESimpleConfig config( fileMap[ tmp ], true ); config.setGroup( "General" ); mDatePatternEdit->setText( config.readEntry( "DatePattern", "Y-M-D" ) ); uint numColumns = config.readUnsignedNumEntry( "Columns" ); @@ -848,7 +848,7 @@ void CSVImportDialog::applyTemplate() void CSVImportDialog::saveTemplate() { TQString fileName = KFileDialog::getSaveFileName( - locateLocal( "data", TQString( kapp->name() ) + "/csv-templates/" ), + locateLocal( "data", TQString( tdeApp->name() ) + "/csv-templates/" ), "*.desktop", this ); if ( fileName.isEmpty() ) diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp index 58ae2afd..6783e4d6 100644 --- a/kaddressbook/xxport/kde2_xxport.cpp +++ b/kaddressbook/xxport/kde2_xxport.cpp @@ -28,8 +28,8 @@ #include <tdeio/netaccess.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <kurl.h> diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp index 59c00f82..4d890b37 100644 --- a/kaddressbook/xxport/pab_xxport.cpp +++ b/kaddressbook/xxport/pab_xxport.cpp @@ -29,8 +29,8 @@ #include <tdeio/netaccess.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <kurl.h> diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 293879cc..797c31d7 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -239,9 +239,22 @@ TDEABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const // With version 3.0, vCards are encoded with UTF-8 by default. Otherwise, use fromLatin1() // and hope that are fields are encoded correctly. - if ( TQString::fromLatin1( rawData ).lower().contains( "version:3.0" ) ) { + bool useUtf8; + TQString tmp = TQString::fromLatin1(rawData).lower(); + int ver = tmp.find("version:"); + if (ver == -1) { + // no version info, assume utf8 + useUtf8 = true; + } + else { + float vCardVersion = tmp.mid(ver + 8, tmp.find("\n", ver)).toFloat(); + useUtf8 = (vCardVersion >= 3.0); + } + + if (useUtf8) { vCardText = TQString::fromUtf8( rawData ); - } else { + } + else { vCardText = TQString::fromLatin1( rawData ); } addrList += parseVCard( vCardText ); @@ -251,7 +264,7 @@ TDEABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const } else { TQString text = i18n( "<qt>When trying to read the vCard, there was an error opening the file '%1': %2</qt>" ); text = text.arg( (*it).url() ); - text = text.arg( kapp->translate( "TQFile", + text = text.arg( tdeApp->translate( "TQFile", TQString(file.errorString()).latin1() ) ); KMessageBox::error( parentWidget(), text, caption ); anyFailures = true; diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp index bdc48f6b..12e6ae9f 100644 --- a/kaddressbook/xxportmanager.cpp +++ b/kaddressbook/xxportmanager.cpp @@ -146,12 +146,12 @@ void XXPortManager::loadPlugins() mCore->guiClient()->insertChildClient( obj ); mXXPortObjects.insert( obj->identifier(), obj ); - connect( obj, TQT_SIGNAL( exportActivated( const TQString&, const TQString& ) ), - this, TQT_SLOT( slotExport( const TQString&, const TQString& ) ) ); - connect( obj, TQT_SIGNAL( importActivated( const TQString&, const TQString& ) ), - this, TQT_SLOT( slotImport( const TQString&, const TQString& ) ) ); + connect( obj, TQ_SIGNAL( exportActivated( const TQString&, const TQString& ) ), + this, TQ_SLOT( slotExport( const TQString&, const TQString& ) ) ); + connect( obj, TQ_SIGNAL( importActivated( const TQString&, const TQString& ) ), + this, TQ_SLOT( slotImport( const TQString&, const TQString& ) ) ); - obj->setTDEApplication( kapp ); + obj->setTDEApplication( tdeApp ); } } } diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h index 02057213..58cbcb75 100644 --- a/kaddressbook/xxportmanager.h +++ b/kaddressbook/xxportmanager.h @@ -29,7 +29,7 @@ #include <kurl.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "xxport.h" @@ -37,7 +37,7 @@ namespace KAB { class Core; } -class KDE_EXPORT XXPortManager : public TQObject +class TDE_EXPORT XXPortManager : public TQObject { TQ_OBJECT diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index b52b41ad..2d7229bf 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp @@ -51,13 +51,13 @@ XXPortSelectDialog::XXPortSelectDialog( KAB::Core *core, bool sort, { initGUI(); - connect( mFiltersCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( filterChanged( int ) ) ); - connect( mCategoriesView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - TQT_SLOT( categoryClicked( TQListViewItem* ) ) ); + connect( mFiltersCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( filterChanged( int ) ) ); + connect( mCategoriesView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + TQ_SLOT( categoryClicked( TQListViewItem* ) ) ); // setup filters - mFilters = Filter::restore( kapp->config(), "Filter" ); + mFilters = Filter::restore( tdeApp->config(), "Filter" ); Filter::List::ConstIterator filterIt; TQStringList filters; for ( filterIt = mFilters.begin(); filterIt != mFilters.end(); ++filterIt ) @@ -172,7 +172,7 @@ void XXPortSelectDialog::categoryClicked( TQListViewItem *i ) void XXPortSelectDialog::slotHelp() { - kapp->invokeHelp( "import-and-export" ); + tdeApp->invokeHelp( "import-and-export" ); } void XXPortSelectDialog::initGUI() diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp index d0150d00..1e08590e 100644 --- a/kalarm/alarmcalendar.cpp +++ b/kalarm/alarmcalendar.cpp @@ -29,7 +29,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <tdeconfig.h> #include <tdeaboutdata.h> @@ -90,7 +90,7 @@ AlarmCalendar* AlarmCalendar::mCalendars[NCALS] = { 0, 0, 0, 0 }; */ bool AlarmCalendar::initialiseCalendars() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup(TQString::fromLatin1("General")); TQString activeKey = TQString::fromLatin1("Calendar"); TQString expiredKey = TQString::fromLatin1("ExpiredCalendar"); @@ -403,7 +403,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile) // Save the change in the config file. if (!mConfigKey.isNull()) { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup(TQString::fromLatin1("General")); config->writePathEntry(mConfigKey, mICalUrl.path()); config->sync(); @@ -615,7 +615,7 @@ void AlarmCalendar::convertToICal() { if (!mConfigKey.isNull()) { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup(TQString::fromLatin1("General")); config->writePathEntry(mConfigKey, mICalUrl.path()); config->sync(); @@ -717,7 +717,7 @@ void AlarmCalendar::purgeIfQueued() void AlarmCalendar::startPurgeTimer() { if (mPurgeDays > 0) - StartOfDayTimer::connect(this, TQT_SLOT(slotPurge())); + StartOfDayTimer::connect(this, TQ_SLOT(slotPurge())); } /****************************************************************************** diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp index 615696cf..6586b896 100644 --- a/kalarm/alarmtimewidget.cpp +++ b/kalarm/alarmtimewidget.cpp @@ -83,7 +83,7 @@ void AlarmTimeWidget::init(int mode) "If a recurrence is configured, the start date/time will be adjusted " "to the first recurrence on or after the entered date/time."); - connect(this, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotButtonSet(int))); + connect(this, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotButtonSet(int))); TQBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); if (!title().isEmpty()) { @@ -101,7 +101,7 @@ void AlarmTimeWidget::init(int mode) // Date edit box mDateEdit = new DateEdit(this); mDateEdit->setFixedSize(mDateEdit->sizeHint()); - connect(mDateEdit, TQT_SIGNAL(dateEntered(const TQDate&)), TQT_SLOT(dateTimeChanged())); + connect(mDateEdit, TQ_SIGNAL(dateEntered(const TQDate&)), TQ_SLOT(dateTimeChanged())); static const TQString enterDateText = i18n("Enter the date to schedule the alarm."); TQWhatsThis::add(mDateEdit, ((mode & DEFER_TIME) ? enterDateText : TQString("%1\n%2").arg(enterDateText).arg(recurText))); @@ -112,7 +112,7 @@ void AlarmTimeWidget::init(int mode) timeBox->setSpacing(2*KDialog::spacingHint()); mTimeEdit = new TimeEdit(timeBox); mTimeEdit->setFixedSize(mTimeEdit->sizeHint()); - connect(mTimeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dateTimeChanged())); + connect(mTimeEdit, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dateTimeChanged())); static const TQString enterTimeText = i18n("Enter the time to schedule the alarm."); TQWhatsThis::add(mTimeEdit, ((mode & DEFER_TIME) ? TQString("%1\n\n%2").arg(enterTimeText).arg(TimeSpinBox::shiftWhatsThis()) @@ -129,7 +129,7 @@ void AlarmTimeWidget::init(int mode) mAnyTimeAllowed = true; mAnyTimeCheckBox = new CheckBox(i18n("An&y time"), timeBox); mAnyTimeCheckBox->setFixedSize(mAnyTimeCheckBox->sizeHint()); - connect(mAnyTimeCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool))); + connect(mAnyTimeCheckBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAnyTimeToggled(bool))); TQWhatsThis::add(mAnyTimeCheckBox, i18n("Schedule the alarm for any time during the day")); } @@ -145,7 +145,7 @@ void AlarmTimeWidget::init(int mode) mDelayTimeEdit = new TimeSpinBox(1, maxDelayTime, this); mDelayTimeEdit->setValue(maxDelayTime); mDelayTimeEdit->setFixedSize(mDelayTimeEdit->sizeHint()); - connect(mDelayTimeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(delayTimeChanged(int))); + connect(mDelayTimeEdit, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(delayTimeChanged(int))); TQWhatsThis::add(mDelayTimeEdit, ((mode & DEFER_TIME) ? TQString("%1\n\n%2").arg(i18n_TimeAfterPeriod()).arg(TimeSpinBox::shiftWhatsThis()) : TQString("%1\n%2\n\n%3").arg(i18n_TimeAfterPeriod()).arg(recurText).arg(TimeSpinBox::shiftWhatsThis()))); @@ -182,7 +182,7 @@ void AlarmTimeWidget::init(int mode) setButton(id(mAtTimeRadio)); // Timeout every minute to update alarm time fields. - MinuteTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(slotTimer())); + MinuteTimer::connect(this, TQ_SLOT(slotTimer())); } /****************************************************************************** diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index 322d6fb3..6ebe07a6 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -80,7 +80,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) // Prefix and suffix to the name in the alarm text // Get default prefix and suffix texts from config file - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup(TQString::fromLatin1("General")); mPrefixText = config->readEntry(TQString::fromLatin1("BirthdayPrefix"), i18n("Birthday: ")); mSuffixText = config->readEntry(TQString::fromLatin1("BirthdaySuffix")); @@ -91,7 +91,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) mPrefix = new BLineEdit(mPrefixText, textGroup); mPrefix->setMinimumSize(mPrefix->sizeHint()); label->setBuddy(mPrefix); - connect(mPrefix, TQT_SIGNAL(focusLost()), TQT_SLOT(slotTextLostFocus())); + connect(mPrefix, TQ_SIGNAL(focusLost()), TQ_SLOT(slotTextLostFocus())); TQWhatsThis::add(mPrefix, i18n("Enter text to appear before the person's name in the alarm message, " "including any necessary trailing spaces.")); @@ -100,7 +100,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) mSuffix = new BLineEdit(mSuffixText, textGroup); mSuffix->setMinimumSize(mSuffix->sizeHint()); label->setBuddy(mSuffix); - connect(mSuffix, TQT_SIGNAL(focusLost()), TQT_SLOT(slotTextLostFocus())); + connect(mSuffix, TQ_SIGNAL(focusLost()), TQ_SLOT(slotTextLostFocus())); TQWhatsThis::add(mSuffix, i18n("Enter text to appear after the person's name in the alarm message, " "including any necessary leading spaces.")); @@ -114,7 +114,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) mAddresseeList->setFullWidth(true); mAddresseeList->addColumn(i18n("Name")); mAddresseeList->addColumn(i18n("Birthday")); - connect(mAddresseeList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(mAddresseeList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); TQWhatsThis::add(mAddresseeList, i18n("Select birthdays to set alarms for.\n" "This list shows all birthdays in KAddressBook except those for which alarms already exist.\n\n" @@ -198,7 +198,7 @@ void BirthdayDlg::loadAddressBook() #if KDE_IS_VERSION(3,1,90) mAddressBook = TDEABC::StdAddressBook::self(true); if (mAddressBook) - connect(mAddressBook, TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT(updateSelectionList())); + connect(mAddressBook, TQ_SIGNAL(addressBookChanged(AddressBook*)), TQ_SLOT(updateSelectionList())); #else mAddressBook = TDEABC::StdAddressBook::self(); if (mAddressBook) @@ -343,7 +343,7 @@ TQValueList<KAEvent> BirthdayDlg::events() const void BirthdayDlg::slotOk() { // Save prefix and suffix texts to use as future defaults - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup(TQString::fromLatin1("General")); config->writeEntry(TQString::fromLatin1("BirthdayPrefix"), mPrefix->text()); config->writeEntry(TQString::fromLatin1("BirthdaySuffix"), mSuffix->text()); @@ -421,7 +421,7 @@ BListView::BListView(TQWidget* parent, const char* name) : TDEListView(parent, name) { TDEAccel* accel = new TDEAccel(this); - accel->insert(TDEStdAccel::SelectAll, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll())); - accel->insert(TDEStdAccel::Deselect, TQT_TQOBJECT(this), TQT_SLOT(slotDeselect())); + accel->insert(TDEStdAccel::SelectAll, this, TQ_SLOT(slotSelectAll())); + accel->insert(TDEStdAccel::Deselect, this, TQ_SLOT(slotDeselect())); accel->readSettings(); } diff --git a/kalarm/calendarcompat.cpp b/kalarm/calendarcompat.cpp index 9a5aca37..cc7431f9 100644 --- a/kalarm/calendarcompat.cpp +++ b/kalarm/calendarcompat.cpp @@ -86,7 +86,7 @@ int CalendarCompat::readKAlarmVersion(KCal::Calendar& calendar, TQString& subVer { // Older versions used KAlarm's translated name in the product ID, which // could have created problems using a calendar in different locales. - progname = TQString(" ") + kapp->aboutData()->programName() + ' '; + progname = TQString(" ") + tdeApp->aboutData()->programName() + ' '; i = prodid.find(progname, 0, false); if (i < 0) return 0; // calendar wasn't created by KAlarm diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp index 842514d9..264e0a5b 100644 --- a/kalarm/daemon.cpp +++ b/kalarm/daemon.cpp @@ -23,7 +23,7 @@ #include <tqtimer.h> #include <tqiconset.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdeaboutdata.h> #include <tdemessagebox.h> @@ -95,7 +95,7 @@ void Daemon::initialise() { if (!mInstance) mInstance = new Daemon(); - connect(AlarmCalendar::activeCalendar(), TQT_SIGNAL(calendarSaved(AlarmCalendar*)), mInstance, TQT_SLOT(slotCalendarSaved(AlarmCalendar*))); + connect(AlarmCalendar::activeCalendar(), TQ_SIGNAL(calendarSaved(AlarmCalendar*)), mInstance, TQ_SLOT(slotCalendarSaved(AlarmCalendar*))); } /****************************************************************************** @@ -111,10 +111,10 @@ void Daemon::createDcopHandler() mRunning = isRunning(false); mStatusTimerInterval = Preferences::daemonTrayCheckInterval(); - Preferences::connect(TQT_SIGNAL(preferencesChanged()), mInstance, TQT_SLOT(slotPreferencesChanged())); + Preferences::connect(TQ_SIGNAL(preferencesChanged()), mInstance, TQ_SLOT(slotPreferencesChanged())); mStatusTimer = new TQTimer(mInstance); - connect(mStatusTimer, TQT_SIGNAL(timeout()), mInstance, TQT_SLOT(timerCheckIfRunning())); + connect(mStatusTimer, TQ_SIGNAL(timeout()), mInstance, TQ_SLOT(timerCheckIfRunning())); mStatusTimer->start(mStatusTimerInterval * 1000); // check regularly if daemon is running } @@ -132,7 +132,7 @@ bool Daemon::start() { if (mStartTimer) return true; // we're currently waiting for the daemon to start - // Start the alarm daemon. It is a KUniqueApplication, which means that + // Start the alarm daemon. It is a TDEUniqueApplication, which means that // there is automatically only one instance of the alarm daemon running. TQString execStr = locate("exe", TQString::fromLatin1(DAEMON_APP_NAME)); if (execStr.isEmpty()) @@ -145,7 +145,7 @@ bool Daemon::start() kdDebug(5950) << "Daemon::start(): Alarm daemon started" << endl; mStartTimeout = 5000/startCheckInterval + 1; // check daemon status for 5 seconds before giving up mStartTimer = new TQTimer(mInstance); - connect(mStartTimer, TQT_SIGNAL(timeout()), mInstance, TQT_SLOT(checkIfStarted())); + connect(mStartTimer, TQ_SIGNAL(timeout()), mInstance, TQ_SLOT(checkIfStarted())); mStartTimer->start(startCheckInterval); mInstance->checkIfStarted(); return true; @@ -188,12 +188,12 @@ bool Daemon::registerWith(bool reregister) bool disabledIfStopped = theApp()->alarmsDisabledIfStopped(); kdDebug(5950) << (reregister ? "Daemon::reregisterWith(): " : "Daemon::registerWith(): ") << (disabledIfStopped ? "NO_START" : "COMMAND_LINE") << endl; - TQCString appname = kapp->aboutData()->appName(); + TQCString appname = tdeApp->aboutData()->appName(); AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT); if (reregister) s.registerChange(appname, !disabledIfStopped); else - s.registerApp(appname, kapp->aboutData()->programName(), TQCString(NOTIFY_DCOP_OBJECT), AlarmCalendar::activeCalendar()->urlString(), !disabledIfStopped); + s.registerApp(appname, tdeApp->aboutData()->programName(), TQCString(NOTIFY_DCOP_OBJECT), AlarmCalendar::activeCalendar()->urlString(), !disabledIfStopped); if (!s.ok()) { kdError(5950) << "Daemon::registerWith(" << reregister << "): DCOP error" << endl; @@ -201,7 +201,7 @@ bool Daemon::registerWith(bool reregister) return false; } mRegisterTimer = new TQTimer(mInstance); - connect(mRegisterTimer, TQT_SIGNAL(timeout()), mInstance, TQT_SLOT(registerTimerExpired())); + connect(mRegisterTimer, TQ_SIGNAL(timeout()), mInstance, TQ_SLOT(registerTimerExpired())); mRegisterTimer->start(REGISTER_TIMEOUT * 1000); // wait for the reply return true; } @@ -233,11 +233,11 @@ void Daemon::registrationResult(bool reregister, int result, int version) // We've successfully registered with the daemon, but the daemon can't // find the KAlarm executable so won't be able to restart KAlarm if // KAlarm exits. - kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << kapp->aboutData()->appName() << " not found\n"; + kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << tdeApp->aboutData()->appName() << " not found\n"; KMessageBox::error(0, i18n("Alarms will be disabled if you stop KAlarm.\n" "(Installation or configuration error: %1 cannot locate %2 executable.)") .arg(TQString::fromLatin1(DAEMON_APP_NAME)) - .arg(kapp->aboutData()->appName())); + .arg(tdeApp->aboutData()->appName())); break; case KAlarmd::FAILURE: default: @@ -314,7 +314,7 @@ void Daemon::checkIfStarted() */ void Daemon::updateRegisteredStatus(bool timeout) { - if (!kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME)) + if (!tdeApp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME)) { mStatus = STOPPED; mRegisterFailMsg = false; @@ -327,7 +327,7 @@ void Daemon::updateRegisteredStatus(bool timeout) // The daemon has newly been detected as registered with DCOP. // Wait for a short time to ensure that it is ready for DCOP calls. mStatus = RUNNING; - TQTimer::singleShot(startCheckInterval, mInstance, TQT_SLOT(slotStarted())); + TQTimer::singleShot(startCheckInterval, mInstance, TQ_SLOT(slotStarted())); break; case RUNNING: if (timeout) @@ -350,7 +350,7 @@ void Daemon::updateRegisteredStatus(bool timeout) bool Daemon::stop() { kdDebug(5950) << "Daemon::stop()" << endl; - if (kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME)) + if (tdeApp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME)) { AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT); s.quit(); @@ -371,10 +371,10 @@ bool Daemon::stop() bool Daemon::reset() { kdDebug(5950) << "Daemon::reset()" << endl; - if (!kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME)) + if (!tdeApp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME)) return false; AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT); - s.resetCalendar(TQCString(kapp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString()); + s.resetCalendar(TQCString(tdeApp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString()); if (!s.ok()) kdError(5950) << "Daemon::reset(): resetCalendar dcop send failed" << endl; return true; @@ -387,7 +387,7 @@ void Daemon::reload() { kdDebug(5950) << "Daemon::reload()\n"; AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT); - s.reloadCalendar(TQCString(kapp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString()); + s.reloadCalendar(TQCString(tdeApp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString()); if (!s.ok()) kdError(5950) << "Daemon::reload(): reloadCalendar dcop send failed" << endl; } @@ -569,8 +569,8 @@ void Daemon::slotPreferencesChanged() AlarmEnableAction* Daemon::createAlarmEnableAction(TDEActionCollection* actions, const char* name) { AlarmEnableAction* a = new AlarmEnableAction(0, actions, name); - connect(a, TQT_SIGNAL(userClicked(bool)), mInstance, TQT_SLOT(setAlarmsEnabled(bool))); - connect(mInstance, TQT_SIGNAL(daemonRunning(bool)), a, TQT_SLOT(setCheckedActual(bool))); + connect(a, TQ_SIGNAL(userClicked(bool)), mInstance, TQ_SLOT(setAlarmsEnabled(bool))); + connect(mInstance, TQ_SIGNAL(daemonRunning(bool)), a, TQ_SLOT(setCheckedActual(bool))); return a; } @@ -635,7 +635,7 @@ void Daemon::notifyEventHandled(const TQString& eventId, bool reloadCal) { kdDebug(5950) << "Daemon::notifyEventHandled(" << eventId << (reloadCal ? "): reload" : ")") << endl; AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT); - s.eventHandled(TQCString(kapp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString(), eventId, reloadCal); + s.eventHandled(TQCString(tdeApp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString(), eventId, reloadCal); if (!s.ok()) kdError(5950) << "Daemon::notifyEventHandled(): eventHandled dcop send failed" << endl; } diff --git a/kalarm/deferdlg.cpp b/kalarm/deferdlg.cpp index c5fab880..7a37f3f9 100644 --- a/kalarm/deferdlg.cpp +++ b/kalarm/deferdlg.cpp @@ -53,7 +53,7 @@ DeferAlarmDlg::DeferAlarmDlg(const TQString& caption, const DateTime& initialDT, mTimeWidget = new AlarmTimeWidget(AlarmTimeWidget::DEFER_TIME, page, "timeGroup"); mTimeWidget->setDateTime(initialDT); mTimeWidget->setMinDateTimeIsCurrent(); - connect(mTimeWidget, TQT_SIGNAL(pastMax()), TQT_SLOT(slotPastLimit())); + connect(mTimeWidget, TQ_SIGNAL(pastMax()), TQ_SLOT(slotPastLimit())); layout->addWidget(mTimeWidget); layout->addSpacing(spacingHint()); diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp index 5ceb16e1..5652ba66 100644 --- a/kalarm/editdlg.cpp +++ b/kalarm/editdlg.cpp @@ -49,7 +49,7 @@ #include <kurlcompletion.h> #include <twin.h> #include <twinmodule.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdguiitem.h> #include <tdeabc/addresseedialog.h> #include <kdebug.h> @@ -211,7 +211,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par mTabs->addTab(mainPageBox, i18n("&Alarm")); mMainPageIndex = 0; PageFrame* mainPage = new PageFrame(mainPageBox); - connect(mainPage, TQT_SIGNAL(shown()), TQT_SLOT(slotShowMainPage())); + connect(mainPage, TQ_SIGNAL(shown()), TQ_SLOT(slotShowMainPage())); TQVBoxLayout* topLayout = new TQVBoxLayout(mainPage, 0, spacingHint()); // Recurrence tab @@ -220,15 +220,15 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par mTabs->addTab(recurTab, TQString()); mRecurPageIndex = 1; mRecurrenceEdit = new RecurrenceEdit(readOnly, recurTab, "recurPage"); - connect(mRecurrenceEdit, TQT_SIGNAL(shown()), TQT_SLOT(slotShowRecurrenceEdit())); - connect(mRecurrenceEdit, TQT_SIGNAL(typeChanged(int)), TQT_SLOT(slotRecurTypeChange(int))); - connect(mRecurrenceEdit, TQT_SIGNAL(frequencyChanged()), TQT_SLOT(slotRecurFrequencyChange())); - connect(mRecurrenceEdit, TQT_SIGNAL(repeatNeedsInitialisation()), TQT_SLOT(slotSetSubRepetition())); + connect(mRecurrenceEdit, TQ_SIGNAL(shown()), TQ_SLOT(slotShowRecurrenceEdit())); + connect(mRecurrenceEdit, TQ_SIGNAL(typeChanged(int)), TQ_SLOT(slotRecurTypeChange(int))); + connect(mRecurrenceEdit, TQ_SIGNAL(frequencyChanged()), TQ_SLOT(slotRecurFrequencyChange())); + connect(mRecurrenceEdit, TQ_SIGNAL(repeatNeedsInitialisation()), TQ_SLOT(slotSetSubRepetition())); // Alarm action mActionGroup = new ButtonGroup(i18n("Action"), mainPage, "actionGroup"); - connect(mActionGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotAlarmTypeChanged(int))); + connect(mActionGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotAlarmTypeChanged(int))); topLayout->addWidget(mActionGroup, 1); TQBoxLayout* layout = new TQVBoxLayout(mActionGroup, marginHint(), spacingHint()); layout->addSpacing(fontMetrics().lineSpacing()/2); @@ -281,7 +281,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par mDeferChangeButton = new TQPushButton(i18n("C&hange..."), mDeferGroup); mDeferChangeButton->setFixedSize(mDeferChangeButton->sizeHint()); - connect(mDeferChangeButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditDeferral())); + connect(mDeferChangeButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditDeferral())); TQWhatsThis::add(mDeferChangeButton, i18n("Change the alarm's deferred time, or cancel the deferral")); mDeferGroup->addSpace(0); @@ -291,7 +291,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par if (mTemplate) { mTemplateTimeGroup = new ButtonGroup(i18n("Time"), mainPage, "templateGroup"); - connect(mTemplateTimeGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotTemplateTimeType(int))); + connect(mTemplateTimeGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotTemplateTimeType(int))); layout->addWidget(mTemplateTimeGroup); grid = new TQGridLayout(mTemplateTimeGroup, 2, 2, marginHint(), spacingHint()); grid->addRowSpacing(0, fontMetrics().lineSpacing()/2); @@ -355,7 +355,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par else { mTimeWidget = new AlarmTimeWidget(i18n("Time"), AlarmTimeWidget::AT_TIME, mainPage, "timeGroup"); - connect(mTimeWidget, TQT_SIGNAL(anyTimeToggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool))); + connect(mTimeWidget, TQ_SIGNAL(anyTimeToggled(bool)), TQ_SLOT(slotAnyTimeToggled(bool))); topLayout->addWidget(mTimeWidget); } @@ -489,7 +489,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent) mCmdTypeScript = new CheckBox(i18n_p_EnterScript(), mCommandFrame); mCmdTypeScript->setFixedSize(mCmdTypeScript->sizeHint()); - connect(mCmdTypeScript, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCmdScriptToggled(bool))); + connect(mCmdTypeScript, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCmdScriptToggled(bool))); TQWhatsThis::add(mCmdTypeScript, i18n("Check to enter the contents of a script instead of a shell command line")); frameLayout->addWidget(mCmdTypeScript, 0, TQt::AlignAuto); @@ -595,7 +595,7 @@ void EditAlarmDlg::initEmail(TQWidget* parent) mEmailAddressButton = new TQPushButton(mEmailFrame); mEmailAddressButton->setPixmap(SmallIcon("contents")); mEmailAddressButton->setFixedSize(mEmailAddressButton->sizeHint()); - connect(mEmailAddressButton, TQT_SIGNAL(clicked()), TQT_SLOT(openAddressBook())); + connect(mEmailAddressButton, TQ_SIGNAL(clicked()), TQ_SLOT(openAddressBook())); TQToolTip::add(mEmailAddressButton, i18n("Open address book")); TQWhatsThis::add(mEmailAddressButton, i18n("Select email addresses from your address book.")); grid->addWidget(mEmailAddressButton, 1, 2); @@ -635,12 +635,12 @@ list->setGeometry(rect.left() - 50, rect.top(), rect.width(), rect.height()); grid->setColStretch(1, 1); mEmailAddAttachButton = new TQPushButton(i18n("Add..."), mEmailFrame); - connect(mEmailAddAttachButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddAttachment())); + connect(mEmailAddAttachButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddAttachment())); TQWhatsThis::add(mEmailAddAttachButton, i18n("Add an attachment to the email.")); grid->addWidget(mEmailAddAttachButton, 0, 2); mEmailRemoveButton = new TQPushButton(i18n("Remo&ve"), mEmailFrame); - connect(mEmailRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveAttachment())); + connect(mEmailRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveAttachment())); TQWhatsThis::add(mEmailRemoveButton, i18n("Remove the highlighted attachment from the email.")); grid->addWidget(mEmailRemoveButton, 1, 2); diff --git a/kalarm/eventlistviewbase.cpp b/kalarm/eventlistviewbase.cpp index 14a7afd6..2425a11b 100644 --- a/kalarm/eventlistviewbase.cpp +++ b/kalarm/eventlistviewbase.cpp @@ -199,7 +199,7 @@ void EventListViewBase::slotFind() if (!mFind) { mFind = new Find(this); - connect(mFind, TQT_SIGNAL(active(bool)), TQT_SIGNAL(findActive(bool))); + connect(mFind, TQ_SIGNAL(active(bool)), TQ_SIGNAL(findActive(bool))); } mFind->display(); } diff --git a/kalarm/find.cpp b/kalarm/find.cpp index 8882b6b2..9e30388e 100644 --- a/kalarm/find.cpp +++ b/kalarm/find.cpp @@ -146,7 +146,7 @@ void Find::display() mEmailType->setChecked(mOptions & FIND_EMAIL); #ifndef MODAL_FIND - connect(mDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotFind())); + connect(mDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotFind())); #endif } @@ -245,7 +245,7 @@ void Find::slotFind() #else mFind = new KFind(mLastPattern, options, mListView, mDialog); #endif - connect(mFind, TQT_SIGNAL(destroyed()), TQT_SLOT(slotKFindDestroyed())); + connect(mFind, TQ_SIGNAL(destroyed()), TQ_SLOT(slotKFindDestroyed())); mFind->closeFindNextDialog(); // prevent 'Find Next' dialog appearing } diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp index 74feffb6..64a8cdce 100644 --- a/kalarm/fontcolour.cpp +++ b/kalarm/fontcolour.cpp @@ -68,7 +68,7 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, TQLabel* label = new TQLabel(i18n("&Foreground color:"), box); box->setStretchFactor(new TQWidget(box), 0); mFgColourButton = new ColourCombo(box); - connect(mFgColourButton, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(setSampleColour())); + connect(mFgColourButton, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(setSampleColour())); label->setBuddy(mFgColourButton); TQWhatsThis::add(box, i18n("Select the alarm message foreground color")); } @@ -80,7 +80,7 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, TQLabel* label = new TQLabel(i18n("&Background color:"), box); box->setStretchFactor(new TQWidget(box), 0); mBgColourButton = new ColourCombo(box); - connect(mBgColourButton, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(setSampleColour())); + connect(mBgColourButton, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(setSampleColour())); label->setBuddy(mBgColourButton); TQWhatsThis::add(box, i18n("Select the alarm message background color")); hlayout->addStretch(); @@ -90,13 +90,13 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, TQHBoxLayout* layout = new TQHBoxLayout(topLayout); TQPushButton* button = new TQPushButton(i18n("Add Co&lor..."), page); button->setFixedSize(button->sizeHint()); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddColour())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddColour())); TQWhatsThis::add(button, i18n("Choose a new color to add to the color selection list.")); layout->addWidget(button); mRemoveColourButton = new TQPushButton(i18n("&Remove Color"), page); mRemoveColourButton->setFixedSize(mRemoveColourButton->sizeHint()); - connect(mRemoveColourButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveColour())); + connect(mRemoveColourButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveColour())); TQWhatsThis::add(mRemoveColourButton, i18n("Remove the color currently shown in the background color chooser, from the color selection list.")); layout->addWidget(mRemoveColourButton); @@ -107,7 +107,7 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, TQHBoxLayout* layout = new TQHBoxLayout(topLayout); mDefaultFont = new CheckBox(i18n("Use &default font"), page); mDefaultFont->setMinimumSize(mDefaultFont->sizeHint()); - connect(mDefaultFont, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDefaultFontToggled(bool))); + connect(mDefaultFont, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDefaultFontToggled(bool))); TQWhatsThis::add(mDefaultFont, i18n("Check to use the default font current at the time the alarm is displayed.")); layout->addWidget(mDefaultFont); diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp index 5321cdc9..a291a376 100644 --- a/kalarm/fontcolourbutton.cpp +++ b/kalarm/fontcolourbutton.cpp @@ -47,7 +47,7 @@ FontColourButton::FontColourButton(TQWidget* parent, const char* name) mButton = new PushButton(i18n("Font && Co&lor..."), this); mButton->setFixedSize(mButton->sizeHint()); - connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonPressed())); + connect(mButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonPressed())); TQWhatsThis::add(mButton, i18n("Choose the font, and foreground and background color, for the alarm message.")); layout->addWidget(mButton); diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index 9ae28740..d3e85a62 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -718,7 +718,7 @@ TQString runKMail(bool minimise) */ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString& dcopName, TQString& errorMessage) { - if (!kapp->dcopClient()->isApplicationRegistered(program)) + if (!tdeApp->dcopClient()->isApplicationRegistered(program)) { // KOrganizer is not already running, so start it if (TDEApplication::startServiceByDesktopName(TQString::fromLatin1(program), TQString(), &errorMessage, &dcopName)) @@ -729,7 +729,7 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString // Minimise its window - don't use hide() since this would remove all // trace of it from the panel if it is not configured to be docked in // the system tray. - kapp->dcopClient()->send(dcopName, windowName, "minimize()", TQString()); + tdeApp->dcopClient()->send(dcopName, windowName, "minimize()", TQString()); } else if (dcopName.isEmpty()) dcopName = program; @@ -747,7 +747,7 @@ bool readConfigWindowSize(const char* window, TQSize& result) { TDEConfig* config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1(window)); - TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop()); + TQWidget* desktop = TDEApplication::desktop(); TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), 0), config->readNumEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), 0)); if (s.isEmpty()) @@ -764,7 +764,7 @@ void writeConfigWindowSize(const char* window, const TQSize& size) { TDEConfig* config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1(window)); - TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop()); + TQWidget* desktop = TDEApplication::desktop(); config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width()); config->writeEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), size.height()); config->sync(); @@ -981,7 +981,7 @@ kdDebug(5950)<<"Korg->"<<iCal<<endl; TQCString replyType; TQDataStream arg(data, IO_WriteOnly); arg << iCal; - if (kapp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "addIncidence(TQString)", data, replyType, replyData) + if (tdeApp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "addIncidence(TQString)", data, replyType, replyData) && replyType == "bool") { bool result; @@ -1009,7 +1009,7 @@ bool deleteFromKOrganizer(const TQString& eventID) TQCString replyType; TQDataStream arg(data, IO_WriteOnly); arg << newID << true; - if (kapp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "deleteIncidence(TQString,bool)", data, replyType, replyData) + if (tdeApp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "deleteIncidence(TQString,bool)", data, replyType, replyData) && replyType == "bool") { bool result; @@ -1042,16 +1042,16 @@ bool runKOrganizer() // to load KOrganizer into Kontact. But if KOrganizer is running independently, // the load() method doesn't exist. TQCString dummy; - if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) + if (!tdeApp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) { - DCOPRef ref(dcopService, dcopService); // talk to the KUniqueApplication or its Kontact wrapper + DCOPRef ref(dcopService, dcopService); // talk to the TDEUniqueApplication or its Kontact wrapper DCOPReply reply = ref.call("load()"); if (!reply.isValid() || !(bool)reply) { kdWarning(5950) << "Error loading " << dcopService << endl; return false; } - if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) + if (!tdeApp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) { kdWarning(5950) << "Unable to access KOrganizer's " KORG_DCOP_OBJECT " DCOP object" << endl; return false; diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index 476a8c1f..c0eb6b55 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -31,11 +31,11 @@ #include <tdecmdlineargs.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdeaboutdata.h> #include <dcopclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdetempfile.h> #include <tdefileitem.h> #include <kstdguiitem.h> @@ -94,7 +94,7 @@ TQString KAlarmApp::mFatalMessage; * Construct the application. */ KAlarmApp::KAlarmApp() - : KUniqueApplication(), + : TDEUniqueApplication(), mInitialised(false), mDcopHandler(new DcopHandler()), #ifdef OLD_DCOP @@ -109,7 +109,7 @@ KAlarmApp::KAlarmApp() mSpeechEnabled(false) { Preferences::initialise(); - Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPreferencesChanged())); + Preferences::connect(TQ_SIGNAL(preferencesChanged()), this, TQ_SLOT(slotPreferencesChanged())); KCal::CalFormat::setApplication(aboutData()->programName(), AlarmCalendar::icalProductId()); KARecurrence::setDefaultFeb29Type(Preferences::defaultFeb29Type()); @@ -118,9 +118,9 @@ KAlarmApp::KAlarmApp() if (AlarmCalendar::initialiseCalendars()) { - connect(AlarmCalendar::expiredCalendar(), TQT_SIGNAL(purged()), TQT_SLOT(slotExpiredPurged())); + connect(AlarmCalendar::expiredCalendar(), TQ_SIGNAL(purged()), TQ_SLOT(slotExpiredPurged())); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup(TQString::fromLatin1("General")); mNoSystemTray = config->readBoolEntry(TQString::fromLatin1("NoSystemTray"), false); mSavedNoSystemTray = mNoSystemTray; @@ -244,7 +244,7 @@ bool KAlarmApp::restoreSession() } /****************************************************************************** -* Called for a KUniqueApplication when a new instance of the application is +* Called for a TDEUniqueApplication when a new instance of the application is * started. */ int KAlarmApp::newInstance() @@ -834,7 +834,7 @@ void KAlarmApp::doQuit(TQWidget* parent) void KAlarmApp::commitData(TQSessionManager& sm) { mSessionClosingDown = true; - KUniqueApplication::commitData(sm); + TDEUniqueApplication::commitData(sm); mSessionClosingDown = false; // reset in case shutdown is cancelled } @@ -849,7 +849,7 @@ void KAlarmApp::displayFatalError(const TQString& message) mFatalError = 1; mFatalMessage = message; if (theInstance) - TQTimer::singleShot(0, theInstance, TQT_SLOT(quitFatal())); + TQTimer::singleShot(0, theInstance, TQ_SLOT(quitFatal())); } } @@ -873,7 +873,7 @@ void KAlarmApp::quitFatal() theInstance->quitIf(1, true); break; } - TQTimer::singleShot(1000, this, TQT_SLOT(quitFatal())); + TQTimer::singleShot(1000, this, TQ_SLOT(quitFatal())); } /****************************************************************************** @@ -989,7 +989,7 @@ bool KAlarmApp::displayTrayIcon(bool show, MainWindow* parent) creating = false; } mTrayWindow = new TrayWindow(parent ? parent : MainWindow::firstWindow()); - connect(mTrayWindow, TQT_SIGNAL(deleted()), TQT_SIGNAL(trayIconToggled())); + connect(mTrayWindow, TQ_SIGNAL(deleted()), TQ_SIGNAL(trayIconToggled())); mTrayWindow->show(); emit trayIconToggled(); @@ -998,7 +998,7 @@ bool KAlarmApp::displayTrayIcon(bool show, MainWindow* parent) mCheckingSystemTray = true; mSavedNoSystemTray = mNoSystemTray; mNoSystemTray = false; - TQTimer::singleShot(0, this, TQT_SLOT(slotSystemTrayTimer())); + TQTimer::singleShot(0, this, TQ_SLOT(slotSystemTrayTimer())); } } else if (mTrayWindow) @@ -1042,7 +1042,7 @@ bool KAlarmApp::checkSystemTray() // daemon with the correct NOTIFY type. If that happened when there was no system // tray and alarms are disabled when KAlarm is not running, registering with // NO_START_NOTIFY could result in alarms never being seen. - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup(TQString::fromLatin1("General")); config->writeEntry(TQString::fromLatin1("NoSystemTray"), mNoSystemTray); config->sync(); @@ -1212,7 +1212,7 @@ bool KAlarmApp::scheduleEvent(KAEvent::Action action, const TQString& text, cons // Queue the alarm for insertion into the calendar file mDcopQueue.append(DcopTQEntry(event)); if (mInitialised) - TQTimer::singleShot(0, this, TQT_SLOT(processQueue())); + TQTimer::singleShot(0, this, TQ_SLOT(processQueue())); return true; } @@ -1234,7 +1234,7 @@ bool KAlarmApp::handleEvent(const TQString& urlString, const TQString& eventID, } mDcopQueue.append(DcopTQEntry(function, eventID)); if (mInitialised) - TQTimer::singleShot(0, this, TQT_SLOT(processQueue())); + TQTimer::singleShot(0, this, TQ_SLOT(processQueue())); return true; } @@ -1751,16 +1751,16 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& comms = TDEProcess::AllOutput; } ShellProcess* proc = new ShellProcess(cmd); - connect(proc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotCommandExited(ShellProcess*))); + connect(proc, TQ_SIGNAL(shellExited(ShellProcess*)), TQ_SLOT(slotCommandExited(ShellProcess*))); TQGuardedPtr<ShellProcess> logproc = 0; if (comms == TDEProcess::AllOutput && !event.logFile().isEmpty()) { // Output is to be appended to a log file. // Set up a logging process to write the command's output to. - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotCommandOutput(TDEProcess*,char*,int))); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotCommandOutput(TDEProcess*,char*,int))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotCommandOutput(TDEProcess*,char*,int))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotCommandOutput(TDEProcess*,char*,int))); logproc = new ShellProcess(TQString::fromLatin1("cat >>%1").arg(event.logFile())); - connect(logproc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotLogProcExited(ShellProcess*))); + connect(logproc, TQ_SIGNAL(shellExited(ShellProcess*)), TQ_SLOT(slotLogProcExited(ShellProcess*))); logproc->start(TDEProcess::Stdin); TQCString heading; if (alarm && alarm->dateTime().isValid()) @@ -1940,7 +1940,7 @@ void KAlarmApp::setUpDcop() { mInitialised = true; // we're now ready to handle DCOP calls Daemon::createDcopHandler(); - TQTimer::singleShot(0, this, TQT_SLOT(processQueue())); // process anything already queued + TQTimer::singleShot(0, this, TQ_SLOT(processQueue())); // process anything already queued } } diff --git a/kalarm/kalarmapp.h b/kalarm/kalarmapp.h index 17f707ea..52359ef0 100644 --- a/kalarm/kalarmapp.h +++ b/kalarm/kalarmapp.h @@ -27,7 +27,7 @@ class TQTimer; class TQDateTime; -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <kurl.h> class TDEProcess; namespace KCal { class Event; } @@ -45,7 +45,7 @@ class TrayWindow; class ShellProcess; -class KAlarmApp : public KUniqueApplication +class KAlarmApp : public TDEUniqueApplication { TQ_OBJECT diff --git a/kalarm/kalarmd/adapp.cpp b/kalarm/kalarmd/adapp.cpp index 2c9e09dc..3d5f2298 100644 --- a/kalarm/kalarmd/adapp.cpp +++ b/kalarm/kalarmd/adapp.cpp @@ -30,7 +30,7 @@ AlarmDaemonApp::AlarmDaemonApp() - : KUniqueApplication(false, false), + : TDEUniqueApplication(false, false), mAd(0) { disableSessionManagement(); diff --git a/kalarm/kalarmd/adapp.h b/kalarm/kalarmd/adapp.h index 62992094..c4a4188d 100644 --- a/kalarm/kalarmd/adapp.h +++ b/kalarm/kalarmd/adapp.h @@ -23,12 +23,12 @@ #ifndef ADAPP_H #define ADAPP_H -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> class AlarmDaemon; -class AlarmDaemonApp : public KUniqueApplication +class AlarmDaemonApp : public TDEUniqueApplication { TQ_OBJECT diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp index b1033eb0..699e9684 100644 --- a/kalarm/kalarmd/adcalendar.cpp +++ b/kalarm/kalarmd/adcalendar.cpp @@ -96,7 +96,7 @@ bool ADCalendar::loadFile(bool reset) KURL dest; dest.setPath(mTempFileName); TDEIO::FileCopyJob* job = TDEIO::file_copy(url, dest, -1, true); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotDownloadJobResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotDownloadJobResult(TDEIO::Job*))); } return true; } diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp index b0f7850d..75179185 100644 --- a/kalarm/kalarmd/adconfigdata.cpp +++ b/kalarm/kalarmd/adconfigdata.cpp @@ -24,7 +24,7 @@ #include <tqstringlist.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "adcalendar.h" diff --git a/kalarm/kalarmd/admain.cpp b/kalarm/kalarmd/admain.cpp index a5d9fd16..b1533e4a 100644 --- a/kalarm/kalarmd/admain.cpp +++ b/kalarm/kalarmd/admain.cpp @@ -49,7 +49,7 @@ int main(int argc, char** argv) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); TDEStartupInfo::disableAutoAppStartedSending(); if (!AlarmDaemonApp::start()) diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp index 573cac0d..8759c171 100644 --- a/kalarm/kalarmd/alarmdaemon.cpp +++ b/kalarm/kalarmd/alarmdaemon.cpp @@ -29,8 +29,8 @@ #include <tqdatetime.h> #include <tdeapplication.h> -#include <kstandarddirs.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeprocess.h> #include <tdeio/netaccess.h> #include <dcopclient.h> #include <tdeconfig.h> @@ -89,7 +89,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name) if (autostart) { bool done = false; - DCOPClient* client = kapp->dcopClient(); + DCOPClient* client = tdeApp->dcopClient(); if (client->isApplicationRegistered("ksmserver")) { TQByteArray callData; @@ -98,7 +98,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name) for (int i=0; !done && i<KALARM_AUTOSTART_TIMEOUT; ++i) { // Check if the session has been fully created/restored. If not, wait a little and try again - if (!kapp->dcopClient()->call("ksmserver", "ksmserver", "startupCompleted()", callData, replyType, replyData) || + if (!tdeApp->dcopClient()->call("ksmserver", "ksmserver", "startupCompleted()", callData, replyType, replyData) || replyType != "bool") { done = true; // In case of DCOP call error, just continue normally @@ -119,7 +119,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name) } } // Give some extra time to KAlarm to be fully restored, then proceed as usual - TQTimer::singleShot(3000, this, TQT_SLOT(autostartKAlarm())); + TQTimer::singleShot(3000, this, TQ_SLOT(autostartKAlarm())); } } } @@ -168,7 +168,7 @@ void AlarmDaemon::startMonitoring() { // Set up the alarm timer mAlarmTimer = new TQTimer(this); - connect(mAlarmTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAlarmsSlot())); + connect(mAlarmTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAlarmsSlot())); setTimerStatus(); // Start monitoring calendar files. @@ -216,7 +216,7 @@ void AlarmDaemon::reloadCal(ADCalendar* cal, bool reset) { cal->close(); if (!cal->setLoadedConnected()) - connect(cal, TQT_SIGNAL(loaded(ADCalendar*, bool)), TQT_SLOT(calendarLoaded(ADCalendar*, bool))); + connect(cal, TQ_SIGNAL(loaded(ADCalendar*, bool)), TQ_SLOT(calendarLoaded(ADCalendar*, bool))); cal->loadFile(reset); } else if (reset) @@ -512,12 +512,12 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID) TQString id = TQString::fromLatin1("ad:") + eventID; // prefix to indicate that the notification if from the daemon // Check if the client application is running and ready to receive notification - bool registered = kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname)); + bool registered = tdeApp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname)); bool ready = registered; if (registered) { // It's running, but check if it has created our DCOP interface yet - QCStringList objects = kapp->dcopClient()->remoteObjects(appname); + QCStringList objects = tdeApp->dcopClient()->remoteObjects(appname); if (objects.find(client->dcopObject()) == objects.end()) ready = false; } @@ -606,7 +606,7 @@ void AlarmDaemon::notifyCalStatus(const ADCalendar* cal) if (!client) return; TQCString appname = client->appName(); - if (kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname))) + if (tdeApp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname))) { KAlarmd::CalendarStatus change = cal->available() ? (cal->enabled() ? KAlarmd::CALENDAR_ENABLED : KAlarmd::CALENDAR_DISABLED) : KAlarmd::CALENDAR_UNAVAILABLE; diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp index 0c33a3ae..b86b8262 100644 --- a/kalarm/kamail.cpp +++ b/kalarm/kamail.cpp @@ -30,11 +30,11 @@ #include <tqfile.h> #include <tqregexp.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <dcopclient.h> #include <dcopref.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <tdeaboutdata.h> #include <tdefileitem.h> @@ -242,7 +242,7 @@ TQString KAMail::sendKMail(const KAMailData& data) // KMail is now running. Determine which DCOP call to use. bool useSend = false; TQCString sendFunction = "sendMessage(TQString,TQString,TQString,TQString,TQString,TQString,KURL::List)"; - QCStringList funcs = kapp->dcopClient()->remoteFunctions("kmail", "MailTransportServiceIface"); + QCStringList funcs = tdeApp->dcopClient()->remoteFunctions("kmail", "MailTransportServiceIface"); for (QCStringList::Iterator it=funcs.begin(); it != funcs.end() && !useSend; ++it) { TQCString func = DCOPClient::normalizeFunctionSignature(*it); @@ -337,7 +337,7 @@ bool KAMail::callKMail(const TQByteArray& callData, const TQCString& iface, cons { TQCString replyType; TQByteArray replyData; - if (!kapp->dcopClient()->call("kmail", iface, function, callData, replyType, replyData) + if (!tdeApp->dcopClient()->call("kmail", iface, function, callData, replyType, replyData) || replyType != funcType) { TQCString funcname = function; @@ -394,7 +394,7 @@ TQString KAMail::initHeaders(const KAMailData& data, bool dateId) if (!data.bcc.isEmpty()) message += TQString::fromLatin1("\nBcc: ") + data.bcc; message += TQString::fromLatin1("\nSubject: ") + data.event.emailSubject(); - message += TQString::fromLatin1("\nX-Mailer: %1/" KALARM_VERSION).arg(kapp->aboutData()->programName()); + message += TQString::fromLatin1("\nX-Mailer: %1/" KALARM_VERSION).arg(tdeApp->aboutData()->programName()); return message; } @@ -943,7 +943,7 @@ TQString KAMail::getMailBody(TQ_UINT32 serialNumber) arg << serialNumber; arg << (int)0; TQString body; - if (kapp->dcopClient()->call("kmail", "KMailIface", "getDecodedBodyPart(TQ_UINT32,int)", data, replyType, replyData) + if (tdeApp->dcopClient()->call("kmail", "KMailIface", "getDecodedBodyPart(TQ_UINT32,int)", data, replyType, replyData) && replyType == "TQString") { TQDataStream reply_stream(replyData, IO_ReadOnly); diff --git a/kalarm/latecancel.cpp b/kalarm/latecancel.cpp index ff684a77..6f656410 100644 --- a/kalarm/latecancel.cpp +++ b/kalarm/latecancel.cpp @@ -61,7 +61,7 @@ LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, c TQBoxLayout* layout = new TQVBoxLayout(mCheckboxFrame, 0, 0); mCheckbox = new CheckBox(i18n_n_CancelIfLate(), mCheckboxFrame); mCheckbox->setFixedSize(mCheckbox->sizeHint()); - connect(mCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); + connect(mCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggled(bool))); TQWhatsThis::add(mCheckbox, whatsThis); layout->addWidget(mCheckbox, 0, TQt::AlignAuto); @@ -72,7 +72,7 @@ LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, c mTimeSelector = new TimeSelector(i18n("Cancel if late by 10 minutes", "Ca&ncel if late by"), TQString(), whatsThis, i18n("Enter how late will cause the alarm to be canceled"), allowHourMinute, mTimeSelectorFrame); - connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); + connect(mTimeSelector, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggled(bool))); layout->addWidget(mTimeSelector); mLayout->addWidget(mStack); diff --git a/kalarm/lib/buttongroup.cpp b/kalarm/lib/buttongroup.cpp index e3d47e41..d1ba243f 100644 --- a/kalarm/lib/buttongroup.cpp +++ b/kalarm/lib/buttongroup.cpp @@ -29,25 +29,25 @@ ButtonGroup::ButtonGroup(TQWidget* parent, const char* name) : TQButtonGroup(parent, name) { - connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); + connect(this, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(buttonSet(int))); } ButtonGroup::ButtonGroup(const TQString& title, TQWidget* parent, const char* name) : TQButtonGroup(title, parent, name) { - connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); + connect(this, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(buttonSet(int))); } ButtonGroup::ButtonGroup(int strips, TQt::Orientation orient, TQWidget* parent, const char* name) : TQButtonGroup(strips, orient, parent, name) { - connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); + connect(this, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(buttonSet(int))); } ButtonGroup::ButtonGroup(int strips, TQt::Orientation orient, const TQString& title, TQWidget* parent, const char* name) : TQButtonGroup(strips, orient, title, parent, name) { - connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); + connect(this, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(buttonSet(int))); } /****************************************************************************** @@ -57,7 +57,7 @@ ButtonGroup::ButtonGroup(int strips, TQt::Orientation orient, const TQString& ti int ButtonGroup::insert(TQButton* button, int id) { id = TQButtonGroup::insert(button, id); - connect(button, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotButtonToggled(bool))); + connect(button, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotButtonToggled(bool))); return id; } diff --git a/kalarm/lib/checkbox.cpp b/kalarm/lib/checkbox.cpp index a1f594bc..4b29d927 100644 --- a/kalarm/lib/checkbox.cpp +++ b/kalarm/lib/checkbox.cpp @@ -58,9 +58,9 @@ void CheckBox::setFocusWidget(TQWidget* w, bool enable) mFocusWidget = w; mFocusWidgetEnable = enable; if (w) - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked())); else - disconnect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); + disconnect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked())); } /****************************************************************************** diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp index c859ac6c..d612180a 100644 --- a/kalarm/lib/colourcombo.cpp +++ b/kalarm/lib/colourcombo.cpp @@ -39,9 +39,9 @@ ColourCombo::ColourCombo(TQWidget* parent, const char* name, const TQColor& defa mDisabled(false) { addColours(); - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); - connect(this, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotHighlighted(int))); - Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPreferencesChanged())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); + connect(this, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotHighlighted(int))); + Preferences::connect(TQ_SIGNAL(preferencesChanged()), this, TQ_SLOT(slotPreferencesChanged())); } void ColourCombo::setColour(const TQColor& colour) diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp index 051e3a64..862e859f 100644 --- a/kalarm/lib/dateedit.cpp +++ b/kalarm/lib/dateedit.cpp @@ -28,7 +28,7 @@ DateEdit::DateEdit(TQWidget* parent, const char* name) : KDateEdit(parent, name) { - connect(this, TQT_SIGNAL(dateEntered(const TQDate&)), TQT_SLOT(newDateEntered(const TQDate&))); + connect(this, TQ_SIGNAL(dateEntered(const TQDate&)), TQ_SLOT(newDateEntered(const TQDate&))); } void DateEdit::setMinDate(const TQDate& d, const TQString& errorDate) diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp index f2aa91b5..8a41d624 100644 --- a/kalarm/lib/label.cpp +++ b/kalarm/lib/label.cpp @@ -50,12 +50,12 @@ Label::Label(TQWidget* buddy, const TQString& text, TQWidget* parent, const char void Label::setBuddy(TQWidget* bud) { if (mRadioButton) - disconnect(mRadioButton, TQT_SIGNAL(destroyed()), this, TQT_SLOT(buddyDead())); + disconnect(mRadioButton, TQ_SIGNAL(destroyed()), this, TQ_SLOT(buddyDead())); TQWidget* w = bud; if (w) { while (w->focusProxy()) - w = TQT_TQWIDGET(w->focusProxy()); + w = w->focusProxy(); if (!w->inherits("TQRadioButton")) w = 0; } @@ -74,7 +74,7 @@ void Label::setBuddy(TQWidget* bud) mFocusWidget = new LabelFocusWidget(this); TQLabel::setBuddy(mFocusWidget); mRadioButton = (TQRadioButton*)bud; - connect(mRadioButton, TQT_SIGNAL(destroyed()), this, TQT_SLOT(buddyDead())); + connect(mRadioButton, TQ_SIGNAL(destroyed()), this, TQ_SLOT(buddyDead())); } } diff --git a/kalarm/lib/radiobutton.cpp b/kalarm/lib/radiobutton.cpp index e9f60430..62fb9b63 100644 --- a/kalarm/lib/radiobutton.cpp +++ b/kalarm/lib/radiobutton.cpp @@ -58,9 +58,9 @@ void RadioButton::setFocusWidget(TQWidget* w, bool enable) mFocusWidget = w; mFocusWidgetEnable = enable; if (w) - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked())); else - disconnect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); + disconnect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked())); } /****************************************************************************** diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp index 1ed64df7..97d89fee 100644 --- a/kalarm/lib/shellprocess.cpp +++ b/kalarm/lib/shellprocess.cpp @@ -56,8 +56,8 @@ bool ShellProcess::start(Communication comm) return false; } KShellProcess::operator<<(mCommand); - connect(this, TQT_SIGNAL(wroteStdin(TDEProcess*)), TQT_SLOT(writtenStdin(TDEProcess*))); - connect(this, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotExited(TDEProcess*))); + connect(this, TQ_SIGNAL(wroteStdin(TDEProcess*)), TQ_SLOT(writtenStdin(TDEProcess*))); + connect(this, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotExited(TDEProcess*))); if (!KShellProcess::start(TDEProcess::NotifyOnExit, comm)) { mStatus = START_FAIL; @@ -201,7 +201,7 @@ bool ShellProcess::authorised() { if (!mInitialised) { - mAuthorised = kapp->authorize("shell_access"); + mAuthorised = tdeApp->authorize("shell_access"); mInitialised = true; } return mAuthorised; diff --git a/kalarm/lib/shellprocess.h b/kalarm/lib/shellprocess.h index 316d6ef7..95189e70 100644 --- a/kalarm/lib/shellprocess.h +++ b/kalarm/lib/shellprocess.h @@ -23,7 +23,7 @@ /** @file shellprocess.h - execute a process through the shell */ -#include <kprocess.h> +#include <tdeprocess.h> /** diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp index 80adc6d8..667d5c7c 100644 --- a/kalarm/lib/spinbox.cpp +++ b/kalarm/lib/spinbox.cpp @@ -65,7 +65,7 @@ void SpinBox::init() #if KDE_IS_VERSION(3,1,90) // Detect when the text field is edited - connect(editor(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textEdited())); + connect(editor(), TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textEdited())); #endif } diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp index 43570dba..328813e2 100644 --- a/kalarm/lib/spinbox2.cpp +++ b/kalarm/lib/spinbox2.cpp @@ -89,11 +89,11 @@ void SpinBox2::init() mSpinMirror = new SpinMirror(mUpdown2, mUpdown2Frame, this); if (!mirrorStyle(style())) mSpinMirror->hide(); // hide mirrored spin buttons when they are inappropriate - connect(mSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(valueChange())); - connect(mSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(valueChanged(int))); - connect(mSpinbox, TQT_SIGNAL(valueChanged(const TQString&)), TQT_SIGNAL(valueChanged(const TQString&))); - connect(mUpdown2, TQT_SIGNAL(stepped(int)), TQT_SLOT(stepPage(int))); - connect(mUpdown2, TQT_SIGNAL(styleUpdated()), TQT_SLOT(updateMirror())); + connect(mSpinbox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(valueChange())); + connect(mSpinbox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(valueChanged(int))); + connect(mSpinbox, TQ_SIGNAL(valueChanged(const TQString&)), TQ_SIGNAL(valueChanged(const TQString&))); + connect(mUpdown2, TQ_SIGNAL(stepped(int)), TQ_SLOT(stepPage(int))); + connect(mUpdown2, TQ_SIGNAL(styleUpdated()), TQ_SLOT(updateMirror())); } void SpinBox2::setReadOnly(bool ro) @@ -451,7 +451,7 @@ void SpinMirror::contentsMouseEvent(TQMouseEvent* e) { case TQEvent::MouseButtonPress: case TQEvent::MouseButtonRelease: - TQTimer::singleShot(0, this, TQT_SLOT(redraw())); + TQTimer::singleShot(0, this, TQ_SLOT(redraw())); break; default: break; @@ -481,11 +481,11 @@ bool SpinMirror::event(TQEvent* e) case TQEvent::Leave: case TQEvent::Enter: TQApplication::postEvent(mSpinWidget, new TQEvent(e->type())); - TQTimer::singleShot(0, this, TQT_SLOT(redraw())); + TQTimer::singleShot(0, this, TQ_SLOT(redraw())); break; case TQEvent::FocusIn: mSpinbox->setFocus(); - TQTimer::singleShot(0, this, TQT_SLOT(redraw())); + TQTimer::singleShot(0, this, TQ_SLOT(redraw())); break; default: break; diff --git a/kalarm/lib/synchtimer.cpp b/kalarm/lib/synchtimer.cpp index eecef7d4..e32cf659 100644 --- a/kalarm/lib/synchtimer.cpp +++ b/kalarm/lib/synchtimer.cpp @@ -48,11 +48,11 @@ void SynchTimer::connecT(TQObject* receiver, const char* member) Connection connection(receiver, member); if (mConnections.find(connection) != mConnections.end()) return; // the slot is already connected, so ignore request - connect(mTimer, TQT_SIGNAL(timeout()), receiver, member); + connect(mTimer, TQ_SIGNAL(timeout()), receiver, member); mConnections.append(connection); if (!mTimer->isActive()) { - connect(mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimer())); + connect(mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimer())); start(); } } diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp index 80713f2f..21215a6c 100644 --- a/kalarm/lib/timeedit.cpp +++ b/kalarm/lib/timeedit.cpp @@ -38,13 +38,13 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name) bool use12hour = TDEGlobal::locale()->use12Clock(); mSpinBox = new TimeSpinBox(!use12hour, this); mSpinBox->setFixedSize(mSpinBox->sizeHint()); - connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); + connect(mSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int))); if (use12hour) { mAmPm = new ComboBox(this); setAmPmCombo(1, 1); // add "am" and "pm" options to the combo box mAmPm->setFixedSize(mAmPm->sizeHint()); - connect(mAmPm, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotAmPmChanged(int))); + connect(mAmPm, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotAmPmChanged(int))); } } diff --git a/kalarm/lib/timeperiod.cpp b/kalarm/lib/timeperiod.cpp index 37c78702..b2290a77 100644 --- a/kalarm/lib/timeperiod.cpp +++ b/kalarm/lib/timeperiod.cpp @@ -63,12 +63,12 @@ TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name) mSpinBox->setLineStep(1); mSpinBox->setLineShiftStep(10); mSpinBox->setRange(1, mMaxDays); - connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotDaysChanged(int))); + connect(mSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotDaysChanged(int))); mSpinStack->addWidget(mSpinBox, 0); mTimeSpinBox = new TimeSpinBox(0, 99999, mSpinStack); mTimeSpinBox->setRange(1, maxMinutes); // max 999H59M - connect(mTimeSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotTimeChanged(int))); + connect(mTimeSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotTimeChanged(int))); mSpinStack->addWidget(mTimeSpinBox, 1); mSpinStack->setFixedSize(mSpinBox->sizeHint().expandedTo(mTimeSpinBox->sizeHint())); @@ -88,7 +88,7 @@ TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name) mUnitsCombo->insertItem(i18n_weeks()); mMaxUnitShown = WEEKS; mUnitsCombo->setFixedSize(mUnitsCombo->sizeHint()); - connect(mUnitsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUnitsSelected(int))); + connect(mUnitsCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotUnitsSelected(int))); setFocusProxy(mUnitsCombo); setTabOrder(mUnitsCombo, mSpinStack); diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp index 0ac932e6..db3d5400 100644 --- a/kalarm/lib/timespinbox.cpp +++ b/kalarm/lib/timespinbox.cpp @@ -31,7 +31,7 @@ class TimeSpinBox::TimeValidator : public TQValidator { public: TimeValidator(int minMin, int maxMin, TQWidget* parent, const char* name = 0) - : TQValidator(TQT_TQOBJECT(parent), name), + : TQValidator(parent, name), minMinute(minMin), maxMinute(maxMin), m12Hour(false), mPm(false) { } virtual State validate(TQString&, int&) const; int minMinute, maxMinute; @@ -70,7 +70,7 @@ TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* parent, const char* name) setShiftSteps(5, 360); // shift-left button increments 5 min / 6 hours setSelectOnStep(false); setAlignment(TQt::AlignHCenter); - connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); + connect(this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int))); } /****************************************************************************** diff --git a/kalarm/main.cpp b/kalarm/main.cpp index f29ec673..62904a17 100644 --- a/kalarm/main.cpp +++ b/kalarm/main.cpp @@ -115,7 +115,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); if (!KAlarmApp::start()) { diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp index b2f6d420..77d86e09 100644 --- a/kalarm/mainwindow.cpp +++ b/kalarm/mainwindow.cpp @@ -124,7 +124,7 @@ MainWindow::MainWindow(bool restored) { kdDebug(5950) << "MainWindow::MainWindow()\n"; setAutoSaveSettings(TQString::fromLatin1(WINDOW_NAME)); // save window sizes etc. - setPlainCaption(kapp->aboutData()->programName()); + setPlainCaption(tdeApp->aboutData()->programName()); TDEConfig* config = TDEGlobal::config(); config->setGroup(VIEW_GROUP); mShowExpired = config->readBoolEntry(SHOW_ARCHIVED_KEY, false); @@ -149,14 +149,14 @@ MainWindow::MainWindow(bool restored) mListView->refresh(); // populate the alarm list mListView->clearSelection(); - connect(mListView, TQT_SIGNAL(itemDeleted()), TQT_SLOT(slotDeletion())); - connect(mListView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelection())); - connect(mListView, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&, int))); - connect(mListView, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(slotMouseClicked(int, TQListViewItem*, const TQPoint&, int))); - connect(mListView, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(slotDoubleClicked(TQListViewItem*))); - connect(mListView->header(), TQT_SIGNAL(indexChange(int, int, int)), TQT_SLOT(columnsReordered())); + connect(mListView, TQ_SIGNAL(itemDeleted()), TQ_SLOT(slotDeletion())); + connect(mListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelection())); + connect(mListView, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&, int))); + connect(mListView, TQ_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(slotMouseClicked(int, TQListViewItem*, const TQPoint&, int))); + connect(mListView, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(slotDoubleClicked(TQListViewItem*))); + connect(mListView->header(), TQ_SIGNAL(indexChange(int, int, int)), TQ_SLOT(columnsReordered())); initActions(); mWindowList.append(this); @@ -182,7 +182,7 @@ MainWindow::~MainWindow() else theApp()->trayWindow()->removeWindow(this); } - MinuteTimer::disconnect(TQT_TQOBJECT(this)); + MinuteTimer::disconnect(this); mMinuteTimerActive = false; // to ensure that setUpdateTimer() works correctly setUpdateTimer(); MainWindow* main = mainMainWindow(); @@ -326,70 +326,70 @@ void MainWindow::columnsReordered() void MainWindow::initActions() { TDEActionCollection* actions = actionCollection(); - mActionTemplates = new TDEAction(i18n("&Templates..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTemplates()), actions, "templates"); - mActionNew = KAlarm::createNewAlarmAction(i18n("&New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNew()), actions, "new"); - mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl"); - mActionCreateTemplate = new TDEAction(i18n("Create Tem&plate..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTemplate()), actions, "createTemplate"); - mActionCopy = new TDEAction(i18n("&Copy..."), "edit-copy", TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actions, "copy"); - mActionModify = new TDEAction(i18n("&Edit..."), "edit", TQt::CTRL+TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotModify()), actions, "modify"); - mActionDelete = new TDEAction(i18n("&Delete"), "edit-delete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDelete()), actions, "delete"); - mActionReactivate = new TDEAction(i18n("Reac&tivate"), 0, TQt::CTRL+TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotReactivate()), actions, "undelete"); - mActionEnable = new TDEAction(TQString(), 0, TQt::CTRL+TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotEnable()), actions, "disable"); - mActionView = new TDEAction(i18n("&View"), "viewmag", TQt::CTRL+TQt::Key_W, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actions, "view"); - mActionShowTime = new TDEToggleAction(i18n_a_ShowAlarmTimes(), TQt::CTRL+TQt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotShowTime()), actions, "showAlarmTimes"); + mActionTemplates = new TDEAction(i18n("&Templates..."), 0, this, TQ_SLOT(slotTemplates()), actions, "templates"); + mActionNew = KAlarm::createNewAlarmAction(i18n("&New..."), this, TQ_SLOT(slotNew()), actions, "new"); + mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), this, TQ_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl"); + mActionCreateTemplate = new TDEAction(i18n("Create Tem&plate..."), 0, this, TQ_SLOT(slotNewTemplate()), actions, "createTemplate"); + mActionCopy = new TDEAction(i18n("&Copy..."), "edit-copy", TQt::SHIFT+TQt::Key_Insert, this, TQ_SLOT(slotCopy()), actions, "copy"); + mActionModify = new TDEAction(i18n("&Edit..."), "edit", TQt::CTRL+TQt::Key_E, this, TQ_SLOT(slotModify()), actions, "modify"); + mActionDelete = new TDEAction(i18n("&Delete"), "edit-delete", TQt::Key_Delete, this, TQ_SLOT(slotDelete()), actions, "delete"); + mActionReactivate = new TDEAction(i18n("Reac&tivate"), 0, TQt::CTRL+TQt::Key_R, this, TQ_SLOT(slotReactivate()), actions, "undelete"); + mActionEnable = new TDEAction(TQString(), 0, TQt::CTRL+TQt::Key_B, this, TQ_SLOT(slotEnable()), actions, "disable"); + mActionView = new TDEAction(i18n("&View"), "viewmag", TQt::CTRL+TQt::Key_W, this, TQ_SLOT(slotView()), actions, "view"); + mActionShowTime = new TDEToggleAction(i18n_a_ShowAlarmTimes(), TQt::CTRL+TQt::Key_M, this, TQ_SLOT(slotShowTime()), actions, "showAlarmTimes"); mActionShowTime->setCheckedState(i18n("Hide &Alarm Times")); - mActionShowTimeTo = new TDEToggleAction(i18n_o_ShowTimeToAlarms(), TQt::CTRL+TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms"); + mActionShowTimeTo = new TDEToggleAction(i18n_o_ShowTimeToAlarms(), TQt::CTRL+TQt::Key_I, this, TQ_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms"); mActionShowTimeTo->setCheckedState(i18n("Hide Time t&o Alarms")); - mActionShowExpired = new TDEToggleAction(i18n_e_ShowExpiredAlarms(), "history", TQt::CTRL+TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotShowExpired()), actions, "showExpiredAlarms"); + mActionShowExpired = new TDEToggleAction(i18n_e_ShowExpiredAlarms(), "history", TQt::CTRL+TQt::Key_P, this, TQ_SLOT(slotShowExpired()), actions, "showExpiredAlarms"); mActionShowExpired->setCheckedState(i18n_e_HideExpiredAlarms()); - mActionToggleTrayIcon = new TDEToggleAction(i18n("Show in System &Tray"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray"); + mActionToggleTrayIcon = new TDEToggleAction(i18n("Show in System &Tray"), 0, this, TQ_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray"); mActionToggleTrayIcon->setCheckedState(i18n("Hide From System &Tray")); - new TDEAction(i18n("Import &Alarms..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportAlarms()), actions, "importAlarms"); - new TDEAction(i18n("Import &Birthdays..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBirthdays()), actions, "importBirthdays"); - new TDEAction(i18n("&Refresh Alarms"), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT(slotResetDaemon()), actions, "refreshAlarms"); + new TDEAction(i18n("Import &Alarms..."), 0, this, TQ_SLOT(slotImportAlarms()), actions, "importAlarms"); + new TDEAction(i18n("Import &Birthdays..."), 0, this, TQ_SLOT(slotBirthdays()), actions, "importBirthdays"); + new TDEAction(i18n("&Refresh Alarms"), "reload", 0, this, TQ_SLOT(slotResetDaemon()), actions, "refreshAlarms"); Daemon::createAlarmEnableAction(actions, "alarmEnable"); if (undoText.isNull()) { // Get standard texts, etc., for Undo and Redo actions - TDEAction* act = KStdAction::undo(TQT_TQOBJECT(this), 0, actions); + TDEAction* act = KStdAction::undo(this, 0, actions); undoIcon = act->icon(); undoShortcut = act->shortcut(); undoText = act->text(); undoTextStripped = KAlarm::stripAccel(undoText); delete act; - act = KStdAction::redo(TQT_TQOBJECT(this), 0, actions); + act = KStdAction::redo(this, 0, actions); redoIcon = act->icon(); redoShortcut = act->shortcut(); redoText = act->text(); redoTextStripped = KAlarm::stripAccel(redoText); delete act; } - mActionUndo = new TDEToolBarPopupAction(undoText, undoIcon, undoShortcut, TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actions, "edit_undo"); - mActionRedo = new TDEToolBarPopupAction(redoText, redoIcon, redoShortcut, TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actions, "edit_redo"); - KStdAction::find(TQT_TQOBJECT(mListView), TQT_SLOT(slotFind()), actions); - mActionFindNext = KStdAction::findNext(TQT_TQOBJECT(mListView), TQT_SLOT(slotFindNext()), actions); - mActionFindPrev = KStdAction::findPrev(TQT_TQOBJECT(mListView), TQT_SLOT(slotFindPrev()), actions); - KStdAction::selectAll(TQT_TQOBJECT(mListView), TQT_SLOT(slotSelectAll()), actions); - KStdAction::deselect(TQT_TQOBJECT(mListView), TQT_SLOT(slotDeselect()), actions); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actions); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actions); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbar()), actions); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actions); + mActionUndo = new TDEToolBarPopupAction(undoText, undoIcon, undoShortcut, this, TQ_SLOT(slotUndo()), actions, "edit_undo"); + mActionRedo = new TDEToolBarPopupAction(redoText, redoIcon, redoShortcut, this, TQ_SLOT(slotRedo()), actions, "edit_redo"); + KStdAction::find(mListView, TQ_SLOT(slotFind()), actions); + mActionFindNext = KStdAction::findNext(mListView, TQ_SLOT(slotFindNext()), actions); + mActionFindPrev = KStdAction::findPrev(mListView, TQ_SLOT(slotFindPrev()), actions); + KStdAction::selectAll(mListView, TQ_SLOT(slotSelectAll()), actions); + KStdAction::deselect(mListView, TQ_SLOT(slotDeselect()), actions); + KStdAction::quit(this, TQ_SLOT(slotQuit()), actions); + KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actions); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbar()), actions); + KStdAction::preferences(this, TQ_SLOT(slotPreferences()), actions); setStandardToolBarMenuEnabled(true); createGUI(UI_FILE); mContextMenu = static_cast<TDEPopupMenu*>(factory()->container("listContext", this)); mActionsMenu = static_cast<TDEPopupMenu*>(factory()->container("actions", this)); mMenuError = (!mContextMenu || !mActionsMenu); - connect(mActionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(updateActionsMenu())); - connect(mActionUndo->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotInitUndoMenu())); - connect(mActionUndo->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotUndoItem(int))); - connect(mActionRedo->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotInitRedoMenu())); - connect(mActionRedo->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotRedoItem(int))); - connect(Undo::instance(), TQT_SIGNAL(changed(const TQString&, const TQString&)), TQT_SLOT(slotUndoStatus(const TQString&, const TQString&))); - connect(mListView, TQT_SIGNAL(findActive(bool)), TQT_SLOT(slotFindActive(bool))); - Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPrefsChanged())); - connect(theApp(), TQT_SIGNAL(trayIconToggled()), TQT_SLOT(updateTrayIconAction())); + connect(mActionsMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(updateActionsMenu())); + connect(mActionUndo->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotInitUndoMenu())); + connect(mActionUndo->popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotUndoItem(int))); + connect(mActionRedo->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotInitRedoMenu())); + connect(mActionRedo->popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotRedoItem(int))); + connect(Undo::instance(), TQ_SIGNAL(changed(const TQString&, const TQString&)), TQ_SLOT(slotUndoStatus(const TQString&, const TQString&))); + connect(mListView, TQ_SIGNAL(findActive(bool)), TQ_SLOT(slotFindActive(bool))); + Preferences::connect(TQ_SIGNAL(preferencesChanged()), this, TQ_SLOT(slotPrefsChanged())); + connect(theApp(), TQ_SIGNAL(trayIconToggled()), TQ_SLOT(updateTrayIconAction())); // Set menu item states setEnableText(true); @@ -485,13 +485,13 @@ void MainWindow::setUpdateTimer() { // Timeout every minute. needTimer->mMinuteTimerActive = true; - MinuteTimer::connect(TQT_TQOBJECT(needTimer), TQT_SLOT(slotUpdateTimeTo())); + MinuteTimer::connect(needTimer, TQ_SLOT(slotUpdateTimeTo())); kdDebug(5950) << "MainWindow::setUpdateTimer(): started timer" << endl; } else if (!needTimer && timerWindow) { timerWindow->mMinuteTimerActive = false; - MinuteTimer::disconnect(TQT_TQOBJECT(timerWindow)); + MinuteTimer::disconnect(timerWindow); kdDebug(5950) << "MainWindow::setUpdateTimer(): stopped timer" << endl; } } @@ -895,7 +895,7 @@ void MainWindow::slotTemplates() { mTemplateDlg = TemplateDlg::create(this); enableTemplateMenuItem(false); // disable menu item in all windows - connect(mTemplateDlg, TQT_SIGNAL(finished()), TQT_SLOT(slotTemplatesEnd())); + connect(mTemplateDlg, TQ_SIGNAL(finished()), TQ_SLOT(slotTemplatesEnd())); mTemplateDlg->show(); } } @@ -1088,7 +1088,7 @@ void MainWindow::slotConfigureToolbar() { saveMainWindowSettings(TDEGlobal::config(), WINDOW_NAME); KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } diff --git a/kalarm/mainwindowbase.cpp b/kalarm/mainwindowbase.cpp index 3d30a5ba..78dac9fa 100644 --- a/kalarm/mainwindowbase.cpp +++ b/kalarm/mainwindowbase.cpp @@ -43,7 +43,7 @@ void MainWindowBase::closeEvent(TQCloseEvent* ce) bool MainWindowBase::queryExit() { #if KDE_IS_VERSION(3,1,90) - if (kapp->sessionSaving()) + if (tdeApp->sessionSaving()) return true; #endif return disableQuit ? false : TDEMainWindow::queryExit(); diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index 3082c449..4e8c90a8 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -34,7 +34,7 @@ #include <tqtextedit.h> #include <tqtimer.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeaction.h> #include <kstdguiitem.h> #include <tdeaboutdata.h> @@ -48,7 +48,7 @@ #include <tdemessagebox.h> #include <twin.h> #include <twinmodule.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeio/netaccess.h> #include <knotifyclient.h> #include <kpushbutton.h> @@ -429,12 +429,12 @@ void MessageWin::initView() if (mDateTime.isDateOnly() || TQDate::currentDate().daysTo(mDateTime.date()) > 0) { setRemainingTextDay(); - MidnightTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextDay())); // update every day + MidnightTimer::connect(this, TQ_SLOT(setRemainingTextDay())); // update every day } else { setRemainingTextMinute(); - MinuteTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextMinute())); // update every minute + MinuteTimer::connect(this, TQ_SLOT(setRemainingTextMinute())); // update every minute } topLayout->addWidget(mRemainingText, 0, TQt::AlignHCenter); topLayout->addSpacing(KDialog::spacingHint()); @@ -512,7 +512,7 @@ void MessageWin::initView() mOkButton->clearFocus(); mOkButton->setFocusPolicy(TQWidget::ClickFocus); // don't allow keyboard selection mOkButton->setFixedSize(mOkButton->sizeHint()); - connect(mOkButton, TQT_SIGNAL(clicked()), TQT_SLOT(close())); + connect(mOkButton, TQ_SIGNAL(clicked()), TQ_SLOT(close())); grid->addWidget(mOkButton, 0, gridIndex++, AlignHCenter); TQWhatsThis::add(mOkButton, i18n("Acknowledge the alarm")); @@ -522,7 +522,7 @@ void MessageWin::initView() mEditButton = new TQPushButton(i18n("&Edit..."), topWidget); mEditButton->setFocusPolicy(TQWidget::ClickFocus); // don't allow keyboard selection mEditButton->setFixedSize(mEditButton->sizeHint()); - connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit())); + connect(mEditButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEdit())); grid->addWidget(mEditButton, 0, gridIndex++, AlignHCenter); TQWhatsThis::add(mEditButton, i18n("Edit the alarm.")); } @@ -533,7 +533,7 @@ void MessageWin::initView() mDeferButton = new TQPushButton(i18n("&Defer..."), topWidget); mDeferButton->setFocusPolicy(TQWidget::ClickFocus); // don't allow keyboard selection mDeferButton->setFixedSize(mDeferButton->sizeHint()); - connect(mDeferButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefer())); + connect(mDeferButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDefer())); grid->addWidget(mDeferButton, 0, gridIndex++, AlignHCenter); TQWhatsThis::add(mDeferButton, i18n("Defer the alarm until later.\n" @@ -550,7 +550,7 @@ void MessageWin::initView() mSilenceButton = new TQPushButton(topWidget); mSilenceButton->setPixmap(pixmap); mSilenceButton->setFixedSize(mSilenceButton->sizeHint()); - connect(mSilenceButton, TQT_SIGNAL(clicked()), TQT_SLOT(stopPlay())); + connect(mSilenceButton, TQ_SIGNAL(clicked()), TQ_SLOT(stopPlay())); grid->addWidget(mSilenceButton, 0, gridIndex++, AlignHCenter); TQToolTip::add(mSilenceButton, i18n("Stop sound")); TQWhatsThis::add(mSilenceButton, i18n("Stop playing the sound")); @@ -567,7 +567,7 @@ void MessageWin::initView() mKMailButton = new TQPushButton(topWidget); mKMailButton->setPixmap(pixmap); mKMailButton->setFixedSize(mKMailButton->sizeHint()); - connect(mKMailButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotShowKMailMessage())); + connect(mKMailButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotShowKMailMessage())); grid->addWidget(mKMailButton, 0, gridIndex++, AlignHCenter); TQToolTip::add(mKMailButton, i18n("Locate this email in KMail", "Locate in KMail")); TQWhatsThis::add(mKMailButton, i18n("Locate and highlight this email in KMail")); @@ -576,11 +576,11 @@ void MessageWin::initView() mKMailButton = 0; // KAlarm button - TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1(kapp->aboutData()->appName()), TDEIcon::MainToolbar); + TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1(tdeApp->aboutData()->appName()), TDEIcon::MainToolbar); mKAlarmButton = new TQPushButton(topWidget); mKAlarmButton->setPixmap(pixmap); mKAlarmButton->setFixedSize(mKAlarmButton->sizeHint()); - connect(mKAlarmButton, TQT_SIGNAL(clicked()), TQT_SLOT(displayMainWindow())); + connect(mKAlarmButton, TQ_SIGNAL(clicked()), TQ_SLOT(displayMainWindow())); grid->addWidget(mKAlarmButton, 0, gridIndex++, AlignHCenter); TQString actKAlarm = i18n("Activate KAlarm"); TQToolTip::add(mKAlarmButton, actKAlarm); @@ -619,9 +619,9 @@ void MessageWin::setRemainingTextDay() if (days <= 0 && !mDateTime.isDateOnly()) { // The alarm is due today, so start refreshing every minute - MidnightTimer::disconnect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextDay())); + MidnightTimer::disconnect(this, TQ_SLOT(setRemainingTextDay())); setRemainingTextMinute(); - MinuteTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextMinute())); // update every minute + MinuteTimer::connect(this, TQ_SLOT(setRemainingTextMinute())); // update every minute } else { @@ -796,14 +796,14 @@ void MessageWin::playAudio() #else // An audio file is specified. Because loading it may take some time, // call it on a timer to allow the window to display first. - TQTimer::singleShot(0, this, TQT_SLOT(slotPlayAudio())); + TQTimer::singleShot(0, this, TQ_SLOT(slotPlayAudio())); #endif } else if (mSpeak) { // The message is to be spoken. In case of error messges, // call it on a timer to allow the window to display first. - TQTimer::singleShot(0, this, TQT_SLOT(slotSpeak())); + TQTimer::singleShot(0, this, TQ_SLOT(slotSpeak())); } } @@ -813,12 +813,12 @@ void MessageWin::playAudio() */ void MessageWin::slotSpeak() { - DCOPClient* client = kapp->dcopClient(); + DCOPClient* client = tdeApp->dcopClient(); if (!client->isApplicationRegistered("kttsd")) { // kttsd is not running, so start it TQString error; - if (kapp->startServiceByDesktopName("kttsd", TQStringList(), &error)) + if (tdeApp->startServiceByDesktopName("kttsd", TQStringList(), &error)) { kdDebug(5950) << "MessageWin::slotSpeak(): failed to start kttsd: " << error << endl; if (!haveErrorMessage(ErrMsg_Speak)) @@ -868,7 +868,7 @@ void MessageWin::slotPlayAudio() { mFadeTimer = 0; mPlayTimer = new TQTimer(this); - connect(mPlayTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAudioPlay())); + connect(mPlayTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAudioPlay())); mArtsDispatcher = new KArtsDispatcher; mPlayedOnce = false; mAudioFileStart = TQTime::currentTime(); @@ -935,7 +935,7 @@ void MessageWin::initAudio(bool firstTime) } mSilenceButton->setEnabled(true); mPlayed = false; - connect(mPlayObject, TQT_SIGNAL(playObjectCreated()), TQT_SLOT(checkAudioPlay())); + connect(mPlayObject, TQ_SIGNAL(playObjectCreated()), TQ_SLOT(checkAudioPlay())); if (!mPlayObject->object().isNull()) checkAudioPlay(); } @@ -976,7 +976,7 @@ void MessageWin::checkAudioPlay() // Set up volume fade mAudioFileStart = now; mFadeTimer = new TQTimer(this); - connect(mFadeTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFade())); + connect(mFadeTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFade())); mFadeTimer->start(1000); // adjust volume every second } mPlayedOnce = true; @@ -1117,7 +1117,7 @@ int MessageWin::getKMixVolume() TQByteArray data, replyData; TQCString replyType; TQDataStream arg(data, IO_WriteOnly); - if (!kapp->dcopClient()->call(mKMixName, KMIX_DCOP_OBJECT, "masterVolume()", data, replyType, replyData) + if (!tdeApp->dcopClient()->call(mKMixName, KMIX_DCOP_OBJECT, "masterVolume()", data, replyType, replyData) || replyType != "int") return -1; int result; @@ -1138,7 +1138,7 @@ void MessageWin::setKMixVolume(int percent) TQByteArray data; TQDataStream arg(data, IO_WriteOnly); arg << percent; - if (!kapp->dcopClient()->send(mKMixName, KMIX_DCOP_OBJECT, "setMasterVolume(int)", data)) + if (!tdeApp->dcopClient()->send(mKMixName, KMIX_DCOP_OBJECT, "setMasterVolume(int)", data)) kdError(5950) << "MessageWin::setKMixVolume(): kmix dcop call failed\n"; } #endif @@ -1186,7 +1186,7 @@ void MessageWin::show() int delay = TQDateTime::currentDateTime().secsTo(mCloseTime); if (delay < 0) delay = 0; - TQTimer::singleShot(delay * 1000, this, TQT_SLOT(close())); + TQTimer::singleShot(delay * 1000, this, TQ_SLOT(close())); if (!delay) return; // don't show the window if auto-closing is already due } @@ -1302,7 +1302,7 @@ void MessageWin::showEvent(TQShowEvent* se) if (mAction == KAEvent::MESSAGE) { // Set the window size once the frame size is known - TQTimer::singleShot(0, this, TQT_SLOT(setMaxSize())); + TQTimer::singleShot(0, this, TQ_SLOT(setMaxSize())); } } mShown = true; @@ -1345,7 +1345,7 @@ void MessageWin::displayComplete() // Enable the window's buttons either now or after the configured delay if (mButtonDelay > 0) - TQTimer::singleShot(mButtonDelay, this, TQT_SLOT(enableButtons())); + TQTimer::singleShot(mButtonDelay, this, TQ_SLOT(enableButtons())); else enableButtons(); } @@ -1438,7 +1438,7 @@ void MessageWin::slotShowKMailMessage() TQByteArray data, replyData; TQDataStream arg(data, IO_WriteOnly); arg << (TQ_UINT32)mKMailSerialNumber << TQString(); - if (kapp->dcopClient()->call("kmail", KMAIL_DCOP_OBJECT, "showMail(TQ_UINT32,TQString)", data, replyType, replyData) + if (tdeApp->dcopClient()->call("kmail", KMAIL_DCOP_OBJECT, "showMail(TQ_UINT32,TQString)", data, replyType, replyData) && replyType == "bool") { bool result; @@ -1497,7 +1497,7 @@ void MessageWin::setDeferralLimit(const KAEvent& event) if (mDeferButton) { mDeferLimit = event.deferralLimit().dateTime(); - MidnightTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(checkDeferralLimit())); // check every day + MidnightTimer::connect(this, TQ_SLOT(checkDeferralLimit())); // check every day mDisableDeferral = false; checkDeferralLimit(); } @@ -1519,14 +1519,14 @@ void MessageWin::checkDeferralLimit() int n = TQDate::currentDate().daysTo(mDeferLimit.date()); if (n > 0) return; - MidnightTimer::disconnect(TQT_TQOBJECT(this), TQT_SLOT(checkDeferralLimit())); + MidnightTimer::disconnect(this, TQ_SLOT(checkDeferralLimit())); if (n == 0) { // The deferral limit will be reached today n = TQTime::currentTime().secsTo(mDeferLimit.time()); if (n > 0) { - TQTimer::singleShot(n * 1000, this, TQT_SLOT(checkDeferralLimit())); + TQTimer::singleShot(n * 1000, this, TQ_SLOT(checkDeferralLimit())); return; } } diff --git a/kalarm/pickfileradio.cpp b/kalarm/pickfileradio.cpp index 15b56d94..bdfb2bb4 100644 --- a/kalarm/pickfileradio.cpp +++ b/kalarm/pickfileradio.cpp @@ -41,10 +41,10 @@ PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQStrin Q_ASSERT(parent); Q_ASSERT(button); mButton->setEnabled(false); - connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile())); + connect(mButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotPickFile())); if (mEdit) mEdit->setEnabled(false); - connect(mGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotSelectionChanged(int))); + connect(mGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotSelectionChanged(int))); } PickFileRadio::PickFileRadio(const TQString& text, TQButtonGroup* parent, const char* name) @@ -64,10 +64,10 @@ void PickFileRadio::init(TQPushButton* button, LineEdit* edit) mEdit = edit; mButton = button; mButton->setEnabled(false); - connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile())); + connect(mButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotPickFile())); if (mEdit) mEdit->setEnabled(false); - connect(mGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotSelectionChanged(int))); + connect(mGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotSelectionChanged(int))); setReadOnly(RadioButton::isReadOnly()); } @@ -165,7 +165,7 @@ void PickFileRadio::slotPickFile() // No file is selected, so revert to the previous radio button selection. // But wait a moment before setting the radio button, or it won't work. mRevertId = true; // prevent picker dialogue popping up twice - TQTimer::singleShot(0, this, TQT_SLOT(setLastId())); + TQTimer::singleShot(0, this, TQ_SLOT(setLastId())); } } diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp index f439d609..c2d200bd 100644 --- a/kalarm/prefdlg.cpp +++ b/kalarm/prefdlg.cpp @@ -35,7 +35,7 @@ #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kshell.h> #include <tdemessagebox.h> #include <tdeaboutdata.h> @@ -159,7 +159,7 @@ void KAlarmPrefDlg::slotDefault() void KAlarmPrefDlg::slotHelp() { - kapp->invokeHelp("preferences"); + tdeApp->invokeHelp("preferences"); } // Apply the preferences that are currently selected @@ -263,7 +263,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) // Run-on-demand radio button mRunOnDemand = new TQRadioButton(i18n("&Run only on demand"), group, "runDemand"); mRunOnDemand->setFixedSize(mRunOnDemand->sizeHint()); - connect(mRunOnDemand, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRunModeToggled(bool))); + connect(mRunOnDemand, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRunModeToggled(bool))); TQWhatsThis::add(mRunOnDemand, i18n("Check to run KAlarm only when required.\n\n" "Notes:\n" @@ -274,7 +274,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) // Run-in-system-tray radio button mRunInSystemTray = new TQRadioButton(i18n("Run continuously in system &tray"), group, "runTray"); mRunInSystemTray->setFixedSize(mRunInSystemTray->sizeHint()); - connect(mRunInSystemTray, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRunModeToggled(bool))); + connect(mRunInSystemTray, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRunModeToggled(bool))); TQWhatsThis::add(mRunInSystemTray, i18n("Check to run KAlarm continuously in the TDE system tray.\n\n" "Notes:\n" @@ -286,7 +286,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) // Run continuously options mDisableAlarmsIfStopped = new TQCheckBox(i18n("Disa&ble alarms while not running"), group, "disableAl"); mDisableAlarmsIfStopped->setFixedSize(mDisableAlarmsIfStopped->sizeHint()); - connect(mDisableAlarmsIfStopped, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDisableIfStoppedToggled(bool))); + connect(mDisableAlarmsIfStopped, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDisableIfStoppedToggled(bool))); TQWhatsThis::add(mDisableAlarmsIfStopped, i18n("Check to disable alarms whenever KAlarm is not running. Alarms will only appear while the system tray icon is visible.")); grid->addMultiCellWidget(mDisableAlarmsIfStopped, 3, 3, 1, 2, alignment); @@ -299,14 +299,14 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) mAutostartTrayIcon = new TQCheckBox(i18n("Autostart at &login"), group, "autoTray"); #ifdef AUTOSTART_BY_KALARMD - connect(mAutostartTrayIcon, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutostartToggled(bool))); + connect(mAutostartTrayIcon, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAutostartToggled(bool))); #endif grid->addMultiCellWidget(mAutostartTrayIcon, 5, 5, 0, 2, alignment); // Autostart alarm daemon mAutostartDaemon = new TQCheckBox(i18n("Start alarm monitoring at lo&gin"), group, "startDaemon"); mAutostartDaemon->setFixedSize(mAutostartDaemon->sizeHint()); - connect(mAutostartDaemon, TQT_SIGNAL(clicked()), TQT_SLOT(slotAutostartDaemonClicked())); + connect(mAutostartDaemon, TQ_SIGNAL(clicked()), TQ_SLOT(slotAutostartDaemonClicked())); TQWhatsThis::add(mAutostartDaemon, i18n("Automatically start alarm monitoring whenever you start TDE, by running the alarm daemon (%1).\n\n" "This option should always be checked unless you intend to discontinue use of KAlarm.") @@ -346,7 +346,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) grid->addRowSpacing(0, fontMetrics().lineSpacing()/2); mKeepExpired = new TQCheckBox(i18n("Keep alarms after e&xpiry"), group, "keepExpired"); mKeepExpired->setFixedSize(mKeepExpired->sizeHint()); - connect(mKeepExpired, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotExpiredToggled(bool))); + connect(mKeepExpired, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotExpiredToggled(bool))); TQWhatsThis::add(mKeepExpired, i18n("Check to store alarms after expiry or deletion (except deleted alarms which were never triggered).")); grid->addMultiCellWidget(mKeepExpired, 1, 1, 0, 1, alignment); @@ -355,7 +355,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) box->setSpacing(KDialog::spacingHint()); mPurgeExpired = new TQCheckBox(i18n("Discard ex&pired alarms after:"), box, "purgeExpired"); mPurgeExpired->setMinimumSize(mPurgeExpired->sizeHint()); - connect(mPurgeExpired, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotExpiredToggled(bool))); + connect(mPurgeExpired, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotExpiredToggled(bool))); mPurgeAfter = new SpinBox(box); mPurgeAfter->setMinValue(1); mPurgeAfter->setLineShiftStep(10); @@ -369,7 +369,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) mClearExpired = new TQPushButton(i18n("Clear Expired Alar&ms"), group); mClearExpired->setFixedSize(mClearExpired->sizeHint()); - connect(mClearExpired, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearExpired())); + connect(mClearExpired, TQ_SIGNAL(clicked()), TQ_SLOT(slotClearExpired())); TQWhatsThis::add(mClearExpired, i18n("Delete all existing expired alarms.")); grid->addWidget(mClearExpired, 3, 1, alignment); @@ -399,7 +399,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) mXtermType->insert(radio, mXtermCount); if (mXtermFirst < 0) mXtermFirst = mXtermCount; // note the id of the first button - cmd.replace("%t", kapp->aboutData()->programName()); + cmd.replace("%t", tdeApp->aboutData()->programName()); cmd.replace("%c", "<command>"); cmd.replace("%w", "<command; sleep>"); cmd.replace("%C", "[command]"); @@ -413,7 +413,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) grid->addMultiCellWidget(box, row + 1, row + 1, 0, 2, TQt::AlignAuto); TQRadioButton* radio = new TQRadioButton(i18n("Other:"), box); radio->setFixedSize(radio->sizeHint()); - connect(radio, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotOtherTerminalToggled(bool))); + connect(radio, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotOtherTerminalToggled(bool))); mXtermType->insert(radio, mXtermCount); if (mXtermFirst < 0) mXtermFirst = mXtermCount; // note the id of the first button @@ -609,7 +609,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) radio = new RadioButton(i18n("&Sendmail"), box, "sendmail"); radio->setMinimumSize(radio->sizeHint()); mEmailClient->insert(radio, Preferences::SENDMAIL); - connect(mEmailClient, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotEmailClientChanged(int))); + connect(mEmailClient, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotEmailClientChanged(int))); box->setFixedHeight(box->sizeHint().height()); TQWhatsThis::add(box, i18n("Choose how to send email when an email alarm is triggered.\n" @@ -637,7 +637,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) grid->addWidget(label, 1, 0); mFromAddressGroup = new ButtonGroup(group); mFromAddressGroup->hide(); - connect(mFromAddressGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotFromAddrChanged(int))); + connect(mFromAddressGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotFromAddrChanged(int))); // Line edit to enter a 'From' email address radio = new RadioButton(group); @@ -646,7 +646,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) label->setBuddy(radio); grid->addWidget(radio, 1, 1); mEmailAddress = new TQLineEdit(group); - connect(mEmailAddress, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotAddressChanged())); + connect(mEmailAddress, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotAddressChanged())); TQString whatsThis = i18n("Your email address, used to identify you as the sender when sending email alarms."); TQWhatsThis::add(radio, whatsThis); TQWhatsThis::add(mEmailAddress, whatsThis); @@ -678,7 +678,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) grid->addWidget(label, 5, 0); mBccAddressGroup = new ButtonGroup(group); mBccAddressGroup->hide(); - connect(mBccAddressGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotBccAddrChanged(int))); + connect(mBccAddressGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotBccAddrChanged(int))); // Line edit to enter a 'Bcc' email address radio = new RadioButton(group); @@ -962,7 +962,7 @@ EditPrefTab::EditPrefTab(TQVBox* frame) mSoundFileBrowse = new TQPushButton(box); mSoundFileBrowse->setPixmap(SmallIcon("document-open")); mSoundFileBrowse->setFixedSize(mSoundFileBrowse->sizeHint()); - connect(mSoundFileBrowse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowseSoundFile())); + connect(mSoundFileBrowse, TQ_SIGNAL(clicked()), TQ_SLOT(slotBrowseSoundFile())); TQToolTip::add(mSoundFileBrowse, i18n("Choose a sound file")); TQWhatsThis::add(box, i18n("Enter the default sound file to use in the alarm edit dialog.")); @@ -1201,7 +1201,7 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame) mTooltipShowAlarms = new TQCheckBox(i18n("Show next &24 hours' alarms"), group, "tooltipShow"); mTooltipShowAlarms->setMinimumSize(mTooltipShowAlarms->sizeHint()); - connect(mTooltipShowAlarms, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipAlarmsToggled(bool))); + connect(mTooltipShowAlarms, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTooltipAlarmsToggled(bool))); TQWhatsThis::add(mTooltipShowAlarms, i18n("Specify whether to include in the system tray tooltip, a summary of alarms due in the next 24 hours")); grid->addMultiCellWidget(mTooltipShowAlarms, 1, 1, 0, 2, TQt::AlignAuto); @@ -1210,7 +1210,7 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame) box->setSpacing(KDialog::spacingHint()); mTooltipMaxAlarms = new TQCheckBox(i18n("Ma&ximum number of alarms to show:"), box, "tooltipMax"); mTooltipMaxAlarms->setMinimumSize(mTooltipMaxAlarms->sizeHint()); - connect(mTooltipMaxAlarms, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipMaxToggled(bool))); + connect(mTooltipMaxAlarms, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTooltipMaxToggled(bool))); mTooltipMaxAlarmCount = new SpinBox(1, 99, 1, box); mTooltipMaxAlarmCount->setLineShiftStep(5); mTooltipMaxAlarmCount->setMinimumSize(mTooltipMaxAlarmCount->sizeHint()); @@ -1221,14 +1221,14 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame) mTooltipShowTime = new TQCheckBox(MainWindow::i18n_m_ShowAlarmTime(), group, "tooltipTime"); mTooltipShowTime->setMinimumSize(mTooltipShowTime->sizeHint()); - connect(mTooltipShowTime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToggled(bool))); + connect(mTooltipShowTime, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTooltipTimeToggled(bool))); TQWhatsThis::add(mTooltipShowTime, i18n("Specify whether to show in the system tray tooltip, the time at which each alarm is due")); grid->addMultiCellWidget(mTooltipShowTime, 3, 3, 1, 2, TQt::AlignAuto); mTooltipShowTimeTo = new TQCheckBox(MainWindow::i18n_l_ShowTimeToAlarm(), group, "tooltipTimeTo"); mTooltipShowTimeTo->setMinimumSize(mTooltipShowTimeTo->sizeHint()); - connect(mTooltipShowTimeTo, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToToggled(bool))); + connect(mTooltipShowTimeTo, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTooltipTimeToToggled(bool))); TQWhatsThis::add(mTooltipShowTimeTo, i18n("Specify whether to show in the system tray tooltip, how long until each alarm is due")); grid->addMultiCellWidget(mTooltipShowTimeTo, 4, 4, 1, 2, TQt::AlignAuto); diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp index 8bf67957..00ff26bb 100644 --- a/kalarm/preferences.cpp +++ b/kalarm/preferences.cpp @@ -22,7 +22,7 @@ #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdeglobalsettings.h> #include <tdemessagebox.h> diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp index 7c04c1db..feee5e84 100644 --- a/kalarm/recurrenceedit.cpp +++ b/kalarm/recurrenceedit.cpp @@ -116,7 +116,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mRuleButtonGroup->setFrameStyle(TQFrame::NoFrame); lay->addWidget(mRuleButtonGroup); lay->addStretch(); // top-adjust the interval radio buttons - connect(mRuleButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(periodClicked(int))); + connect(mRuleButtonGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(periodClicked(int))); mNoneButton = new RadioButton(i18n_Norecur(), mRuleButtonGroup); mNoneButton->setFixedSize(mNoneButton->sizeHint()); @@ -172,8 +172,8 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mSubRepetition = new RepetitionButton(i18n("Sub-Repetition"), true, ruleFrame); mSubRepetition->setFixedSize(mSubRepetition->sizeHint()); mSubRepetition->setReadOnly(mReadOnly); - connect(mSubRepetition, TQT_SIGNAL(needsInitialisation()), TQT_SIGNAL(repeatNeedsInitialisation())); - connect(mSubRepetition, TQT_SIGNAL(changed()), TQT_SIGNAL(frequencyChanged())); + connect(mSubRepetition, TQ_SIGNAL(needsInitialisation()), TQ_SIGNAL(repeatNeedsInitialisation())); + connect(mSubRepetition, TQ_SIGNAL(changed()), TQ_SIGNAL(frequencyChanged())); TQWhatsThis::add(mSubRepetition, i18n("Set up a repetition within the recurrence, to trigger the alarm multiple times each time the recurrence is due.")); lay->addSpacing(KDialog::spacingHint()); lay->addWidget(mSubRepetition); @@ -196,11 +196,11 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mMonthlyRule = new MonthlyRule(mReadOnly, ruleFrame, "monthFrame"); mYearlyRule = new YearlyRule(mReadOnly, ruleFrame, "yearFrame"); - connect(mSubDailyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged())); - connect(mDailyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged())); - connect(mWeeklyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged())); - connect(mMonthlyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged())); - connect(mYearlyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged())); + connect(mSubDailyRule, TQ_SIGNAL(frequencyChanged()), this, TQ_SIGNAL(frequencyChanged())); + connect(mDailyRule, TQ_SIGNAL(frequencyChanged()), this, TQ_SIGNAL(frequencyChanged())); + connect(mWeeklyRule, TQ_SIGNAL(frequencyChanged()), this, TQ_SIGNAL(frequencyChanged())); + connect(mMonthlyRule, TQ_SIGNAL(frequencyChanged()), this, TQ_SIGNAL(frequencyChanged())); + connect(mYearlyRule, TQ_SIGNAL(frequencyChanged()), this, TQ_SIGNAL(frequencyChanged())); mRuleStack = new TQWidgetStack(ruleFrame); layout->addWidget(mRuleStack); @@ -217,7 +217,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name // which specify how long the recurrence is to last. mRangeButtonGroup = new ButtonGroup(i18n("Recurrence End"), this, "mRangeButtonGroup"); - connect(mRangeButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(rangeTypeClicked())); + connect(mRangeButtonGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(rangeTypeClicked())); topLayout->addWidget(mRangeButtonGroup); TQVBoxLayout* vlayout = new TQVBoxLayout(mRangeButtonGroup, KDialog::marginHint(), KDialog::spacingHint()); @@ -239,7 +239,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mRepeatCountEntry->setLineShiftStep(10); mRepeatCountEntry->setSelectOnStep(false); mRepeatCountEntry->setReadOnly(mReadOnly); - connect(mRepeatCountEntry, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(repeatCountChanged(int))); + connect(mRepeatCountEntry, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(repeatCountChanged(int))); TQWhatsThis::add(mRepeatCountEntry, i18n("Enter the total number of times to trigger the alarm")); mRepeatCountButton->setFocusWidget(mRepeatCountEntry); @@ -272,7 +272,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mEndAnyTimeCheckBox = new CheckBox(i18n("Any time"), mRangeButtonGroup); mEndAnyTimeCheckBox->setFixedSize(mEndAnyTimeCheckBox->sizeHint()); mEndAnyTimeCheckBox->setReadOnly(mReadOnly); - connect(mEndAnyTimeCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool))); + connect(mEndAnyTimeCheckBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAnyTimeToggled(bool))); TQWhatsThis::add(mEndAnyTimeCheckBox, i18n("Stop repeating the alarm after your first login on or after the specified end date")); layout->addWidget(mEndDateButton); @@ -300,7 +300,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mExceptionDateList = new TQListBox(mExceptionGroup); mExceptionDateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); - connect(mExceptionDateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(enableExceptionButtons())); + connect(mExceptionDateList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(enableExceptionButtons())); TQWhatsThis::add(mExceptionDateList, i18n("The list of exceptions, i.e. dates/times excluded from the recurrence")); vlayout->addWidget(mExceptionDateList); @@ -325,21 +325,21 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); TQPushButton* button = new TQPushButton(i18n("Add"), mExceptionGroup); button->setFixedSize(button->sizeHint()); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addException())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(addException())); TQWhatsThis::add(button, i18n("Add the date entered above to the exceptions list")); layout->addWidget(button); mChangeExceptionButton = new TQPushButton(i18n("Change"), mExceptionGroup); mChangeExceptionButton->setFixedSize(mChangeExceptionButton->sizeHint()); - connect(mChangeExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(changeException())); + connect(mChangeExceptionButton, TQ_SIGNAL(clicked()), TQ_SLOT(changeException())); TQWhatsThis::add(mChangeExceptionButton, i18n("Replace the currently highlighted item in the exceptions list with the date entered above")); layout->addWidget(mChangeExceptionButton); mDeleteExceptionButton = new TQPushButton(i18n("Delete"), mExceptionGroup); mDeleteExceptionButton->setFixedSize(mDeleteExceptionButton->sizeHint()); - connect(mDeleteExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(deleteException())); + connect(mDeleteExceptionButton, TQ_SIGNAL(clicked()), TQ_SLOT(deleteException())); TQWhatsThis::add(mDeleteExceptionButton, i18n("Remove the currently highlighted item from the exceptions list")); layout->addWidget(mDeleteExceptionButton); @@ -1137,7 +1137,7 @@ Rule::Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, b mIntSpinBox->setFixedSize(mIntSpinBox->sizeHint()); mIntSpinBox->setReadOnly(readOnly); } - connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(frequencyChanged())); + connect(mSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(frequencyChanged())); label->setBuddy(mSpinBox); label = new TQLabel(freqText, box); label->setFixedSize(label->sizeHint()); @@ -1368,7 +1368,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats mDayCombo->setReadOnly(readOnly); TQWhatsThis::add(mDayCombo, i18n("Select the day of the month on which to repeat the alarm")); mDayButton->setFocusWidget(mDayCombo); - connect(mDayCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotDaySelected(int))); + connect(mDayCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotDaySelected(int))); box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls box->setFixedHeight(box->sizeHint().height()); @@ -1418,7 +1418,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls box->setFixedHeight(box->sizeHint().height()); - connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(clicked(int))); + connect(mButtonGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(clicked(int))); } MonthYearRule::DayPosType MonthYearRule::type() const @@ -1567,7 +1567,7 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name) mMonthBox[i]->setReadOnly(readOnly); grid->addWidget(mMonthBox[i], i%3, i/3, TQt::AlignAuto); } - connect(mMonthBox[1], TQT_SIGNAL(toggled(bool)), TQT_SLOT(enableFeb29())); + connect(mMonthBox[1], TQ_SIGNAL(toggled(bool)), TQ_SLOT(enableFeb29())); w->setFixedHeight(w->sizeHint().height()); TQWhatsThis::add(w, i18n("Select the months of the year in which to repeat the alarm")); diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp index dd4b4151..7f327a85 100644 --- a/kalarm/reminder.cpp +++ b/kalarm/reminder.cpp @@ -52,7 +52,7 @@ Reminder::Reminder(const TQString& caption, const TQString& reminderWhatsThis, c mTime = new TimeSelector(caption, i18n("in advance"), reminderWhatsThis, valueWhatsThis, allowHourMinute, this, "timeOption"); mTime->setFixedSize(mTime->sizeHint()); - connect(mTime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotReminderToggled(bool))); + connect(mTime, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotReminderToggled(bool))); topLayout->addWidget(mTime); if (showOnceOnly) diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp index 4305cd65..8a964eac 100644 --- a/kalarm/repetition.cpp +++ b/kalarm/repetition.cpp @@ -52,7 +52,7 @@ RepetitionButton::RepetitionButton(const TQString& caption, bool waitForInitiali { setToggleButton(true); setOn(false); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotPressed())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotPressed())); } void RepetitionButton::set(int interval, int count) @@ -166,12 +166,12 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p i18n("Enter the time between repetitions of the alarm"), true, page); mTimeSelector->setFixedSize(mTimeSelector->sizeHint()); - connect(mTimeSelector, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(intervalChanged(int))); - connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(repetitionToggled(bool))); + connect(mTimeSelector, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(intervalChanged(int))); + connect(mTimeSelector, TQ_SIGNAL(toggled(bool)), TQ_SLOT(repetitionToggled(bool))); topLayout->addWidget(mTimeSelector, 0, TQt::AlignAuto); mButtonGroup = new ButtonGroup(page, "buttonGroup"); - connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(typeClicked())); + connect(mButtonGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(typeClicked())); topLayout->addWidget(mButtonGroup); TQBoxLayout* vlayout = new TQVBoxLayout(mButtonGroup, marginHint(), spacing); @@ -185,7 +185,7 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p mCount->setFixedSize(mCount->sizeHint()); mCount->setLineShiftStep(10); mCount->setSelectOnStep(false); - connect(mCount, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(countChanged(int))); + connect(mCount, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(countChanged(int))); TQWhatsThis::add(mCount, i18n("Enter the number of times to trigger the alarm after its initial occurrence")); layout->addWidget(mCount); @@ -200,7 +200,7 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p layout->addWidget(mDurationButton); mDuration = new TimePeriod(true, mButtonGroup); mDuration->setFixedSize(mDuration->sizeHint()); - connect(mDuration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(durationChanged(int))); + connect(mDuration, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(durationChanged(int))); TQWhatsThis::add(mDuration, i18n("Enter the length of time to repeat the alarm")); layout->addWidget(mDuration); diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index d7dc7738..1ca5db6a 100644 --- a/kalarm/sounddlg.cpp +++ b/kalarm/sounddlg.cpp @@ -32,7 +32,7 @@ #include <tqtooltip.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #ifdef WITHOUT_ARTS #include <kaudioplayer.h> @@ -86,7 +86,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad mFilePlay = new TQPushButton(box); mFilePlay->setPixmap(SmallIcon("media-playback-start")); mFilePlay->setFixedSize(mFilePlay->sizeHint()); - connect(mFilePlay, TQT_SIGNAL(clicked()), TQT_SLOT(playSound())); + connect(mFilePlay, TQ_SIGNAL(clicked()), TQ_SLOT(playSound())); TQToolTip::add(mFilePlay, i18n("Test the sound")); TQWhatsThis::add(mFilePlay, i18n("Play the selected sound file.")); @@ -99,7 +99,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad mFileBrowseButton = new PushButton(box); mFileBrowseButton->setPixmap(SmallIcon("document-open")); mFileBrowseButton->setFixedSize(mFileBrowseButton->sizeHint()); - connect(mFileBrowseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile())); + connect(mFileBrowseButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotPickFile())); TQToolTip::add(mFileBrowseButton, i18n("Choose a file")); TQWhatsThis::add(mFileBrowseButton, i18n("Select a sound file to play.")); @@ -128,7 +128,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad grid->addMultiCellWidget(box, 1, 1, 0, 2); mVolumeCheckbox = new CheckBox(i18n_v_SetVolume(), box); mVolumeCheckbox->setFixedSize(mVolumeCheckbox->sizeHint()); - connect(mVolumeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotVolumeToggled(bool))); + connect(mVolumeCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotVolumeToggled(bool))); TQWhatsThis::add(mVolumeCheckbox, i18n("Select to choose the volume for playing the sound file.")); @@ -143,7 +143,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad // Fade checkbox mFadeCheckbox = new CheckBox(i18n("Fade"), group); mFadeCheckbox->setFixedSize(mFadeCheckbox->sizeHint()); - connect(mFadeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFadeToggled(bool))); + connect(mFadeCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotFadeToggled(bool))); TQWhatsThis::add(mFadeCheckbox, i18n("Select to fade the volume when the sound file first starts to play.")); grid->addMultiCellWidget(mFadeCheckbox, 2, 2, 1, 2, alignment); @@ -303,7 +303,7 @@ void SoundDlg::playSound() return; } mPlayTimer = new TQTimer(this); - connect(mPlayTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAudioPlay())); + connect(mPlayTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAudioPlay())); mArtsDispatcher = new KArtsDispatcher; mPlayStarted = false; KArtsServer aserver; @@ -313,7 +313,7 @@ void SoundDlg::playSound() mFilePlay->setPixmap(SmallIcon("media-playback-stop")); TQToolTip::add(mFilePlay, i18n("Stop sound")); TQWhatsThis::add(mFilePlay, i18n("Stop playing the sound")); - connect(mPlayObject, TQT_SIGNAL(playObjectCreated()), TQT_SLOT(checkAudioPlay())); + connect(mPlayObject, TQ_SIGNAL(playObjectCreated()), TQ_SLOT(checkAudioPlay())); if (!mPlayObject->object().isNull()) checkAudioPlay(); #endif diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp index 947e9fb9..7c58e206 100644 --- a/kalarm/soundpicker.cpp +++ b/kalarm/soundpicker.cpp @@ -31,7 +31,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdefiledialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #ifndef WITHOUT_ARTS #include <arts/kplayobjectfactory.h> @@ -74,7 +74,7 @@ SoundPicker::SoundPicker(TQWidget* parent, const char* name) mTypeCombo->insertItem(i18n_File()); // index PLAY_FILE mSpeakShowing = !theApp()->speechEnabled(); showSpeak(!mSpeakShowing); // index SPEAK (only displayed if appropriate) - connect(mTypeCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeSelected(int))); + connect(mTypeCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeSelected(int))); label->setBuddy(mTypeCombo); soundLayout->addWidget(mTypeBox); @@ -82,7 +82,7 @@ SoundPicker::SoundPicker(TQWidget* parent, const char* name) mFilePicker = new PushButton(this); mFilePicker->setPixmap(SmallIcon("playsound")); mFilePicker->setFixedSize(mFilePicker->sizeHint()); - connect(mFilePicker, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile())); + connect(mFilePicker, TQ_SIGNAL(clicked()), TQ_SLOT(slotPickFile())); TQToolTip::add(mFilePicker, i18n("Configure sound file")); TQWhatsThis::add(mFilePicker, i18n("Configure a sound file to play when the alarm is displayed.")); soundLayout->addWidget(mFilePicker); diff --git a/kalarm/specialactions.cpp b/kalarm/specialactions.cpp index fd4b7a7d..f2599e35 100644 --- a/kalarm/specialactions.cpp +++ b/kalarm/specialactions.cpp @@ -46,7 +46,7 @@ SpecialActionsButton::SpecialActionsButton(const TQString& caption, TQWidget* pa { setToggleButton(true); setOn(false); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonPressed())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonPressed())); TQWhatsThis::add(this, i18n("Specify actions to execute before and after the alarm is displayed.")); } diff --git a/kalarm/startdaytimer.cpp b/kalarm/startdaytimer.cpp index 84f0096c..ef8ddf86 100644 --- a/kalarm/startdaytimer.cpp +++ b/kalarm/startdaytimer.cpp @@ -29,7 +29,7 @@ StartOfDayTimer* StartOfDayTimer::mInstance = 0; StartOfDayTimer::StartOfDayTimer() : DailyTimer(Preferences::startOfDay(), false) { - Preferences::connect(TQT_SIGNAL(startOfDayChanged(const TQTime&)), this, TQT_SLOT(startOfDayChanged(const TQTime&))); + Preferences::connect(TQ_SIGNAL(startOfDayChanged(const TQTime&)), this, TQ_SLOT(startOfDayChanged(const TQTime&))); } StartOfDayTimer* StartOfDayTimer::instance() diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp index 3754487a..ebf7f1c6 100644 --- a/kalarm/templatedlg.cpp +++ b/kalarm/templatedlg.cpp @@ -54,34 +54,34 @@ TemplateDlg::TemplateDlg(TQWidget* parent, const char* name) mTemplateList = new TemplateListView(true, i18n("The list of alarm templates"), topWidget); mTemplateList->setSelectionMode(TQListView::Extended); mTemplateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); - connect(mTemplateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(mTemplateList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); layout->addWidget(mTemplateList); layout = new TQVBoxLayout(topLayout); TQPushButton* button = new TQPushButton(i18n("&New..."), topWidget); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotNew())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(slotNew())); TQWhatsThis::add(button, i18n("Create a new alarm template")); layout->addWidget(button); mEditButton = new TQPushButton(i18n("&Edit..."), topWidget); - connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit())); + connect(mEditButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEdit())); TQWhatsThis::add(mEditButton, i18n("Edit the currently highlighted alarm template")); layout->addWidget(mEditButton); mCopyButton = new TQPushButton(i18n("Co&py"), topWidget); - connect(mCopyButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotCopy())); + connect(mCopyButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotCopy())); TQWhatsThis::add(mCopyButton, i18n("Create a new alarm template based on a copy of the currently highlighted template")); layout->addWidget(mCopyButton); mDeleteButton = new TQPushButton(i18n("&Delete"), topWidget); - connect(mDeleteButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelete())); + connect(mDeleteButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelete())); TQWhatsThis::add(mDeleteButton, i18n("Delete the currently highlighted alarm template")); layout->addWidget(mDeleteButton); TDEAccel* accel = new TDEAccel(this); - accel->insert(TDEStdAccel::SelectAll, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotSelectAll())); - accel->insert(TDEStdAccel::Deselect, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotDeselect())); + accel->insert(TDEStdAccel::SelectAll, mTemplateList, TQ_SLOT(slotSelectAll())); + accel->insert(TDEStdAccel::Deselect, mTemplateList, TQ_SLOT(slotDeselect())); accel->readSettings(); mTemplateList->refresh(); diff --git a/kalarm/templatemenuaction.cpp b/kalarm/templatemenuaction.cpp index 5da72a6d..1bcabf12 100644 --- a/kalarm/templatemenuaction.cpp +++ b/kalarm/templatemenuaction.cpp @@ -35,9 +35,9 @@ TemplateMenuAction::TemplateMenuAction(const TQString& label, const TQString& ic : TDEActionMenu(label, icon, actions, name) { setDelayed(false); - connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotInitMenu())); - connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelected(int))); - connect(this, TQT_SIGNAL(selected(const KAEvent&)), receiver, slot); + connect(popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotInitMenu())); + connect(popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelected(int))); + connect(this, TQ_SIGNAL(selected(const KAEvent&)), receiver, slot); } /****************************************************************************** diff --git a/kalarm/templatepickdlg.cpp b/kalarm/templatepickdlg.cpp index b3bc4488..9acd8fb8 100644 --- a/kalarm/templatepickdlg.cpp +++ b/kalarm/templatepickdlg.cpp @@ -46,9 +46,9 @@ TemplatePickDlg::TemplatePickDlg(TQWidget* parent, const char* name) mTemplateList = new TemplateListView(includeCmdAlarms, i18n("Select a template to base the new alarm on."), topWidget, "list"); mTemplateList->setSelectionMode(TQListView::Single); mTemplateList->refresh(); // populate the template list - connect(mTemplateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(mTemplateList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); // Require a real double click (even if KDE is in single-click mode) to accept the selection - connect(mTemplateList, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQT_SLOT(slotOk())); + connect(mTemplateList, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQ_SLOT(slotOk())); topLayout->addWidget(mTemplateList); slotSelectionChanged(); // enable or disable the OK button diff --git a/kalarm/timeselector.cpp b/kalarm/timeselector.cpp index de7ef828..710152b4 100644 --- a/kalarm/timeselector.cpp +++ b/kalarm/timeselector.cpp @@ -44,7 +44,7 @@ TimeSelector::TimeSelector(const TQString& selectText, const TQString& postfix, TQHBoxLayout* layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); mSelect = new CheckBox(selectText, this); mSelect->setFixedSize(mSelect->sizeHint()); - connect(mSelect, TQT_SIGNAL(toggled(bool)), TQT_SLOT(selectToggled(bool))); + connect(mSelect, TQ_SIGNAL(toggled(bool)), TQ_SLOT(selectToggled(bool))); TQWhatsThis::add(mSelect, selectWhatsThis); layout->addWidget(mSelect); @@ -54,7 +54,7 @@ TimeSelector::TimeSelector(const TQString& selectText, const TQString& postfix, mPeriod = new TimePeriod(allowHourMinute, box); mPeriod->setFixedSize(mPeriod->sizeHint()); mPeriod->setSelectOnStep(false); - connect(mPeriod, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(periodChanged(int))); + connect(mPeriod, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(periodChanged(int))); mSelect->setFocusWidget(mPeriod); mPeriod->setEnabled(false); diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index 9e06c44c..5c36bb1b 100644 --- a/kalarm/traywindow.cpp +++ b/kalarm/traywindow.cpp @@ -29,7 +29,7 @@ #include <tdeaboutdata.h> #include <tdepopupmenu.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdaction.h> #include <kstdguiitem.h> #include <tdeaccel.h> @@ -87,16 +87,16 @@ TrayWindow::TrayWindow(MainWindow* parent, const char* name) TDEActionCollection* actcol = actionCollection(); AlarmEnableAction* a = Daemon::createAlarmEnableAction(actcol, "tAlarmEnable"); a->plug(contextMenu()); - connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledStatus(bool))); - KAlarm::createNewAlarmAction(i18n("&New Alarm..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewAlarm()), actcol, "tNew")->plug(contextMenu()); - KAlarm::createNewFromTemplateAction(i18n("New Alarm From &Template"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actcol, "tNewFromTempl")->plug(contextMenu()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actcol)->plug(contextMenu()); + connect(a, TQ_SIGNAL(switched(bool)), TQ_SLOT(setEnabledStatus(bool))); + KAlarm::createNewAlarmAction(i18n("&New Alarm..."), this, TQ_SLOT(slotNewAlarm()), actcol, "tNew")->plug(contextMenu()); + KAlarm::createNewFromTemplateAction(i18n("New Alarm From &Template"), this, TQ_SLOT(slotNewFromTemplate(const KAEvent&)), actcol, "tNewFromTempl")->plug(contextMenu()); + KStdAction::preferences(this, TQ_SLOT(slotPreferences()), actcol)->plug(contextMenu()); // Replace the default handler for the Quit context menu item const char* quitName = KStdAction::name(KStdAction::Quit); actcol->remove(actcol->action(quitName)); actcol->tdeaccel()->remove(quitName); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actcol); + KStdAction::quit(this, TQ_SLOT(slotQuit()), actcol); // Set icon to correspond with the alarms enabled menu status Daemon::checkStatus(); @@ -351,9 +351,9 @@ void TrayTooltip::maybeTip(const TQPoint&) TrayWindow* parent = (TrayWindow*)parentWidget(); TQString text; if (Daemon::monitoringAlarms()) - text = kapp->aboutData()->programName(); + text = tdeApp->aboutData()->programName(); else - text = i18n("%1 - disabled").arg(kapp->aboutData()->programName()); + text = i18n("%1 - disabled").arg(tdeApp->aboutData()->programName()); kdDebug(5950) << "TrayTooltip::maybeTip(): " << text << endl; if (Preferences::tooltipAlarmCount()) parent->tooltipAlarmText(text); diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp index d1d3602f..1e6d3b0f 100644 --- a/kalarm/undo.cpp +++ b/kalarm/undo.cpp @@ -207,7 +207,7 @@ Undo::List Undo::mRedoList; Undo* Undo::instance() { if (!mInstance) - mInstance = new Undo(TQT_TQOBJECT(kapp)); + mInstance = new Undo(tdeApp); return mInstance; } diff --git a/kandy/src/cmdpropertiesdialog.cpp b/kandy/src/cmdpropertiesdialog.cpp index 9d605fda..7b4b2c71 100644 --- a/kandy/src/cmdpropertiesdialog.cpp +++ b/kandy/src/cmdpropertiesdialog.cpp @@ -60,7 +60,7 @@ class ParameterItem : public TQCheckListItem { * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ CmdPropertiesDialog::CmdPropertiesDialog(ATCommand *cmd, TQWidget* parent, const char* name, bool modal, diff --git a/kandy/src/cmdpropertiesdialog_base.ui b/kandy/src/cmdpropertiesdialog_base.ui index 7454b740..9b589d73 100644 --- a/kandy/src/cmdpropertiesdialog_base.ui +++ b/kandy/src/cmdpropertiesdialog_base.ui @@ -164,9 +164,9 @@ <slot>reject()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>editParameterName(TQListViewItem *)</slot> <slot access="protected">slotAccept()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kandy/src/commandscheduler.cpp b/kandy/src/commandscheduler.cpp index cc18a666..d6a95390 100644 --- a/kandy/src/commandscheduler.cpp +++ b/kandy/src/commandscheduler.cpp @@ -35,8 +35,8 @@ CommandScheduler::CommandScheduler(Modem *modem,TQObject *parent, TQObject(parent,name), mModem(modem) { - connect(mModem,TQT_SIGNAL(gotLine(const char *)), - TQT_SLOT(processOutput(const char *))); + connect(mModem,TQ_SIGNAL(gotLine(const char *)), + TQ_SLOT(processOutput(const char *))); } void CommandScheduler::execute(ATCommand *command) diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp index 13bd4ff6..643ecafa 100644 --- a/kandy/src/kandy.cpp +++ b/kandy/src/kandy.cpp @@ -41,7 +41,7 @@ #include <kurlrequesterdlg.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kedittoolbar.h> #include <tdestdaccel.h> #include <tdeaction.h> @@ -81,12 +81,12 @@ Kandy::Kandy(CommandScheduler *scheduler) setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(mView, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(mView, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(mView, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(mView, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); - connect(mView,TQT_SIGNAL(modifiedChanged(bool)),TQT_SLOT(setTitle())); + connect(mView,TQ_SIGNAL(modifiedChanged(bool)),TQ_SLOT(setTitle())); TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); @@ -123,26 +123,26 @@ void Kandy::save(const TQString & filename) void Kandy::setupActions() { - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection()); - KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection()); -// KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(filePrint()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); +// KStdAction::print(this, TQ_SLOT(filePrint()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); - new TDEAction(i18n("Mobile GUI"),0,TQT_TQOBJECT(this),TQT_SLOT(showMobileGui()), + new TDEAction(i18n("Mobile GUI"),0,this,TQ_SLOT(showMobileGui()), actionCollection(),"show_mobilegui"); - mConnectAction = new TDEAction(i18n("Connect"),0,TQT_TQOBJECT(this),TQT_SLOT(modemConnect()), + mConnectAction = new TDEAction(i18n("Connect"),0,this,TQ_SLOT(modemConnect()), actionCollection(),"modem_connect"); - mDisconnectAction = new TDEAction(i18n("Disconnect"),0,TQT_TQOBJECT(this), - TQT_SLOT(modemDisconnect()),actionCollection(), + mDisconnectAction = new TDEAction(i18n("Disconnect"),0,this, + TQ_SLOT(modemDisconnect()),actionCollection(), "modem_disconnect"); createGUI(); @@ -252,7 +252,7 @@ void Kandy::optionsConfigureToolbars() // use the standard toolbar editor saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(newToolbarConfig())); dlg.exec(); } diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp index 60ec1a67..e852ccd6 100644 --- a/kandy/src/kandyprefsdialog.cpp +++ b/kandy/src/kandyprefsdialog.cpp @@ -42,7 +42,7 @@ #include <tdelocale.h> #include <tdeglobal.h> #include <tdefontdialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <kcolordialog.h> #include <kiconloader.h> @@ -292,60 +292,60 @@ void KandyPrefsDialog::setupAddressbookTab() } - connect( useHomeSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - HomeSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useHomeSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - HomeSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useWorkSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - WorkSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useWorkSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - WorkSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useMessagingSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - MessagingSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useMessagingSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - MessagingSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useFaxSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - FaxSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useFaxSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - FaxSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useCellSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - CellSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useCellSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - CellSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useVideoSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - VideoSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useVideoSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - VideoSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useMailboxSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - MailboxSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useMailboxSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - MailboxSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useModemSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - ModemSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useModemSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - ModemSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useCarSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - CarSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useCarSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - CarSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useISDNSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - ISDNSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useISDNSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - ISDNSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( usePagerSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - PagerSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( usePagerSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - PagerSuff->label(), TQT_SLOT(setEnabled(bool)) ); + connect( useHomeSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + HomeSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useHomeSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + HomeSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useWorkSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + WorkSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useWorkSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + WorkSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useMessagingSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + MessagingSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useMessagingSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + MessagingSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useFaxSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + FaxSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useFaxSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + FaxSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useCellSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + CellSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useCellSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + CellSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useVideoSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + VideoSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useVideoSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + VideoSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useMailboxSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + MailboxSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useMailboxSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + MailboxSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useModemSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + ModemSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useModemSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + ModemSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useCarSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + CarSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useCarSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + CarSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useISDNSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + ISDNSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useISDNSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + ISDNSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( usePagerSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + PagerSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( usePagerSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + PagerSuff->label(), TQ_SLOT(setEnabled(bool)) ); } void KandyPrefsDialog::setupWindowsTab() diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp index 7f11adc9..51987b30 100644 --- a/kandy/src/kandyview.cpp +++ b/kandy/src/kandyview.cpp @@ -80,24 +80,24 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *parent) mCommandList->addColumn( i18n( "Hex" ) ); commandLayout->addWidget( mCommandList ); - connect( mCommandList, TQT_SIGNAL( doubleClicked(TQListViewItem*) ), - TQT_SLOT( executeCommand() ) ); + connect( mCommandList, TQ_SIGNAL( doubleClicked(TQListViewItem*) ), + TQ_SLOT( executeCommand() ) ); TQPushButton *buttonAdd = new TQPushButton( i18n("Add..."), commandBox ); commandLayout->addWidget( buttonAdd ); - connect( buttonAdd, TQT_SIGNAL( clicked() ), TQT_SLOT( addCommand() ) ); + connect( buttonAdd, TQ_SIGNAL( clicked() ), TQ_SLOT( addCommand() ) ); TQPushButton *buttonEdit = new TQPushButton( i18n("Edit..."), commandBox ); commandLayout->addWidget( buttonEdit ); - connect( buttonEdit, TQT_SIGNAL( clicked() ), TQT_SLOT( editCommand() ) ); + connect( buttonEdit, TQ_SIGNAL( clicked() ), TQ_SLOT( editCommand() ) ); TQPushButton *buttonDelete = new TQPushButton( i18n("Delete"), commandBox ); commandLayout->addWidget( buttonDelete ); - connect( buttonDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteCommand() ) ); + connect( buttonDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( deleteCommand() ) ); TQPushButton *buttonExecute = new TQPushButton( i18n("Execute"), commandBox ); commandLayout->addWidget( buttonExecute ); - connect( buttonExecute, TQT_SIGNAL( clicked() ), TQT_SLOT( executeCommand() ) ); + connect( buttonExecute, TQ_SIGNAL( clicked() ), TQ_SLOT( executeCommand() ) ); TQSplitter *ioSplitter = new TQSplitter( TQt::Vertical, mainSplitter ); @@ -132,15 +132,15 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *parent) mResultView = new TQTextEdit( resultBox ); mResultView->setReadOnly( true ); - connect (mInput,TQT_SIGNAL(returnPressed()),TQT_SLOT(processLastLine())); + connect (mInput,TQ_SIGNAL(returnPressed()),TQ_SLOT(processLastLine())); - connect(mScheduler->modem(),TQT_SIGNAL(gotLine(const char *)), - TQT_SLOT(appendOutput(const char *))); + connect(mScheduler->modem(),TQ_SIGNAL(gotLine(const char *)), + TQ_SLOT(appendOutput(const char *))); - connect(mScheduler,TQT_SIGNAL(result(const TQString &)), - mResultView,TQT_SLOT(setText(const TQString &))); - connect(mScheduler,TQT_SIGNAL(commandProcessed(ATCommand *)), - TQT_SLOT(setResult(ATCommand *))); + connect(mScheduler,TQ_SIGNAL(result(const TQString &)), + mResultView,TQ_SLOT(setText(const TQString &))); + connect(mScheduler,TQ_SIGNAL(commandProcessed(ATCommand *)), + TQ_SLOT(setResult(ATCommand *))); } KandyView::~KandyView() @@ -158,7 +158,7 @@ void KandyView::importPhonebook() { #if 0 createMobileGui(); - connect (mMobileGui,TQT_SIGNAL(phonebookRead()),mMobileGui,TQT_SLOT(writeKab())); + connect (mMobileGui,TQ_SIGNAL(phonebookRead()),mMobileGui,TQ_SLOT(writeKab())); mMobileGui->readPhonebook(); #endif } diff --git a/kandy/src/main.cpp b/kandy/src/main.cpp index a22229d5..00ca8764 100644 --- a/kandy/src/main.cpp +++ b/kandy/src/main.cpp @@ -135,18 +135,18 @@ int main(int argc, char **argv) args->clear(); - TQObject::connect(k,TQT_SIGNAL(showMobileWin()),m,TQT_SLOT(show())); - TQObject::connect(m,TQT_SIGNAL(showTerminalWin()),k,TQT_SLOT(show())); - TQObject::connect(m,TQT_SIGNAL(showPreferencesWin()), - k,TQT_SLOT(optionsPreferences())); - - TQObject::connect( m->view(), TQT_SIGNAL( connectModem() ), k, - TQT_SLOT( modemConnect() ) ); - TQObject::connect( m->view(), TQT_SIGNAL( disconnectModem() ), k, - TQT_SLOT( modemDisconnect() ) ); - - TQObject::connect( modem, TQT_SIGNAL( errorMessage( const TQString & ) ), - k, TQT_SLOT( showErrorMessage( const TQString & ) ) ); + TQObject::connect(k,TQ_SIGNAL(showMobileWin()),m,TQ_SLOT(show())); + TQObject::connect(m,TQ_SIGNAL(showTerminalWin()),k,TQ_SLOT(show())); + TQObject::connect(m,TQ_SIGNAL(showPreferencesWin()), + k,TQ_SLOT(optionsPreferences())); + + TQObject::connect( m->view(), TQ_SIGNAL( connectModem() ), k, + TQ_SLOT( modemConnect() ) ); + TQObject::connect( m->view(), TQ_SIGNAL( disconnectModem() ), k, + TQ_SLOT( modemDisconnect() ) ); + + TQObject::connect( modem, TQ_SIGNAL( errorMessage( const TQString & ) ), + k, TQ_SLOT( showErrorMessage( const TQString & ) ) ); initModem( modem ); diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp index 819d7e0f..1ba89cdd 100644 --- a/kandy/src/mobilegui.cpp +++ b/kandy/src/mobilegui.cpp @@ -180,7 +180,7 @@ class PhoneBookItem : public TQCheckListItem * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ MobileGui::MobileGui( CommandScheduler *scheduler, KandyPrefs *kprefs, TQWidget* parent, const char* name, WFlags fl ) : @@ -220,10 +220,10 @@ MobileGui::MobileGui( CommandScheduler *scheduler, KandyPrefs *kprefs, setMobState( UNLOADED ); // Setup signal handlers - connect( mScheduler, TQT_SIGNAL( commandProcessed( ATCommand * ) ), - TQT_SLOT( processResult( ATCommand * ) ) ); - connect( mScheduler->modem(), TQT_SIGNAL( gotLine( const char * ) ), - TQT_SLOT( termAddOutput( const char * ) ) ); + connect( mScheduler, TQ_SIGNAL( commandProcessed( ATCommand * ) ), + TQ_SLOT( processResult( ATCommand * ) ) ); + connect( mScheduler->modem(), TQ_SIGNAL( gotLine( const char * ) ), + TQ_SLOT( termAddOutput( const char * ) ) ); } @@ -240,7 +240,7 @@ void MobileGui::exit() mComingFromExit = true; if ( !warnMobState( UNLOADED ) ) { mComingFromExit = false; - kapp->quit(); + tdeApp->quit(); } } @@ -455,7 +455,7 @@ void MobileGui::writePhonebookPostProcessing() } else if ( mComingFromExit ) { mComingFromExit = false; - kapp->quit(); + tdeApp->quit(); } } diff --git a/kandy/src/mobilegui_base.ui b/kandy/src/mobilegui_base.ui index 83f8149e..01d77f27 100644 --- a/kandy/src/mobilegui_base.ui +++ b/kandy/src/mobilegui_base.ui @@ -565,7 +565,7 @@ <tabstop>PushButton1</tabstop> <tabstop>PushButton8_3</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>readKabc()</slot> <slot>readModelInformation()</slot> <slot>readPhonebook()</slot> @@ -578,6 +578,6 @@ <slot>termAddOutput( const char *line )</slot> <slot>toggleConnection()</slot> <slot>deleteMobPhonebook()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp index 33da5f56..fd1b0a8f 100644 --- a/kandy/src/mobilemain.cpp +++ b/kandy/src/mobilemain.cpp @@ -31,7 +31,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kedittoolbar.h> #include <kurldrag.h> @@ -55,10 +55,10 @@ MobileMain::MobileMain(CommandScheduler *scheduler, KandyPrefs *prefs) setupActions(); statusBar()->insertItem(i18n(" Disconnected "),1,0,true); - connect(mView,TQT_SIGNAL(statusMessage(const TQString &)), - TQT_SLOT(showStatusMessage(const TQString &))); - connect(mView,TQT_SIGNAL(transienStatusMessage(const TQString &)), - TQT_SLOT(showTransienStatusMessage(const TQString &))); + connect(mView,TQ_SIGNAL(statusMessage(const TQString &)), + TQ_SLOT(showStatusMessage(const TQString &))); + connect(mView,TQ_SIGNAL(transienStatusMessage(const TQString &)), + TQ_SLOT(showTransienStatusMessage(const TQString &))); statusBar()->show(); @@ -71,17 +71,17 @@ MobileMain::~MobileMain() void MobileMain::setupActions() { - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); - new TDEAction(i18n("Terminal"),0,TQT_TQOBJECT(this),TQT_SLOT(showTerminal()), + new TDEAction(i18n("Terminal"),0,this,TQ_SLOT(showTerminal()), actionCollection(),"show_terminal"); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); createGUI("kandymobileui.rc"); } @@ -130,7 +130,7 @@ void MobileMain::optionsConfigureToolbars() // use the standard toolbar editor saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(newToolbarConfig())); dlg.exec(); } diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp index 2a275bf4..ef16d00d 100644 --- a/kandy/src/modem.cpp +++ b/kandy/src/modem.cpp @@ -84,7 +84,7 @@ Modem::Modem( KandyPrefs *kprefs, TQObject *parent, const char *name ) : timer = new TQTimer( this, "modemtimer" ); TQ_CHECK_PTR( timer ); - connect( timer, TQT_SIGNAL( timeout() ), TQT_SLOT( timerDone() ) ); + connect( timer, TQ_SIGNAL( timeout() ), TQ_SLOT( timerDone() ) ); init(); xreset(); @@ -234,7 +234,7 @@ bool Modem::open() sn = new TQSocketNotifier( fd, TQSocketNotifier::Read, this, "modemsocketnotifier" ); TQ_CHECK_PTR( sn ); - connect( sn, TQT_SIGNAL( activated( int ) ), TQT_SLOT( readChar( int ) ) ); + connect( sn, TQ_SIGNAL( activated( int ) ), TQ_SLOT( readChar( int ) ) ); mOpen = true; @@ -372,7 +372,7 @@ void Modem::timerStart( int msec ) void Modem::receiveXModem( bool crc ) { disconnect( sn, 0, this, 0 ); - connect( sn, TQT_SIGNAL( activated( int ) ), TQT_SLOT( readXChar( int ) ) ); + connect( sn, TQ_SIGNAL( activated( int ) ), TQ_SLOT( readXChar( int ) ) ); xcrc = crc; @@ -598,7 +598,7 @@ void Modem::xreset() if ( sn ) { disconnect( sn, 0, this, 0 ); - connect( sn, TQT_SIGNAL( activated( int ) ), TQT_SLOT( readChar( int ) ) ); + connect( sn, TQ_SIGNAL( activated( int ) ), TQ_SLOT( readChar( int ) ) ); } } @@ -1,6 +1,6 @@ * KarmWindow::makeMenus -> export TDEAction? KarmWindow::contextMenuRequest * QPopupMenu should be static! put connect( ..contextMenu at the right place -* mainwindow: move tray Q_SIGNALS into tray.cpp add mouse double-click action +* mainwindow: move tray signals into tray.cpp add mouse double-click action * (start new timer, stop old) to "Configure Shortcuts" dialog. diff --git a/karm/csvexportdialog_base.ui b/karm/csvexportdialog_base.ui index 361ff510..091262c3 100644 --- a/karm/csvexportdialog_base.ui +++ b/karm/csvexportdialog_base.ui @@ -402,9 +402,9 @@ <tabstop>btnExport</tabstop> <tabstop>btnCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>enableExportButton()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kdateedit.h</include> diff --git a/karm/desktoptracker.cpp b/karm/desktoptracker.cpp index 06216570..cf41d5b3 100644 --- a/karm/desktoptracker.cpp +++ b/karm/desktoptracker.cpp @@ -11,8 +11,8 @@ const int minimumInterval = 5; // seconds DesktopTracker::DesktopTracker () { // Setup desktop change handling - connect( &kWinModule, TQT_SIGNAL( currentDesktopChanged(int) ), - this, TQT_SLOT( handleDesktopChange(int) )); + connect( &kWinModule, TQ_SIGNAL( currentDesktopChanged(int) ), + this, TQ_SLOT( handleDesktopChange(int) )); _desktopCount = kWinModule.numberOfDesktops(); _previousDesktop = kWinModule.currentDesktop()-1; @@ -21,7 +21,7 @@ DesktopTracker::DesktopTracker () if( _previousDesktop < 0 ) _previousDesktop = 0; _timer = new TQTimer(this); - connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( changeTimers() ) ); + connect( _timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( changeTimers() ) ); } void DesktopTracker::handleDesktopChange( int desktop ) diff --git a/karm/doc/Mainpage.dox b/karm/doc/Mainpage.dox index b320effb..b1228f32 100644 --- a/karm/doc/Mainpage.dox +++ b/karm/doc/Mainpage.dox @@ -24,7 +24,7 @@ order and can return a pointer to a KCal::Todo object that holds the same information. Preferences is a singleton that stores configuration options. It raises -Q_SIGNALS when options change (for example, the location where the karm data is +signals when options change (for example, the location where the karm data is stored) so the application can react and adjust. KarmStorage is a singleton that creates an interface for storing KArm data. @@ -35,7 +35,7 @@ format. /** \page sig_slot_index Index of Signals and Slots -To get an understanding of the flow program, it may be useful to see an overview of all of the Q_SIGNALS, Q_SLOTS, and +To get an understanding of the flow program, it may be useful to see an overview of all of the signals, slots, and connections. See \see connections to get an index of what signal is connected to which slot. \section overview Summary of what each class provides @@ -60,9 +60,9 @@ connections. See \see connections to get an index of what signal is connected to <tr><td>Task</td> <td> </td> <td> </td> <td>Y </td> <td> </td></tr> </table> -\section Q_SIGNALS Listing of all of the Q_SIGNALS +\section signals Listing of all of the signals -These are the Q_SIGNALS: +These are the signals: <ol> <li>IdleTimer::extractTime(int) <li>IdleTimer::stopTimer() @@ -83,7 +83,7 @@ These are the Q_SIGNALS: <li>Preferences::hideOnClose(bool) </ol> -\section Q_SLOTS Listing of the Q_SLOTS +\section slots Listing of the slots \subsection public Public Slots diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp index d63a339a..37d215d5 100644 --- a/karm/edittaskdialog.cpp +++ b/karm/edittaskdialog.cpp @@ -72,7 +72,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, _absoluteRB = new TQRadioButton( i18n( "Edit &absolute" ), page, "_absoluteRB" ); lay1->addWidget( _absoluteRB ); - connect( _absoluteRB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbsolutePressed() ) ); + connect( _absoluteRB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAbsolutePressed() ) ); // Absolute times @@ -124,7 +124,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, _relativeRB = new TQRadioButton( i18n( "Edit &relative (apply to both time and" " session time)" ), page, "_relativeRB" ); lay1->addWidget( _relativeRB ); - connect( _relativeRB, TQT_SIGNAL( clicked() ), this, TQT_SLOT(slotRelativePressed()) ); + connect( _relativeRB, TQ_SIGNAL( clicked() ), this, TQ_SLOT(slotRelativePressed()) ); // The relative times TQHBoxLayout *lay4 = new TQHBoxLayout(); @@ -207,7 +207,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, for (int i=0; i<desktopCount; i++) _deskBox[i]->setEnabled(enableDesktops); - connect(_desktopCB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAutoTrackingPressed())); + connect(_desktopCB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAutoTrackingPressed())); lay1->addStretch(1); diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp index 110eacd0..bf4092f5 100644 --- a/karm/idletimedetector.cpp +++ b/karm/idletimedetector.cpp @@ -27,7 +27,7 @@ IdleTimeDetector::IdleTimeDetector(int maxIdle) } _timer = new TQTimer(this); - connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(check())); + connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(check())); #else _idleDetectionPossible = false; #endif // HAVE_LIBXSS diff --git a/karm/karm.tdevelop b/karm/karm.tdevelop deleted file mode 100644 index 963fa7c4..00000000 --- a/karm/karm.tdevelop +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>root</author> - <email>root@duffman</email> - <version>$VERSION$</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <ignoreparts/> - </general> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - <hidenonprojectfiles>false</hidenonprojectfiles> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>sw</toc> - <toc>w3c-dom-level2-html</toc> - <toc>w3c-svg</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoreqt_xml> - <toc>qmake User Guide</toc> - </ignoreqt_xml> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs/> - <gdbpath/> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</outputradix> - </display> - </kdevdebugger> - <kdevfilecreate> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevautoproject> - <make> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - </make> - <run> - <directoryradio>executable</directoryradio> - <customdirectory>/</customdirectory> - <mainprogram>karm</mainprogram> - <programargs/> - <terminal>false</terminal> - <autocompile>true</autocompile> - <envvars/> - </run> - </kdevautoproject> - <cppsupportpart> - <filetemplates> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - </filetemplates> - </cppsupportpart> - <kdevcppsupport> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - <creategettersetter> - <prefixGet/> - <prefixSet>set</prefixSet> - <prefixVariable>m_,_</prefixVariable> - <parameterName>theValue</parameterName> - <inlineGet>true</inlineGet> - <inlineSet>true</inlineSet> - </creategettersetter> - <references/> - </kdevcppsupport> -</tdevelop> diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index 157222d2..1adb45df 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -8,7 +8,7 @@ #include "version.h" #include <tdeaccel.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> @@ -25,7 +25,7 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name ) : DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(parent, name), _accel ( new TDEAccel( parentWidget ) ), - _watcher ( new TDEAccelMenuWatch( _accel, TQT_TQOBJECT(parentWidget) ) ) + _watcher ( new TDEAccelMenuWatch( _accel, parentWidget ) ) { // we need an instance setInstance( karmPartFactory::instance() ); @@ -40,9 +40,9 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName, setWidget(_taskView); // create our actions - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::save(this, TQ_SLOT(save()), actionCollection()); makeMenus(); @@ -50,29 +50,29 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName, // connections - connect( _taskView, TQT_SIGNAL( totalTimesChanged( long, long ) ), - this, TQT_SLOT( updateTime( long, long ) ) ); - connect( _taskView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )), - this, TQT_SLOT(slotSelectionChanged())); - connect( _taskView, TQT_SIGNAL( updateButtons() ), - this, TQT_SLOT(slotSelectionChanged())); + connect( _taskView, TQ_SIGNAL( totalTimesChanged( long, long ) ), + this, TQ_SLOT( updateTime( long, long ) ) ); + connect( _taskView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )), + this, TQ_SLOT(slotSelectionChanged())); + connect( _taskView, TQ_SIGNAL( updateButtons() ), + this, TQ_SLOT(slotSelectionChanged())); // Setup context menu request handling connect( _taskView, - TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )), + TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )), this, - TQT_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int ))); + TQ_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int ))); _tray = new KarmTray( this ); - connect( _tray, TQT_SIGNAL( quitSelected() ), TQT_SLOT( quit() ) ); + connect( _tray, TQ_SIGNAL( quitSelected() ), TQ_SLOT( quit() ) ); - connect( _taskView, TQT_SIGNAL( timersActive() ), _tray, TQT_SLOT( startClock() ) ); - connect( _taskView, TQT_SIGNAL( timersActive() ), this, TQT_SLOT( enableStopAll() )); - connect( _taskView, TQT_SIGNAL( timersInactive() ), _tray, TQT_SLOT( stopClock() ) ); - connect( _taskView, TQT_SIGNAL( timersInactive() ), this, TQT_SLOT( disableStopAll())); - connect( _taskView, TQT_SIGNAL( tasksChanged( TQPtrList<Task> ) ), - _tray, TQT_SLOT( updateToolTip( TQPtrList<Task> ) )); + connect( _taskView, TQ_SIGNAL( timersActive() ), _tray, TQ_SLOT( startClock() ) ); + connect( _taskView, TQ_SIGNAL( timersActive() ), this, TQ_SLOT( enableStopAll() )); + connect( _taskView, TQ_SIGNAL( timersInactive() ), _tray, TQ_SLOT( stopClock() ) ); + connect( _taskView, TQ_SIGNAL( timersInactive() ), this, TQ_SLOT( disableStopAll())); + connect( _taskView, TQ_SIGNAL( tasksChanged( TQPtrList<Task> ) ), + _tray, TQ_SLOT( updateToolTip( TQPtrList<Task> ) )); _taskView->load(); @@ -113,119 +113,119 @@ void karmPart::makeMenus() *actionNew, *actionNewSub; - (void) KStdAction::quit( this, TQT_SLOT( quit() ), actionCollection()); - (void) KStdAction::print( this, TQT_SLOT( print() ), actionCollection()); - actionKeyBindings = KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ), + (void) KStdAction::quit( this, TQ_SLOT( quit() ), actionCollection()); + (void) KStdAction::print( this, TQ_SLOT( print() ), actionCollection()); + actionKeyBindings = KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ), actionCollection() ); - actionPreferences = KStdAction::preferences(TQT_TQOBJECT(_preferences), - TQT_SLOT(showDialog()), + actionPreferences = KStdAction::preferences(_preferences, + TQ_SLOT(showDialog()), actionCollection() ); - (void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() ); + (void) KStdAction::save( this, TQ_SLOT( save() ), actionCollection() ); TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"), 0, - TQT_TQOBJECT(this), - TQT_SLOT( startNewSession() ), + this, + TQ_SLOT( startNewSession() ), actionCollection(), "start_new_session"); TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"), 0, - TQT_TQOBJECT(this), - TQT_SLOT( resetAllTimes() ), + this, + TQ_SLOT( resetAllTimes() ), actionCollection(), "reset_all_times"); actionStart = new TDEAction( i18n("&Start"), TQString::fromLatin1("1rightarrow"), Key_S, - TQT_TQOBJECT(_taskView), - TQT_SLOT( startCurrentTimer() ), actionCollection(), + _taskView, + TQ_SLOT( startCurrentTimer() ), actionCollection(), "start"); actionStop = new TDEAction( i18n("S&top"), TQString::fromLatin1("process-stop"), 0, - TQT_TQOBJECT(_taskView), - TQT_SLOT( stopCurrentTimer() ), actionCollection(), + _taskView, + TQ_SLOT( stopCurrentTimer() ), actionCollection(), "stop"); actionStopAll = new TDEAction( i18n("Stop &All Timers"), Key_Escape, - TQT_TQOBJECT(_taskView), - TQT_SLOT( stopAllTimers() ), actionCollection(), + _taskView, + TQ_SLOT( stopAllTimers() ), actionCollection(), "stopAll"); actionStopAll->setEnabled(false); actionNew = new TDEAction( i18n("&New..."), TQString::fromLatin1("document-new"), CTRL+Key_N, - TQT_TQOBJECT(_taskView), - TQT_SLOT( newTask() ), actionCollection(), + _taskView, + TQ_SLOT( newTask() ), actionCollection(), "new_task"); actionNewSub = new TDEAction( i18n("New &Subtask..."), TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N, - TQT_TQOBJECT(_taskView), - TQT_SLOT( newSubTask() ), actionCollection(), + _taskView, + TQ_SLOT( newSubTask() ), actionCollection(), "new_sub_task"); actionDelete = new TDEAction( i18n("&Delete"), TQString::fromLatin1("edit-delete"), Key_Delete, - TQT_TQOBJECT(_taskView), - TQT_SLOT( deleteTask() ), actionCollection(), + _taskView, + TQ_SLOT( deleteTask() ), actionCollection(), "delete_task"); actionEdit = new TDEAction( i18n("&Edit..."), TQString::fromLatin1("edit"), CTRL + Key_E, - TQT_TQOBJECT(_taskView), - TQT_SLOT( editTask() ), actionCollection(), + _taskView, + TQ_SLOT( editTask() ), actionCollection(), "edit_task"); // actionAddComment = new TDEAction( i18n("&Add Comment..."), // TQString::fromLatin1("text-x-generic"), // CTRL+ALT+Key_E, -// TQT_TQOBJECT(_taskView), -// TQT_SLOT( addCommentToTask() ), +// _taskView, +// TQ_SLOT( addCommentToTask() ), // actionCollection(), // "add_comment_to_task"); actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"), TQString::fromLatin1("text-x-generic"), CTRL+Key_M, - TQT_TQOBJECT(_taskView), - TQT_SLOT( markTaskAsComplete() ), + _taskView, + TQ_SLOT( markTaskAsComplete() ), actionCollection(), "mark_as_complete"); actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"), TQString::fromLatin1("text-x-generic"), CTRL+Key_M, - TQT_TQOBJECT(_taskView), - TQT_SLOT( markTaskAsIncomplete() ), + _taskView, + TQ_SLOT( markTaskAsIncomplete() ), actionCollection(), "mark_as_incomplete"); actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"), TQString::fromLatin1("klipper"), CTRL+Key_C, - TQT_TQOBJECT(_taskView), - TQT_SLOT( clipTotals() ), + _taskView, + TQ_SLOT( clipTotals() ), actionCollection(), "clip_totals"); actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"), TQString::fromLatin1("klipper"), CTRL+ALT+Key_C, - TQT_TQOBJECT(_taskView), - TQT_SLOT( clipHistory() ), + _taskView, + TQ_SLOT( clipHistory() ), actionCollection(), "clip_history"); new TDEAction( i18n("Import &Legacy Flat File..."), 0, - TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(), + _taskView, TQ_SLOT(loadFromFlatFile()), actionCollection(), "import_flatfile"); new TDEAction( i18n("&Export to CSV File..."), 0, - TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(), + _taskView, TQ_SLOT(exportcsvFile()), actionCollection(), "export_csvfile"); new TDEAction( i18n("Export &History to CSV File..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(), + this, TQ_SLOT(exportcsvHistory()), actionCollection(), "export_csvhistory"); new TDEAction( i18n("Import Tasks From &Planner..."), 0, - TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(), + _taskView, TQ_SLOT(importPlanner()), actionCollection(), "import_planner"); new TDEAction( i18n("Configure KArm..."), 0, - TQT_TQOBJECT(_preferences), TQT_SLOT(showDialog()), actionCollection(), + _preferences, TQ_SLOT(showDialog()), actionCollection(), "configure_karm"); /* new TDEAction( i18n("Import E&vents"), 0, _taskView, - TQT_SLOT( loadFromKOrgEvents() ), actionCollection(), + TQ_SLOT( loadFromKOrgEvents() ), actionCollection(), "import_korg_events"); */ @@ -287,12 +287,12 @@ void karmPart::setReadWrite(bool rw) { // notify your internal widget of the read-write state if (rw) - connect(_taskView, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + connect(_taskView, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); else { - disconnect(_taskView, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + disconnect(_taskView, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); } ReadWritePart::setReadWrite(rw); @@ -414,7 +414,7 @@ TDEInstance* karmPartFactory::instance() extern "C" { - KDE_EXPORT void* init_libkarmpart() + TDE_EXPORT void* init_libkarmpart() { TDEGlobal::locale()->insertCatalogue("karm"); return new karmPartFactory; @@ -473,7 +473,7 @@ TQString karmPart::taskIdFromName( const TQString &taskname ) const void karmPart::quit() { - // TODO: write something for kapp->quit(); + // TODO: write something for tdeApp->quit(); } bool karmPart::save() diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index 1992c0f8..84ac8930 100644 --- a/karm/karmstorage.cpp +++ b/karm/karmstorage.cpp @@ -35,7 +35,7 @@ #include <tqstringlist.h> #include "incidence.h" -#include "tdeapplication.h" // kapp +#include "tdeapplication.h" // tdeApp #include <kdebug.h> #include <tdeemailsettings.h> #include <tdelocale.h> // i18n @@ -132,8 +132,8 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt } _calendar = resource; - TQObject::connect (_calendar, TQT_SIGNAL(resourceChanged(ResourceCalendar *)), - view, TQT_SLOT(iCalFileModified(ResourceCalendar *))); + TQObject::connect (_calendar, TQ_SIGNAL(resourceChanged(ResourceCalendar *)), + view, TQ_SLOT(iCalFileModified(ResourceCalendar *))); _calendar->setTimeZoneId( KPimPrefs::timezone() ); _calendar->setResourceName( TQString::fromLatin1("KArm") ); _calendar->open(); @@ -608,7 +608,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview, while ( tasknr < taskview->count() && !dialog.wasCancelled() ) { dialog.progressBar()->advance( 1 ); - if ( tasknr % 15 == 0 ) kapp->processEvents(); // repainting is slow + if ( tasknr % 15 == 0 ) tdeApp->processEvents(); // repainting is slow if ( taskview->item_at_index(tasknr)->depth() > maxdepth ) maxdepth = taskview->item_at_index(tasknr)->depth(); tasknr++; @@ -620,7 +620,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview, { task = taskview->item_at_index( tasknr ); dialog.progressBar()->advance( 1 ); - if ( tasknr % 15 == 0 ) kapp->processEvents(); + if ( tasknr % 15 == 0 ) tdeApp->processEvents(); // indent the task in the csv-file: for ( int i=0; i < task->depth(); ++i ) retval += delim; @@ -1069,7 +1069,7 @@ bool KarmStorage::bookTime(const Task* task, e->setDtEnd( startDateTime.addSecs( durationInSeconds ) ); // Use a custom property to keep a record of negative durations - e->setCustomProperty( kapp->instanceName(), + e->setCustomProperty( tdeApp->instanceName(), TQCString("duration"), TQString::number(durationInSeconds)); @@ -1095,7 +1095,7 @@ void KarmStorage::changeTime(const Task* task, const long deltaSeconds) e->setDtEnd(end); // Use a custom property to keep a record of negative durations - e->setCustomProperty( kapp->instanceName(), + e->setCustomProperty( tdeApp->instanceName(), TQCString("duration"), TQString::number(deltaSeconds)); @@ -1175,7 +1175,7 @@ TQValueList<HistoryEvent> KarmStorage::getHistory(const TQDate& from, // an easy fix for a (hopefully) rare situation. processed.append( (*event)->uid()); - duration = (*event)->customProperty(kapp->instanceName(), + duration = (*event)->customProperty(tdeApp->instanceName(), TQCString("duration")); if ( ! duration.isNull() ) { diff --git a/karm/karmstorage.h b/karm/karmstorage.h index 4087d3da..e411f09d 100644 --- a/karm/karmstorage.h +++ b/karm/karmstorage.h @@ -34,7 +34,7 @@ #include <calendarresources.h> #include <vector> #include "resourcecalendar.h" -#include <kdemacros.h> +#include <tdemacros.h> class TQDateTime; class Preferences; diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp index fb18e8be..ecf632a7 100644 --- a/karm/ktimewidget.cpp +++ b/karm/ktimewidget.cpp @@ -17,7 +17,7 @@ class TimeValidator : public TQValidator { public: TimeValidator( ValidatorType tp, TQWidget *parent=0, const char *name=0) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { _tp = tp; } diff --git a/karm/main.cpp b/karm/main.cpp index ef4326dc..cdc43e9d 100644 --- a/karm/main.cpp +++ b/karm/main.cpp @@ -15,7 +15,7 @@ namespace void cleanup( int ) { kdDebug(5970) << i18n("Just caught a software interrupt.") << endl; - kapp->exit(); + tdeApp->exit(); } } @@ -79,7 +79,7 @@ int main( int argc, char *argv[] ) myApp.setMainWidget( mainWindow ); - if (kapp->isRestored() && TDEMainWindow::canBeRestored( 1 )) + if (tdeApp->isRestored() && TDEMainWindow::canBeRestored( 1 )) mainWindow->restore( 1, false ); else mainWindow->show(); diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index 8265db05..26cab9b5 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -9,7 +9,7 @@ #include <dcopclient.h> #include <tdeaccel.h> #include <tdeaction.h> -#include <tdeapplication.h> // kapp +#include <tdeapplication.h> // tdeApp #include <tdeconfig.h> #include <kdebug.h> #include <tdeglobal.h> @@ -38,7 +38,7 @@ MainWindow::MainWindow( const TQString &icsfile ) : DCOPObject ( "KarmDCOPIface" ), KParts::MainWindow(0,TQt::WStyle_ContextHelp), _accel ( new TDEAccel( this ) ), - _watcher ( new TDEAccelMenuWatch( _accel, TQT_TQOBJECT(this) ) ), + _watcher ( new TDEAccelMenuWatch( _accel, this ) ), _totalSum ( 0 ), _sessionSum( 0 ) { @@ -57,33 +57,33 @@ MainWindow::MainWindow( const TQString &icsfile ) _watcher->updateMenus(); // connections - connect( _taskView, TQT_SIGNAL( totalTimesChanged( long, long ) ), - this, TQT_SLOT( updateTime( long, long ) ) ); - connect( _taskView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )), - this, TQT_SLOT(slotSelectionChanged())); - connect( _taskView, TQT_SIGNAL( updateButtons() ), - this, TQT_SLOT(slotSelectionChanged())); - connect( _taskView, TQT_SIGNAL( setStatusBar( TQString ) ), - this, TQT_SLOT(setStatusBar( TQString ))); + connect( _taskView, TQ_SIGNAL( totalTimesChanged( long, long ) ), + this, TQ_SLOT( updateTime( long, long ) ) ); + connect( _taskView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )), + this, TQ_SLOT(slotSelectionChanged())); + connect( _taskView, TQ_SIGNAL( updateButtons() ), + this, TQ_SLOT(slotSelectionChanged())); + connect( _taskView, TQ_SIGNAL( setStatusBar( TQString ) ), + this, TQ_SLOT(setStatusBar( TQString ))); loadGeometry(); // Setup context menu request handling connect( _taskView, - TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )), + TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )), this, - TQT_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int ))); + TQ_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int ))); _tray = new KarmTray( this ); - connect( _tray, TQT_SIGNAL( quitSelected() ), TQT_SLOT( quit() ) ); + connect( _tray, TQ_SIGNAL( quitSelected() ), TQ_SLOT( quit() ) ); - connect( _taskView, TQT_SIGNAL( timersActive() ), _tray, TQT_SLOT( startClock() ) ); - connect( _taskView, TQT_SIGNAL( timersActive() ), this, TQT_SLOT( enableStopAll() )); - connect( _taskView, TQT_SIGNAL( timersInactive() ), _tray, TQT_SLOT( stopClock() ) ); - connect( _taskView, TQT_SIGNAL( timersInactive() ), this, TQT_SLOT( disableStopAll())); - connect( _taskView, TQT_SIGNAL( tasksChanged( TQPtrList<Task> ) ), - _tray, TQT_SLOT( updateToolTip( TQPtrList<Task> ) )); + connect( _taskView, TQ_SIGNAL( timersActive() ), _tray, TQ_SLOT( startClock() ) ); + connect( _taskView, TQ_SIGNAL( timersActive() ), this, TQ_SLOT( enableStopAll() )); + connect( _taskView, TQ_SIGNAL( timersInactive() ), _tray, TQ_SLOT( stopClock() ) ); + connect( _taskView, TQ_SIGNAL( timersInactive() ), this, TQ_SLOT( disableStopAll())); + connect( _taskView, TQ_SIGNAL( tasksChanged( TQPtrList<Task> ) ), + _tray, TQ_SLOT( updateToolTip( TQPtrList<Task> ) )); _taskView->load(); @@ -93,10 +93,10 @@ MainWindow::MainWindow( const TQString &icsfile ) slotSelectionChanged(); // Register with DCOP - if ( !kapp->dcopClient()->isRegistered() ) + if ( !tdeApp->dcopClient()->isRegistered() ) { - kapp->dcopClient()->registerAs( "karm" ); - kapp->dcopClient()->setDefaultObject( objId() ); + tdeApp->dcopClient()->registerAs( "karm" ); + tdeApp->dcopClient()->setDefaultObject( objId() ); } // Set up DCOP error messages @@ -161,7 +161,7 @@ void MainWindow::exportcsvHistory() void MainWindow::quit() { - kapp->quit(); + tdeApp->quit(); } @@ -251,124 +251,124 @@ void MainWindow::makeMenus() *actionNew, *actionNewSub; - (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( quit() ), actionCollection()); - (void) KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection()); - actionKeyBindings = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ), + (void) KStdAction::quit( this, TQ_SLOT( quit() ), actionCollection()); + (void) KStdAction::print( this, TQ_SLOT( print() ), actionCollection()); + actionKeyBindings = KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ), actionCollection() ); - actionPreferences = KStdAction::preferences(TQT_TQOBJECT(_preferences), - TQT_SLOT(showDialog()), + actionPreferences = KStdAction::preferences(_preferences, + TQ_SLOT(showDialog()), actionCollection() ); - (void) KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( save() ), actionCollection() ); + (void) KStdAction::save( this, TQ_SLOT( save() ), actionCollection() ); TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"), 0, - TQT_TQOBJECT(this), - TQT_SLOT( startNewSession() ), + this, + TQ_SLOT( startNewSession() ), actionCollection(), "start_new_session"); TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"), 0, - TQT_TQOBJECT(this), - TQT_SLOT( resetAllTimes() ), + this, + TQ_SLOT( resetAllTimes() ), actionCollection(), "reset_all_times"); actionStart = new TDEAction( i18n("&Start"), TQString::fromLatin1("1rightarrow"), Key_S, - TQT_TQOBJECT(_taskView), - TQT_SLOT( startCurrentTimer() ), actionCollection(), + _taskView, + TQ_SLOT( startCurrentTimer() ), actionCollection(), "start"); actionStop = new TDEAction( i18n("S&top"), TQString::fromLatin1("process-stop"), Key_S, - TQT_TQOBJECT(_taskView), - TQT_SLOT( stopCurrentTimer() ), actionCollection(), + _taskView, + TQ_SLOT( stopCurrentTimer() ), actionCollection(), "stop"); actionStopAll = new TDEAction( i18n("Stop &All Timers"), Key_Escape, - TQT_TQOBJECT(_taskView), - TQT_SLOT( stopAllTimers() ), actionCollection(), + _taskView, + TQ_SLOT( stopAllTimers() ), actionCollection(), "stopAll"); actionStopAll->setEnabled(false); actionNew = new TDEAction( i18n("&New..."), TQString::fromLatin1("document-new"), CTRL+Key_N, - TQT_TQOBJECT(_taskView), - TQT_SLOT( newTask() ), actionCollection(), + _taskView, + TQ_SLOT( newTask() ), actionCollection(), "new_task"); actionNewSub = new TDEAction( i18n("New &Subtask..."), TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N, - TQT_TQOBJECT(_taskView), - TQT_SLOT( newSubTask() ), actionCollection(), + _taskView, + TQ_SLOT( newSubTask() ), actionCollection(), "new_sub_task"); actionDelete = new TDEAction( i18n("&Delete"), TQString::fromLatin1("edit-delete"), Key_Delete, - TQT_TQOBJECT(_taskView), - TQT_SLOT( deleteTask() ), actionCollection(), + _taskView, + TQ_SLOT( deleteTask() ), actionCollection(), "delete_task"); actionEdit = new TDEAction( i18n("&Edit..."), TQString::fromLatin1("edit"), CTRL + Key_E, - TQT_TQOBJECT(_taskView), - TQT_SLOT( editTask() ), actionCollection(), + _taskView, + TQ_SLOT( editTask() ), actionCollection(), "edit_task"); // actionAddComment = new TDEAction( i18n("&Add Comment..."), // TQString::fromLatin1("text-x-generic"), // CTRL+ALT+Key_E, -// TQT_TQOBJECT(_taskView), -// TQT_SLOT( addCommentToTask() ), +// _taskView, +// TQ_SLOT( addCommentToTask() ), // actionCollection(), // "add_comment_to_task"); actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"), TQString::fromLatin1("text-x-generic"), CTRL+Key_M, - TQT_TQOBJECT(_taskView), - TQT_SLOT( markTaskAsComplete() ), + _taskView, + TQ_SLOT( markTaskAsComplete() ), actionCollection(), "mark_as_complete"); actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"), TQString::fromLatin1("text-x-generic"), CTRL+Key_M, - TQT_TQOBJECT(_taskView), - TQT_SLOT( markTaskAsIncomplete() ), + _taskView, + TQ_SLOT( markTaskAsIncomplete() ), actionCollection(), "mark_as_incomplete"); actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"), TQString::fromLatin1("klipper"), CTRL+Key_C, - TQT_TQOBJECT(_taskView), - TQT_SLOT( clipTotals() ), + _taskView, + TQ_SLOT( clipTotals() ), actionCollection(), "clip_totals"); // actionClipTotals will never be used again, overwrite it actionClipTotals = new TDEAction( i18n("&Copy Session Time to Clipboard"), TQString::fromLatin1("klipper"), 0, - TQT_TQOBJECT(_taskView), - TQT_SLOT( clipSession() ), + _taskView, + TQ_SLOT( clipSession() ), actionCollection(), "clip_session"); actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"), TQString::fromLatin1("klipper"), CTRL+ALT+Key_C, - TQT_TQOBJECT(_taskView), - TQT_SLOT( clipHistory() ), + _taskView, + TQ_SLOT( clipHistory() ), actionCollection(), "clip_history"); new TDEAction( i18n("Import &Legacy Flat File..."), 0, - TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(), + _taskView, TQ_SLOT(loadFromFlatFile()), actionCollection(), "import_flatfile"); new TDEAction( i18n("&Export to CSV File..."), 0, - TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(), + _taskView, TQ_SLOT(exportcsvFile()), actionCollection(), "export_csvfile"); new TDEAction( i18n("Export &History to CSV File..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(), + this, TQ_SLOT(exportcsvHistory()), actionCollection(), "export_csvhistory"); new TDEAction( i18n("Import Tasks From &Planner..."), 0, - TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(), + _taskView, TQ_SLOT(importPlanner()), actionCollection(), "import_planner"); /* new TDEAction( i18n("Import E&vents"), 0, _taskView, - TQT_SLOT( loadFromKOrgEvents() ), actionCollection(), + TQ_SLOT( loadFromKOrgEvents() ), actionCollection(), "import_korg_events"); */ @@ -440,7 +440,7 @@ void MainWindow::loadGeometry() if (initialGeometrySet()) setAutoSaveSettings(); else { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup( TQString::fromLatin1("Main Window Geometry") ); int w = config.readNumEntry( TQString::fromLatin1("Width"), 100 ); @@ -463,7 +463,7 @@ void MainWindow::saveGeometry() bool MainWindow::queryClose() { - if ( !kapp->sessionSaving() ) { + if ( !tdeApp->sessionSaving() ) { hide(); return false; } diff --git a/karm/preferences.cpp b/karm/preferences.cpp index 29b242cf..3c04ee8f 100644 --- a/karm/preferences.cpp +++ b/karm/preferences.cpp @@ -5,14 +5,14 @@ #include <tqspinbox.h> #include <tqlayout.h> -#include <tdeapplication.h> // kapp +#include <tdeapplication.h> // tdeApp #include <tdeconfig.h> #include <kdebug.h> #include <tdeemailsettings.h> #include <kiconloader.h> #include <klineedit.h> // lineEdit() #include <tdelocale.h> // i18n -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include "preferences.h" @@ -68,8 +68,8 @@ void Preferences::makeBehaviorPage() topLevel->addStretch(); - connect( _doIdleDetectionW, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( idleDetectCheckBoxChanged() )); + connect( _doIdleDetectionW, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( idleDetectCheckBoxChanged() )); } void Preferences::makeDisplayPage() @@ -138,8 +138,8 @@ void Preferences::makeStoragePage() topLevel->addStretch(); // checkboxes disable file selection controls - connect( _doAutoSaveW, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( autoSaveCheckBoxChanged() )); + connect( _doAutoSaveW, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( autoSaveCheckBoxChanged() )); } void Preferences::disableIdleDetection() @@ -252,7 +252,7 @@ TQString Preferences::userRealName() const { return _userRealNa //--------------------------------------------------------------------------- void Preferences::load() { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup( TQString::fromLatin1("Idle detection") ); _doIdleDetectionV = config.readBoolEntry( TQString::fromLatin1("enabled"), diff --git a/karm/task.cpp b/karm/task.cpp index 5b05407d..6b4d3283 100644 --- a/karm/task.cpp +++ b/karm/task.cpp @@ -5,7 +5,7 @@ #include <kiconloader.h> -#include "tdeapplication.h" // kapp +#include "tdeapplication.h" // tdeApp #include "kdebug.h" #include "event.h" @@ -54,11 +54,11 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime, // If our parent is the taskview then connect our totalTimesChanged // signal to its receiver if ( ! parent() ) - connect( this, TQT_SIGNAL( totalTimesChanged ( long, long ) ), - listView(), TQT_SLOT( taskTotalTimesChanged( long, long) )); + connect( this, TQ_SIGNAL( totalTimesChanged ( long, long ) ), + listView(), TQ_SLOT( taskTotalTimesChanged( long, long) )); - connect( this, TQT_SIGNAL( deletingTask( Task* ) ), - listView(), TQT_SLOT( deletingTask( Task* ) )); + connect( this, TQ_SIGNAL( deletingTask( Task* ) ), + listView(), TQ_SLOT( deletingTask( Task* ) )); if (icons == 0) { icons = new TQPtrVector<TQPixmap>(8); @@ -80,7 +80,7 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime, _totalSessionTime = _sessionTime = sessionTime; _timer = new TQTimer(this); _desktops = desktops; - connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateActiveIcon())); + connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateActiveIcon())); setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm"))); _currentPic = 0; _percentcomplete = percent_complete; @@ -306,15 +306,15 @@ KCal::Todo* Task::asTodo(KCal::Todo* todo) const // time the file is opened. // todo->setDtStart( current ); - todo->setCustomProperty( kapp->instanceName(), + todo->setCustomProperty( tdeApp->instanceName(), TQCString( "totalTaskTime" ), TQString::number( _time ) ); - todo->setCustomProperty( kapp->instanceName(), + todo->setCustomProperty( tdeApp->instanceName(), TQCString( "totalSessionTime" ), TQString::number( _sessionTime) ); if (getDesktopStr().isEmpty()) - todo->removeCustomProperty(kapp->instanceName(), TQCString("desktopList")); + todo->removeCustomProperty(tdeApp->instanceName(), TQCString("desktopList")); else - todo->setCustomProperty( kapp->instanceName(), + todo->setCustomProperty( tdeApp->instanceName(), TQCString( "desktopList" ), getDesktopStr() ); todo->setOrganizer( Preferences::instance()->userRealName() ); @@ -336,18 +336,18 @@ bool Task::parseIncidence( KCal::Incidence* incident, long& minutes, _comment = incident->description(); ok = false; - minutes = incident->customProperty( kapp->instanceName(), + minutes = incident->customProperty( tdeApp->instanceName(), TQCString( "totalTaskTime" )).toInt( &ok ); if ( !ok ) minutes = 0; ok = false; - sessionMinutes = incident->customProperty( kapp->instanceName(), + sessionMinutes = incident->customProperty( tdeApp->instanceName(), TQCString( "totalSessionTime" )).toInt( &ok ); if ( !ok ) sessionMinutes = 0; - TQString desktopList = incident->customProperty( kapp->instanceName(), + TQString desktopList = incident->customProperty( tdeApp->instanceName(), TQCString( "desktopList" ) ); TQStringList desktopStrList = TQStringList::split( TQString::fromLatin1(","), desktopList ); diff --git a/karm/taskview.cpp b/karm/taskview.cpp index d1b80bf8..6fb09c38 100644 --- a/karm/taskview.cpp +++ b/karm/taskview.cpp @@ -10,7 +10,7 @@ #include <tqtimer.h> #include <tqxml.h> -#include "tdeapplication.h" // kapp +#include "tdeapplication.h" // tdeApp #include <tdeconfig.h> #include <kdebug.h> #include <tdefiledialog.h> @@ -42,10 +42,10 @@ TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile ) _preferences = Preferences::instance( icsfile ); _storage = KarmStorage::instance(); - connect( this, TQT_SIGNAL( expanded( TQListViewItem * ) ), - this, TQT_SLOT( itemStateChanged( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( collapsed( TQListViewItem * ) ), - this, TQT_SLOT( itemStateChanged( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( expanded( TQListViewItem * ) ), + this, TQ_SLOT( itemStateChanged( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( collapsed( TQListViewItem * ) ), + this, TQ_SLOT( itemStateChanged( TQListViewItem * ) ) ); // setup default values previousColumnWidths[0] = previousColumnWidths[1] @@ -65,49 +65,49 @@ TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile ) // set up the minuteTimer _minuteTimer = new TQTimer(this); - connect( _minuteTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( minuteUpdate() )); + connect( _minuteTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( minuteUpdate() )); _minuteTimer->start(1000 * secsPerMinute); // React when user changes iCalFile - connect(_preferences, TQT_SIGNAL(iCalFile(TQString)), - this, TQT_SLOT(iCalFileChanged(TQString))); + connect(_preferences, TQ_SIGNAL(iCalFile(TQString)), + this, TQ_SLOT(iCalFileChanged(TQString))); // resize columns when config is changed - connect(_preferences, TQT_SIGNAL( setupChanged() ), this,TQT_SLOT( adaptColumns() )); + connect(_preferences, TQ_SIGNAL( setupChanged() ), this,TQ_SLOT( adaptColumns() )); _minuteTimer->start(1000 * secsPerMinute); // Set up the idle detection. _idleTimeDetector = new IdleTimeDetector( _preferences->idlenessTimeout() ); - connect( _idleTimeDetector, TQT_SIGNAL( extractTime(int) ), - this, TQT_SLOT( extractTime(int) )); - connect( _idleTimeDetector, TQT_SIGNAL( stopAllTimersAt(TQDateTime) ), - this, TQT_SLOT( stopAllTimersAt(TQDateTime) )); - connect( _preferences, TQT_SIGNAL( idlenessTimeout(int) ), - _idleTimeDetector, TQT_SLOT( setMaxIdle(int) )); - connect( _preferences, TQT_SIGNAL( detectIdleness(bool) ), - _idleTimeDetector, TQT_SLOT( toggleOverAllIdleDetection(bool) )); + connect( _idleTimeDetector, TQ_SIGNAL( extractTime(int) ), + this, TQ_SLOT( extractTime(int) )); + connect( _idleTimeDetector, TQ_SIGNAL( stopAllTimersAt(TQDateTime) ), + this, TQ_SLOT( stopAllTimersAt(TQDateTime) )); + connect( _preferences, TQ_SIGNAL( idlenessTimeout(int) ), + _idleTimeDetector, TQ_SLOT( setMaxIdle(int) )); + connect( _preferences, TQ_SIGNAL( detectIdleness(bool) ), + _idleTimeDetector, TQ_SLOT( toggleOverAllIdleDetection(bool) )); if (!_idleTimeDetector->isIdleDetectionPossible()) _preferences->disableIdleDetection(); // Setup auto save timer _autoSaveTimer = new TQTimer(this); - connect( _preferences, TQT_SIGNAL( autoSave(bool) ), - this, TQT_SLOT( autoSaveChanged(bool) )); - connect( _preferences, TQT_SIGNAL( autoSavePeriod(int) ), - this, TQT_SLOT( autoSavePeriodChanged(int) )); - connect( _autoSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( save() )); + connect( _preferences, TQ_SIGNAL( autoSave(bool) ), + this, TQ_SLOT( autoSaveChanged(bool) )); + connect( _preferences, TQ_SIGNAL( autoSavePeriod(int) ), + this, TQ_SLOT( autoSavePeriodChanged(int) )); + connect( _autoSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( save() )); // Setup manual save timer (to save changes a little while after they happen) _manualSaveTimer = new TQTimer(this); - connect( _manualSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( save() )); + connect( _manualSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( save() )); // Connect desktop tracker events to task starting/stopping _desktopTracker = new DesktopTracker(); - connect( _desktopTracker, TQT_SIGNAL( reachedtActiveDesktop( Task* ) ), - this, TQT_SLOT( startTimerFor(Task*) )); - connect( _desktopTracker, TQT_SIGNAL( leftActiveDesktop( Task* ) ), - this, TQT_SLOT( stopTimerFor(Task*) )); + connect( _desktopTracker, TQ_SIGNAL( reachedtActiveDesktop( Task* ) ), + this, TQ_SLOT( startTimerFor(Task*) )); + connect( _desktopTracker, TQ_SIGNAL( leftActiveDesktop( Task* ) ), + this, TQ_SLOT( stopTimerFor(Task*) )); new TaskViewWhatsThis( this ); } diff --git a/karm/tdeaccelmenuwatch.cpp b/karm/tdeaccelmenuwatch.cpp index 5cb22366..3cc72ea8 100644 --- a/karm/tdeaccelmenuwatch.cpp +++ b/karm/tdeaccelmenuwatch.cpp @@ -27,7 +27,7 @@ void TDEAccelMenuWatch::setMenu( TQPopupMenu *menu ) if ( !_menuList.findRef( menu ) ) { _menuList.append( menu ); - connect( menu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(removeDeadMenu()) ); + connect( menu, TQ_SIGNAL(destroyed()), this, TQ_SLOT(removeDeadMenu()) ); } _menu = menu; diff --git a/karm/test/script.cpp b/karm/test/script.cpp index f9fa9d9e..ab6f7579 100644 --- a/karm/test/script.cpp +++ b/karm/test/script.cpp @@ -47,14 +47,14 @@ Script::Script( const TQDir& workingDirectory ) m_proc = new TQProcess( this ); m_proc->setWorkingDirectory( workingDirectory ); - connect ( m_proc, TQT_SIGNAL( readyReadStdout() ), - this , TQT_SLOT ( stdout() ) + connect ( m_proc, TQ_SIGNAL( readyReadStdout() ), + this , TQ_SLOT ( stdout() ) ); - connect ( m_proc, TQT_SIGNAL( readyReadStderr() ), - this , TQT_SLOT ( stderr() ) + connect ( m_proc, TQ_SIGNAL( readyReadStderr() ), + this , TQ_SLOT ( stderr() ) ); - connect ( m_proc, TQT_SIGNAL( processExited() ), - this , TQT_SLOT ( exit() ) + connect ( m_proc, TQ_SIGNAL( processExited() ), + this , TQ_SLOT ( exit() ) ); } @@ -79,7 +79,7 @@ int Script::run() { m_proc->start(); // This didn't work. But Ctrl-C does. :P - //TQTimer::singleShot( m_timeoutInSeconds * 1000, m_proc, TQT_SLOT( kill() ) ); + //TQTimer::singleShot( m_timeoutInSeconds * 1000, m_proc, TQ_SLOT( kill() ) ); //while ( ! m_proc->normalExit() ); while ( m_proc->isRunning() ); return m_status; @@ -89,7 +89,7 @@ void Script::terminate() { // These both trigger processExited, so exit() will run. m_proc->tryTerminate(); - TQTimer::singleShot( NICE_KILL_TIMEOUT_IN_SECS*1000, m_proc, TQT_SLOT( kill() ) ); + TQTimer::singleShot( NICE_KILL_TIMEOUT_IN_SECS*1000, m_proc, TQ_SLOT( kill() ) ); } void Script::exit() diff --git a/karm/tray.cpp b/karm/tray.cpp index 5187c7e4..9332d1e0 100644 --- a/karm/tray.cpp +++ b/karm/tray.cpp @@ -35,8 +35,8 @@ KarmTray::KarmTray(MainWindow* parent) { // the timer that updates the "running" icon in the tray _taskActiveTimer = new TQTimer(this); - connect( _taskActiveTimer, TQT_SIGNAL( timeout() ), this, - TQT_SLOT( advanceClock()) ); + connect( _taskActiveTimer, TQ_SIGNAL( timeout() ), this, + TQ_SLOT( advanceClock()) ); if (icons == 0) { icons = new TQPtrVector<TQPixmap>(8); diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index 2339d1ce..ad1b252c 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -40,7 +40,7 @@ #include "tqptrlist.h" #include "tqmemarray.h" #include "tqlayout.h" -#include "tqlayoutengine_p.h" +#include "private/tqlayoutengine_p.h" #include "tqobjectlist.h" #include "tqstyle.h" #include "tqapplication.h" //sendPostedEvents @@ -295,7 +295,7 @@ public: class TQSplitterData { public: - TQSplitterData() : opaque( FALSE ), firstShow( TRUE ) {} + TQSplitterData() : opaque( false ), firstShow( true ) {} TQPtrList<TQSplitterLayoutStruct> list; bool opaque; @@ -340,7 +340,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i that a widget should keep its size when the splitter is resized. Although KDGanttMinimizeSplitter normally resizes the children only - at the end of a resize operation, if you call setOpaqueResize( TRUE + at the end of a resize operation, if you call setOpaqueResize( true ) the widgets are resized as often as possible. The initial distribution of size between the widgets is determined @@ -404,7 +404,7 @@ KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQt::Orientation o, TQWidget * */ KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter() { - data->list.setAutoDelete( TRUE ); + data->list.setAutoDelete( true ); delete data; } @@ -458,11 +458,11 @@ void KDGanttMinimizeSplitter::resizeEvent( TQResizeEvent * ) /* Inserts the widget \a w at the end (or at the beginning if \a first - is TRUE) of the splitter's list of widgets. + is true) of the splitter's list of widgets. It is the responsibility of the caller of this function to make sure that \a w is not already in the splitter and to call recalcId if - needed. (If \a first is TRUE, then recalcId is very probably + needed. (If \a first is true, then recalcId is very probably needed.) */ TQSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bool first ) @@ -477,7 +477,7 @@ TQSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bool fi newHandle = new KDGanttSplitterHandle( orientation(), this, tmp.latin1() ); s->wid = newHandle; newHandle->setId(data->list.count()); - s->isSplitter = TRUE; + s->isSplitter = true; s->sizer = pick( newHandle->sizeHint() ); if ( first ) data->list.insert( 0, s ); @@ -491,7 +491,7 @@ TQSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bool fi s->sizer = pick( w->sizeHint() ); else s->sizer = pick( w->size() ); - s->isSplitter = FALSE; + s->isSplitter = false; if ( first ) data->list.insert( 0, s ); else @@ -585,7 +585,7 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e ) if ( e->type() == TQEvent::LayoutHint || ( e->type() == TQEvent::Show && data->firstShow ) ) { recalc( isVisible() ); if ( e->type() == TQEvent::Show ) - data->firstShow = FALSE; + data->firstShow = false; } return TQWidget::event( e ); } @@ -615,12 +615,12 @@ void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p, int KDGanttMinimizeSplitter::idAfter( TQWidget* w ) const { TQSplitterLayoutStruct *s = data->list.first(); - bool seen_w = FALSE; + bool seen_w = false; while ( s ) { if ( s->isSplitter && seen_w ) return data->list.at(); if ( !s->isSplitter && s->wid == w ) - seen_w = TRUE; + seen_w = true; s = data->list.next(); } return 0; @@ -696,11 +696,11 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft ) pos1 = pos2 + 1; } if ( upLeft ) { - setG( w, pos1, dd, TRUE ); + setG( w, pos1, dd, true ); moveBefore( pos2, id-1, upLeft ); } else { moveBefore( pos2, id-1, upLeft ); - setG( w, pos1, dd, TRUE ); + setG( w, pos1, dd, true ); } } else { int dd, newLeft, nextPos; @@ -715,7 +715,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft ) newLeft = pos-dd+1; nextPos = newLeft - 1; } - setG( w, newLeft, dd, TRUE ); + setG( w, newLeft, dd, true ); moveBefore( nextPos, id-1, upLeft ); } } @@ -749,11 +749,11 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft ) pos2 = pos + dd; } if ( upLeft ) { - setG( w, pos1, dd, TRUE ); + setG( w, pos1, dd, true ); moveAfter( pos2, id+1, upLeft ); } else { moveAfter( pos2, id+1, upLeft ); - setG( w, pos1, dd, TRUE ); + setG( w, pos1, dd, true ); } } else { int left = pick( w->pos() ); @@ -771,7 +771,7 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft ) newLeft = pos; nextPos = newLeft + dd; } - setG( w, newLeft, dd, TRUE ); + setG( w, newLeft, dd, true ); /*if( right != newRight )*/ moveAfter( nextPos, id+1, upLeft ); } @@ -884,23 +884,23 @@ void KDGanttMinimizeSplitter::doResize() } else if ( s->isSplitter ) { a[i].stretch = 0; a[i].sizeHint = a[i].minimumSize = a[i].maximumSize = s->sizer; - a[i].empty = FALSE; + a[i].empty = false; } else if ( s->mode == KeepSize ) { a[i].stretch = 0; a[i].minimumSize = pick( minSize(s->wid) ); a[i].sizeHint = s->sizer; a[i].maximumSize = pick( s->wid->maximumSize() ); - a[i].empty = FALSE; + a[i].empty = false; } else if ( s->mode == FollowSizeHint ) { a[i].stretch = 0; a[i].minimumSize = a[i].sizeHint = pick( s->wid->sizeHint() ); a[i].maximumSize = pick( s->wid->maximumSize() ); - a[i].empty = FALSE; + a[i].empty = false; } else { //proportional a[i].stretch = s->sizer; a[i].maximumSize = pick( s->wid->maximumSize() ); a[i].sizeHint = a[i].minimumSize = pick( minSize(s->wid) ); - a[i].empty = FALSE; + a[i].empty = false; } } @@ -922,7 +922,7 @@ void KDGanttMinimizeSplitter::recalc( bool update ) int maxt = TQWIDGETSIZE_MAX; int mint = fi; int n = data->list.count(); - bool first = TRUE; + bool first = true; /* The splitter before a hidden widget is always hidden. The splitter before the first visible widget is hidden. @@ -938,15 +938,15 @@ void KDGanttMinimizeSplitter::recalc( bool update ) else p->wid->show(); //may trigger new recalc if ( !s->wid->isHidden() ) - first = FALSE; + first = false; } } - bool empty=TRUE; + bool empty=true; for ( int j = 0; j< n; j++ ) { TQSplitterLayoutStruct *s = data->list.at(j); if ( !s->wid->isHidden() ) { - empty = FALSE; + empty = false; if ( s->isSplitter ) { minl += s->sizer; maxl += s->sizer; @@ -1003,13 +1003,13 @@ void KDGanttMinimizeSplitter::setResizeMode( TQWidget *w, ResizeMode mode ) } s = data->list.next(); } - s = addWidget( w, TRUE ); + s = addWidget( w, true ); s->mode = mode; } /*! - Returns TRUE if opaque resize is on; otherwise returns FALSE. + Returns true if opaque resize is on; otherwise returns false. \sa setOpaqueResize() */ @@ -1021,7 +1021,7 @@ bool KDGanttMinimizeSplitter::opaqueResize() const /*! - If \a on is TRUE then opaque resizing is turned on; otherwise + If \a on is true then opaque resizing is turned on; otherwise opaque resizing is turned off. Opaque resizing is initially turned off. @@ -1041,11 +1041,11 @@ void KDGanttMinimizeSplitter::setOpaqueResize( bool on ) void KDGanttMinimizeSplitter::moveToFirst( TQWidget *w ) { processChildEvents(); - bool found = FALSE; + bool found = false; TQSplitterLayoutStruct *s = data->list.first(); while ( s ) { if ( s->wid == w ) { - found = TRUE; + found = true; TQSplitterLayoutStruct *p = data->list.prev(); if ( p ) { // not already at first place data->list.take(); //take p @@ -1058,7 +1058,7 @@ void KDGanttMinimizeSplitter::moveToFirst( TQWidget *w ) s = data->list.next(); } if ( !found ) - addWidget( w, TRUE ); + addWidget( w, true ); recalcId(); } @@ -1070,11 +1070,11 @@ void KDGanttMinimizeSplitter::moveToFirst( TQWidget *w ) void KDGanttMinimizeSplitter::moveToLast( TQWidget *w ) { processChildEvents(); - bool found = FALSE; + bool found = false; TQSplitterLayoutStruct *s = data->list.first(); while ( s ) { if ( s->wid == w ) { - found = TRUE; + found = true; data->list.take(); // take s TQSplitterLayoutStruct *p = data->list.current(); if ( p ) { // the splitter handle after s @@ -1179,7 +1179,7 @@ void KDGanttMinimizeSplitter::storeSizes() #if 0 // ### remove this code ASAP /*! - Hides \a w if \a hide is TRUE and updates the splitter. + Hides \a w if \a hide is true and updates the splitter. \warning Due to a limitation in the current implementation, calling TQWidget::hide() will not work. @@ -1201,7 +1201,7 @@ void KDGanttMinimizeSplitter::setHidden( TQWidget *w, bool hide ) w->hide(); else w->show(); - recalc( TRUE ); + recalc( true ); } @@ -1219,7 +1219,7 @@ bool KDGanttMinimizeSplitter::isHidden( TQWidget *w ) const else tqWarning( "KDGanttMinimizeSplitter::isHidden(), unknown widget" ); #endif - return FALSE; + return false; } #endif @@ -1358,12 +1358,12 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i int sumStretch = 0; int spacerCount = 0; - bool wannaGrow = FALSE; // anyone who really wants to grow? - // bool canShrink = FALSE; // anyone who could be persuaded to shrink? + bool wannaGrow = false; // anyone who really wants to grow? + // bool canShrink = false; // anyone who could be persuaded to shrink? int i; for ( i = start; i < start + count; i++ ) { - chain[i].done = FALSE; + chain[i].done = false; cHint += chain[i].sizeHint; cMin += chain[i].minimumSize; cMax += chain[i].maximumSize; @@ -1380,7 +1380,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i // tqDebug("not enough space"); for ( i = start; i < start+count; i++ ) { chain[i].size = chain[i].minimumSize; - chain[i].done = TRUE; + chain[i].done = true; } } else if ( space < cHint + spacerCount*spacer ) { // Less space than sizeHint, but more than minimum. @@ -1393,7 +1393,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i for ( i = start; i < start+count; i++ ) { if ( !chain[i].done && chain[i].minimumSize >= chain[i].sizeHint) { chain[i].size = chain[i].sizeHint; - chain[i].done = TRUE; + chain[i].done = true; space_left -= chain[i].sizeHint; // sumStretch -= chain[i].stretch; n--; @@ -1401,7 +1401,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i } bool finished = n == 0; while ( !finished ) { - finished = TRUE; + finished = true; fixed fp_over = toFixed( overdraft ); fixed fp_w = 0; @@ -1416,9 +1416,9 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i chain[i].size = chain[i].sizeHint - w; fp_w -= toFixed( w ); //give the difference to the next if ( chain[i].size < chain[i].minimumSize ) { - chain[i].done = TRUE; + chain[i].done = true; chain[i].size = chain[i].minimumSize; - finished = FALSE; + finished = false; overdraft -= chain[i].sizeHint - chain[i].minimumSize; // sumStretch -= chain[i].stretch; n--; @@ -1434,7 +1434,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i if ( !chain[i].done && (chain[i].maximumSize <= chain[i].sizeHint || wannaGrow && !chain[i].expansive) ) { chain[i].size = chain[i].sizeHint; - chain[i].done = TRUE; + chain[i].done = true; space_left -= chain[i].sizeHint; sumStretch -= chain[i].stretch; n--; @@ -1479,7 +1479,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i if ( !chain[i].done && chain[i].size < chain[i].sizeHint ) { chain[i].size = chain[i].sizeHint; - chain[i].done = TRUE; + chain[i].done = true; space_left -= chain[i].sizeHint; sumStretch -= chain[i].stretch; n--; @@ -1492,7 +1492,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i if ( !chain[i].done && chain[i].size > chain[i].maximumSize ) { chain[i].size = chain[i].maximumSize; - chain[i].done = TRUE; + chain[i].done = true; space_left -= chain[i].maximumSize; sumStretch -= chain[i].stretch; n--; diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h index 3dfa659a..628a9c6f 100644 --- a/kdgantt/KDGanttMinimizeSplitter.h +++ b/kdgantt/KDGanttMinimizeSplitter.h @@ -63,13 +63,13 @@ public: Direction minimizeDirection() const; virtual void setResizeMode( TQWidget *w, ResizeMode ); - virtual void setOpaqueResize( bool = TRUE ); + virtual void setOpaqueResize( bool = true ); bool opaqueResize() const; void moveToFirst( TQWidget * ); void moveToLast( TQWidget * ); - void refresh() { recalc( TRUE ); } + void refresh() { recalc( true ); } virtual TQSize sizeHint() const; virtual TQSize minimumSizeHint() const; @@ -95,15 +95,15 @@ protected: private: void init(); - void recalc( bool update = FALSE ); + void recalc( bool update = false ); void doResize(); void storeSizes(); void processChildEvents(); - TQSplitterLayoutStruct *addWidget( TQWidget*, bool first = FALSE ); + TQSplitterLayoutStruct *addWidget( TQWidget*, bool first = false ); void recalcId(); void moveBefore( int pos, int id, bool upLeft ); void moveAfter( int pos, int id, bool upLeft ); - void setG( TQWidget *w, int p, int s, bool isSplitter = FALSE ); + void setG( TQWidget *w, int p, int s, bool isSplitter = false ); TQCOORD pick( const TQPoint &p ) const { return orient == TQt::Horizontal ? p.x() : p.y(); } diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp index 86268e87..6ea8375d 100644 --- a/kdgantt/KDGanttSemiSizingControl.cpp +++ b/kdgantt/KDGanttSemiSizingControl.cpp @@ -248,7 +248,7 @@ void KDGanttSemiSizingControl::init() { _but = new TQPushButton( this ); _but->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - connect( _but, TQT_SIGNAL( clicked() ), this, TQT_SLOT(changeState()) ); + connect( _but, TQ_SIGNAL( clicked() ), this, TQ_SLOT(changeState()) ); _layout = 0; TQWhatsThis::add( _but, "Click on this button to show the \nlegend at the bottom of the widget"); TQToolTip::add( _but, "Show / hide legend"); diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index 5df5248b..e9adada9 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -100,17 +100,17 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name ) spacerLeft = new TQHBox( leftWidget ); myListView = new KDListView(leftWidget, this); myListView->setVScrollBarMode (TQScrollView::AlwaysOff ); - connect( myListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( myListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); - connect( myListView, TQT_SIGNAL( mouseButtonClicked ( int, TQListViewItem * , const TQPoint &, int ) ), this, TQT_SLOT( slotmouseButtonClicked ( int , TQListViewItem * , const TQPoint &, int ) ) ); - connect( myListView, TQT_SIGNAL( contextMenuRequested ( TQListViewItem * , const TQPoint &, int ) ), this, TQT_SLOT( slotcontextMenuRequested ( TQListViewItem * , const TQPoint & , int ) ) ); + connect( myListView, TQ_SIGNAL( mouseButtonClicked ( int, TQListViewItem * , const TQPoint &, int ) ), this, TQ_SLOT( slotmouseButtonClicked ( int , TQListViewItem * , const TQPoint &, int ) ) ); + connect( myListView, TQ_SIGNAL( contextMenuRequested ( TQListViewItem * , const TQPoint &, int ) ), this, TQ_SLOT( slotcontextMenuRequested ( TQListViewItem * , const TQPoint & , int ) ) ); - connect( myListView, TQT_SIGNAL(currentChanged( TQListViewItem * ) ), this, TQT_SLOT(slotCurrentChanged ( TQListViewItem * ) ) ); - connect( myListView, TQT_SIGNAL(itemRenamed ( TQListViewItem * , int , const TQString & ) ), this, TQT_SLOT(slotItemRenamed ( TQListViewItem *, int , const TQString & ) ) ); - connect( myListView, TQT_SIGNAL(mouseButtonPressed( int, TQListViewItem * , const TQPoint &, int ) ), this, TQT_SLOT(slotMouseButtonPressed ( int , TQListViewItem * , const TQPoint & , int ) ) ); + connect( myListView, TQ_SIGNAL(currentChanged( TQListViewItem * ) ), this, TQ_SLOT(slotCurrentChanged ( TQListViewItem * ) ) ); + connect( myListView, TQ_SIGNAL(itemRenamed ( TQListViewItem * , int , const TQString & ) ), this, TQ_SLOT(slotItemRenamed ( TQListViewItem *, int , const TQString & ) ) ); + connect( myListView, TQ_SIGNAL(mouseButtonPressed( int, TQListViewItem * , const TQPoint &, int ) ), this, TQ_SLOT(slotMouseButtonPressed ( int , TQListViewItem * , const TQPoint & , int ) ) ); - //connect( myListView, TQT_SIGNAL( ), this, TQT_SLOT( ) ); + //connect( myListView, TQ_SIGNAL( ), this, TQ_SLOT( ) ); myTimeTable = new KDTimeTableWidget (rightWidget,this); spacerRight = new TQWidget( rightWidget ); @@ -145,8 +145,8 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name ) setLineWidth( 2 ); myListView->setFrameStyle( TQFrame::NoFrame ); myListView->setMargin( 0 ); - TQObject::connect(myListView, TQT_SIGNAL ( expanded ( TQListViewItem * ) ) , myTimeTable , TQT_SLOT( expandItem(TQListViewItem * ))) ; - TQObject::connect(myListView, TQT_SIGNAL (collapsed ( TQListViewItem * ) ) , myTimeTable , TQT_SLOT(collapseItem(TQListViewItem * ))) ; + TQObject::connect(myListView, TQ_SIGNAL ( expanded ( TQListViewItem * ) ) , myTimeTable , TQ_SLOT( expandItem(TQListViewItem * ))) ; + TQObject::connect(myListView, TQ_SIGNAL (collapsed ( TQListViewItem * ) ) , myTimeTable , TQ_SLOT(collapseItem(TQListViewItem * ))) ; timeHeaderSpacerWidget->setFixedWidth(myCanvasView->verticalScrollBar()->width() ); listViewIsVisible = true; @@ -158,7 +158,7 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name ) myTextColor = TQt::black; myLegendItems = new TQPtrList<legendItem>; - //TQObject::connect( this, TQT_SIGNAL (itemDoubleClicked( KDGanttViewItem* ) ) , this, TQT_SLOT( editItem( KDGanttViewItem* ))) ; + //TQObject::connect( this, TQ_SIGNAL (itemDoubleClicked( KDGanttViewItem* ) ) , this, TQ_SLOT( editItem( KDGanttViewItem* ))) ; myItemAttributeDialog = new itemAttributeDialog(); setRepaintMode( KDGanttView::Medium ); //setRepaintMode( KDGanttView::Always ); @@ -166,19 +166,19 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name ) setHeaderVisible( false ); // now connecting the widgets - connect(myCanvasView->horizontalScrollBar(), TQT_SIGNAL ( valueChanged ( int )) ,myTimeHeaderScroll->horizontalScrollBar(), TQT_SLOT( setValue ( int))) ; - connect(myCanvasView, TQT_SIGNAL ( heightResized( int )) ,myTimeTable, TQT_SLOT( checkHeight ( int))) ; - connect(myCanvasView, TQT_SIGNAL ( widthResized( int )) ,myTimeHeader, TQT_SLOT( checkWidth ( int))) ; - - TQObject::connect(myCanvasView->verticalScrollBar(), TQT_SIGNAL ( valueChanged ( int ) ) ,myListView->verticalScrollBar(), TQT_SLOT( setValue ( int ))) ; - connect(myTimeHeader, TQT_SIGNAL ( sizeChanged( int ) ) ,this, TQT_SLOT(slotHeaderSizeChanged() )) ; - connect(myTimeHeader, TQT_SIGNAL ( sizeChanged( int ) ) ,myTimeTable, TQT_SLOT(resetWidth( int ) )) ; - connect(myListView, TQT_SIGNAL ( contentsMoving ( int, int ) ) ,myCanvasView, TQT_SLOT( moveMyContent( int, int ))) ; - connect(myTimeTable, TQT_SIGNAL ( heightComputed ( int ) ) ,myCanvasView, TQT_SLOT( setMyContentsHeight( int ))) ; + connect(myCanvasView->horizontalScrollBar(), TQ_SIGNAL ( valueChanged ( int )) ,myTimeHeaderScroll->horizontalScrollBar(), TQ_SLOT( setValue ( int))) ; + connect(myCanvasView, TQ_SIGNAL ( heightResized( int )) ,myTimeTable, TQ_SLOT( checkHeight ( int))) ; + connect(myCanvasView, TQ_SIGNAL ( widthResized( int )) ,myTimeHeader, TQ_SLOT( checkWidth ( int))) ; + + TQObject::connect(myCanvasView->verticalScrollBar(), TQ_SIGNAL ( valueChanged ( int ) ) ,myListView->verticalScrollBar(), TQ_SLOT( setValue ( int ))) ; + connect(myTimeHeader, TQ_SIGNAL ( sizeChanged( int ) ) ,this, TQ_SLOT(slotHeaderSizeChanged() )) ; + connect(myTimeHeader, TQ_SIGNAL ( sizeChanged( int ) ) ,myTimeTable, TQ_SLOT(resetWidth( int ) )) ; + connect(myListView, TQ_SIGNAL ( contentsMoving ( int, int ) ) ,myCanvasView, TQ_SLOT( moveMyContent( int, int ))) ; + connect(myTimeTable, TQ_SIGNAL ( heightComputed ( int ) ) ,myCanvasView, TQ_SLOT( setMyContentsHeight( int ))) ; // the next three are for adding new ticks at left/right - connect( myCanvasView->horizontalScrollBar(), TQT_SIGNAL (prevLine () ) ,this, TQT_SLOT(addTickLeft())); - connect( myCanvasView->horizontalScrollBar(), TQT_SIGNAL (nextLine () ) ,this, TQT_SLOT(addTickRight())); - connect( myCanvasView->horizontalScrollBar(), TQT_SIGNAL (valueChanged ( int ) ) ,this, TQT_SLOT( enableAdding( int ))); + connect( myCanvasView->horizontalScrollBar(), TQ_SIGNAL (prevLine () ) ,this, TQ_SLOT(addTickLeft())); + connect( myCanvasView->horizontalScrollBar(), TQ_SIGNAL (nextLine () ) ,this, TQ_SLOT(addTickRight())); + connect( myCanvasView->horizontalScrollBar(), TQ_SIGNAL (valueChanged ( int ) ) ,this, TQ_SLOT( enableAdding( int ))); // now initing fCenterTimeLineAfterShow = false; @@ -553,18 +553,18 @@ void KDGanttView::setRepaintMode( RepaintMode mode ) break; case Medium: - connect( cvv, TQT_SIGNAL (sliderReleased () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvh, TQT_SIGNAL (sliderReleased () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvv, TQT_SIGNAL (nextLine () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvh, TQT_SIGNAL (nextLine () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvv, TQT_SIGNAL (prevLine () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvh, TQT_SIGNAL (prevLine () ) ,this, TQT_SLOT(forceRepaint())); + connect( cvv, TQ_SIGNAL (sliderReleased () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvh, TQ_SIGNAL (sliderReleased () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvv, TQ_SIGNAL (nextLine () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvh, TQ_SIGNAL (nextLine () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvv, TQ_SIGNAL (prevLine () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvh, TQ_SIGNAL (prevLine () ) ,this, TQ_SLOT(forceRepaint())); break; case Always: - connect( cvv, TQT_SIGNAL (valueChanged ( int ) ) ,this, TQT_SLOT(forceRepaint( int ))); - connect( cvh, TQT_SIGNAL (valueChanged ( int ) ) ,this, TQT_SLOT(forceRepaint( int ))); - connect( cvv, TQT_SIGNAL (sliderReleased () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvh, TQT_SIGNAL (sliderReleased () ) ,this, TQT_SLOT(forceRepaint())); + connect( cvv, TQ_SIGNAL (valueChanged ( int ) ) ,this, TQ_SLOT(forceRepaint( int ))); + connect( cvh, TQ_SIGNAL (valueChanged ( int ) ) ,this, TQ_SLOT(forceRepaint( int ))); + connect( cvv, TQ_SIGNAL (sliderReleased () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvh, TQ_SIGNAL (sliderReleased () ) ,this, TQ_SLOT(forceRepaint())); break; } } diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index f3dd9c40..4b1e3472 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -59,7 +59,7 @@ #include <kdebug.h> KDTimeTableWidget:: KDTimeTableWidget( TQWidget* parent,KDGanttView* myGantt) - : TQCanvas (TQT_TQOBJECT(parent)) + : TQCanvas (parent) { myGanttView = myGantt; taskLinksVisible = true; @@ -725,42 +725,42 @@ KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* parent,KDGanttView* gant ) myPopupMenu = new TQPopupMenu(this); TQPopupMenu * zoomPopupMenu = new TQPopupMenu(this); myPopupMenu->insertItem (i18n("Zoom"),zoomPopupMenu, 1); - zoomPopupMenu->insertItem( i18n("Zoom to 100%"),this, TQT_SLOT(setSettings(int)),0 ,21,21 ); - zoomPopupMenu->insertItem( i18n("Zoom to Fit"),this, TQT_SLOT(setSettings(int)),0 ,20,20 ); - zoomPopupMenu->insertItem( i18n("Zoom In (x 2)"),this, TQT_SLOT(setSettings(int)),0 ,22,22 ); - zoomPopupMenu->insertItem( i18n("Zoom In (x 6)"),this, TQT_SLOT(setSettings(int)),0 ,24,24 ); - zoomPopupMenu->insertItem( i18n("Zoom In (x 12)"),this, TQT_SLOT(setSettings(int)),0 ,26,26 ); - zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/2)"),this, TQT_SLOT(setSettings(int)),0 ,23,23 ); - zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/6)"),this, TQT_SLOT(setSettings(int)),0 ,25,25 ); - zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/12)"),this, TQT_SLOT(setSettings(int)),0 ,27,27 ); + zoomPopupMenu->insertItem( i18n("Zoom to 100%"),this, TQ_SLOT(setSettings(int)),0 ,21,21 ); + zoomPopupMenu->insertItem( i18n("Zoom to Fit"),this, TQ_SLOT(setSettings(int)),0 ,20,20 ); + zoomPopupMenu->insertItem( i18n("Zoom In (x 2)"),this, TQ_SLOT(setSettings(int)),0 ,22,22 ); + zoomPopupMenu->insertItem( i18n("Zoom In (x 6)"),this, TQ_SLOT(setSettings(int)),0 ,24,24 ); + zoomPopupMenu->insertItem( i18n("Zoom In (x 12)"),this, TQ_SLOT(setSettings(int)),0 ,26,26 ); + zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/2)"),this, TQ_SLOT(setSettings(int)),0 ,23,23 ); + zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/6)"),this, TQ_SLOT(setSettings(int)),0 ,25,25 ); + zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/12)"),this, TQ_SLOT(setSettings(int)),0 ,27,27 ); scalePopupMenu = new TQPopupMenu(this); myPopupMenu->insertItem (i18n("Scale"),scalePopupMenu, 2); - scalePopupMenu->insertItem( i18n("Minute"),this, TQT_SLOT(setSettings(int)),0 ,1,1 ); - scalePopupMenu->insertItem( i18n("Hour"),this, TQT_SLOT(setSettings(int)),0 ,2,2 ); - scalePopupMenu->insertItem( i18n("Day"),this, TQT_SLOT(setSettings(int)),0 ,3,3 ); - scalePopupMenu->insertItem( i18n("Week"),this, TQT_SLOT(setSettings(int)),0 ,4,4 ); - scalePopupMenu->insertItem( i18n("Month"),this, TQT_SLOT(setSettings(int)),0 ,5,5 ); - scalePopupMenu->insertItem( i18n("Auto"),this, TQT_SLOT(setSettings(int)),0 ,6,6 ); + scalePopupMenu->insertItem( i18n("Minute"),this, TQ_SLOT(setSettings(int)),0 ,1,1 ); + scalePopupMenu->insertItem( i18n("Hour"),this, TQ_SLOT(setSettings(int)),0 ,2,2 ); + scalePopupMenu->insertItem( i18n("Day"),this, TQ_SLOT(setSettings(int)),0 ,3,3 ); + scalePopupMenu->insertItem( i18n("Week"),this, TQ_SLOT(setSettings(int)),0 ,4,4 ); + scalePopupMenu->insertItem( i18n("Month"),this, TQ_SLOT(setSettings(int)),0 ,5,5 ); + scalePopupMenu->insertItem( i18n("Auto"),this, TQ_SLOT(setSettings(int)),0 ,6,6 ); scalePopupMenu->setCheckable ( true ); timePopupMenu = new TQPopupMenu(this); myPopupMenu->insertItem (i18n("Time Format"),timePopupMenu, 3); - timePopupMenu->insertItem( i18n("24 Hour"),this, TQT_SLOT(setSettings(int)),0 ,40,40 ); - timePopupMenu->insertItem( i18n("12 PM Hour"),this, TQT_SLOT(setSettings(int)),0 ,41,41 ); - timePopupMenu->insertItem( i18n("24:00 Hour"),this, TQT_SLOT(setSettings(int)),0 ,42,42 ); + timePopupMenu->insertItem( i18n("24 Hour"),this, TQ_SLOT(setSettings(int)),0 ,40,40 ); + timePopupMenu->insertItem( i18n("12 PM Hour"),this, TQ_SLOT(setSettings(int)),0 ,41,41 ); + timePopupMenu->insertItem( i18n("24:00 Hour"),this, TQ_SLOT(setSettings(int)),0 ,42,42 ); yearPopupMenu = new TQPopupMenu(this); myPopupMenu->insertItem (i18n("Year Format"),yearPopupMenu, 4); - yearPopupMenu->insertItem( i18n("Four Digit"),this, TQT_SLOT(setSettings(int)),0 ,50,50 ); - yearPopupMenu->insertItem( i18n("Two Digit"),this, TQT_SLOT(setSettings(int)),0 ,51,51 ); - yearPopupMenu->insertItem( i18n("Two Digit Apostrophe"),this, TQT_SLOT(setSettings(int)),0 ,52,52 ); - yearPopupMenu->insertItem( i18n("No Date on Minute/Hour Scale"),this, TQT_SLOT(setSettings(int)),0 ,53,53 ); + yearPopupMenu->insertItem( i18n("Four Digit"),this, TQ_SLOT(setSettings(int)),0 ,50,50 ); + yearPopupMenu->insertItem( i18n("Two Digit"),this, TQ_SLOT(setSettings(int)),0 ,51,51 ); + yearPopupMenu->insertItem( i18n("Two Digit Apostrophe"),this, TQ_SLOT(setSettings(int)),0 ,52,52 ); + yearPopupMenu->insertItem( i18n("No Date on Minute/Hour Scale"),this, TQ_SLOT(setSettings(int)),0 ,53,53 ); gridPopupMenu = new TQPopupMenu(this); myPopupMenu->insertItem (i18n("Grid"),gridPopupMenu,5); - gridPopupMenu->insertItem( i18n("Show Minor Grid"),this, TQT_SLOT(setSettings(int)),0 ,10,10 ); - gridPopupMenu->insertItem( i18n("Show Major Grid"),this, TQT_SLOT(setSettings(int)),0 ,11,11 ); - gridPopupMenu->insertItem( i18n("Show No Grid"),this, TQT_SLOT(setSettings(int)),0 ,12,12 ); - myPopupMenu->insertItem( i18n("Print"),this, TQT_SLOT(setSettings(int)),0 ,30,30 ); - connect(myPopupMenu, TQT_SIGNAL ( aboutToShow () ) , this, TQT_SLOT( preparePopupMenu() )) ; + gridPopupMenu->insertItem( i18n("Show Minor Grid"),this, TQ_SLOT(setSettings(int)),0 ,10,10 ); + gridPopupMenu->insertItem( i18n("Show Major Grid"),this, TQ_SLOT(setSettings(int)),0 ,11,11 ); + gridPopupMenu->insertItem( i18n("Show No Grid"),this, TQ_SLOT(setSettings(int)),0 ,12,12 ); + myPopupMenu->insertItem( i18n("Print"),this, TQ_SLOT(setSettings(int)),0 ,30,30 ); + connect(myPopupMenu, TQ_SIGNAL ( aboutToShow () ) , this, TQ_SLOT( preparePopupMenu() )) ; flagZoomToFit = false; setShowMinorTicks( true ); myRealEnd = myHorizonEnd; @@ -2702,7 +2702,7 @@ KDListView::KDListView(TQWidget* parent, KDGanttView* gantView):TQListView (pare setDefaultRenameAction(TQListView::Accept); setColumnWidthMode ( 0,Maximum ); _calendarMode = false; - // TQObject::connect(this, TQT_SIGNAL ( pressed ( TQListViewItem * )) , this, TQT_SLOT( dragItem( TQListViewItem *))) ; + // TQObject::connect(this, TQ_SIGNAL ( pressed ( TQListViewItem * )) , this, TQ_SLOT( dragItem( TQListViewItem *))) ; } @@ -3177,38 +3177,38 @@ KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWi TQPopupMenu * newMenu = new TQPopupMenu( this ); TQPopupMenu * onView = new TQPopupMenu( this ); onView->insertItem( i18n( "Summary" ), this, - TQT_SLOT ( newRootItem( int ) ), 0, 0 ); + TQ_SLOT ( newRootItem( int ) ), 0, 0 ); onView->insertItem( i18n( "Event" ), this, - TQT_SLOT ( newRootItem( int ) ), 0, 1); + TQ_SLOT ( newRootItem( int ) ), 0, 1); onView->insertItem( i18n( "Task" ), this, - TQT_SLOT ( newRootItem( int ) ), 0, 2 ); + TQ_SLOT ( newRootItem( int ) ), 0, 2 ); onItem->insertItem( i18n( "New Root" ), onView ); newMenu->insertItem( i18n( "Summary" ), - this, TQT_SLOT ( newChildItem( int) ), 0, 0 ); + this, TQ_SLOT ( newChildItem( int) ), 0, 0 ); newMenu->insertItem( i18n( "Event" ), - this, TQT_SLOT ( newChildItem( int ) ), 0, 1 ); + this, TQ_SLOT ( newChildItem( int ) ), 0, 1 ); newMenu->insertItem( i18n( "Task" ), - this, TQT_SLOT ( newChildItem( int ) ), 0, 2 ); + this, TQ_SLOT ( newChildItem( int ) ), 0, 2 ); onItem->insertItem( i18n( "New Child" ), newMenu ); TQPopupMenu * afterMenu = new TQPopupMenu( this ); afterMenu->insertItem( i18n( "Summary" ), - this, TQT_SLOT ( newChildItem( int) ), 0, 0+4 ); + this, TQ_SLOT ( newChildItem( int) ), 0, 0+4 ); afterMenu->insertItem( i18n( "Event" ), - this, TQT_SLOT ( newChildItem( int ) ), 0, 1+4 ); + this, TQ_SLOT ( newChildItem( int ) ), 0, 1+4 ); afterMenu->insertItem( i18n( "Task" ), - this, TQT_SLOT ( newChildItem( int ) ), 0, 2+4 ); + this, TQ_SLOT ( newChildItem( int ) ), 0, 2+4 ); onItem->insertItem( i18n( "New After" ), afterMenu ); TQPopupMenu *pasteMenu = new TQPopupMenu( this ); pasteMenu->insertItem( i18n( "As Root" ), - this, TQT_SLOT ( pasteItem( int ) ), 0, 0 ); + this, TQ_SLOT ( pasteItem( int ) ), 0, 0 ); pasteMenu->insertItem( i18n( "As Child" ), - this, TQT_SLOT ( pasteItem( int ) ), 0, 1 ); + this, TQ_SLOT ( pasteItem( int ) ), 0, 1 ); pasteMenu->insertItem( i18n( "After" ), - this, TQT_SLOT ( pasteItem( int ) ), 0, 2 ); + this, TQ_SLOT ( pasteItem( int ) ), 0, 2 ); onItem->insertItem( i18n( "Paste" ), pasteMenu, 3 ); - onItem->insertItem( i18n( "Cut Item" ), this, TQT_SLOT ( cutItem() ) ); + onItem->insertItem( i18n( "Cut Item" ), this, TQ_SLOT ( cutItem() ) ); onItem->setItemEnabled( 3, false ); myMyContentsHeight = 0; _showItemAddPopupMenu = false; @@ -3216,13 +3216,13 @@ KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWi TQObject *scrollViewTimer = child( "scrollview scrollbar timer", "TQTimer", false ); Q_ASSERT( scrollViewTimer ); if ( scrollViewTimer ) { - disconnect( scrollViewTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateScrollBars() ) ); + disconnect( scrollViewTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateScrollBars() ) ); } // If they needed a scrollbar timer in scrollview... - connect( &scrollBarTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(myUpdateScrollBars() ) ); + connect( &scrollBarTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(myUpdateScrollBars() ) ); myScrollTimer = new TQTimer( this, "myScrollTimer" ); - connect( myScrollTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotScrollTimer() ) ); + connect( myScrollTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotScrollTimer() ) ); autoScrollEnabled = false; } diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui index 5a34dbb5..2eaa3173 100644 --- a/kdgantt/itemAttributeDialog.ui +++ b/kdgantt/itemAttributeDialog.ui @@ -702,7 +702,7 @@ <variables> <variable>KDGanttViewItem * myItem</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>ChangeText_clicked()</slot> <slot>ChangeStart_clicked()</slot> @@ -732,6 +732,6 @@ <slot>CalBox_toggled( bool mode )</slot> <slot>PrioSlider_valueChanged( int val )</slot> <slot returnType="KDGanttViewItem *">getItem()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdgantt/qlayoutengine_p.h b/kdgantt/qlayoutengine_p.h index cd659d69..4e46984b 100644 --- a/kdgantt/qlayoutengine_p.h +++ b/kdgantt/qlayoutengine_p.h @@ -63,7 +63,7 @@ struct QLayoutStruct { void initParameters() { minimumSize = sizeHint = 0; - maximumSize = TQWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; } + maximumSize = TQWIDGETSIZE_MAX; expansive = false; empty = true; } void init() { stretch = 0; initParameters(); } //permanent storage: int stretch; diff --git a/kgantt/kgantt/KGantt.cpp b/kgantt/kgantt/KGantt.cpp index f16d4776..59df7764 100644 --- a/kgantt/kgantt/KGantt.cpp +++ b/kgantt/kgantt/KGantt.cpp @@ -58,8 +58,8 @@ KGantt::KGantt(KGanttItem* toplevelitem, _ganttbar = new xQGanttBarView(_toplevelitem, _splitter); _ganttbar->setPalette(pal1); - connect(_ganttbar, TQT_SIGNAL(contentsMoving(int,int)), - _ganttlist, TQT_SLOT(contentsMoved(int,int))); + connect(_ganttbar, TQ_SIGNAL(contentsMoving(int,int)), + _ganttlist, TQ_SLOT(contentsMoved(int,int))); _ganttlist->setBarView(_ganttbar); diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h index e49e9045..32c5a66a 100644 --- a/kgantt/kgantt/KGantt.h +++ b/kgantt/kgantt/KGantt.h @@ -38,7 +38,7 @@ #include <tqsplitter.h> #include <tdepopupmenu.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "KGanttItem.h" #include "xQGanttListView.h" @@ -87,7 +87,7 @@ * bar view. */ //////////////////////////////// -class KDE_EXPORT KGantt : public TQWidget +class TDE_EXPORT KGantt : public TQWidget //////////////////////////////// { diff --git a/kgantt/kgantt/KGanttBarConfig.cpp b/kgantt/kgantt/KGanttBarConfig.cpp index ff5f4ee8..547373b1 100644 --- a/kgantt/kgantt/KGanttBarConfig.cpp +++ b/kgantt/kgantt/KGanttBarConfig.cpp @@ -20,8 +20,8 @@ KGanttBarConfig::KGanttBarConfig(xQGanttBarView* barview, _barview = barview; KColorButton* b = new KColorButton(this); - connect(b, TQT_SIGNAL(changed(const TQColor&)), - this, TQT_SLOT(changeBackground(const TQColor&))); + connect(b, TQ_SIGNAL(changed(const TQColor&)), + this, TQ_SLOT(changeBackground(const TQColor&))); } diff --git a/kgantt/kgantt/KGanttItem.cpp b/kgantt/kgantt/KGanttItem.cpp index f032ede0..c517e767 100644 --- a/kgantt/kgantt/KGanttItem.cpp +++ b/kgantt/kgantt/KGanttItem.cpp @@ -94,8 +94,8 @@ KGanttItem::addRelation(KGanttItem* from, KGanttItem* to, KGanttRelation* rel = new KGanttRelation(from,to,text); _relations.append(rel); - connect(rel, TQT_SIGNAL(destroyed(KGanttRelation*)), - this, TQT_SLOT(removeRelation(KGanttRelation*))); + connect(rel, TQ_SIGNAL(destroyed(KGanttRelation*)), + this, TQ_SLOT(removeRelation(KGanttRelation*))); emit changed(this, RelationAdded); return rel; @@ -130,8 +130,8 @@ KGanttItem::registerItem(KGanttItem* item) { _subitems.append(item); - connect(item, TQT_SIGNAL(changed(KGanttItem*, KGanttItem::Change)), - this, TQT_SLOT(subItemChanged(KGanttItem*, KGanttItem::Change)) ); + connect(item, TQ_SIGNAL(changed(KGanttItem*, KGanttItem::Change)), + this, TQ_SLOT(subItemChanged(KGanttItem*, KGanttItem::Change)) ); bool minChanged = false; bool maxChanged = false; diff --git a/kgantt/kgantt/KGanttItem.h b/kgantt/kgantt/KGanttItem.h index 3472b889..b4a13c3c 100644 --- a/kgantt/kgantt/KGanttItem.h +++ b/kgantt/kgantt/KGanttItem.h @@ -38,7 +38,7 @@ #include <tqptrlist.h> #include <tqpainter.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "KGanttRelation.h" @@ -51,7 +51,7 @@ * in a gantt diagramm. */ ////////////////////////////////// -class KDE_EXPORT KGanttItem : public TQObject +class TDE_EXPORT KGanttItem : public TQObject ////////////////////////////////// { diff --git a/kgantt/kgantt/KGanttRelation.cpp b/kgantt/kgantt/KGanttRelation.cpp index e5eab3b4..13bba2aa 100644 --- a/kgantt/kgantt/KGanttRelation.cpp +++ b/kgantt/kgantt/KGanttRelation.cpp @@ -23,11 +23,11 @@ KGanttRelation::KGanttRelation(KGanttItem* from, KGanttItem* to, _text = text; _pen = TQPen(TQColor(20,20,20),1); - connect(from, TQT_SIGNAL(destroyed(KGanttItem*)), - this, TQT_SLOT(itemDestroyed(KGanttItem*))); + connect(from, TQ_SIGNAL(destroyed(KGanttItem*)), + this, TQ_SLOT(itemDestroyed(KGanttItem*))); - connect(to, TQT_SIGNAL(destroyed(KGanttItem*)), - this, TQT_SLOT(itemDestroyed(KGanttItem*))); + connect(to, TQ_SIGNAL(destroyed(KGanttItem*)), + this, TQ_SLOT(itemDestroyed(KGanttItem*))); } diff --git a/kgantt/kgantt/xQGanttBarView.cpp b/kgantt/kgantt/xQGanttBarView.cpp index 60d25797..3e691c04 100644 --- a/kgantt/kgantt/xQGanttBarView.cpp +++ b/kgantt/kgantt/xQGanttBarView.cpp @@ -33,14 +33,14 @@ xQGanttBarView::xQGanttBarView(KGanttItem* toplevelitem, _viewport->setMode(xQGanttBarViewPort::Select); - connect(_viewport, TQT_SIGNAL(scroll(int,int)), - this, TQT_SLOT(scrollBy(int,int)) ); + connect(_viewport, TQ_SIGNAL(scroll(int,int)), + this, TQ_SLOT(scrollBy(int,int)) ); - connect(_viewport, TQT_SIGNAL(recalculated()), - this, TQT_SLOT(drawHeader()) ); + connect(_viewport, TQ_SIGNAL(recalculated()), + this, TQ_SLOT(drawHeader()) ); - connect(horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(horizontalScrollBarChanged(int)) ); + connect(horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(horizontalScrollBarChanged(int)) ); } diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp index d1d62036..5aca74c9 100644 --- a/kgantt/kgantt/xQGanttBarViewPort.cpp +++ b/kgantt/kgantt/xQGanttBarViewPort.cpp @@ -52,8 +52,8 @@ xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem, _itemTextEdit->hide(); _itemTextEdit->setFrame(false); - connect(_itemTextEdit, TQT_SIGNAL(returnPressed ()), - this, TQT_SLOT(textEdited())); + connect(_itemTextEdit, TQ_SIGNAL(returnPressed ()), + this, TQ_SLOT(textEdited())); _iconloader = new TDEIconLoader(); @@ -83,8 +83,8 @@ xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem, _cursor_lupe = new TQCursor( TQPixmap(lupe) ); - connect(_toplevelitem, TQT_SIGNAL(changed(KGanttItem*, KGanttItem::Change)), - this, TQT_SLOT(toplevelitemChanged(KGanttItem*, KGanttItem::Change)) ); + connect(_toplevelitem, TQ_SIGNAL(changed(KGanttItem*, KGanttItem::Change)), + this, TQ_SLOT(toplevelitemChanged(KGanttItem*, KGanttItem::Change)) ); recalc(); adjustSize(); @@ -116,8 +116,8 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) _toolbar->insertButton("ganttSelect.png", 0, - TQT_SIGNAL(clicked()), - TQT_TQOBJECT(this), TQT_SLOT(setSelect()), + TQ_SIGNAL(clicked()), + this, TQ_SLOT(setSelect()), true, i18n("Select") ); TDEPopupMenu *selectMenu = new TDEPopupMenu(_toolbar); @@ -128,7 +128,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) */ TQPixmap pix = _iconloader->loadIcon("ganttSelecttask.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("ganttSelecttask.png not found !\n"); - selectMenu->insertItem(pix, i18n("Select All"), TQT_TQOBJECT(this), TQT_SLOT(selectAll()) ); + selectMenu->insertItem(pix, i18n("Select All"), this, TQ_SLOT(selectAll()) ); /* @@ -136,7 +136,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) */ pix = _iconloader->loadIcon("ganttUnselecttask", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("ganttUnselecttask.png not found !\n"); - selectMenu->insertItem(pix, i18n("Unselect All"), TQT_TQOBJECT(this), TQT_SLOT(unselectAll()) ); + selectMenu->insertItem(pix, i18n("Unselect All"), this, TQ_SLOT(unselectAll()) ); TDEToolBarButton* b = _toolbar->getButton(0); @@ -144,31 +144,31 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) _toolbar->insertButton("viewmag.png", 1, - TQT_SIGNAL(clicked()), - TQT_TQOBJECT(this), TQT_SLOT(setZoom()), + TQ_SIGNAL(clicked()), + this, TQ_SLOT(setZoom()), true, i18n("Zoom") ); TDEPopupMenu* zoomMenu = new TDEPopupMenu(_toolbar); pix = _iconloader->loadIcon("viewmag.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag.png not found !\n"); - zoomMenu->insertItem(pix, i18n("Zoom All"), TQT_TQOBJECT(this), TQT_SLOT(zoomAll()) ); + zoomMenu->insertItem(pix, i18n("Zoom All"), this, TQ_SLOT(zoomAll()) ); zoomMenu->insertSeparator(); pix = _iconloader->loadIcon("viewmag+.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag+.png not found !\n"); - zoomMenu->insertItem(pix, i18n("Zoom In +"), TQT_TQOBJECT(this), TQT_SLOT(zoomIn()) ); + zoomMenu->insertItem(pix, i18n("Zoom In +"), this, TQ_SLOT(zoomIn()) ); pix = _iconloader->loadIcon("viewmag-.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag-.png not found !\n"); - zoomMenu->insertItem(pix, i18n("Zoom Out -"), TQT_TQOBJECT(this), TQT_SLOT(zoomOut()) ); + zoomMenu->insertItem(pix, i18n("Zoom Out -"), this, TQ_SLOT(zoomOut()) ); b = _toolbar->getButton(1); b->setDelayedPopup(zoomMenu); _toolbar->insertButton("move.png", 2, - TQT_SIGNAL(clicked()), - TQT_TQOBJECT(this), TQT_SLOT(setMove()), + TQ_SIGNAL(clicked()), + this, TQ_SLOT(setMove()), true, i18n("Move") ); return _toolbar; @@ -191,17 +191,17 @@ xQGanttBarViewPort::initMenu() TQPixmap pix = _iconloader->loadIcon("ganttSelect.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("ganttSelect.png not found !\n"); - _selectMenu->insertItem(pix, i18n("Select Mode"), this, TQT_SLOT(setSelect())); + _selectMenu->insertItem(pix, i18n("Select Mode"), this, TQ_SLOT(setSelect())); _selectMenu->insertSeparator(); pix = _iconloader->loadIcon("ganttSelecttask.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("ganttSelecttask.png not found !\n"); - _selectMenu->insertItem(pix, i18n("Select All"), this, TQT_SLOT(selectAll()) ); + _selectMenu->insertItem(pix, i18n("Select All"), this, TQ_SLOT(selectAll()) ); pix = _iconloader->loadIcon("ganttUnselecttask", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("ganttUnselecttask.png not found !\n"); - _selectMenu->insertItem(pix, i18n("Unselect All"), this, TQT_SLOT(unselectAll()) ); + _selectMenu->insertItem(pix, i18n("Unselect All"), this, TQ_SLOT(unselectAll()) ); _menu->insertItem( i18n("Select"), _selectMenu); @@ -214,32 +214,32 @@ xQGanttBarViewPort::initMenu() pix = _iconloader->loadIcon("viewmag.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag.png not found !\n"); - _zoomMenu->insertItem(i18n("Zoom Mode"), this, TQT_SLOT(setZoom()) ); + _zoomMenu->insertItem(i18n("Zoom Mode"), this, TQ_SLOT(setZoom()) ); _zoomMenu->insertSeparator(); - _zoomMenu->insertItem(pix, i18n("Zoom All"), this, TQT_SLOT(zoomAll()) ); + _zoomMenu->insertItem(pix, i18n("Zoom All"), this, TQ_SLOT(zoomAll()) ); _zoomMenu->insertSeparator(); pix = _iconloader->loadIcon("viewmag+.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag+.png not found !\n"); - _zoomMenu->insertItem(pix, i18n("Zoom In +"), this, TQT_SLOT(zoomIn()) ); + _zoomMenu->insertItem(pix, i18n("Zoom In +"), this, TQ_SLOT(zoomIn()) ); pix = _iconloader->loadIcon("viewmag-.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag-.png not found !\n"); - _zoomMenu->insertItem(pix, i18n("Zoom Out -"), this, TQT_SLOT(zoomOut()) ); + _zoomMenu->insertItem(pix, i18n("Zoom Out -"), this, TQ_SLOT(zoomOut()) ); _menu->insertItem( "Zoom", _zoomMenu); pix = _iconloader->loadIcon("move.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("move.png not found !\n"); - _menu->insertItem(pix, i18n("Move Mode"), this, TQT_SLOT(setMove()) ); + _menu->insertItem(pix, i18n("Move Mode"), this, TQ_SLOT(setMove()) ); _menu->insertSeparator(); pix = _iconloader->loadIcon("configure.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("configure.png not found !\n"); - _menu->insertItem(pix, i18n("Configure Gantt..."), _parent, TQT_SLOT(showConfig())); + _menu->insertItem(pix, i18n("Configure Gantt..."), _parent, TQ_SLOT(showConfig())); } @@ -1017,8 +1017,8 @@ xQGanttBarViewPort::deleteSelectedItems() #ifdef _DEBUG_ printf(" : %s \n", subitem->getText().latin1() ); #endif - connect(subitem, TQT_SIGNAL(destroyed(KGanttItem*)), - this, TQT_SLOT(itemDestroyed(KGanttItem*))); + connect(subitem, TQ_SIGNAL(destroyed(KGanttItem*)), + this, TQ_SLOT(itemDestroyed(KGanttItem*))); } list.remove(_toplevelitem); diff --git a/kgantt/kgantt/xQGanttBarViewPort.h b/kgantt/kgantt/xQGanttBarViewPort.h index 09054552..06676d73 100644 --- a/kgantt/kgantt/xQGanttBarViewPort.h +++ b/kgantt/kgantt/xQGanttBarViewPort.h @@ -85,7 +85,7 @@ public : */ ///////////////////////////////////////// -class KDE_EXPORT xQGanttBarViewPort : public TQFrame +class TDE_EXPORT xQGanttBarViewPort : public TQFrame //////////////////////////////////////// { diff --git a/kgantt/kgantt/xQGanttListViewPort.cpp b/kgantt/kgantt/xQGanttListViewPort.cpp index d643fe8c..e12534ef 100644 --- a/kgantt/kgantt/xQGanttListViewPort.cpp +++ b/kgantt/kgantt/xQGanttListViewPort.cpp @@ -50,16 +50,16 @@ xQGanttListViewPort::setBarViewPort(xQGanttBarViewPort* v) printf("setBarViewPort()\n"); - connect(_barviewport, TQT_SIGNAL(resized()), - this, TQT_SLOT(barViewResized())); + connect(_barviewport, TQ_SIGNAL(resized()), + this, TQ_SLOT(barViewResized())); - connect(_barviewport, TQT_SIGNAL(recalculated()), - this, TQT_SLOT(update())); + connect(_barviewport, TQ_SIGNAL(recalculated()), + this, TQ_SLOT(update())); /* - connect(_barviewport, TQT_SIGNAL(contentsRepainted()), - this, TQT_SLOT(barViewRepainted())); + connect(_barviewport, TQ_SIGNAL(contentsRepainted()), + this, TQ_SLOT(barViewRepainted())); */ } diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt index daa365ec..9d503d31 100644 --- a/kmail/CMakeLists.txt +++ b/kmail/CMakeLists.txt @@ -212,8 +212,8 @@ add_custom_target( kmail_settings_base tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} LINK - emailfunctions-static kmime-shared kpgp-shared tdepim-shared kpimidentities-shared - mimelib-shared ksieve-shared tdehtml-shared ${INDEX_LIBRARY} + kmime-shared kpgp-shared tdepim-shared kpimidentities-shared + mimelib-shared ksieve-shared tdecore-shared tdehtml-shared ${INDEX_LIBRARY} DESTINATION ${LIB_INSTALL_DIR} DEPENDENCIES kmail_settings_base ) diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox index cd21bf04..148f9e60 100644 --- a/kmail/Mainpage.dox +++ b/kmail/Mainpage.dox @@ -71,7 +71,7 @@ is not modal and the user may hit apply/ok anytime between calls to function that want to use the identity reference. Store the UOID instead if you need to keep track of the identity. You may also want to connect to one of the KPIM::IdentityManager::changed() or ::deleted() -Q_SIGNALS, if you want to do special processing in case the identity +signals, if you want to do special processing in case the identity changes. Thus, in the ConfigureDialog, you will see non-const KPIM::Identity @@ -277,13 +277,13 @@ accessed via KMKernel ( the "kmkernel" construct ). Those methods are : FolderJob classes - These classes allow asynchronous operations on KMFolder's. You create a Job on the heap, connect to one of its -Q_SIGNALS and wait for the job to finish. Folders serve as FolderJob +signals and wait for the job to finish. Folders serve as FolderJob factories. For example, to retrieve the full message from a folder you do : FolderJob *job = folderParent->createJob( aMsg, tGetMessage ); -connect( job, SIGNAL(messageRetrieved(KMMessage*)), - SLOT(msgWasRetrieved(KMMessage*)) ); +connect( job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + TQ_SLOT(msgWasRetrieved(KMMessage*)) ); job->start(); @@ -856,10 +856,10 @@ public: : TQObject( 0, "DelayedHelloWorldBodyPartMemento" ), KMail::BodyPartMemento() { - QTimer::singleShot( 10*1000, this, SLOT(slotTimeout()) ); + QTimer::singleShot( 10*1000, this, TQ_SLOT(slotTimeout()) ); } -private Q_SLOTS: +private slots: void slotTimeout() { notify(): } private: diff --git a/kmail/about/top-right-kmail.png b/kmail/about/top-right-kmail.png Binary files differindex dd83cd5b..5d3d7076 100644 --- a/kmail/about/top-right-kmail.png +++ b/kmail/about/top-right-kmail.png diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h index 2ae6283a..b8a4f404 100644 --- a/kmail/aboutdata.h +++ b/kmail/aboutdata.h @@ -33,11 +33,11 @@ #define __KMAIL_ABOUTDATA_H__ #include <tdeaboutdata.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KMail { - class KDE_EXPORT AboutData : public TDEAboutData { + class TDE_EXPORT AboutData : public TDEAboutData { public: AboutData(); ~AboutData(); diff --git a/kmail/accountcombobox.cpp b/kmail/accountcombobox.cpp index 97f95b11..3f200f66 100644 --- a/kmail/accountcombobox.cpp +++ b/kmail/accountcombobox.cpp @@ -37,10 +37,10 @@ using namespace KMail; AccountComboBox::AccountComboBox( TQWidget* parent, const char* name ) : TQComboBox( parent, name ) { - connect( kmkernel->acctMgr(), TQT_SIGNAL( accountAdded( KMAccount* ) ), - this, TQT_SLOT( slotRefreshAccounts() ) ); - connect( kmkernel->acctMgr(), TQT_SIGNAL( accountRemoved( KMAccount* ) ), - this, TQT_SLOT( slotRefreshAccounts() ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( accountAdded( KMAccount* ) ), + this, TQ_SLOT( slotRefreshAccounts() ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( accountRemoved( KMAccount* ) ), + this, TQ_SLOT( slotRefreshAccounts() ) ); slotRefreshAccounts(); } diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index 657624f7..2967b87d 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -353,7 +353,7 @@ void AccountDialog::makeLocalAccountPage() TQPushButton *choose = new TQPushButton( i18n("Choo&se..."), page ); choose->setAutoDefault( false ); - connect( choose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLocationChooser()) ); + connect( choose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLocationChooser()) ); topLayout->addWidget( choose, 3, 2 ); TQButtonGroup *group = new TQButtonGroup(i18n("Locking Method"), page ); @@ -373,8 +373,8 @@ void AccountDialog::makeLocalAccountPage() mLocal.procmailLockFileName->insertStringList(procmailrcParser.getLockFilesList()); mLocal.procmailLockFileName->setEnabled(false); - TQObject::connect(mLocal.lockProcmail, TQT_SIGNAL(toggled(bool)), - mLocal.procmailLockFileName, TQT_SLOT(setEnabled(bool))); + TQObject::connect(mLocal.lockProcmail, TQ_SIGNAL(toggled(bool)), + mLocal.procmailLockFileName, TQ_SLOT(setEnabled(bool))); mLocal.lockMutt = new TQRadioButton( i18n("&Mutt dotlock"), group); @@ -404,19 +404,19 @@ void AccountDialog::makeLocalAccountPage() TQWhatsThis::add( mLocal.resourceClearButton, i18n( "Delete all allocations for the resource represented by this account." ) ); mLocal.resourceClearButton->setEnabled( false ); - connect( mLocal.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mLocal.resourceClearButton, TQT_SLOT( setEnabled(bool) ) ); - connect( mLocal.resourceClearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearResourceAllocations() ) ); + connect( mLocal.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mLocal.resourceClearButton, TQ_SLOT( setEnabled(bool) ) ); + connect( mLocal.resourceClearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearResourceAllocations() ) ); mLocal.resourceClearPastButton = new TQPushButton( i18n( "Clear Past" ), resourceHB ); mLocal.resourceClearPastButton->setEnabled( false ); - connect( mLocal.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mLocal.resourceClearPastButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mLocal.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mLocal.resourceClearPastButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mLocal.resourceClearPastButton, i18n( "Delete all outdated allocations for the resource represented by this account." ) ); - connect( mLocal.resourceClearPastButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearPastResourceAllocations() ) ); + connect( mLocal.resourceClearPastButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearPastResourceAllocations() ) ); topLayout->addMultiCellWidget( resourceHB, 5, 5, 0, 2 ); #endif @@ -428,8 +428,8 @@ void AccountDialog::makeLocalAccountPage() mLocal.intervalCheck = new TQCheckBox( i18n("Enable &interval mail checking"), page ); topLayout->addMultiCellWidget( mLocal.intervalCheck, 6, 6, 0, 2 ); - connect( mLocal.intervalCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotEnableLocalInterval(bool)) ); + connect( mLocal.intervalCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotEnableLocalInterval(bool)) ); mLocal.intervalLabel = new TQLabel( i18n("Check inter&val:"), page ); topLayout->addWidget( mLocal.intervalLabel, 7, 0 ); mLocal.intervalSpin = new KIntNumInput( page ); @@ -457,7 +457,7 @@ void AccountDialog::makeLocalAccountPage() mLocal.identityLabel->setBuddy( mLocal.identityCombo ); topLayout->addWidget( mLocal.identityCombo, 10, 1 ); - connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged())); + connect(tdeApp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); } void AccountDialog::makeMaildirAccountPage() @@ -492,7 +492,7 @@ void AccountDialog::makeMaildirAccountPage() TQPushButton *choose = new TQPushButton( i18n("Choo&se..."), page ); choose->setAutoDefault( false ); - connect( choose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMaildirChooser()) ); + connect( choose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMaildirChooser()) ); topLayout->addWidget( choose, 3, 2 ); #if 0 @@ -503,21 +503,21 @@ void AccountDialog::makeMaildirAccountPage() mMaildir.resourceClearButton = new TQPushButton( i18n( "Clear" ), resourceHB ); mMaildir.resourceClearButton->setEnabled( false ); - connect( mMaildir.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mMaildir.resourceClearButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mMaildir.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mMaildir.resourceClearButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mMaildir.resourceClearButton, i18n( "Delete all allocations for the resource represented by this account." ) ); - connect( mMaildir.resourceClearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearResourceAllocations() ) ); + connect( mMaildir.resourceClearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearResourceAllocations() ) ); mMaildir.resourceClearPastButton = new TQPushButton( i18n( "Clear Past" ), resourceHB ); mMaildir.resourceClearPastButton->setEnabled( false ); - connect( mMaildir.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mMaildir.resourceClearPastButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mMaildir.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mMaildir.resourceClearPastButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mMaildir.resourceClearPastButton, i18n( "Delete all outdated allocations for the resource represented by this account." ) ); - connect( mMaildir.resourceClearPastButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearPastResourceAllocations() ) ); + connect( mMaildir.resourceClearPastButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearPastResourceAllocations() ) ); topLayout->addMultiCellWidget( resourceHB, 4, 4, 0, 2 ); #endif @@ -528,8 +528,8 @@ void AccountDialog::makeMaildirAccountPage() mMaildir.intervalCheck = new TQCheckBox( i18n("Enable &interval mail checking"), page ); topLayout->addMultiCellWidget( mMaildir.intervalCheck, 5, 5, 0, 2 ); - connect( mMaildir.intervalCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotEnableMaildirInterval(bool)) ); + connect( mMaildir.intervalCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotEnableMaildirInterval(bool)) ); mMaildir.intervalLabel = new TQLabel( i18n("Check inter&val:"), page ); topLayout->addWidget( mMaildir.intervalLabel, 6, 0 ); mMaildir.intervalSpin = new KIntNumInput( page ); @@ -557,7 +557,7 @@ void AccountDialog::makeMaildirAccountPage() mMaildir.identityLabel->setBuddy( mMaildir.identityCombo ); topLayout->addWidget( mMaildir.identityCombo, 9, 1 ); - connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged())); + connect(tdeApp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); } @@ -618,7 +618,7 @@ void AccountDialog::makePopAccountPage() label = new TQLabel( i18n("&Port:"), page1 ); grid->addWidget( label, 4, 0 ); mPop.portEdit = new KLineEdit( page1 ); - mPop.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) ); + mPop.portEdit->setValidator( new TQIntValidator(this) ); label->setBuddy( mPop.portEdit ); grid->addWidget( mPop.portEdit, 4, 1 ); @@ -638,19 +638,19 @@ void AccountDialog::makePopAccountPage() mPop.leaveOnServerCheck = new TQCheckBox( i18n("Lea&ve fetched messages on the server"), page1 ); - connect( mPop.leaveOnServerCheck, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotLeaveOnServerClicked() ) ); + connect( mPop.leaveOnServerCheck, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotLeaveOnServerClicked() ) ); grid->addMultiCellWidget( mPop.leaveOnServerCheck, 6, 6, 0, 1 ); TQHBox *afterDaysBox = new TQHBox( page1 ); afterDaysBox->setSpacing( KDialog::spacingHint() ); mPop.leaveOnServerDaysCheck = new TQCheckBox( i18n("Leave messages on the server for"), afterDaysBox ); - connect( mPop.leaveOnServerDaysCheck, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( slotEnableLeaveOnServerDays(bool)) ); + connect( mPop.leaveOnServerDaysCheck, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( slotEnableLeaveOnServerDays(bool)) ); mPop.leaveOnServerDaysSpin = new KIntNumInput( afterDaysBox ); mPop.leaveOnServerDaysSpin->setRange( 1, 365, 1, false ); - connect( mPop.leaveOnServerDaysSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotLeaveOnServerDaysChanged(int))); + connect( mPop.leaveOnServerDaysSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotLeaveOnServerDaysChanged(int))); mPop.leaveOnServerDaysSpin->setValue( 1 ); afterDaysBox->setStretchFactor( mPop.leaveOnServerDaysSpin, 1 ); grid->addMultiCellWidget( afterDaysBox, 7, 7, 0, 1 ); @@ -658,20 +658,20 @@ void AccountDialog::makePopAccountPage() leaveOnServerCountBox->setSpacing( KDialog::spacingHint() ); mPop.leaveOnServerCountCheck = new TQCheckBox( i18n("Keep only the last"), leaveOnServerCountBox ); - connect( mPop.leaveOnServerCountCheck, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( slotEnableLeaveOnServerCount(bool)) ); + connect( mPop.leaveOnServerCountCheck, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( slotEnableLeaveOnServerCount(bool)) ); mPop.leaveOnServerCountSpin = new KIntNumInput( leaveOnServerCountBox ); mPop.leaveOnServerCountSpin->setRange( 1, 999999, 1, false ); - connect( mPop.leaveOnServerCountSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotLeaveOnServerCountChanged(int))); + connect( mPop.leaveOnServerCountSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotLeaveOnServerCountChanged(int))); mPop.leaveOnServerCountSpin->setValue( 100 ); grid->addMultiCellWidget( leaveOnServerCountBox, 8, 8, 0, 1 ); TQHBox *leaveOnServerSizeBox = new TQHBox( page1 ); leaveOnServerSizeBox->setSpacing( KDialog::spacingHint() ); mPop.leaveOnServerSizeCheck = new TQCheckBox( i18n("Keep only the last"), leaveOnServerSizeBox ); - connect( mPop.leaveOnServerSizeCheck, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( slotEnableLeaveOnServerSize(bool)) ); + connect( mPop.leaveOnServerSizeCheck, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( slotEnableLeaveOnServerSize(bool)) ); mPop.leaveOnServerSizeSpin = new KIntNumInput( leaveOnServerSizeBox ); mPop.leaveOnServerSizeSpin->setRange( 1, 999999, 1, false ); mPop.leaveOnServerSizeSpin->setSuffix( i18n(" MB") ); @@ -685,21 +685,21 @@ void AccountDialog::makePopAccountPage() mPop.resourceClearButton = new TQPushButton( i18n( "Clear" ), resourceHB ); mPop.resourceClearButton->setEnabled( false ); - connect( mPop.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mPop.resourceClearButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mPop.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mPop.resourceClearButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mPop.resourceClearButton, i18n( "Delete all allocations for the resource represented by this account." ) ); - connect( mPop.resourceClearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearResourceAllocations() ) ); + connect( mPop.resourceClearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearResourceAllocations() ) ); mPop.resourceClearPastButton = new TQPushButton( i18n( "Clear Past" ), resourceHB ); mPop.resourceClearPastButton->setEnabled( false ); - connect( mPop.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mPop.resourceClearPastButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mPop.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mPop.resourceClearPastButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mPop.resourceClearPastButton, i18n( "Delete all outdated allocations for the resource represented by this account." ) ); - connect( mPop.resourceClearPastButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearPastResourceAllocations() ) ); + connect( mPop.resourceClearPastButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearPastResourceAllocations() ) ); grid->addMultiCellWidget( resourceHB, 10, 10, 0, 2 ); #endif @@ -715,14 +715,14 @@ void AccountDialog::makePopAccountPage() mPop.filterOnServerSizeSpin->setEnabled( false ); hbox->setStretchFactor( mPop.filterOnServerSizeSpin, 1 ); mPop.filterOnServerSizeSpin->setRange( 1, 10000000, 100, false ); - connect(mPop.filterOnServerSizeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotFilterOnServerSizeChanged(int))); + connect(mPop.filterOnServerSizeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotFilterOnServerSizeChanged(int))); mPop.filterOnServerSizeSpin->setValue( 50000 ); grid->addMultiCellWidget( hbox, 11, 11, 0, 1 ); - connect( mPop.filterOnServerCheck, TQT_SIGNAL(toggled(bool)), - mPop.filterOnServerSizeSpin, TQT_SLOT(setEnabled(bool)) ); - connect( mPop.filterOnServerCheck, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotFilterOnServerClicked() ) ); + connect( mPop.filterOnServerCheck, TQ_SIGNAL(toggled(bool)), + mPop.filterOnServerSizeSpin, TQ_SLOT(setEnabled(bool)) ); + connect( mPop.filterOnServerCheck, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotFilterOnServerClicked() ) ); TQString msg = i18n("If you select this option, POP Filters will be used to " "decide what to do with messages. You can then select " "to download, delete or keep them on the server." ); @@ -732,8 +732,8 @@ void AccountDialog::makePopAccountPage() mPop.intervalCheck = new TQCheckBox( i18n("Enable &interval mail checking"), page1 ); grid->addMultiCellWidget( mPop.intervalCheck, 12, 12, 0, 1 ); - connect( mPop.intervalCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotEnablePopInterval(bool)) ); + connect( mPop.intervalCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotEnablePopInterval(bool)) ); mPop.intervalLabel = new TQLabel( i18n("Chec&k interval:"), page1 ); grid->addWidget( mPop.intervalLabel, 13, 0 ); mPop.intervalSpin = new KIntNumInput( page1 ); @@ -770,8 +770,8 @@ void AccountDialog::makePopAccountPage() TQHBoxLayout *buttonLay = new TQHBoxLayout( vlay ); mPop.checkCapabilities = new TQPushButton( i18n("Check &What the Server Supports"), page2 ); - connect(mPop.checkCapabilities, TQT_SIGNAL(clicked()), - TQT_SLOT(slotCheckPopCapabilities())); + connect(mPop.checkCapabilities, TQ_SIGNAL(clicked()), + TQ_SLOT(slotCheckPopCapabilities())); buttonLay->addStretch(); buttonLay->addWidget( mPop.checkCapabilities ); buttonLay->addStretch(); @@ -782,14 +782,14 @@ void AccountDialog::makePopAccountPage() i18n("Encryption"), page2 ); mPop.encryptionNone = new TQRadioButton( i18n("&None"), mPop.encryptionGroup ); - mPop.encryptionSSL = - new TQRadioButton( i18n("Use &SSL for secure mail download"), - mPop.encryptionGroup ); mPop.encryptionTLS = - new TQRadioButton( i18n("Use &TLS for secure mail download"), + new TQRadioButton( i18n("Use &StartTLS"), + mPop.encryptionGroup ); + mPop.encryptionSSL = + new TQRadioButton( i18n("Enforce SSL/&TLS"), mPop.encryptionGroup ); - connect(mPop.encryptionGroup, TQT_SIGNAL(clicked(int)), - TQT_SLOT(slotPopEncryptionChanged(int))); + connect(mPop.encryptionGroup, TQ_SIGNAL(clicked(int)), + TQ_SLOT(slotPopEncryptionChanged(int))); vlay->addWidget( mPop.encryptionGroup ); mPop.authGroup = new TQButtonGroup( 1, TQt::Horizontal, @@ -817,13 +817,13 @@ void AccountDialog::makePopAccountPage() mPop.usePipeliningCheck = new TQCheckBox( i18n("&Use pipelining for faster mail download"), page2 ); - connect(mPop.usePipeliningCheck, TQT_SIGNAL(clicked()), - TQT_SLOT(slotPipeliningClicked())); + connect(mPop.usePipeliningCheck, TQ_SIGNAL(clicked()), + TQ_SLOT(slotPipeliningClicked())); vlay->addWidget( mPop.usePipeliningCheck ); vlay->addStretch(); - connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged())); + connect(tdeApp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); } @@ -891,7 +891,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) label = new TQLabel( i18n("&Port:"), page1 ); grid->addWidget( label, row, 0 ); mImap.portEdit = new KLineEdit( page1 ); - mImap.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) ); + mImap.portEdit->setValidator( new TQIntValidator(this) ); label->setBuddy( mImap.portEdit ); grid->addWidget( mImap.portEdit, row, 1 ); @@ -909,7 +909,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) button->setFixedSize( 22, 22 ); button->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "reload", TDEIcon::Small, 0 ) ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReloadNamespaces()) ); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotReloadNamespaces()) ); TQWhatsThis::add( button, i18n("Reload the namespaces from the server. This overwrites any changes.") ); grid->addWidget( box, row, 0 ); @@ -926,7 +926,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.editPNS->setAutoRaise( true ); mImap.editPNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editPNS->setFixedSize( 22, 22 ); - connect( mImap.editPNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditPersonalNamespace()) ); + connect( mImap.editPNS, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditPersonalNamespace()) ); label = new TQLabel( i18n("Other Users"), listbox ); TQWhatsThis::add( label, i18n( "These namespaces include the folders of other users." ) ); @@ -938,7 +938,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.editONS->setAutoRaise( true ); mImap.editONS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editONS->setFixedSize( 22, 22 ); - connect( mImap.editONS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditOtherUsersNamespace()) ); + connect( mImap.editONS, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditOtherUsersNamespace()) ); label = new TQLabel( i18n("Shared"), listbox ); TQWhatsThis::add( label, i18n( "These namespaces include the shared folders." ) ); @@ -950,7 +950,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.editSNS->setAutoRaise( true ); mImap.editSNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editSNS->setFixedSize( 22, 22 ); - connect( mImap.editSNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditSharedNamespace()) ); + connect( mImap.editSNS, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditSharedNamespace()) ); label->setBuddy( listbox ); grid->addWidget( listbox, row, 1 ); @@ -1021,21 +1021,21 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.resourceClearButton = new TQPushButton( i18n( "Clear" ), resourceHB ); mImap.resourceClearButton->setEnabled( false ); - connect( mImap.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mImap.resourceClearButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mImap.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mImap.resourceClearButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mImap.resourceClearButton, i18n( "Delete all allocations for the resource represented by this account." ) ); - connect( mImap.resourceClearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearResourceAllocations() ) ); + connect( mImap.resourceClearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearResourceAllocations() ) ); mImap.resourceClearPastButton = new TQPushButton( i18n( "Clear Past" ), resourceHB ); mImap.resourceClearPastButton->setEnabled( false ); - connect( mImap.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mImap.resourceClearPastButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mImap.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mImap.resourceClearPastButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mImap.resourceClearPastButton, i18n( "Delete all outdated allocations for the resource represented by this account." ) ); - connect( mImap.resourceClearPastButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearPastResourceAllocations() ) ); + connect( mImap.resourceClearPastButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearPastResourceAllocations() ) ); grid->addMultiCellWidget( resourceHB, row, row, 0, 2 ); #endif @@ -1048,8 +1048,8 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.intervalCheck = new TQCheckBox( i18n("Enable &interval mail checking"), page1 ); grid->addMultiCellWidget( mImap.intervalCheck, row, row, 0, 2 ); - connect( mImap.intervalCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotEnableImapInterval(bool)) ); + connect( mImap.intervalCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotEnableImapInterval(bool)) ); ++row; mImap.intervalLabel = new TQLabel( i18n("Check inter&val:"), page1 ); grid->addWidget( mImap.intervalLabel, row, 0 ); @@ -1085,8 +1085,8 @@ void AccountDialog::makeImapAccountPage( bool connected ) TQHBoxLayout *buttonLay = new TQHBoxLayout( vlay ); mImap.checkCapabilities = new TQPushButton( i18n("Check &What the Server Supports"), page2 ); - connect(mImap.checkCapabilities, TQT_SIGNAL(clicked()), - TQT_SLOT(slotCheckImapCapabilities())); + connect(mImap.checkCapabilities, TQ_SIGNAL(clicked()), + TQ_SLOT(slotCheckImapCapabilities())); buttonLay->addStretch(); buttonLay->addWidget( mImap.checkCapabilities ); buttonLay->addStretch(); @@ -1097,14 +1097,14 @@ void AccountDialog::makeImapAccountPage( bool connected ) i18n("Encryption"), page2 ); mImap.encryptionNone = new TQRadioButton( i18n("&None"), mImap.encryptionGroup ); - mImap.encryptionSSL = - new TQRadioButton( i18n("Use &SSL for secure mail download"), - mImap.encryptionGroup ); mImap.encryptionTLS = - new TQRadioButton( i18n("Use &TLS for secure mail download"), + new TQRadioButton( i18n("Use &StartTLS"), + mImap.encryptionGroup ); + mImap.encryptionSSL = + new TQRadioButton( i18n("Enforce SSL/&TLS"), mImap.encryptionGroup ); - connect(mImap.encryptionGroup, TQT_SIGNAL(clicked(int)), - TQT_SLOT(slotImapEncryptionChanged(int))); + connect(mImap.encryptionGroup, TQ_SIGNAL(clicked(int)), + TQ_SLOT(slotImapEncryptionChanged(int))); vlay->addWidget( mImap.encryptionGroup ); mImap.authGroup = new TQButtonGroup( 1, TQt::Horizontal, @@ -1130,7 +1130,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mSieveConfigEditor->layout()->setMargin( KDialog::marginHint() ); tabWidget->addTab( mSieveConfigEditor, i18n("&Filtering") ); - connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged())); + connect(tdeApp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); } @@ -1499,12 +1499,12 @@ void AccountDialog::slotPopEncryptionChanged(int id) { kdDebug(5006) << "slotPopEncryptionChanged( " << id << " )" << endl; // adjust port - if ( id == SSL || mPop.portEdit->text() == "995" ) - mPop.portEdit->setText( ( id == SSL ) ? "995" : "110" ); + if ( id == EnforceSSL || mPop.portEdit->text() == "995" ) + mPop.portEdit->setText( ( id == EnforceSSL ) ? "995" : "110" ); // switch supported auth methods - mCurCapa = ( id == TLS ) ? mCapaTLS - : ( id == SSL ) ? mCapaSSL + mCurCapa = ( id == StartTLS ) ? mCapaTLS + : ( id == EnforceSSL ) ? mCapaSSL : mCapaNormal; enablePopFeatures( mCurCapa ); const TQButton *old = mPop.authGroup->selected(); @@ -1517,12 +1517,12 @@ void AccountDialog::slotImapEncryptionChanged(int id) { kdDebug(5006) << "slotImapEncryptionChanged( " << id << " )" << endl; // adjust port - if ( id == SSL || mImap.portEdit->text() == "993" ) - mImap.portEdit->setText( ( id == SSL ) ? "993" : "143" ); + if ( id == EnforceSSL || mImap.portEdit->text() == "993" ) + mImap.portEdit->setText( ( id == EnforceSSL ) ? "993" : "143" ); // switch supported auth methods - int authMethods = ( id == TLS ) ? mCapaTLS - : ( id == SSL ) ? mCapaSSL + int authMethods = ( id == StartTLS ) ? mCapaTLS + : ( id == EnforceSSL ) ? mCapaSSL : mCapaNormal; enableImapAuthMethods( authMethods ); TQButton *old = mImap.authGroup->selected(); @@ -1542,9 +1542,9 @@ void AccountDialog::slotCheckPopCapabilities() delete mServerTest; mServerTest = new KMServerTest(POP_PROTOCOL, mPop.hostEdit->text(), mPop.portEdit->text().toInt()); - connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList &, + connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList &, const TQStringList & ) ), - this, TQT_SLOT( slotPopCapabilities( const TQStringList &, + this, TQ_SLOT( slotPopCapabilities( const TQStringList &, const TQStringList & ) ) ); mPop.checkCapabilities->setEnabled(false); } @@ -1561,9 +1561,9 @@ void AccountDialog::slotCheckImapCapabilities() delete mServerTest; mServerTest = new KMServerTest(IMAP_PROTOCOL, mImap.hostEdit->text(), mImap.portEdit->text().toInt()); - connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList &, + connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList &, const TQStringList & ) ), - this, TQT_SLOT( slotImapCapabilities( const TQStringList &, + this, TQ_SLOT( slotImapCapabilities( const TQStringList &, const TQStringList & ) ) ); mImap.checkCapabilities->setEnabled(false); } @@ -2120,10 +2120,10 @@ void AccountDialog::slotReloadNamespaces() mImap.otherUsersNS->setText( TQString() ); mImap.sharedNS->setText( TQString() ); ImapAccountBase* ai = static_cast<ImapAccountBase*>( mAccount ); - connect( ai, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), - this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); - connect( ai, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( ai, TQ_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), + this, TQ_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); + connect( ai, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); ai->getNamespaces(); } } @@ -2132,17 +2132,17 @@ void AccountDialog::slotConnectionResult( int errorCode, const TQString& ) { if ( errorCode > 0 ) { ImapAccountBase* ai = static_cast<ImapAccountBase*>( mAccount ); - disconnect( ai, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), - this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); - disconnect( ai, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + disconnect( ai, TQ_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), + this, TQ_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); + disconnect( ai, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); mImap.personalNS->setText( TQString() ); } } void AccountDialog::slotSetupNamespaces( const ImapAccountBase::nsDelimMap& map ) { - disconnect( this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); + disconnect( this, TQ_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); mImap.personalNS->setText( TQString() ); mImap.otherUsersNS->setText( TQString() ); mImap.sharedNS->setText( TQString() ); @@ -2297,7 +2297,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent, TQGrid* grid = new TQGrid( 2, page ); mBg = new TQButtonGroup( 0 ); - connect( mBg, TQT_SIGNAL( clicked(int) ), this, TQT_SLOT( slotRemoveEntry(int) ) ); + connect( mBg, TQ_SIGNAL( clicked(int) ), this, TQ_SLOT( slotRemoveEntry(int) ) ); mDelimMap = mNamespaceMap->find( mType ).data(); ImapAccountBase::namespaceDelim::Iterator it; for ( it = mDelimMap.begin(); it != mDelimMap.end(); ++it ) { diff --git a/kmail/accountdialog.h b/kmail/accountdialog.h index 417d0e28..e80dbb61 100644 --- a/kmail/accountdialog.h +++ b/kmail/accountdialog.h @@ -273,8 +273,8 @@ class AccountDialog : public KDialogBase KMServerTest *mServerTest; enum EncryptionMethods { NoEncryption = 0, - SSL = 1, - TLS = 2 + StartTLS = 1, + EnforceSSL = 2 }; enum Capabilities { Plain = 1, diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp index 6b9f38fe..8e4565c8 100644 --- a/kmail/accountmanager.cpp +++ b/kmail/accountmanager.cpp @@ -149,8 +149,8 @@ void AccountManager::processNextCheck( bool _newMail ) kdDebug(5006) << "account " << acct->name() << " finished check" << endl; mAcctChecking.remove( acct ); kmkernel->filterMgr()->deref(); - disconnect( acct, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( processNextCheck( bool ) ) ); + disconnect( acct, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( processNextCheck( bool ) ) ); } if ( mAcctChecking.isEmpty() ) { // all checks finished, display summary @@ -203,7 +203,7 @@ void AccountManager::processNextCheck( bool _newMail ) TQDataStream stream( params, IO_WriteOnly ); stream << static_cast<NetworkAccount*>( curAccount )->host(); - if ( kapp->dcopClient()->call( "kded", "networkstatus", "status(TQString)", + if ( tdeApp->dcopClient()->call( "kded", "networkstatus", "status(TQString)", params, replyType, reply ) && ( replyType == "int" ) ) { int result; @@ -219,8 +219,8 @@ void AccountManager::processNextCheck( bool _newMail ) } } - connect( curAccount, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( processNextCheck( bool ) ) ); + connect( curAccount, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( processNextCheck( bool ) ) ); KPIM::BroadcastStatus::instance()->setStatusMsg( i18n("Checking account %1 for new mail").arg(curAccount->name())); @@ -258,8 +258,8 @@ KMAccount* AccountManager::create( const TQString &aType, const TQString &aName, kdWarning(5006) << "Attempt to instantiate a non-existing account type!" << endl; return 0; } - connect( act, TQT_SIGNAL( newMailsProcessed( const TQMap<TQString, int> & ) ), - this, TQT_SLOT( addToTotalNewMailCount( const TQMap<TQString, int> & ) ) ); + connect( act, TQ_SIGNAL( newMailsProcessed( const TQMap<TQString, int> & ) ), + this, TQ_SLOT( addToTotalNewMailCount( const TQMap<TQString, int> & ) ) ); return act; } @@ -416,7 +416,7 @@ uint AccountManager::createId() int newId; do { - newId = kapp->random(); + newId = tdeApp->random(); } while ( usedIds.find(newId) != usedIds.end() ); return newId; diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h index ddc82e47..edffac54 100644 --- a/kmail/accountmanager.h +++ b/kmail/accountmanager.h @@ -22,7 +22,7 @@ #include <tqobject.h> #include "kmaccount.h" -#include <kdemacros.h> +#include <tdemacros.h> class TQString; class TQStringList; @@ -32,7 +32,7 @@ namespace KMail { * The account manager is responsible for creating accounts of various types * via the factory method create() and for keeping track of them. */ -class KDE_EXPORT AccountManager: public TQObject +class TDE_EXPORT AccountManager: public TQObject { TQ_OBJECT @@ -68,7 +68,7 @@ public: KMAccount* find( const uint id ) const; /** Physically remove account. Also deletes the given account object ! - Returns FALSE and does nothing if the account cannot be removed. */ + Returns false and does nothing if the account cannot be removed. */ bool remove( KMAccount* ); /** First account of the list */ diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp index 92e6a232..aec50b7c 100644 --- a/kmail/accountwizard.cpp +++ b/kmail/accountwizard.cpp @@ -276,14 +276,14 @@ void AccountWizard::setupServerInformationPage() mIncomingServerWdg = new TQVBox( mServerInformationPage ); mIncomingServer = new KLineEdit( mIncomingServerWdg ); - mIncomingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL)" ), mIncomingServerWdg ); + mIncomingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL/TLS)" ), mIncomingServerWdg ); mIncomingLocationWdg = new TQHBox( mServerInformationPage ); mIncomingLocation = new KLineEdit( mIncomingLocationWdg ); mChooseLocation = new TQPushButton( i18n( "Choose..." ), mIncomingLocationWdg ); - connect( mChooseLocation, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( chooseLocation() ) ); + connect( mChooseLocation, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( chooseLocation() ) ); layout->addWidget( mIncomingLabel, 0, 0, AlignTop ); layout->addWidget( mIncomingLocationWdg, 0, 1 ); @@ -296,15 +296,15 @@ void AccountWizard::setupServerInformationPage() layout->addWidget( label, 1, 0 ); layout->addWidget( mOutgoingServer, 1, 1 ); - mOutgoingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL)" ), mServerInformationPage ); + mOutgoingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL/TLS)" ), mServerInformationPage ); layout->addWidget( mOutgoingUseSSL, 2, 1 ); mLocalDelivery = new TQCheckBox( i18n( "Use local delivery" ), mServerInformationPage ); layout->addWidget( mLocalDelivery, 3, 0 ); - connect( mLocalDelivery, TQT_SIGNAL( toggled( bool ) ), - mOutgoingServer, TQT_SLOT( setDisabled( bool ) ) ); + connect( mLocalDelivery, TQ_SIGNAL( toggled( bool ) ), + mOutgoingServer, TQ_SLOT( setDisabled( bool ) ) ); addPage( mServerInformationPage, i18n( "Server Information" ) ); } @@ -361,7 +361,7 @@ void AccountWizard::accept() manager->commit(); - TQTimer::singleShot( 0, this, TQT_SLOT( createTransport() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( createTransport() ) ); } void AccountWizard::createTransport() @@ -386,7 +386,7 @@ void AccountWizard::createTransport() mTransportInfo->auth = false; mTransportInfo->setStorePasswd( false ); - TQTimer::singleShot( 0, this, TQT_SLOT( transportCreated() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( transportCreated() ) ); } else { // delivery via SMTP mTransportInfo->type = "smtp"; mTransportInfo->name = accountName(); @@ -425,7 +425,7 @@ void AccountWizard::transportCreated() mTransportInfoList.setAutoDelete( true ); mTransportInfoList.clear(); - TQTimer::singleShot( 0, this, TQT_SLOT( createAccount() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( createAccount() ) ); } void AccountWizard::createAccount() @@ -485,7 +485,7 @@ void AccountWizard::createAccount() else if ( mTypeBox->type() == AccountTypeBox::IMAP || mTypeBox->type() == AccountTypeBox::dIMAP ) checkImapCapabilities( mIncomingServer->text(), port ); else - TQTimer::singleShot( 0, this, TQT_SLOT( accountCreated() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( accountCreated() ) ); } void AccountWizard::accountCreated() @@ -513,10 +513,10 @@ void AccountWizard::checkPopCapabilities( const TQString &server, int port ) delete mServerTest; mServerTest = new KMServerTest( POP_PROTOCOL, server, port ); - connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), - this, TQT_SLOT( popCapabilities( const TQStringList&, const TQStringList& ) ) ); + connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), + this, TQ_SLOT( popCapabilities( const TQStringList&, const TQStringList& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Checking for supported security capabilities of %1..." ).arg( server ) ); } void AccountWizard::checkImapCapabilities( const TQString &server, int port ) @@ -524,10 +524,10 @@ void AccountWizard::checkImapCapabilities( const TQString &server, int port ) delete mServerTest; mServerTest = new KMServerTest( IMAP_PROTOCOL, server, port ); - connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), - this, TQT_SLOT( imapCapabilities( const TQStringList&, const TQStringList& ) ) ); + connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), + this, TQ_SLOT( imapCapabilities( const TQStringList&, const TQStringList& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Checking for supported security capabilities of %1..." ).arg( server ) ); } void AccountWizard::checkSmtpCapabilities( const TQString &server, int port ) @@ -535,12 +535,12 @@ void AccountWizard::checkSmtpCapabilities( const TQString &server, int port ) delete mServerTest; mServerTest = new KMServerTest( SMTP_PROTOCOL, server, port ); - connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList&, + connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList&, const TQStringList&, const TQString&, const TQString&, const TQString& ) ), - this, TQT_SLOT( smtpCapabilities( const TQStringList&, const TQStringList&, + this, TQ_SLOT( smtpCapabilities( const TQStringList&, const TQStringList&, const TQString&, const TQString&, const TQString& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Checking for supported security capabilities of %1..." ).arg( server ) ); } void AccountWizard::popCapabilities( const TQStringList &capaNormalList, diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp index 4b5f54f6..036ed51d 100644 --- a/kmail/acljobs.cpp +++ b/kmail/acljobs.cpp @@ -170,8 +170,8 @@ ACLJobs::GetACLJob::GetACLJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); + connect( this, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); } void ACLJobs::GetACLJob::slotInfoMessage( TDEIO::Job*, const TQString& str ) @@ -191,8 +191,8 @@ ACLJobs::GetUserRightsJob::GetUserRightsJob( const KURL& url, const TQByteArray bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); + connect( this, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); } void ACLJobs::GetUserRightsJob::slotInfoMessage( TDEIO::Job*, const TQString& str ) @@ -216,7 +216,7 @@ ACLJobs::MultiSetACLJob::MultiSetACLJob( TDEIO::Slave* slave, const KURL& url, c mSlave( slave ), mUrl( url ), mACLList( acl ), mACLListIterator( mACLList.begin() ) { - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } void ACLJobs::MultiSetACLJob::slotStart() diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp index 738d6285..e5b0bdf5 100644 --- a/kmail/actionscheduler.cpp +++ b/kmail/actionscheduler.cpp @@ -48,7 +48,7 @@ using KMail::AccountManager; #include <tqtimer.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> using namespace KMail; typedef TQPtrList<KMMsgBase> KMMessageList; @@ -82,19 +82,19 @@ ActionScheduler::ActionScheduler(KMFilterMgr::FilterSet set, lastCommand = 0; lastJob = 0; finishTimer = new TQTimer( this, "finishTimer" ); - connect( finishTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(finish())); + connect( finishTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(finish())); fetchMessageTimer = new TQTimer( this, "fetchMessageTimer" ); - connect( fetchMessageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fetchMessage())); + connect( fetchMessageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fetchMessage())); tempCloseFoldersTimer = new TQTimer( this, "tempCloseFoldersTimer" ); - connect( tempCloseFoldersTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(tempCloseFolders())); + connect( tempCloseFoldersTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(tempCloseFolders())); processMessageTimer = new TQTimer( this, "processMessageTimer" ); - connect( processMessageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processMessage())); + connect( processMessageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processMessage())); filterMessageTimer = new TQTimer( this, "filterMessageTimer" ); - connect( filterMessageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(filterMessage())); + connect( filterMessageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(filterMessage())); timeOutTimer = new TQTimer( this, "timeOutTimer" ); - connect( timeOutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeOut())); + connect( timeOutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeOut())); fetchTimeOutTimer = new TQTimer( this, "fetchTimeOutTimer" ); - connect( fetchTimeOutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fetchTimeOut())); + connect( fetchTimeOutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fetchTimeOut())); TQValueList<KMFilter*>::Iterator it = filters.begin(); for (; it != filters.end(); ++it) @@ -122,10 +122,10 @@ ActionScheduler::~ActionScheduler() { schedulerList->remove( this ); tempCloseFolders(); - disconnect( mSrcFolder, TQT_SIGNAL(closed()), - this, TQT_SLOT(folderClosedOrExpunged()) ); - disconnect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)), - this, TQT_SLOT(folderClosedOrExpunged()) ); + disconnect( mSrcFolder, TQ_SIGNAL(closed()), + this, TQ_SLOT(folderClosedOrExpunged()) ); + disconnect( mSrcFolder, TQ_SIGNAL(expunged(KMFolder*)), + this, TQ_SLOT(folderClosedOrExpunged()) ); mSrcFolder->close("actionschedsrc"); if (mDeleteSrcFolder) @@ -157,12 +157,12 @@ void ActionScheduler::setSourceFolder( KMFolder *srcFolder ) { srcFolder->open("actionschedsrc"); if (mSrcFolder) { - disconnect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(msgAdded(KMFolder*, TQ_UINT32)) ); - disconnect( mSrcFolder, TQT_SIGNAL(closed()), - this, TQT_SLOT(folderClosedOrExpunged()) ); - disconnect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)), - this, TQT_SLOT(folderClosedOrExpunged()) ); + disconnect( mSrcFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(msgAdded(KMFolder*, TQ_UINT32)) ); + disconnect( mSrcFolder, TQ_SIGNAL(closed()), + this, TQ_SLOT(folderClosedOrExpunged()) ); + disconnect( mSrcFolder, TQ_SIGNAL(expunged(KMFolder*)), + this, TQ_SLOT(folderClosedOrExpunged()) ); mSrcFolder->close("actionschedsrc"); } mSrcFolder = srcFolder; @@ -170,12 +170,12 @@ void ActionScheduler::setSourceFolder( KMFolder *srcFolder ) for (i = 0; i < mSrcFolder->count(); ++i) enqueue( mSrcFolder->getMsgBase( i )->getMsgSerNum() ); if (mSrcFolder) { - connect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(msgAdded(KMFolder*, TQ_UINT32)) ); - connect( mSrcFolder, TQT_SIGNAL(closed()), - this, TQT_SLOT(folderClosedOrExpunged()) ); - connect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)), - this, TQT_SLOT(folderClosedOrExpunged()) ); + connect( mSrcFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(msgAdded(KMFolder*, TQ_UINT32)) ); + connect( mSrcFolder, TQ_SIGNAL(closed()), + this, TQ_SLOT(folderClosedOrExpunged()) ); + connect( mSrcFolder, TQ_SIGNAL(expunged(KMFolder*)), + this, TQ_SLOT(folderClosedOrExpunged()) ); } } @@ -422,8 +422,8 @@ void ActionScheduler::fetchMessage() fetchTimeOutTime = TQTime::currentTime(); fetchTimeOutTimer->start( 60 * 1000, true ); FolderJob *job = msg->parent()->createJob( msg ); - connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )), - TQT_SLOT(messageFetched( KMMessage* )) ); + connect( job, TQ_SIGNAL(messageRetrieved( KMMessage* )), + TQ_SLOT(messageFetched( KMMessage* )) ); lastJob = job; job->start(); } else { @@ -563,8 +563,8 @@ void ActionScheduler::processMessage() } if (msg) { FolderJob *job = msg->parent()->createJob( msg ); - connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )), - TQT_SLOT(messageRetrieved( KMMessage* )) ); + connect( job, TQ_SIGNAL(messageRetrieved( KMMessage* )), + TQ_SLOT(messageRetrieved( KMMessage* )) ); job->start(); } else { mExecuting = false; @@ -689,8 +689,8 @@ void ActionScheduler::moveMessage() timeOutTime = TQTime::currentTime(); KMCommand *cmd = new KMMoveCommand( folder, msg ); - connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( moveMessageFinished( KMCommand * ) ) ); + connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( moveMessageFinished( KMCommand * ) ) ); cmd->start(); // sometimes the move command doesn't complete so time out after a minute // and move onto the next message @@ -727,16 +727,16 @@ void ActionScheduler::moveMessageFinished( KMCommand *command ) if (mResult == ResultOk) { mExecutingLock = false; if (cmd) - connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( processMessage() ) ); + connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( processMessage() ) ); else processMessageTimer->start( 0, true ); } else { // Note: An alternative to consider is just calling // finishTimer->start and returning if (cmd) - connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( finish() ) ); + connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( finish() ) ); else finishTimer->start( 0, true ); } @@ -758,8 +758,8 @@ void ActionScheduler::timeOut() // Note: This is a good place for a debug statement assert( lastCommand ); // sometimes imap jobs seem to just stall so give up and move on - disconnect( lastCommand, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( moveMessageFinished( KMCommand * ) ) ); + disconnect( lastCommand, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( moveMessageFinished( KMCommand * ) ) ); lastCommand = 0; mExecutingLock = false; mExecuting = false; @@ -773,8 +773,8 @@ void ActionScheduler::fetchTimeOut() // Note: This is a good place for a debug statement assert( lastJob ); // sometimes imap jobs seem to just stall so give up and move on - disconnect( lastJob, TQT_SIGNAL(messageRetrieved( KMMessage* )), - this, TQT_SLOT(messageFetched( KMMessage* )) ); + disconnect( lastJob, TQ_SIGNAL(messageRetrieved( KMMessage* )), + this, TQ_SLOT(messageFetched( KMMessage* )) ); lastJob->kill(); lastJob = 0; fetchMessageTimer->start( 0, true ); diff --git a/kmail/annotationjobs.cpp b/kmail/annotationjobs.cpp index c2fd8267..37f16d64 100644 --- a/kmail/annotationjobs.cpp +++ b/kmail/annotationjobs.cpp @@ -66,8 +66,8 @@ AnnotationJobs::GetAnnotationJob::GetAnnotationJob( const KURL& url, const TQStr : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ), mEntry( entry ) { - connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); + connect( this, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); } void AnnotationJobs::GetAnnotationJob::slotInfoMessage( TDEIO::Job*, const TQString& str ) @@ -88,7 +88,7 @@ AnnotationJobs::MultiGetAnnotationJob::MultiGetAnnotationJob( mSlave( slave ), mUrl( url ), mEntryList( entries ), mEntryListIterator( mEntryList.begin() ) { - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } @@ -143,7 +143,7 @@ AnnotationJobs::MultiSetAnnotationJob::MultiSetAnnotationJob( mSlave( slave ), mUrl( url ), mAnnotationList( annotations ), mAnnotationListIterator( mAnnotationList.begin() ) { - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } @@ -196,7 +196,7 @@ AnnotationJobs::MultiUrlGetAnnotationJob::MultiUrlGetAnnotationJob( TDEIO::Slave mPathListIterator( mPathList.begin() ), mAnnotation( annotation ) { - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp index f187dcd6..e0dbb5bf 100644 --- a/kmail/antispamconfig.cpp +++ b/kmail/antispamconfig.cpp @@ -33,8 +33,6 @@ #include "antispamconfig.h" -#include <kasciistricmp.h> - #include <kstaticdeleter.h> #include <tdeconfig.h> diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index 5552b058..6c537334 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -46,7 +46,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqdom.h> #include <tqlabel.h> @@ -104,24 +104,24 @@ AntiSpamWizard::AntiSpamWizard( WizardMode mode, ( mMode == AntiSpam ) ? i18n( "Welcome to the KMail Anti-Spam Wizard" ) : i18n( "Welcome to the KMail Anti-Virus Wizard" ) ); - connect( mInfoPage, TQT_SIGNAL( selectionChanged( void ) ), - this, TQT_SLOT( checkProgramsSelections( void ) ) ); + connect( mInfoPage, TQ_SIGNAL( selectionChanged( void ) ), + this, TQ_SLOT( checkProgramsSelections( void ) ) ); if ( mMode == AntiSpam ) { mSpamRulesPage = new ASWizSpamRulesPage( 0, "", mainFolderTree ); addPage( mSpamRulesPage, i18n( "Options to fine-tune the handling of spam messages" )); - connect( mSpamRulesPage, TQT_SIGNAL( selectionChanged( void ) ), - this, TQT_SLOT( slotBuildSummary( void ) ) ); + connect( mSpamRulesPage, TQ_SIGNAL( selectionChanged( void ) ), + this, TQ_SLOT( slotBuildSummary( void ) ) ); } else { mVirusRulesPage = new ASWizVirusRulesPage( 0, "", mainFolderTree ); addPage( mVirusRulesPage, i18n( "Options to fine-tune the handling of virus messages" )); - connect( mVirusRulesPage, TQT_SIGNAL( selectionChanged( void ) ), - this, TQT_SLOT( checkVirusRulesSelections( void ) ) ); + connect( mVirusRulesPage, TQ_SIGNAL( selectionChanged( void ) ), + this, TQ_SLOT( checkVirusRulesSelections( void ) ) ); } - connect( this, TQT_SIGNAL( helpClicked( void) ), - this, TQT_SLOT( slotHelpClicked( void ) ) ); + connect( this, TQ_SIGNAL( helpClicked( void) ), + this, TQ_SLOT( slotHelpClicked( void ) ) ); setNextEnabled( mInfoPage, false ); @@ -132,7 +132,7 @@ AntiSpamWizard::AntiSpamWizard( WizardMode mode, setFinishEnabled( mSummaryPage, true ); } - TQTimer::singleShot( 0, this, TQT_SLOT( checkToolAvailability( void ) ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( checkToolAvailability( void ) ) ); } @@ -517,7 +517,7 @@ void AntiSpamWizard::checkToolAvailability() } else { // check the availability of the application - TDEApplication::kApplication()->processEvents( 200 ); + tdeApp->processEvents( 200 ); if ( !checkForProgram( (*it).getExecutable() ) ) { mInfoPage->addAvailableTool( (*it).getVisibleName() ); found = true; @@ -540,9 +540,9 @@ void AntiSpamWizard::checkToolAvailability() void AntiSpamWizard::slotHelpClicked() { if ( mMode == AntiSpam ) - kapp->invokeHelp( "the-anti-spam-wizard", "kmail" ); + tdeApp->invokeHelp( "the-anti-spam-wizard", "kmail" ); else - kapp->invokeHelp( "the-anti-virus-wizard", "kmail" ); + tdeApp->invokeHelp( "the-anti-virus-wizard", "kmail" ); } @@ -891,8 +891,8 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode, mToolsList->setRowMode( TQListBox::FixedNumber ); mToolsList->setRowMode( 10 ); layout->addWidget( mToolsList ); - connect( mToolsList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(processSelectionChange(void)) ); + connect( mToolsList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(processSelectionChange(void)) ); mSelectionHint = new TQLabel( this ); mSelectionHint->setText( "" ); @@ -983,16 +983,16 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, layout->addStretch(); - connect( mMarkRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mMoveSpamRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mMoveUnsureRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mFolderReqForSpamFolder, TQT_SIGNAL(folderChanged(KMFolder*)), - this, TQT_SLOT(processSelectionChange(KMFolder*)) ); - connect( mFolderReqForUnsureFolder, TQT_SIGNAL(folderChanged(KMFolder*)), - this, TQT_SLOT(processSelectionChange(KMFolder*)) ); + connect( mMarkRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mMoveSpamRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mMoveUnsureRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mFolderReqForSpamFolder, TQ_SIGNAL(folderChanged(KMFolder*)), + this, TQ_SLOT(processSelectionChange(KMFolder*)) ); + connect( mFolderReqForUnsureFolder, TQ_SIGNAL(folderChanged(KMFolder*)), + this, TQ_SLOT(processSelectionChange(KMFolder*)) ); mMarkRules->setChecked( true ); mMoveSpamRules->setChecked( true ); @@ -1093,14 +1093,14 @@ ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * parent, const char * name, mFolderTree = new SimpleFolderTree( this, mainFolderTree, s, true ); grid->addWidget( mFolderTree, 3, 0 ); - connect( mPipeRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mMoveRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mMarkRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mMoveRules, TQT_SIGNAL( toggled( bool ) ), - mMarkRules, TQT_SLOT( setEnabled( bool ) ) ); + connect( mPipeRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mMoveRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mMarkRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mMoveRules, TQ_SIGNAL( toggled( bool ) ), + mMarkRules, TQ_SLOT( setEnabled( bool ) ) ); } bool ASWizVirusRulesPage::pipeRulesSelected() const diff --git a/kmail/app_octetstream.cpp b/kmail/app_octetstream.cpp index b45140ac..990f1ff3 100644 --- a/kmail/app_octetstream.cpp +++ b/kmail/app_octetstream.cpp @@ -32,7 +32,7 @@ #include "interfaces/bodypartformatter.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace { @@ -59,7 +59,7 @@ namespace { } extern "C" -KDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * +TDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * libkmail_bodypartformatter_application_octetstream_create_bodypart_formatter_plugin() { return new Plugin(); } diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp index 58db524c..4a62497c 100644 --- a/kmail/archivefolderdialog.cpp +++ b/kmail/archivefolderdialog.cpp @@ -71,8 +71,8 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) mainLayout->addWidget( folderLabel, row, 0 ); mFolderRequester = new FolderRequester( mainWidget, kmkernel->getKMMainWidget()->folderTree() ); mFolderRequester->setMustBeReadWrite( false ); - connect( mFolderRequester, TQT_SIGNAL(folderChanged(KMFolder *)), - TQT_SLOT(slotFolderChanged(KMFolder *)) ); + connect( mFolderRequester, TQ_SIGNAL(folderChanged(KMFolder *)), + TQ_SLOT(slotFolderChanged(KMFolder *)) ); folderLabel->setBuddy( mFolderRequester ); mainLayout->addWidget( mFolderRequester, row, 1 ); row++; @@ -88,8 +88,8 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) mFormatComboBox->insertItem( i18n( "BZ2-Compressed Tar Archive (.tar.bz2)" ) ); mFormatComboBox->insertItem( i18n( "GZ-Compressed Tar Archive (.tar.gz)" ) ); mFormatComboBox->setCurrentItem( 2 ); - connect( mFormatComboBox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotFixFileExtension()) ); + connect( mFormatComboBox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotFixFileExtension()) ); mainLayout->addWidget( mFormatComboBox, row, 1 ); row++; @@ -100,10 +100,10 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) mUrlRequester->setFilter( "*.tar *.zip *.tar.gz *.tar.bz2" ); mUrlRequester->fileDialog()->setKeepLocation( true ); fileNameLabel->setBuddy( mUrlRequester ); - connect( mUrlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(slotUrlChanged(const TQString &)) ); - connect( mUrlRequester, TQT_SIGNAL(urlSelected(const TQString&)), - this, TQT_SLOT(slotFixFileExtension()) ); + connect( mUrlRequester->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(slotUrlChanged(const TQString &)) ); + connect( mUrlRequester, TQ_SIGNAL(urlSelected(const TQString&)), + this, TQ_SLOT(slotFixFileExtension()) ); mainLayout->addWidget( mUrlRequester, row, 1 ); row++; diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp index bf78e68c..b67834c4 100644 --- a/kmail/backupjob.cpp +++ b/kmail/backupjob.cpp @@ -234,15 +234,15 @@ void BackupJob::archiveNextMessage() // Use a singleshot timer, or otherwise we risk ending up in a very big recursion // for folders that have many messages mCurrentMessage = message; - TQTimer::singleShot( 0, this, TQT_SLOT( processCurrentMessage() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( processCurrentMessage() ) ); } else if ( message->parent() ) { mCurrentJob = message->parent()->createJob( message ); mCurrentJob->setCancellable( false ); - connect( mCurrentJob, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), - this, TQT_SLOT( messageRetrieved( KMMessage* ) ) ); - connect( mCurrentJob, TQT_SIGNAL( result( KMail::FolderJob* ) ), - this, TQT_SLOT( folderJobFinished( KMail::FolderJob* ) ) ); + connect( mCurrentJob, TQ_SIGNAL( messageRetrieved( KMMessage* ) ), + this, TQ_SLOT( messageRetrieved( KMMessage* ) ) ); + connect( mCurrentJob, TQ_SIGNAL( result( KMail::FolderJob* ) ), + this, TQ_SLOT( folderJobFinished( KMail::FolderJob* ) ) ); mCurrentJob->start(); } else { @@ -490,8 +490,8 @@ void BackupJob::start() TQString(), true ); mProgressItem->setUsesBusyIndicator( true ); - connect( mProgressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), - this, TQT_SLOT(cancelJob()) ); + connect( mProgressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), + this, TQ_SLOT(cancelJob()) ); archiveNextFolder(); } diff --git a/kmail/bodypartformatter.cpp b/kmail/bodypartformatter.cpp index 8435ef25..3ee62d97 100644 --- a/kmail/bodypartformatter.cpp +++ b/kmail/bodypartformatter.cpp @@ -46,7 +46,6 @@ #include <mimelib/utility.h> #include <kdebug.h> -#include <kasciistricmp.h> namespace { class AnyTypeBodyPartFormatter diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp index bba5b1b6..89dd1116 100644 --- a/kmail/cachedimapjob.cpp +++ b/kmail/cachedimapjob.cpp @@ -200,11 +200,11 @@ void CachedImapJob::listMessages() ImapAccountBase::jobData jd( url.url(), mFolder->folder() ); jd.cancellable = true; mAccount->insertJob( job, jd ); - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotListMessagesResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotListMessagesResult( TDEIO::Job* ) ) ); // send the data directly for KMFolderCachedImap - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - mFolder, TQT_SLOT( slotGetMessagesData( TDEIO::Job* , const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + mFolder, TQ_SLOT( slotGetMessagesData( TDEIO::Job* , const TQByteArray& ) ) ); } void CachedImapJob::slotDeleteNextMessages( TDEIO::Job* job ) @@ -240,8 +240,8 @@ void CachedImapJob::slotDeleteNextMessages( TDEIO::Job* job ) TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob ); ImapAccountBase::jobData jd( url.url(), mFolder->folder() ); mAccount->insertJob( simpleJob, jd ); - connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotDeleteNextMessages(TDEIO::Job *) ) ); + connect( simpleJob, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotDeleteNextMessages(TDEIO::Job *) ) ); } void CachedImapJob::expungeFolder() @@ -254,8 +254,8 @@ void CachedImapJob::expungeFolder() TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job ); ImapAccountBase::jobData jd( url.url(), mFolder->folder() ); mAccount->insertJob( job, jd ); - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotExpungeResult(TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotExpungeResult(TDEIO::Job *) ) ); } void CachedImapJob::slotExpungeResult( TDEIO::Job * job ) @@ -349,12 +349,12 @@ void CachedImapJob::slotGetNextMessage(TDEIO::Job * job) TDEIO::SimpleJob *simpleJob = TDEIO::get(url, false, false); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob); mAccount->insertJob(simpleJob, jd); - connect(simpleJob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), - this, TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); - connect(simpleJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotGetNextMessage(TDEIO::Job *))); - connect(simpleJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - mFolder, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); + connect(simpleJob, TQ_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), + this, TQ_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); + connect(simpleJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotGetNextMessage(TDEIO::Job *))); + connect(simpleJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + mFolder, TQ_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); } void CachedImapJob::slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t processed) @@ -420,14 +420,14 @@ void CachedImapJob::slotPutNextMessage() TDEIO::SimpleJob *simpleJob = TDEIO::put(url, 0, false, false, false); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob); mAccount->insertJob(simpleJob, jd); - connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ), - TQT_SLOT( slotPutMessageResult(TDEIO::Job *) ) ); - connect( simpleJob, TQT_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ), - TQT_SLOT( slotPutMessageDataReq(TDEIO::Job *, TQByteArray &) ) ); - connect( simpleJob, TQT_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ), - mFolder, TQT_SLOT( slotSimpleData(TDEIO::Job *, const TQByteArray &) ) ); - connect( simpleJob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), - TQT_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) ); + connect( simpleJob, TQ_SIGNAL( result(TDEIO::Job *) ), + TQ_SLOT( slotPutMessageResult(TDEIO::Job *) ) ); + connect( simpleJob, TQ_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ), + TQ_SLOT( slotPutMessageDataReq(TDEIO::Job *, TQByteArray &) ) ); + connect( simpleJob, TQ_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ), + mFolder, TQ_SLOT( slotSimpleData(TDEIO::Job *, const TQByteArray &) ) ); + connect( simpleJob, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), + TQ_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) ); } @@ -590,8 +590,8 @@ void CachedImapJob::slotAddNextSubfolder( TDEIO::Job * job ) TDEIO::SimpleJob *simpleJob = TDEIO::mkdir(url); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob); mAccount->insertJob(simpleJob, jd); - connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotAddNextSubfolder(TDEIO::Job *)) ); + connect( simpleJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotAddNextSubfolder(TDEIO::Job *)) ); } else { TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); @@ -608,8 +608,8 @@ void CachedImapJob::slotAddNextSubfolder( TDEIO::Job * job ) TDEIO::SimpleJob *simpleJob = TDEIO::special( url.url(), packedArgs, false ); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob); mAccount->insertJob(simpleJob, jd); - connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotAddNextSubfolder(TDEIO::Job *)) ); + connect( simpleJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotAddNextSubfolder(TDEIO::Job *)) ); } } @@ -648,8 +648,8 @@ void CachedImapJob::slotDeleteNextFolder( TDEIO::Job *job ) TDEIO::SimpleJob *simpleJob = TDEIO::file_delete(url, false); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob); mAccount->insertJob(simpleJob, jd); - connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ), - TQT_SLOT( slotDeleteNextFolder(TDEIO::Job *) ) ); + connect( simpleJob, TQ_SIGNAL( result(TDEIO::Job *) ), + TQ_SLOT( slotDeleteNextFolder(TDEIO::Job *) ) ); } void CachedImapJob::checkUidValidity() @@ -663,10 +663,10 @@ void CachedImapJob::checkUidValidity() TDEIO::SimpleJob *job = TDEIO::get( url, false, false ); TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job ); mAccount->insertJob( job, jd ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotCheckUidValidityResult(TDEIO::Job *)) ); - connect( job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - mFolder, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotCheckUidValidityResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + mFolder, TQ_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); } void CachedImapJob::slotCheckUidValidityResult(TDEIO::Job * job) @@ -752,8 +752,8 @@ void CachedImapJob::renameFolder( const TQString &newName ) TDEIO::SimpleJob *simpleJob = TDEIO::rename( urlSrc, urlDst, false ); TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob ); mAccount->insertJob( simpleJob, jd ); - connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotRenameFolderResult(TDEIO::Job *)) ); + connect( simpleJob, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotRenameFolderResult(TDEIO::Job *)) ); } static void renameChildFolders( KMFolderDir* dir, const TQString& oldPath, @@ -826,14 +826,14 @@ void CachedImapJob::slotSubscribtionChange2Failed( const TQString &errorMessage void CachedImapJob::slotSubscribtionChange1Done( const TQString&, bool ) { - disconnect( mAccount, TQT_SIGNAL( subscriptionChanged( const TQString&, bool ) ), - this, TQT_SLOT( slotSubscribtionChange1Done( const TQString&, bool ) ) ); - connect( mAccount, TQT_SIGNAL( subscriptionChanged( const TQString&, bool ) ), - this, TQT_SLOT( slotSubscribtionChange2Done( const TQString&, bool ) ) ); - disconnect( mAccount, TQT_SIGNAL( subscriptionChangeFailed( const TQString& ) ), - this, TQT_SLOT( slotSubscribtionChange1Failed( const TQString& ) ) ); - connect( mAccount, TQT_SIGNAL( subscriptionChangeFailed( const TQString& ) ), - this, TQT_SLOT( slotSubscribtionChange2Failed( const TQString& ) ) ); + disconnect( mAccount, TQ_SIGNAL( subscriptionChanged( const TQString&, bool ) ), + this, TQ_SLOT( slotSubscribtionChange1Done( const TQString&, bool ) ) ); + connect( mAccount, TQ_SIGNAL( subscriptionChanged( const TQString&, bool ) ), + this, TQ_SLOT( slotSubscribtionChange2Done( const TQString&, bool ) ) ); + disconnect( mAccount, TQ_SIGNAL( subscriptionChangeFailed( const TQString& ) ), + this, TQ_SLOT( slotSubscribtionChange1Failed( const TQString& ) ) ); + connect( mAccount, TQ_SIGNAL( subscriptionChangeFailed( const TQString& ) ), + this, TQ_SLOT( slotSubscribtionChange2Failed( const TQString& ) ) ); mAccount->changeSubscription( false, mOldImapPath, true /* quiet */ ); } @@ -865,10 +865,10 @@ void CachedImapJob::slotRenameFolderResult( TDEIO::Job *job ) // Okay, the folder seems to be renamed on the server and on disk. // Now unsubscribe from the old folder name and subscribe to the new folder name, // so that the folder doesn't suddenly disappear after renaming it - connect( mAccount, TQT_SIGNAL( subscriptionChangeFailed( const TQString& ) ), - this, TQT_SLOT( slotSubscribtionChange1Failed( const TQString& ) ) ); - connect( mAccount, TQT_SIGNAL( subscriptionChanged( const TQString&, bool ) ), - this, TQT_SLOT( slotSubscribtionChange1Done( const TQString&, bool ) ) ); + connect( mAccount, TQ_SIGNAL( subscriptionChangeFailed( const TQString& ) ), + this, TQ_SLOT( slotSubscribtionChange1Failed( const TQString& ) ) ); + connect( mAccount, TQ_SIGNAL( subscriptionChanged( const TQString&, bool ) ), + this, TQ_SLOT( slotSubscribtionChange1Done( const TQString&, bool ) ) ); mAccount->changeSubscription( true, mNewImapPath, true /* quiet */ ); } } diff --git a/kmail/callback.cpp b/kmail/callback.cpp index 66bcd12f..70020037 100644 --- a/kmail/callback.cpp +++ b/kmail/callback.cpp @@ -76,7 +76,7 @@ TQString Callback::askForTransport( bool nullIdentity ) const "Please select the transport which should be used to send your reply.</qt>"); bool ok; const TQString transport = KInputDialog::getItem( i18n( "Select Transport" ), text, - transports, defaultIndex, FALSE, &ok, kmkernel->mainWin() ); + transports, defaultIndex, false, &ok, kmkernel->mainWin() ); if ( !ok ) return TQString(); @@ -232,7 +232,7 @@ TQString Callback::receiver() const mReceiver = KInputDialog::getItem( i18n( "Select Address" ), selectMessage, - addrs+ccaddrs, defaultIndex, FALSE, &ok, kmkernel->mainWin() ); + addrs+ccaddrs, defaultIndex, false, &ok, kmkernel->mainWin() ); if( !ok ) mReceiver = TQString(); } diff --git a/kmail/callback.h b/kmail/callback.h index 2722d0ff..4fff0f73 100644 --- a/kmail/callback.h +++ b/kmail/callback.h @@ -38,7 +38,7 @@ class KMMessage; class KMReaderWin; -#include <kdemacros.h> +#include <tdemacros.h> #include <libkcal/attendee.h> // only for an enum, we are not linking @@ -52,7 +52,7 @@ namespace KMail { Feel free to put whatever you want in here. It's not supposed to be a nicely formatted class, but simply include everything necessary for the plugins. */ -class KDE_EXPORT Callback { +class TDE_EXPORT Callback { public: Callback( KMMessage* msg, KMReaderWin* readerWin ); diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp index 9e25743e..c4e546ff 100644 --- a/kmail/chiasmuskeyselector.cpp +++ b/kmail/chiasmuskeyselector.cpp @@ -35,8 +35,8 @@ ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& capt layout->addStretch(); - connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) ); - connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) ); + connect( mListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQ_SLOT( slotOk() ) ); + connect( mListBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQ_SLOT( slotOk() ) ); mListBox->setFocus(); } diff --git a/kmail/colorlistbox.cpp b/kmail/colorlistbox.cpp index c7481924..a8610dcd 100644 --- a/kmail/colorlistbox.cpp +++ b/kmail/colorlistbox.cpp @@ -32,7 +32,7 @@ ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f ) :TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1) { - connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); + connect( this, TQ_SIGNAL(selected(int)), this, TQ_SLOT(newColor(int)) ); setAcceptDrops( true); } diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp index a2ace485..90d0e9f4 100644 --- a/kmail/compactionjob.cpp +++ b/kmail/compactionjob.cpp @@ -131,7 +131,7 @@ int MboxCompactionJob::executeNow( bool silent ) mCurrentIndex = 0; kdDebug(5006) << "MboxCompactionJob: starting to compact folder " << mSrcFolder->location() << " into " << mTempName << endl; - connect( &mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoWork() ) ); + connect( &mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoWork() ) ); if ( !mImmediate ) mTimer.start( COMPACTIONJOB_TIMERINTERVAL ); slotDoWork(); @@ -229,7 +229,7 @@ int MaildirCompactionJob::executeNow( bool silent ) mCurrentIndex = 0; kdDebug(5006) << "MaildirCompactionJob: starting to compact in folder " << mSrcFolder->location() << endl; - connect( &mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoWork() ) ); + connect( &mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoWork() ) ); if ( !mImmediate ) mTimer.start( COMPACTIONJOB_TIMERINTERVAL ); slotDoWork(); diff --git a/kmail/composer.h b/kmail/composer.h index b02a2418..ba2ab035 100644 --- a/kmail/composer.h +++ b/kmail/composer.h @@ -83,7 +83,7 @@ namespace KMail { public: // kmkernel, callback /** * If this flag is set the message of the composer is deleted when - * the composer is closed and the message was not sent. Default: FALSE + * the composer is closed and the message was not sent. Default: false */ virtual void setAutoDelete( bool f ) = 0; diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 040dba3b..2c0d619e 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -85,7 +85,6 @@ using KMime::DateFormatter; #include <tdelocale.h> #include <tdeapplication.h> #include <kcharsets.h> -#include <kasciistringtools.h> #include <kdebug.h> #include <knuminput.h> #include <tdefontdialog.h> @@ -93,7 +92,7 @@ using KMime::DateFormatter; #include <kurlrequester.h> #include <kseparator.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include <knotifydialog.h> #include <tdeconfig.h> @@ -117,6 +116,7 @@ using KMime::DateFormatter; #include <tqlayout.h> #include <tqcheckbox.h> #include <tqwidgetstack.h> +#include <tqglobal.h> // other headers: #include <assert.h> @@ -219,7 +219,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal KGuiItem(), User2, i18n( "Configure" ), parent, name, modal ) , mProfileDialog( 0 ) { - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() ); showButton( User1, true ); addModule ( "kmail_config_identity", false ); @@ -270,8 +270,8 @@ void ConfigureDialog::slotUser2() { return; } mProfileDialog = new ProfileDialog( this, "mProfileDialog" ); - connect( mProfileDialog, TQT_SIGNAL(profileSelected(TDEConfig*)), - this, TQT_SIGNAL(installProfile(TDEConfig*)) ); + connect( mProfileDialog, TQ_SIGNAL(profileSelected(TDEConfig*)), + this, TQ_SIGNAL(installProfile(TDEConfig*)) ); mProfileDialog->show(); } @@ -291,14 +291,14 @@ IdentityPage::IdentityPage( TQWidget * parent, const char * name ) TQHBoxLayout * hlay = new TQHBoxLayout( this, 0, KDialog::spacingHint() ); mIdentityList = new IdentityListView( this ); - connect( mIdentityList, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotIdentitySelectionChanged()) ); - connect( mIdentityList, TQT_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)), - TQT_SLOT(slotRenameIdentity(TQListViewItem*,const TQString&,int)) ); - connect( mIdentityList, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotModifyIdentity()) ); - connect( mIdentityList, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), - TQT_SLOT(slotContextMenu(TDEListView*,TQListViewItem*,const TQPoint&)) ); + connect( mIdentityList, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotIdentitySelectionChanged()) ); + connect( mIdentityList, TQ_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)), + TQ_SLOT(slotRenameIdentity(TQListViewItem*,const TQString&,int)) ); + connect( mIdentityList, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotModifyIdentity()) ); + connect( mIdentityList, TQ_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), + TQ_SLOT(slotContextMenu(TDEListView*,TQListViewItem*,const TQPoint&)) ); // ### connect dragged(...), ... hlay->addWidget( mIdentityList, 1 ); @@ -319,16 +319,16 @@ IdentityPage::IdentityPage( TQWidget * parent, const char * name ) mRemoveButton->setEnabled( false ); mSetAsDefaultButton->setAutoDefault( false ); mSetAsDefaultButton->setEnabled( false ); - connect( button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNewIdentity()) ); - connect( mModifyButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotModifyIdentity()) ); - connect( mRenameButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRenameIdentity()) ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveIdentity()) ); - connect( mSetAsDefaultButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSetAsDefault()) ); + connect( button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNewIdentity()) ); + connect( mModifyButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotModifyIdentity()) ); + connect( mRenameButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRenameIdentity()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveIdentity()) ); + connect( mSetAsDefaultButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSetAsDefault()) ); vlay->addWidget( button ); vlay->addWidget( mModifyButton ); vlay->addWidget( mRenameButton ); @@ -493,13 +493,13 @@ void IdentityPage::slotContextMenu( TDEListView *, TQListViewItem * i, IdentityListViewItem * item = dynamic_cast<IdentityListViewItem*>( i ); TQPopupMenu * menu = new TQPopupMenu( this ); - menu->insertItem( i18n("Add..."), this, TQT_SLOT(slotNewIdentity()) ); + menu->insertItem( i18n("Add..."), this, TQ_SLOT(slotNewIdentity()) ); if ( item ) { - menu->insertItem( i18n("Modify..."), this, TQT_SLOT(slotModifyIdentity()) ); + menu->insertItem( i18n("Modify..."), this, TQ_SLOT(slotModifyIdentity()) ); if ( mIdentityList->childCount() > 1 ) - menu->insertItem( i18n("Remove"), this, TQT_SLOT(slotRemoveIdentity()) ); + menu->insertItem( i18n("Remove"), this, TQ_SLOT(slotRemoveIdentity()) ); if ( !item->identity().isDefault() ) - menu->insertItem( i18n("Set as Default"), this, TQT_SLOT(slotSetAsDefault()) ); + menu->insertItem( i18n("Set as Default"), this, TQ_SLOT(slotSetAsDefault()) ); } menu->exec( pos ); delete menu; @@ -563,16 +563,16 @@ AccountsPage::AccountsPage( TQWidget * parent, const char * name ) // mReceivingTab = new ReceivingTab(); addTab( mReceivingTab, i18n( "&Receiving" ) ); - connect( mReceivingTab, TQT_SIGNAL(accountListChanged(const TQStringList &)), - this, TQT_SIGNAL(accountListChanged(const TQStringList &)) ); + connect( mReceivingTab, TQ_SIGNAL(accountListChanged(const TQStringList &)), + this, TQ_SIGNAL(accountListChanged(const TQStringList &)) ); // // "Sending" tab: // mSendingTab = new SendingTab(); addTab( mSendingTab, i18n( "&Sending" ) ); - connect( mSendingTab, TQT_SIGNAL(transportListChanged(const TQStringList&)), - this, TQT_SIGNAL(transportListChanged(const TQStringList&)) ); + connect( mSendingTab, TQ_SIGNAL(transportListChanged(const TQStringList&)), + this, TQ_SIGNAL(transportListChanged(const TQStringList&)) ); load(); } @@ -608,10 +608,10 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * mTransportList->addColumn( i18n("Type") ); mTransportList->setAllColumnsShowFocus( true ); mTransportList->setSorting( -1 ); - connect( mTransportList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotTransportSelected()) ); - connect( mTransportList, TQT_SIGNAL(doubleClicked( TQListViewItem *)), - this, TQT_SLOT(slotModifySelectedTransport()) ); + connect( mTransportList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotTransportSelected()) ); + connect( mTransportList, TQ_SIGNAL(doubleClicked( TQListViewItem *)), + this, TQ_SLOT(slotModifySelectedTransport()) ); hlay->addWidget( mTransportList, 1 ); // a vbox layout for the buttons: zero stretch, spacing inherited from hlay @@ -620,31 +620,31 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * // "add..." button: stretch 0 button = new TQPushButton( i18n("A&dd..."), this ); button->setAutoDefault( false ); - connect( button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddTransport()) ); + connect( button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddTransport()) ); btn_vlay->addWidget( button ); // "modify..." button: stretch 0 mModifyTransportButton = new TQPushButton( i18n("&Modify..."), this ); mModifyTransportButton->setAutoDefault( false ); mModifyTransportButton->setEnabled( false ); // b/c no item is selected yet - connect( mModifyTransportButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotModifySelectedTransport()) ); + connect( mModifyTransportButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotModifySelectedTransport()) ); btn_vlay->addWidget( mModifyTransportButton ); // "remove" button: stretch 0 mRemoveTransportButton = new TQPushButton( i18n("R&emove"), this ); mRemoveTransportButton->setAutoDefault( false ); mRemoveTransportButton->setEnabled( false ); // b/c no item is selected yet - connect( mRemoveTransportButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveSelectedTransport()) ); + connect( mRemoveTransportButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveSelectedTransport()) ); btn_vlay->addWidget( mRemoveTransportButton ); mSetDefaultTransportButton = new TQPushButton( i18n("Set Default"), this ); mSetDefaultTransportButton->setAutoDefault( false ); mSetDefaultTransportButton->setEnabled( false ); - connect ( mSetDefaultTransportButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSetDefaultTransport()) ); + connect ( mSetDefaultTransportButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSetDefaultTransport()) ); btn_vlay->addWidget( mSetDefaultTransportButton ); btn_vlay->addStretch( 1 ); // spacer @@ -660,8 +660,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * // "confirm before send" check box: mConfirmSendCheck = new TQCheckBox( i18n("Confirm &before send"), group ); glay->addMultiCellWidget( mConfirmSendCheck, 0, 0, 0, 1 ); - connect( mConfirmSendCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mConfirmSendCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "send on check" combo: mSendOnCheckCombo = new TQComboBox( false, group ); @@ -670,8 +670,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * << i18n("On Manual Mail Checks") << i18n("On All Mail Checks") ); glay->addWidget( mSendOnCheckCombo, 1, 1 ); - connect( mSendOnCheckCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mSendOnCheckCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "default send method" combo: mSendMethodCombo = new TQComboBox( false, group ); @@ -679,8 +679,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * << i18n("Send Now") << i18n("Send Later") ); glay->addWidget( mSendMethodCombo, 2, 1 ); - connect( mSendMethodCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mSendMethodCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "message property" combo: @@ -690,14 +690,14 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * << i18n("Allow 8-bit") << i18n("MIME Compliant (Quoted Printable)") ); glay->addWidget( mMessagePropertyCombo, 3, 1 ); - connect( mMessagePropertyCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mMessagePropertyCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "default domain" input field: mDefaultDomainEdit = new KLineEdit( group ); glay->addMultiCellWidget( mDefaultDomainEdit, 4, 4, 1, 2 ); - connect( mDefaultDomainEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mDefaultDomainEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // labels: TQLabel *l = new TQLabel( mSendOnCheckCombo, /*buddy*/ @@ -1082,10 +1082,10 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha mAccountList->addColumn( i18n("Folder") ); mAccountList->setAllColumnsShowFocus( true ); mAccountList->setSorting( -1 ); - connect( mAccountList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotAccountSelected()) ); - connect( mAccountList, TQT_SIGNAL(doubleClicked( TQListViewItem *)), - this, TQT_SLOT(slotModifySelectedAccount()) ); + connect( mAccountList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotAccountSelected()) ); + connect( mAccountList, TQ_SIGNAL(doubleClicked( TQListViewItem *)), + this, TQ_SLOT(slotModifySelectedAccount()) ); hlay->addWidget( mAccountList, 1 ); // a vbox layout for the buttons: zero stretch, spacing inherited from hlay @@ -1094,31 +1094,31 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // "add..." button: stretch 0 button = new TQPushButton( i18n("A&dd..."), this ); button->setAutoDefault( false ); - connect( button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddAccount()) ); + connect( button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddAccount()) ); btn_vlay->addWidget( button ); // "modify..." button: stretch 0 mModifyAccountButton = new TQPushButton( i18n("&Modify..."), this ); mModifyAccountButton->setAutoDefault( false ); mModifyAccountButton->setEnabled( false ); // b/c no item is selected yet - connect( mModifyAccountButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotModifySelectedAccount()) ); + connect( mModifyAccountButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotModifySelectedAccount()) ); btn_vlay->addWidget( mModifyAccountButton ); // "remove..." button: stretch 0 mRemoveAccountButton = new TQPushButton( i18n("R&emove"), this ); mRemoveAccountButton->setAutoDefault( false ); mRemoveAccountButton->setEnabled( false ); // b/c no item is selected yet - connect( mRemoveAccountButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveSelectedAccount()) ); + connect( mRemoveAccountButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveSelectedAccount()) ); btn_vlay->addWidget( mRemoveAccountButton ); btn_vlay->addStretch( 1 ); // spacer mCheckmailStartupCheck = new TQCheckBox( i18n("Chec&k mail on startup"), this ); vlay->addWidget( mCheckmailStartupCheck ); - connect( mCheckmailStartupCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCheckmailStartupCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "New Mail Notification" group box: stretch 0 group = new TQVGroupBox( i18n("New Mail Notification"), this ); @@ -1129,8 +1129,8 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha mBeepNewMailCheck = new TQCheckBox(i18n("&Beep"), group ); mBeepNewMailCheck->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); - connect( mBeepNewMailCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mBeepNewMailCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "Detailed new mail notification" check box mVerboseNotificationCheck = @@ -1142,15 +1142,15 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha "messages" ) ); TQWhatsThis::add( mVerboseNotificationCheck, GlobalSettings::self()->verboseNewMailNotificationItem()->whatsThis() ); - connect( mVerboseNotificationCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mVerboseNotificationCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "Other Actions" button: mOtherNewMailActionsButton = new TQPushButton( i18n("Other Actio&ns"), group ); mOtherNewMailActionsButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - connect( mOtherNewMailActionsButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEditNotifications()) ); + connect( mOtherNewMailActionsButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditNotifications()) ); } AccountsPageReceivingTab::~AccountsPageReceivingTab() @@ -1412,7 +1412,7 @@ void AccountsPage::ReceivingTab::doLoadOther() { mBeepNewMailCheck->setChecked( general.readBoolEntry("beep-on-mail", false ) ); mCheckmailStartupCheck->setChecked( general.readBoolEntry("checkmail-startup", false) ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotTweakAccountList() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotTweakAccountList() ) ); } void AccountsPage::ReceivingTab::slotTweakAccountList() @@ -1565,8 +1565,8 @@ AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * parent, const char * mCustomFontCheck = new TQCheckBox( i18n("&Use custom fonts"), this ); vlay->addWidget( mCustomFontCheck ); vlay->addWidget( new KSeparator( KSeparator::HLine, this ) ); - connect ( mCustomFontCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect ( mCustomFontCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "font location" combo box and label: hlay = new TQHBoxLayout( vlay ); // inherites spacing @@ -1589,20 +1589,20 @@ AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * parent, const char * false, 4 ); mFontChooser->setEnabled( false ); // since !mCustomFontCheck->isChecked() vlay->addWidget( mFontChooser ); - connect ( mFontChooser, TQT_SIGNAL( fontSelected( const TQFont& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect ( mFontChooser, TQ_SIGNAL( fontSelected( const TQFont& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // {en,dis}able widgets depending on the state of mCustomFontCheck: - connect( mCustomFontCheck, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomFontCheck, TQT_SIGNAL(toggled(bool)), - mFontLocationCombo, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomFontCheck, TQT_SIGNAL(toggled(bool)), - mFontChooser, TQT_SLOT(setEnabled(bool)) ); + connect( mCustomFontCheck, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomFontCheck, TQ_SIGNAL(toggled(bool)), + mFontLocationCombo, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomFontCheck, TQ_SIGNAL(toggled(bool)), + mFontChooser, TQ_SLOT(setEnabled(bool)) ); // load the right font settings into mFontChooser: - connect( mFontLocationCombo, TQT_SIGNAL(activated(int) ), - this, TQT_SLOT(slotFontSelectorChanged(int)) ); + connect( mFontLocationCombo, TQ_SIGNAL(activated(int) ), + this, TQ_SLOT(slotFontSelectorChanged(int)) ); } @@ -1629,14 +1629,14 @@ void AppearancePage::FontsTab::slotFontSelectorChanged( int index ) mActiveFontIndex = index; // Disonnect so the "Apply" button is not activated by the change - disconnect ( mFontChooser, TQT_SIGNAL( fontSelected( const TQFont& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + disconnect ( mFontChooser, TQ_SIGNAL( fontSelected( const TQFont& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // Display the new setting: mFontChooser->setFont( mFont[index], fontNames[index].onlyFixed ); - connect ( mFontChooser, TQT_SIGNAL( fontSelected( const TQFont& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect ( mFontChooser, TQ_SIGNAL( fontSelected( const TQFont& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // Disable Family and Size list if we have selected a quote font: mFontChooser->enableColumn( TDEFontChooser::FamilyList|TDEFontChooser::SizeList, @@ -1739,8 +1739,8 @@ AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mCustomColorCheck = new TQCheckBox( i18n("&Use custom colors"), this ); vlay->addWidget( mCustomColorCheck ); - connect( mCustomColorCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCustomColorCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // color list box: mColorList = new ColorListBox( this ); @@ -1755,8 +1755,8 @@ AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char new TQCheckBox( i18n("Recycle colors on deep "ing"), this ); mRecycleColorCheck->setEnabled( false ); vlay->addWidget( mRecycleColorCheck ); - connect( mRecycleColorCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mRecycleColorCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // close to quota threshold TQHBoxLayout *hbox = new TQHBoxLayout(vlay); @@ -1764,25 +1764,25 @@ AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char hbox->addWidget( l ); l->setEnabled( false ); mCloseToQuotaThreshold = new TQSpinBox( 0, 100, 1, this ); - connect( mCloseToQuotaThreshold, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCloseToQuotaThreshold, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mCloseToQuotaThreshold->setEnabled( false ); mCloseToQuotaThreshold->setSuffix( i18n("%")); hbox->addWidget( mCloseToQuotaThreshold ); hbox->addWidget( new TQWidget(this), 2 ); // {en,dir}able widgets depending on the state of mCustomColorCheck: - connect( mCustomColorCheck, TQT_SIGNAL(toggled(bool)), - mColorList, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomColorCheck, TQT_SIGNAL(toggled(bool)), - mRecycleColorCheck, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomColorCheck, TQT_SIGNAL(toggled(bool)), - l, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomColorCheck, TQT_SIGNAL(toggled(bool)), - mCloseToQuotaThreshold, TQT_SLOT(setEnabled(bool)) ); + connect( mCustomColorCheck, TQ_SIGNAL(toggled(bool)), + mColorList, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomColorCheck, TQ_SIGNAL(toggled(bool)), + mRecycleColorCheck, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomColorCheck, TQ_SIGNAL(toggled(bool)), + l, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomColorCheck, TQ_SIGNAL(toggled(bool)), + mCloseToQuotaThreshold, TQ_SLOT(setEnabled(bool)) ); - connect( mCustomColorCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCustomColorCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); } void AppearancePage::ColorsTab::doLoadOther() { @@ -1793,9 +1793,9 @@ void AppearancePage::ColorsTab::doLoadOther() { mCloseToQuotaThreshold->setValue( GlobalSettings::closeToQuotaThreshold() ); static const TQColor defaultColor[ numColorNames ] = { - kapp->palette().active().base(), // bg + tdeApp->palette().active().base(), // bg TDEGlobalSettings::alternateBackgroundColor(), // alt bg - kapp->palette().active().text(), // fg + tdeApp->palette().active().text(), // fg TQColor( 0x00, 0x80, 0x00 ), // quoted l1 TQColor( 0x00, 0x70, 0x00 ), // quoted l2 TQColor( 0x00, 0x60, 0x00 ), // quoted l3 @@ -1823,8 +1823,8 @@ void AppearancePage::ColorsTab::doLoadOther() { mColorList->setColor( i, reader.readColorEntry( colorNames[i].configName, &defaultColor[i] ) ); } - connect( mColorList, TQT_SIGNAL( changed( ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mColorList, TQ_SIGNAL( changed( ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); } void AppearancePage::ColorsTab::installProfile( TDEConfig * profile ) { @@ -1911,30 +1911,30 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char // "folder list" radio buttons: populateButtonGroup( mFolderListGroup = new TQHButtonGroup( this ), folderListMode ); vlay->addWidget( mFolderListGroup ); - connect( mFolderListGroup, TQT_SIGNAL ( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mFolderListGroup, TQ_SIGNAL ( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); mFavoriteFolderViewCB = new TQCheckBox( i18n("Show favorite folder view"), this ); - connect( mFavoriteFolderViewCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); + connect( mFavoriteFolderViewCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); vlay->addWidget( mFavoriteFolderViewCB ); // "show reader window" radio buttons: populateButtonGroup( mReaderWindowModeGroup = new TQVButtonGroup( this ), readerWindowMode ); vlay->addWidget( mReaderWindowModeGroup ); - connect( mReaderWindowModeGroup, TQT_SIGNAL ( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mReaderWindowModeGroup, TQ_SIGNAL ( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "Show MIME Tree" radio buttons: populateButtonGroup( mMIMETreeModeGroup = new TQVButtonGroup( this ), mimeTreeMode ); vlay->addWidget( mMIMETreeModeGroup ); - connect( mMIMETreeModeGroup, TQT_SIGNAL ( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mMIMETreeModeGroup, TQ_SIGNAL ( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "MIME Tree Location" radio buttons: populateButtonGroup( mMIMETreeLocationGroup = new TQHButtonGroup( this ), mimeTreeLocation ); vlay->addWidget( mMIMETreeLocationGroup ); - connect( mMIMETreeLocationGroup, TQT_SIGNAL ( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mMIMETreeLocationGroup, TQ_SIGNAL ( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); vlay->addStretch( 10 ); // spacer } @@ -2015,14 +2015,14 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha mNestedMessagesCheck = new TQCheckBox( i18n("&Threaded message list"), group ); - connect( mMessageSizeCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mAttachmentCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mCryptoIconsCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mNestedMessagesCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mMessageSizeCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mAttachmentCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mCryptoIconsCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mNestedMessagesCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( group ); @@ -2048,8 +2048,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha vlay->addWidget( mNestingPolicy ); - connect( mNestingPolicy, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mNestingPolicy, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "Date Display" group: mDateDisplay = new TQVButtonGroup( i18n("Date Display"), this ); @@ -2064,10 +2064,10 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha if ( dateDisplayConfig[i].dateDisplay == DateFormatter::Custom ) { mCustomDateFormatEdit = new KLineEdit( mDateDisplay ); mCustomDateFormatEdit->setEnabled( false ); - connect( radio, TQT_SIGNAL(toggled(bool)), - mCustomDateFormatEdit, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomDateFormatEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotEmitChanged(void)) ); + connect( radio, TQ_SIGNAL(toggled(bool)), + mCustomDateFormatEdit, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomDateFormatEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotEmitChanged(void)) ); TQString customDateWhatsThis = i18n("<qt><p><strong>These expressions may be used for the date:" "</strong></p>" @@ -2106,8 +2106,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha } // end for loop populating mDateDisplay vlay->addWidget( mDateDisplay ); - connect( mDateDisplay, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mDateDisplay, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addStretch( 10 ); // spacer @@ -2261,40 +2261,40 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, TQToolTip::add( mCloseAfterReplyOrForwardCheck, i18n( "Close the standalone message window after replying or forwarding the message" ) ); vlay->addWidget( mCloseAfterReplyOrForwardCheck ); - connect( mCloseAfterReplyOrForwardCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mCloseAfterReplyOrForwardCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "show colorbar" check box: populateCheckBox( mShowColorbarCheck = new TQCheckBox( this ), showColorbarMode ); vlay->addWidget( mShowColorbarCheck ); - connect( mShowColorbarCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShowColorbarCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "show spam status" check box; populateCheckBox( mShowSpamStatusCheck = new TQCheckBox( this ), showSpamStatusMode ); vlay->addWidget( mShowSpamStatusCheck ); - connect( mShowSpamStatusCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShowSpamStatusCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "replace smileys by emoticons" check box; populateCheckBox( mShowEmoticonsCheck = new TQCheckBox( this ), showEmoticons ); vlay->addWidget( mShowEmoticonsCheck ); - connect( mShowEmoticonsCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShowEmoticonsCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "Use smaller font for quoted text" check box mShrinkQuotesCheck = new TQCheckBox( i18n( shrinkQuotes.desc ), this, "kcfg_ShrinkQuotes" ); vlay->addWidget( mShrinkQuotesCheck ); - connect( mShrinkQuotesCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShrinkQuotesCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "Show expand/collaps quote marks" check box; TQHBoxLayout *hlay= new TQHBoxLayout( vlay ); // inherits spacing populateCheckBox( mShowExpandQuotesMark= new TQCheckBox( this ), showExpandQuotesMark); hlay->addWidget( mShowExpandQuotesMark); - connect( mShowExpandQuotesMark, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShowExpandQuotesMark, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); hlay->addStretch( 1 ); mCollapseQuoteLevelSpin = new KIntSpinBox( 0/*min*/,10/*max*/,1/*step*/, @@ -2306,20 +2306,20 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, hlay->addWidget( label ); mCollapseQuoteLevelSpin->setEnabled( false ); //since !mShowExpandQuotesMark->isCheckec() - connect( mCollapseQuoteLevelSpin, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCollapseQuoteLevelSpin, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hlay->addWidget( mCollapseQuoteLevelSpin); - connect( mShowExpandQuotesMark, TQT_SIGNAL( toggled( bool ) ), - mCollapseQuoteLevelSpin, TQT_SLOT( setEnabled( bool ) ) ); + connect( mShowExpandQuotesMark, TQ_SIGNAL( toggled( bool ) ), + mCollapseQuoteLevelSpin, TQ_SLOT( setEnabled( bool ) ) ); // Fallback Character Encoding hlay = new TQHBoxLayout( vlay ); // inherits spacing mCharsetCombo = new TQComboBox( this ); mCharsetCombo->insertStringList( KMMsgBase::supportedEncodings( false ) ); - connect( mCharsetCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCharsetCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); TQString fallbackCharsetWhatsThis = i18n( GlobalSettings::self()->fallbackCharacterEncodingItem()->whatsThis().utf8() ); @@ -2339,8 +2339,8 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, mOverrideCharsetCombo->insertStringList( encodings ); mOverrideCharsetCombo->setCurrentItem(0); - connect( mOverrideCharsetCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mOverrideCharsetCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); TQString overrideCharsetWhatsThis = i18n( GlobalSettings::self()->overrideCharacterEncodingItem()->whatsThis().utf8() ); @@ -2354,8 +2354,8 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, populateCheckBox( mShowCurrentTimeCheck = new TQCheckBox( this ), showCurrentTime ); vlay->addWidget( mShowCurrentTimeCheck ); - connect( mShowCurrentTimeCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShowCurrentTimeCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); vlay->addStretch( 100 ); // spacer } @@ -2485,17 +2485,17 @@ AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent, // "Enable system tray applet" check box mSystemTrayCheck = new TQCheckBox( i18n("Enable system tray icon"), this ); vlay->addWidget( mSystemTrayCheck ); - connect( mSystemTrayCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mSystemTrayCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // System tray modes mSystemTrayGroup = new TQVButtonGroup( i18n("System Tray Mode"), this ); mSystemTrayGroup->layout()->setSpacing( KDialog::spacingHint() ); vlay->addWidget( mSystemTrayGroup ); - connect( mSystemTrayGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mSystemTrayCheck, TQT_SIGNAL( toggled( bool ) ), - mSystemTrayGroup, TQT_SLOT( setEnabled( bool ) ) ); + connect( mSystemTrayGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mSystemTrayCheck, TQ_SIGNAL( toggled( bool ) ), + mSystemTrayGroup, TQ_SLOT( setEnabled( bool ) ) ); mSystemTrayGroup->insert( new TQRadioButton( i18n("Always show KMail in system tray"), mSystemTrayGroup ), GlobalSettings::EnumSystemTrayPolicy::ShowAlways ); @@ -2617,14 +2617,14 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * GlobalSettings::self()->autoTextSignatureItem()->label(), this ); vlay->addWidget( mAutoAppSignFileCheck ); - connect( mAutoAppSignFileCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mAutoAppSignFileCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mTopQuoteCheck = new TQCheckBox( GlobalSettings::self()->prependSignatureItem()->label(), this ); vlay->addWidget( mTopQuoteCheck); - connect( mTopQuoteCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mTopQuoteCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mSmartQuoteCheck = new TQCheckBox( GlobalSettings::self()->smartQuoteItem()->label(), @@ -2634,8 +2634,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * "even when the line was created by adding an additional linebreak while\n" "word-wrapping the text." ) ); vlay->addWidget( mSmartQuoteCheck ); - connect( mSmartQuoteCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mSmartQuoteCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mQuoteSelectionOnlyCheck = new TQCheckBox( GlobalSettings::self()->quoteSelectionOnlyItem()->label(), this, "kcfg_QuoteSelectionOnly" ); @@ -2643,28 +2643,28 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * i18n( "When replying, only quote the selected text instead of the complete message " "when there is text selected in the message window." ) ); vlay->addWidget( mQuoteSelectionOnlyCheck ); - connect( mQuoteSelectionOnlyCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged(void) ) ); + connect( mQuoteSelectionOnlyCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged(void) ) ); mStripSignatureCheck = new TQCheckBox( GlobalSettings::self()->stripSignatureItem()->label(), this, "kcfg_StripSignature" ); vlay->addWidget( mStripSignatureCheck ); - connect( mStripSignatureCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mStripSignatureCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mAutoRequestMDNCheck = new TQCheckBox( GlobalSettings::self()->requestMDNItem()->label(), this, "kcfg_RequestMDN" ); vlay->addWidget( mAutoRequestMDNCheck ); - connect( mAutoRequestMDNCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mAutoRequestMDNCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mShowRecentAddressesInComposer = new TQCheckBox( GlobalSettings::self()->showRecentAddressesInComposerItem()->label(), this, "kcfg_ShowRecentAddressesInComposer" ); vlay->addWidget( mShowRecentAddressesInComposer ); - connect( mShowRecentAddressesInComposer, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mShowRecentAddressesInComposer, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // a checkbox for "word wrap" and a spinbox for the column in // which to wrap: @@ -2673,20 +2673,20 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * GlobalSettings::self()->wordWrapItem()->label(), this, "kcfg_WordWrap" ); hlay->addWidget( mWordWrapCheck ); - connect( mWordWrapCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mWordWrapCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mWrapColumnSpin = new KIntSpinBox( 30/*min*/, 78/*max*/, 1/*step*/, 78/*init*/, 10 /*base*/, this, "kcfg_LineWrapWidth" ); mWrapColumnSpin->setEnabled( false ); // since !mWordWrapCheck->isChecked() - connect( mWrapColumnSpin, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mWrapColumnSpin, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hlay->addWidget( mWrapColumnSpin ); hlay->addStretch( 1 ); // only enable the spinbox if the checkbox is checked: - connect( mWordWrapCheck, TQT_SIGNAL(toggled(bool)), - mWrapColumnSpin, TQT_SLOT(setEnabled(bool)) ); + connect( mWordWrapCheck, TQ_SIGNAL(toggled(bool)), + mWrapColumnSpin, TQ_SLOT(setEnabled(bool)) ); // a checkbox for "too many recipient warning" and a spinbox for the recipient threshold hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -2694,8 +2694,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * GlobalSettings::self()->tooManyRecipientsItem()->label(), this, "kcfg_TooManyRecipients" ); hlay->addWidget( mRecipientCheck ); - connect( mRecipientCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mRecipientCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); TQString recipientCheckWhatsthis = i18n( GlobalSettings::self()->tooManyRecipientsItem()->whatsThis().utf8() ); @@ -2706,8 +2706,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * mRecipientSpin = new KIntSpinBox( 1/*min*/, 100/*max*/, 1/*step*/, 5/*init*/, 10 /*base*/, this, "kcfg_RecipientThreshold" ); mRecipientSpin->setEnabled( false ); - connect( mRecipientSpin, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mRecipientSpin, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); TQString recipientWhatsthis = i18n( GlobalSettings::self()->recipientThresholdItem()->whatsThis().utf8() ); @@ -2719,8 +2719,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * hlay->addWidget( mRecipientSpin ); hlay->addStretch( 1 ); // only enable the spinbox if the checkbox is checked: - connect( mRecipientCheck, TQT_SIGNAL(toggled(bool)), - mRecipientSpin, TQT_SLOT(setEnabled(bool)) ); + connect( mRecipientCheck, TQ_SIGNAL(toggled(bool)), + mRecipientSpin, TQ_SLOT(setEnabled(bool)) ); hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -2732,8 +2732,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * mAutoSave->setSpecialValueText( i18n("No autosave") ); mAutoSave->setSuffix( i18n(" min") ); hlay->addStretch( 1 ); - connect( mAutoSave, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mAutoSave, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hlay = new TQHBoxLayout( vlay ); // inherits spacing mForwardTypeCombo = new KComboBox( false, this ); @@ -2746,21 +2746,21 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * hlay->addWidget( label ); hlay->addWidget( mForwardTypeCombo ); hlay->addStretch( 1 ); - connect( mForwardTypeCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mForwardTypeCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hlay = new TQHBoxLayout( vlay ); // inherits spacing TQPushButton *completionOrderBtn = new TQPushButton( i18n( "Configure Completion Order" ), this ); - connect( completionOrderBtn, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotConfigureCompletionOrder() ) ); + connect( completionOrderBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotConfigureCompletionOrder() ) ); hlay->addWidget( completionOrderBtn ); hlay->addItem( new TQSpacerItem(0, 0) ); // recent addresses hlay = new TQHBoxLayout( vlay ); // inherits spacing TQPushButton *recentAddressesBtn = new TQPushButton( i18n( "Edit Recent Addresses..." ), this ); - connect( recentAddressesBtn, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotConfigureRecentAddresses() ) ); + connect( recentAddressesBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotConfigureRecentAddresses() ) ); hlay->addWidget( recentAddressesBtn ); hlay->addItem( new TQSpacerItem(0, 0) ); @@ -2771,17 +2771,17 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * mExternalEditorCheck = new TQCheckBox( GlobalSettings::self()->useExternalEditorItem()->label(), group, "kcfg_UseExternalEditor" ); - connect( mExternalEditorCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mExternalEditorCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hbox = new TQHBox( group ); label = new TQLabel( GlobalSettings::self()->externalEditorItem()->label(), hbox ); mEditorRequester = new KURLRequester( hbox, "kcfg_ExternalEditor" ); - connect( mEditorRequester, TQT_SIGNAL( urlSelected(const TQString&) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mEditorRequester, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mEditorRequester, TQ_SIGNAL( urlSelected(const TQString&) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mEditorRequester, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hbox->setStretchFactor( mEditorRequester, 1 ); label->setBuddy( mEditorRequester ); @@ -2791,16 +2791,16 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * "application/x-shellscript " "application/x-desktop" ); mEditorRequester->setEnabled( false ); // !mExternalEditorCheck->isChecked() - connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); - connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)), - mEditorRequester, TQT_SLOT(setEnabled(bool)) ); + connect( mExternalEditorCheck, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); + connect( mExternalEditorCheck, TQ_SIGNAL(toggled(bool)), + mEditorRequester, TQ_SLOT(setEnabled(bool)) ); label = new TQLabel( i18n("<b>%f</b> will be replaced with the " "filename to edit."), group ); label->setEnabled( false ); // see above - connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mExternalEditorCheck, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); vlay->addWidget( group ); vlay->addStretch( 100 ); @@ -2942,8 +2942,8 @@ ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * glay->addWidget( new TQLabel( mPhraseLanguageCombo, i18n("Lang&uage:"), this ), 1, 0 ); glay->addMultiCellWidget( mPhraseLanguageCombo, 1, 1, 1, 2 ); - connect( mPhraseLanguageCombo, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotLanguageChanged(const TQString&)) ); + connect( mPhraseLanguageCombo, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotLanguageChanged(const TQString&)) ); // row 2: "add..." and "remove" push buttons: button = new TQPushButton( i18n("A&dd..."), this ); @@ -2953,39 +2953,39 @@ ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * mRemoveButton->setAutoDefault( false ); mRemoveButton->setEnabled( false ); // combo doesn't contain anything... glay->addWidget( mRemoveButton, 2, 2 ); - connect( button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNewLanguage()) ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveLanguage()) ); + connect( button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNewLanguage()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveLanguage()) ); // row 3: "reply to sender" line edit and label: mPhraseReplyEdit = new KLineEdit( this ); - connect( mPhraseReplyEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mPhraseReplyEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); glay->addWidget( new TQLabel( mPhraseReplyEdit, i18n("Reply to se&nder:"), this ), 3, 0 ); glay->addMultiCellWidget( mPhraseReplyEdit, 3, 3, 1, 2 ); // cols 1..2 // row 4: "reply to all" line edit and label: mPhraseReplyAllEdit = new KLineEdit( this ); - connect( mPhraseReplyAllEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mPhraseReplyAllEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); glay->addWidget( new TQLabel( mPhraseReplyAllEdit, i18n("Repl&y to all:"), this ), 4, 0 ); glay->addMultiCellWidget( mPhraseReplyAllEdit, 4, 4, 1, 2 ); // cols 1..2 // row 5: "forward" line edit and label: mPhraseForwardEdit = new KLineEdit( this ); - connect( mPhraseForwardEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mPhraseForwardEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); glay->addWidget( new TQLabel( mPhraseForwardEdit, i18n("&Forward:"), this ), 5, 0 ); glay->addMultiCellWidget( mPhraseForwardEdit, 5, 5, 1, 2 ); // cols 1..2 // row 6: "quote indicator" line edit and label: mPhraseIndentPrefixEdit = new KLineEdit( this ); - connect( mPhraseIndentPrefixEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mPhraseIndentPrefixEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); glay->addWidget( new TQLabel( mPhraseIndentPrefixEdit, i18n("&Quote indicator:"), this ), 6, 0 ); glay->addMultiCellWidget( mPhraseIndentPrefixEdit, 6, 6, 1, 2 ); @@ -3133,8 +3133,8 @@ ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * parent, const cha mWidget = new TemplatesConfiguration( this ); vlay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL( changed() ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mWidget, TQ_SIGNAL( changed() ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); } void ComposerPage::TemplatesTab::doLoadFromGlobalSettings() { @@ -3157,8 +3157,8 @@ ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * paren mWidget = new CustomTemplates( this ); vlay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL( changed() ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mWidget, TQ_SIGNAL( changed() ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); } void ComposerPage::CustomTemplatesTab::doLoadFromGlobalSettings() { @@ -3200,15 +3200,15 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * i18n("A&dd..."), i18n("Re&move"), i18n("Mod&ify..."), i18n("Enter new reply prefix:") ); - connect( mReplyListEditor, TQT_SIGNAL( changed( void ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mReplyListEditor, TQ_SIGNAL( changed( void ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // row 2: "replace [...]" check box: mReplaceReplyPrefixCheck = new TQCheckBox( GlobalSettings::self()->replaceReplyPrefixItem()->label(), group, "kcfg_ReplaceReplyPrefix" ); - connect( mReplaceReplyPrefixCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mReplaceReplyPrefixCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( group ); @@ -3228,15 +3228,15 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * i18n("Remo&ve"), i18n("Modify..."), i18n("Enter new forward prefix:") ); - connect( mForwardListEditor, TQT_SIGNAL( changed( void ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mForwardListEditor, TQ_SIGNAL( changed( void ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // row 3: "replace [...]" check box: mReplaceForwardPrefixCheck = new TQCheckBox( GlobalSettings::self()->replaceForwardPrefixItem()->label(), group, "kcfg_ReplaceForwardPrefix" ); - connect( mReplaceForwardPrefixCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mReplaceForwardPrefixCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( group ); } @@ -3276,20 +3276,20 @@ ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * new SimpleStringListEditor( this, 0, SimpleStringListEditor::All, i18n("A&dd..."), i18n("Remo&ve"), i18n("&Modify..."), i18n("Enter charset:") ); - connect( mCharsetListEditor, TQT_SIGNAL( changed( void ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCharsetListEditor, TQ_SIGNAL( changed( void ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( mCharsetListEditor, 1 ); mKeepReplyCharsetCheck = new TQCheckBox( i18n("&Keep original charset when " "replying or forwarding (if " "possible)"), this ); - connect( mKeepReplyCharsetCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mKeepReplyCharsetCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( mKeepReplyCharsetCheck ); - connect( mCharsetListEditor, TQT_SIGNAL(aboutToAdd(TQString&)), - this, TQT_SLOT(slotVerifyCharset(TQString&)) ); + connect( mCharsetListEditor, TQ_SIGNAL(aboutToAdd(TQString&)), + this, TQ_SLOT(slotVerifyCharset(TQString&)) ); } void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) { @@ -3327,7 +3327,7 @@ void ComposerPage::CharsetTab::doLoadOther() { it != charsets.end() ; ++it ) if ( (*it) == TQString::fromLatin1("locale") ) { TQCString cset = kmkernel->networkCodec()->mimeName(); - KPIM::kAsciiToLower( cset.data() ); + kasciitolower( cset.data() ); (*it) = TQString("%1 (locale)").arg( TQString(cset) ); } @@ -3367,8 +3367,8 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * // "Use custom Message-Id suffix" checkbox: mCreateOwnMessageIdCheck = new TQCheckBox( i18n("&Use custom message-id suffix"), this ); - connect( mCreateOwnMessageIdCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCreateOwnMessageIdCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( mCreateOwnMessageIdCheck ); // "Message-Id suffix" line edit and label: @@ -3376,7 +3376,7 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * mMessageIdSuffixEdit = new KLineEdit( this ); // only ASCII letters, digits, plus, minus and dots are allowed mMessageIdSuffixValidator = - new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), TQT_TQOBJECT(this) ); + new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), this ); mMessageIdSuffixEdit->setValidator( mMessageIdSuffixValidator ); label = new TQLabel( mMessageIdSuffixEdit, i18n("Custom message-&id suffix:"), this ); @@ -3384,12 +3384,12 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * mMessageIdSuffixEdit->setEnabled( false ); hlay->addWidget( label ); hlay->addWidget( mMessageIdSuffixEdit, 1 ); - connect( mCreateOwnMessageIdCheck, TQT_SIGNAL(toggled(bool) ), - label, TQT_SLOT(setEnabled(bool)) ); - connect( mCreateOwnMessageIdCheck, TQT_SIGNAL(toggled(bool) ), - mMessageIdSuffixEdit, TQT_SLOT(setEnabled(bool)) ); - connect( mMessageIdSuffixEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCreateOwnMessageIdCheck, TQ_SIGNAL(toggled(bool) ), + label, TQ_SLOT(setEnabled(bool)) ); + connect( mCreateOwnMessageIdCheck, TQ_SIGNAL(toggled(bool) ), + mMessageIdSuffixEdit, TQ_SLOT(setEnabled(bool)) ); + connect( mMessageIdSuffixEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // horizontal rule and "custom header fields" label: vlay->addWidget( new KSeparator( KSeparator::HLine, this ) ); @@ -3404,18 +3404,18 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * mTagList->addColumn( i18n("Value") ); mTagList->setAllColumnsShowFocus( true ); mTagList->setSorting( -1 ); - connect( mTagList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotMimeHeaderSelectionChanged()) ); + connect( mTagList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotMimeHeaderSelectionChanged()) ); glay->addMultiCellWidget( mTagList, 0, 2, 0, 1 ); // "new" and "remove" buttons: button = new TQPushButton( i18n("Ne&w"), this ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewMimeHeader()) ); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewMimeHeader()) ); button->setAutoDefault( false ); glay->addWidget( button, 0, 2 ); mRemoveHeaderButton = new TQPushButton( i18n("Re&move"), this ); - connect( mRemoveHeaderButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveMimeHeader()) ); + connect( mRemoveHeaderButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveMimeHeader()) ); button->setAutoDefault( false ); glay->addWidget( mRemoveHeaderButton, 1, 2 ); @@ -3426,8 +3426,8 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * mTagNameLabel->setEnabled( false ); glay->addWidget( mTagNameLabel, 3, 0 ); glay->addWidget( mTagNameEdit, 3, 1 ); - connect( mTagNameEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotMimeHeaderNameChanged(const TQString&)) ); + connect( mTagNameEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotMimeHeaderNameChanged(const TQString&)) ); mTagValueEdit = new KLineEdit( this ); mTagValueEdit->setEnabled( false ); @@ -3435,8 +3435,8 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * mTagValueLabel->setEnabled( false ); glay->addWidget( mTagValueLabel, 4, 0 ); glay->addWidget( mTagValueEdit, 4, 1 ); - connect( mTagValueEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotMimeHeaderValueChanged(const TQString&)) ); + connect( mTagValueEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotMimeHeaderValueChanged(const TQString&)) ); } void ComposerPage::HeadersTab::slotMimeHeaderSelectionChanged() @@ -3583,10 +3583,10 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent, TQToolTip::add( mOutlookCompatibleCheck, i18n( "Turn this option on to make Outlook(tm) understand attachment names " "containing non-English characters" ) ); - connect( mOutlookCompatibleCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mOutlookCompatibleCheck, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotOutlookCompatibleClicked() ) ); + connect( mOutlookCompatibleCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mOutlookCompatibleCheck, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotOutlookCompatibleClicked() ) ); vlay->addWidget( mOutlookCompatibleCheck ); vlay->addSpacing( 5 ); @@ -3594,8 +3594,8 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent, mMissingAttachmentDetectionCheck = new TQCheckBox( i18n("E&nable detection of missing attachments"), this ); mMissingAttachmentDetectionCheck->setChecked( true ); - connect( mMissingAttachmentDetectionCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mMissingAttachmentDetectionCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( mMissingAttachmentDetectionCheck ); // "Attachment key words" label and string list editor @@ -3611,14 +3611,14 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent, i18n("A&dd..."), i18n("Re&move"), i18n("Mod&ify..."), i18n("Enter new key word:") ); - connect( mAttachWordsListEditor, TQT_SIGNAL( changed( void ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mAttachWordsListEditor, TQ_SIGNAL( changed( void ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( mAttachWordsListEditor ); - connect( mMissingAttachmentDetectionCheck, TQT_SIGNAL(toggled(bool) ), - label, TQT_SLOT(setEnabled(bool)) ); - connect( mMissingAttachmentDetectionCheck, TQT_SIGNAL(toggled(bool) ), - mAttachWordsListEditor, TQT_SLOT(setEnabled(bool)) ); + connect( mMissingAttachmentDetectionCheck, TQ_SIGNAL(toggled(bool) ), + label, TQ_SLOT(setEnabled(bool)) ); + connect( mMissingAttachmentDetectionCheck, TQ_SIGNAL(toggled(bool) ), + mAttachWordsListEditor, TQ_SLOT(setEnabled(bool)) ); } void ComposerPage::AttachmentsTab::doLoadFromGlobalSettings() { @@ -3802,13 +3802,13 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * mHtmlMailCheck = new TQCheckBox( i18n("Prefer H&TML to plain text"), group ); TQWhatsThis::add( mHtmlMailCheck, htmlWhatsThis ); - connect( mHtmlMailCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mHtmlMailCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mExternalReferences = new TQCheckBox( i18n("Allow messages to load e&xternal " "references from the Internet" ), group ); TQWhatsThis::add( mExternalReferences, externalWhatsThis ); - connect( mExternalReferences, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mExternalReferences, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); label = new KActiveLabel( i18n("<b>WARNING:</b> Allowing HTML in email may " "increase the risk that your system will be " "compromised by present and anticipated security " @@ -3824,7 +3824,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * group = new TQVGroupBox( i18n("Encrypted Messages"), this ); group->layout()->setSpacing( KDialog::spacingHint() ); mAlwaysDecrypt = new TQCheckBox( i18n( "Attempt decryption of encrypted messages when viewing" ), group ); - connect( mAlwaysDecrypt, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotEmitChanged()) ); + connect( mAlwaysDecrypt, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotEmitChanged()) ); vlay->addWidget( group ); // "Message Disposition Notification" groupbox: @@ -3835,8 +3835,8 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * // "ignore", "ask", "deny", "always send" radiobutton line: mMDNGroup = new TQButtonGroup( group ); mMDNGroup->hide(); - connect( mMDNGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mMDNGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hbox = new TQHBox( group ); hbox->setSpacing( KDialog::spacingHint() ); @@ -3863,8 +3863,8 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * // "Original Message quote" radiobutton line: mOrigQuoteGroup = new TQButtonGroup( group ); mOrigQuoteGroup->hide(); - connect( mOrigQuoteGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mOrigQuoteGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hbox = new TQHBox( group ); hbox->setSpacing( KDialog::spacingHint() ); @@ -3884,7 +3884,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * hbox->setStretchFactor( w, 1 ); mNoMDNsWhenEncryptedCheck = new TQCheckBox( i18n("Do not send MDNs in response to encrypted messages"), group ); - connect( mNoMDNsWhenEncryptedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); + connect( mNoMDNsWhenEncryptedCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); // Warning label: label = new KActiveLabel( i18n("<b>WARNING:</b> Unconditionally returning " @@ -3900,7 +3900,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * group->layout()->setSpacing( KDialog::spacingHint() ); mAutomaticallyImportAttachedKeysCheck = new TQCheckBox( i18n("Automatically import keys and certificates"), group ); - connect( mAutomaticallyImportAttachedKeysCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); + connect( mAutomaticallyImportAttachedKeysCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); vlay->addWidget( group ); @@ -4003,13 +4003,13 @@ SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent, TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 ); mWidget = new ComposerCryptoConfiguration( this ); - connect( mWidget->mAutoSignature, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mEncToSelf, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mShowEncryptionResult, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mShowKeyApprovalDlg, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mAutoEncrypt, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mNeverEncryptWhenSavingInDrafts, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mStoreEncrypted, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); + connect( mWidget->mAutoSignature, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mEncToSelf, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mShowEncryptionResult, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mShowKeyApprovalDlg, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mAutoEncrypt, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mNeverEncryptWhenSavingInDrafts, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mStoreEncrypted, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); vlay->addWidget( mWidget ); } @@ -4080,20 +4080,20 @@ SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char * mWidget = new WarningConfiguration( this ); vlay->addWidget( mWidget ); - connect( mWidget->warnGroupBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); - connect( mWidget->mWarnUnsigned, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); - connect( mWidget->warnUnencryptedCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); - connect( mWidget->warnReceiverNotInCertificateCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); - connect( mWidget->mWarnSignKeyExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mWarnSignChainCertExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mWarnSignRootCertExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); + connect( mWidget->warnGroupBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); + connect( mWidget->mWarnUnsigned, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); + connect( mWidget->warnUnencryptedCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); + connect( mWidget->warnReceiverNotInCertificateCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); + connect( mWidget->mWarnSignKeyExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mWarnSignChainCertExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mWarnSignRootCertExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); - connect( mWidget->mWarnEncrKeyExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mWarnEncrChainCertExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mWarnEncrRootCertExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); + connect( mWidget->mWarnEncrKeyExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mWarnEncrChainCertExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mWarnEncrRootCertExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); - connect( mWidget->enableAllWarningsPB, TQT_SIGNAL(clicked()), - TQT_SLOT(slotReenableAllWarningsClicked()) ); + connect( mWidget->enableAllWarningsPB, TQ_SIGNAL(clicked()), + TQ_SLOT(slotReenableAllWarningsClicked()) ); } void SecurityPage::WarningTab::doLoadOther() { @@ -4206,28 +4206,28 @@ SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * parent, const char * name mConfig = Kleo::CryptoBackendFactory::instance()->config(); - connect( mWidget->CRLRB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->OCSPRB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->OCSPResponderURL, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->OCSPResponderSignature, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->doNotCheckCertPolicyCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->neverConsultCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->fetchMissingCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - - connect( mWidget->ignoreServiceURLCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->ignoreHTTPDPCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->disableHTTPCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->honorHTTPProxyRB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->useCustomHTTPProxyRB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->customHTTPProxy, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->ignoreLDAPDPCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->disableLDAPCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->customLDAPProxy, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotEmitChanged() ) ); - - connect( mWidget->disableHTTPCB, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUpdateHTTPActions() ) ); - connect( mWidget->ignoreHTTPDPCB, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUpdateHTTPActions() ) ); + connect( mWidget->CRLRB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->OCSPRB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->OCSPResponderURL, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->OCSPResponderSignature, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->doNotCheckCertPolicyCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->neverConsultCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->fetchMissingCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + + connect( mWidget->ignoreServiceURLCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->ignoreHTTPDPCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->disableHTTPCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->honorHTTPProxyRB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->useCustomHTTPProxyRB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->customHTTPProxy, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->ignoreLDAPDPCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->disableLDAPCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->customLDAPProxy, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotEmitChanged() ) ); + + connect( mWidget->disableHTTPCB, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUpdateHTTPActions() ) ); + connect( mWidget->ignoreHTTPDPCB, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUpdateHTTPActions() ) ); // Button-group for exclusive radiobuttons TQButtonGroup* bgHTTPProxy = new TQButtonGroup( mWidget ); @@ -4504,7 +4504,7 @@ SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * parent, const cha TQVBoxLayout * vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mBackendConfig = Kleo::CryptoBackendFactory::instance()->configWidget( this, "mBackendConfig" ); - connect( mBackendConfig, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) ); + connect( mBackendConfig, TQ_SIGNAL( changed( bool ) ), this, TQ_SIGNAL( changed( bool ) ) ); vlay->addWidget( mBackendConfig ); } @@ -4563,13 +4563,13 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) "trash"), this ); vlay->addWidget( mEmptyFolderConfirmCheck ); - connect( mEmptyFolderConfirmCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mEmptyFolderConfirmCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mExcludeImportantFromExpiry = new TQCheckBox( i18n("E&xclude important messages from expiry"), this ); vlay->addWidget( mExcludeImportantFromExpiry ); - connect( mExcludeImportantFromExpiry, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mExcludeImportantFromExpiry, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "when trying to find unread messages" combo + label: stretch 0 hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -4587,8 +4587,8 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) "Loop in All Folders")); hlay->addWidget( label ); hlay->addWidget( mLoopOnGotoUnread, 1 ); - connect( mLoopOnGotoUnread, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mLoopOnGotoUnread, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // when entering a folder hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -4611,8 +4611,8 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) "Jump to Oldest Message") ); hlay->addWidget( label ); hlay->addWidget( mActionEnterFolder, 1 ); - connect( mActionEnterFolder, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mActionEnterFolder, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hlay = new TQHBoxLayout( vlay ); // inherits spacing mDelayedMarkAsRead = new TQCheckBox( i18n("Mar&k selected message as read after"), this ); @@ -4623,19 +4623,19 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) mDelayedMarkTime->setEnabled( false ); // since mDelayedMarkAsREad is off hlay->addWidget( mDelayedMarkTime ); hlay->addStretch( 1 ); - connect( mDelayedMarkTime, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mDelayedMarkAsRead, TQT_SIGNAL(toggled(bool)), - mDelayedMarkTime, TQT_SLOT(setEnabled(bool))); - connect( mDelayedMarkAsRead, TQT_SIGNAL(toggled(bool)), - this , TQT_SLOT(slotEmitChanged( void ))); + connect( mDelayedMarkTime, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mDelayedMarkAsRead, TQ_SIGNAL(toggled(bool)), + mDelayedMarkTime, TQ_SLOT(setEnabled(bool))); + connect( mDelayedMarkAsRead, TQ_SIGNAL(toggled(bool)), + this , TQ_SLOT(slotEmitChanged( void ))); // "show popup after Drag'n'Drop" checkbox: stretch 0 mShowPopupAfterDnD = new TQCheckBox( i18n("Ask for action after &dragging messages to another folder"), this ); vlay->addWidget( mShowPopupAfterDnD ); - connect( mShowPopupAfterDnD, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mShowPopupAfterDnD, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "default mailbox format" combo + label: stretch 0 hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -4668,8 +4668,8 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) TQWhatsThis::add( label, msg ); hlay->addWidget( label ); hlay->addWidget( mMailboxPrefCombo, 1 ); - connect( mMailboxPrefCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mMailboxPrefCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "On startup..." option: hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -4679,23 +4679,23 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) i18n("Open this folder on startup:"), this ); hlay->addWidget( label ); hlay->addWidget( mOnStartupOpenFolder, 1 ); - connect( mOnStartupOpenFolder, TQT_SIGNAL( folderChanged( KMFolder* ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mOnStartupOpenFolder, TQ_SIGNAL( folderChanged( KMFolder* ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "Empty &trash on program exit" option: hlay = new TQHBoxLayout( vlay ); // inherits spacing mEmptyTrashCheck = new TQCheckBox( i18n("Empty local &trash folder on program exit"), this ); hlay->addWidget( mEmptyTrashCheck ); - connect( mEmptyTrashCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mEmptyTrashCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); #ifdef HAVE_INDEXLIB // indexing enabled option: mIndexingEnabled = new TQCheckBox( i18n("Enable full text &indexing"), this ); vlay->addWidget( mIndexingEnabled ); - connect( mIndexingEnabled, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mIndexingEnabled, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); #endif // "Quota Units" @@ -4709,7 +4709,7 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) << i18n("GB") ); hlay->addWidget( label ); hlay->addWidget( mQuotaCmbBox, 1 ); - connect( mQuotaCmbBox, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mQuotaCmbBox, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addStretch( 1 ); @@ -4817,14 +4817,14 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) "the Kontact applications" ) ); TQWhatsThis::add( mEnableImapResCB, i18n( GlobalSettings::self()->theIMAPResourceEnabledItem()->whatsThis().utf8() ) ); - connect( mEnableImapResCB, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mEnableImapResCB, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mBox = new TQWidget( b1 ); TQGridLayout* grid = new TQGridLayout( mBox, 5, 2, 0, KDialog::spacingHint() ); grid->setColStretch( 1, 1 ); - connect( mEnableImapResCB, TQT_SIGNAL( toggled(bool) ), - mBox, TQT_SLOT( setEnabled(bool) ) ); + connect( mEnableImapResCB, TQ_SIGNAL( toggled(bool) ), + mBox, TQ_SLOT( setEnabled(bool) ) ); TQLabel* storageFormatLA = new TQLabel( i18n("&Format used for the groupware folders:"), mBox ); @@ -4842,8 +4842,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) grid->addWidget( mStorageFormatCombo, 0, 1 ); TQToolTip::add( mStorageFormatCombo, toolTip ); TQWhatsThis::add( mStorageFormatCombo, whatsThis ); - connect( mStorageFormatCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotStorageFormatChanged( int ) ) ); + connect( mStorageFormatCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotStorageFormatChanged( int ) ) ); TQLabel* languageLA = new TQLabel( i18n("&Language of the groupware folders:"), mBox ); @@ -4862,8 +4862,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) grid->addWidget( mLanguageCombo, 1, 1 ); TQToolTip::add( mLanguageCombo, toolTip ); TQWhatsThis::add( mLanguageCombo, whatsThis ); - connect( mLanguageCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mLanguageCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mFolderComboLabel = new TQLabel( mBox ); // text depends on storage format toolTip = i18n( "Set the parent of the resource folders" ); @@ -4882,8 +4882,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) mFolderComboStack->addWidget( mFolderCombo, 0 ); TQToolTip::add( mFolderCombo, toolTip ); TQWhatsThis::add( mFolderCombo, whatsThis ); - connect( mFolderCombo, TQT_SIGNAL( folderChanged( KMFolder* ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mFolderCombo, TQ_SIGNAL( folderChanged( KMFolder* ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // Second possibility in the widgetstack: a combo showing the list of accounts // This is used with the kolab xml storage since the groupware folders @@ -4892,8 +4892,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) mFolderComboStack->addWidget( mAccountCombo, 1 ); TQToolTip::add( mAccountCombo, toolTip ); TQWhatsThis::add( mAccountCombo, whatsThis ); - connect( mAccountCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mAccountCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); mHideGroupwareFolders = new TQCheckBox( i18n( "&Hide groupware folders" ), mBox, "HideGroupwareFoldersBox" ); @@ -4903,8 +4903,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) "resource folders in the folder tree." ) ); TQWhatsThis::add( mHideGroupwareFolders, i18n( GlobalSettings::self() ->hideGroupwareFoldersItem()->whatsThis().utf8() ) ); - connect( mHideGroupwareFolders, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mHideGroupwareFolders, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotEmitChanged() ) ); mOnlyShowGroupwareFolders = new TQCheckBox( i18n( "&Only show groupware folders for this account" ), mBox, "OnlyGroupwareFoldersBox" ); @@ -4915,20 +4915,20 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) "configured for groupware." ) ); TQWhatsThis::add( mOnlyShowGroupwareFolders, i18n( GlobalSettings::self() ->showOnlyGroupwareFoldersForGroupwareAccountItem()->whatsThis().utf8() ) ); - connect( mOnlyShowGroupwareFolders, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mOnlyShowGroupwareFolders, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotEmitChanged() ) ); mSyncImmediately = new TQCheckBox( i18n( "Synchronize groupware changes immediately" ), mBox ); TQToolTip::add( mSyncImmediately, i18n( "Synchronize groupware changes in disconnected IMAP folders immediately when being online." ) ); - connect( mSyncImmediately, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); + connect( mSyncImmediately, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); grid->addMultiCellWidget( mSyncImmediately, 4, 4, 0, 1 ); mDeleteInvitations = new TQCheckBox( i18n( GlobalSettings::self()->deleteInvitationEmailsAfterSendingReplyItem()->label().utf8() ), mBox ); TQWhatsThis::add( mDeleteInvitations, i18n( GlobalSettings::self() ->deleteInvitationEmailsAfterSendingReplyItem()->whatsThis().utf8() ) ); - connect( mDeleteInvitations, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); + connect( mDeleteInvitations, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); grid->addMultiCellWidget( mDeleteInvitations, 5, 5, 0, 1 ); // Groupware functionality compatibility setup @@ -4939,47 +4939,47 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) // Currently believed to be disused. mEnableGwCB = new TQCheckBox( i18n("&Enable groupware functionality"), b1 ); gBox->setSpacing( KDialog::spacingHint() ); - connect( mEnableGwCB, TQT_SIGNAL( toggled(bool) ), - gBox, TQT_SLOT( setEnabled(bool) ) ); - connect( mEnableGwCB, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mEnableGwCB, TQ_SIGNAL( toggled(bool) ), + gBox, TQ_SLOT( setEnabled(bool) ) ); + connect( mEnableGwCB, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); #endif mEnableGwCB = 0; mLegacyMangleFromTo = new TQCheckBox( i18n( "Mangle From:/To: headers in replies to invitations" ), gBox ); TQToolTip::add( mLegacyMangleFromTo, i18n( "Turn this option on in order to make Outlook(tm) understand your answers to invitation replies" ) ); TQWhatsThis::add( mLegacyMangleFromTo, i18n( GlobalSettings::self()-> legacyMangleFromToHeadersItem()->whatsThis().utf8() ) ); - connect( mLegacyMangleFromTo, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mLegacyMangleFromTo, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mLegacyBodyInvites = new TQCheckBox( i18n( "Send invitations in the mail body" ), gBox ); TQToolTip::add( mLegacyBodyInvites, i18n( "Turn this option on in order to make Outlook(tm) understand your answers to invitations" ) ); TQWhatsThis::add( mLegacyMangleFromTo, i18n( GlobalSettings::self()-> legacyBodyInvitesItem()->whatsThis().utf8() ) ); - connect( mLegacyBodyInvites, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotLegacyBodyInvitesToggled( bool ) ) ); - connect( mLegacyBodyInvites, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mLegacyBodyInvites, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotLegacyBodyInvitesToggled( bool ) ) ); + connect( mLegacyBodyInvites, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mExchangeCompatibleInvitations = new TQCheckBox( i18n( "Exchange compatible invitation naming" ), gBox ); TQToolTip::add( mExchangeCompatibleInvitations, i18n( "Outlook(tm), when used in combination with a Microsoft Exchange server,\nhas a problem understanding standards-compliant groupware e-mail.\nTurn this option on to send groupware invitations and replies in an Exchange compatible way." ) ); TQWhatsThis::add( mExchangeCompatibleInvitations, i18n( GlobalSettings::self()-> exchangeCompatibleInvitationsItem()->whatsThis().utf8() ) ); - connect( mExchangeCompatibleInvitations, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mExchangeCompatibleInvitations, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mOutlookCompatibleInvitationComments = new TQCheckBox( i18n( "Outlook compatible invitation reply comments" ), gBox ); TQToolTip::add( mOutlookCompatibleInvitationComments, i18n( "Send invitation reply comments in a way that Microsoft Outlook(tm) understands." ) ); TQWhatsThis::add( mOutlookCompatibleInvitationComments, i18n( GlobalSettings::self()-> outlookCompatibleInvitationReplyCommentsItem()->whatsThis().utf8() ) ); - connect( mOutlookCompatibleInvitationComments, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mOutlookCompatibleInvitationComments, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mAutomaticSending = new TQCheckBox( i18n( "Automatic invitation sending" ), gBox ); TQToolTip::add( mAutomaticSending, i18n( "When this is on, the user will not see the mail composer window. Invitation mails are sent automatically" ) ); TQWhatsThis::add( mAutomaticSending, i18n( GlobalSettings::self()-> automaticSendingItem()->whatsThis().utf8() ) ); - connect( mAutomaticSending, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mAutomaticSending, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // Open space padding at the end new TQLabel( this ); @@ -5174,8 +5174,8 @@ AccountUpdater::AccountUpdater(ImapAccountBase *account) void AccountUpdater::update() { - connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( namespacesFetched() ) ); + connect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( namespacesFetched() ) ); mAccount->makeConnection(); } diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index 83c13a31..bd5fdcd1 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -20,8 +20,8 @@ // other tdenetwork headers: (none) // other KDE headers: -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> @@ -53,8 +53,8 @@ NewIdentityDialog::NewIdentityDialog( const TQStringList & identities, mLineEdit->setFocus(); hlay->addWidget( new TQLabel( mLineEdit, i18n("&New identity:"), page ) ); hlay->addWidget( mLineEdit, 1 ); - connect( mLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotEnableOK(const TQString&)) ); + connect( mLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotEnableOK(const TQString&)) ); mButtonGroup = new TQButtonGroup( page ); mButtonGroup->hide(); @@ -89,10 +89,10 @@ NewIdentityDialog::NewIdentityDialog( const TQStringList & identities, // enable/disable combobox and label depending on the third radio // button's state: - connect( radio, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); - connect( radio, TQT_SIGNAL(toggled(bool)), - mComboBox, TQT_SLOT(setEnabled(bool)) ); + connect( radio, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); + connect( radio, TQ_SIGNAL(toggled(bool)), + mComboBox, TQ_SLOT(setEnabled(bool)) ); enableButtonOK( false ); // since line edit is empty } @@ -214,7 +214,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, for ( TQStringList::ConstIterator it = pathList.begin(); it != pathList.end(); ++it ) { - KSimpleConfig entry( *it ); + TDESimpleConfig entry( *it ); entry.setGroup( "KCM Locale" ); // full name: TQString name = entry.readEntry( "Name" ); @@ -252,7 +252,7 @@ LanguageComboBox::LanguageComboBox( bool rw, TQWidget *parent, const char *name int LanguageComboBox::insertLanguage( const TQString & language ) { static TQString entryDesktop = TQString::fromLatin1("/entry.desktop"); - KSimpleConfig entry( locate("locale", language + entryDesktop) ); + TDESimpleConfig entry( locate("locale", language + entryDesktop) ); entry.setGroup( "KCM Locale" ); TQString name = entry.readEntry( "Name" ); TQString output = TQString::fromLatin1("%1 (%2)").arg( name ).arg( language ); @@ -305,12 +305,12 @@ ProfileDialog::ProfileDialog( TQWidget * parent, const char * name, bool modal ) setup(); - connect( mListView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotSelectionChanged()) ); - connect( mListView, TQT_SIGNAL(doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT(slotOk()) ); + connect( mListView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotSelectionChanged()) ); + connect( mListView, TQ_SIGNAL(doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + TQ_SLOT(slotOk()) ); - connect( this, TQT_SIGNAL(finished()), TQT_SLOT(delayedDestruct()) ); + connect( this, TQ_SIGNAL(finished()), TQ_SLOT(delayedDestruct()) ); enableButtonOK( false ); } @@ -375,8 +375,8 @@ ConfigModuleWithTabs::ConfigModuleWithTabs( TQWidget * parent, void ConfigModuleWithTabs::addTab( ConfigModuleTab* tab, const TQString & title ) { mTabWidget->addTab( tab, title ); - connect( tab, TQT_SIGNAL(changed( bool )), - this, TQT_SIGNAL(changed( bool )) ); + connect( tab, TQ_SIGNAL(changed( bool )), + this, TQ_SIGNAL(changed( bool )) ); } void ConfigModuleWithTabs::load() { diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h index f8eecdeb..7294c96e 100644 --- a/kmail/configuredialog_p.h +++ b/kmail/configuredialog_p.h @@ -17,7 +17,7 @@ #include <tdelistview.h> #include <tdecmodule.h> #include <tdelocale.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQPushButton; class TQLabel; @@ -266,7 +266,7 @@ private: // // -class KDE_EXPORT IdentityPage : public ConfigModule { +class TDE_EXPORT IdentityPage : public ConfigModule { TQ_OBJECT public: @@ -400,7 +400,7 @@ private: TQValueList< ModifiedAccountsType* > mModifiedAccounts; }; -class KDE_EXPORT AccountsPage : public ConfigModuleWithTabs { +class TDE_EXPORT AccountsPage : public ConfigModuleWithTabs { TQ_OBJECT public: @@ -579,7 +579,7 @@ private: // data TQButtonGroup *mSystemTrayGroup; }; -class KDE_EXPORT AppearancePage : public ConfigModuleWithTabs { +class TDE_EXPORT AppearancePage : public ConfigModuleWithTabs { TQ_OBJECT public: @@ -808,7 +808,7 @@ private: SimpleStringListEditor *mAttachWordsListEditor; }; -class KDE_EXPORT ComposerPage : public ConfigModuleWithTabs { +class TDE_EXPORT ComposerPage : public ConfigModuleWithTabs { TQ_OBJECT public: @@ -959,7 +959,7 @@ private: Kleo::BackendConfigWidget * mBackendConfig; }; -class KDE_EXPORT SecurityPage : public ConfigModuleWithTabs { +class TDE_EXPORT SecurityPage : public ConfigModuleWithTabs { TQ_OBJECT public: @@ -1064,7 +1064,7 @@ private: TQCheckBox* mAutomaticSending; }; -class KDE_EXPORT MiscPage : public ConfigModuleWithTabs { +class TDE_EXPORT MiscPage : public ConfigModuleWithTabs { TQ_OBJECT public: diff --git a/kmail/copyfolderjob.cpp b/kmail/copyfolderjob.cpp index 165d9468..a237db10 100644 --- a/kmail/copyfolderjob.cpp +++ b/kmail/copyfolderjob.cpp @@ -95,8 +95,8 @@ void CopyFolderJob::copyMessagesToTargetDir() slotCopyNextChild(); // no contents, check subfolders } else { KMCommand *command = new KMCopyCommand( mNewFolder, msgList ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotCopyCompleted( KMCommand * ) ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotCopyCompleted( KMCommand * ) ) ); command->start(); } } @@ -104,8 +104,8 @@ void CopyFolderJob::copyMessagesToTargetDir() void CopyFolderJob::slotCopyCompleted( KMCommand* command ) { kdDebug(5006) << k_funcinfo << (command?command->result():0) << endl; - disconnect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotCopyCompleted( KMCommand * ) ) ); + disconnect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotCopyCompleted( KMCommand * ) ) ); mStorage->blockSignals( false ); @@ -160,8 +160,8 @@ void CopyFolderJob::slotCopyNextChild( bool success ) // let it do its thing and report back when we are ready to do the next sibling mNextChildFolder->open( "copyfolder" ); // refcount FolderJob* job = new CopyFolderJob( mNextChildFolder->storage(), dir); - connect( job, TQT_SIGNAL( folderCopyComplete( bool ) ), - this, TQT_SLOT( slotCopyNextChild( bool ) ) ); + connect( job, TQ_SIGNAL( folderCopyComplete( bool ) ), + this, TQ_SLOT( slotCopyNextChild( bool ) ) ); job->start(); } @@ -194,8 +194,8 @@ bool CopyFolderJob::createTargetDir() TQString imapPath; imapPath = anAccount->createImapPath( selectedStorage->imapPath(), mStorage->folder()->name() ); KMFolderImap* newStorage = static_cast<KMFolderImap*>( mNewFolder->storage() ); - connect( selectedStorage, TQT_SIGNAL(folderCreationResult(const TQString&, bool)), - this, TQT_SLOT(folderCreationDone(const TQString&, bool)) ); + connect( selectedStorage, TQ_SIGNAL(folderCreationResult(const TQString&, bool)), + this, TQ_SLOT(folderCreationDone(const TQString&, bool)) ); selectedStorage->createFolder(mStorage->folder()->name(), TQString()); // create it on the server newStorage->initializeFrom( selectedStorage, imapPath, TQString() ); static_cast<KMFolderImap*>(mNewParent->owner()->storage())->setAccount( selectedStorage->account() ); diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp index 5daf001d..4d4080ed 100644 --- a/kmail/customtemplates.cpp +++ b/kmail/customtemplates.cpp @@ -68,29 +68,29 @@ CustomTemplates::CustomTemplates( TQWidget *parent, const char *name ) mEditFrame->setEnabled( false ); - connect( mName, TQT_SIGNAL( textChanged ( const TQString &) ), - this, TQT_SLOT( slotNameChanged( const TQString & ) ) ); - connect( mEdit, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( mToEdit, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( mCCEdit, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - - connect( mInsertCommand, TQT_SIGNAL( insertCommand(TQString, int) ), - this, TQT_SLOT( slotInsertCommand(TQString, int) ) ); - - connect( mAdd, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotAddClicked() ) ); - connect( mRemove, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotRemoveClicked() ) ); - connect( mList, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotListSelectionChanged() ) ); - connect( mType, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotTypeActivated( int ) ) ); - - connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ), - this, TQT_SLOT( slotShortcutCaptured( const TDEShortcut& ) ) ); + connect( mName, TQ_SIGNAL( textChanged ( const TQString &) ), + this, TQ_SLOT( slotNameChanged( const TQString & ) ) ); + connect( mEdit, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( mToEdit, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( mCCEdit, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + + connect( mInsertCommand, TQ_SIGNAL( insertCommand(TQString, int) ), + this, TQ_SLOT( slotInsertCommand(TQString, int) ) ); + + connect( mAdd, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotAddClicked() ) ); + connect( mRemove, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotRemoveClicked() ) ); + connect( mList, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotListSelectionChanged() ) ); + connect( mType, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotTypeActivated( int ) ) ); + + connect( mKeyButton, TQ_SIGNAL( capturedShortcut( const TDEShortcut& ) ), + this, TQ_SLOT( slotShortcutCaptured( const TDEShortcut& ) ) ); mReplyPix = TDEIconLoader().loadIcon( "mail-reply-sender", TDEIcon::Small ); mReplyAllPix = TDEIconLoader().loadIcon( "mail-reply-all", TDEIcon::Small ); diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui index 82d477b5..2d0d7796 100644 --- a/kmail/customtemplates_base.ui +++ b/kmail/customtemplates_base.ui @@ -351,10 +351,10 @@ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data> </image> </images> -<Q_SLOTS> +<slots> <slot>mAdd_clicked()</slot> <slot>mRemove_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kactivelabel.h</include> diff --git a/kmail/dictionarycombobox.cpp b/kmail/dictionarycombobox.cpp index be705d3d..b6da5abf 100644 --- a/kmail/dictionarycombobox.cpp +++ b/kmail/dictionarycombobox.cpp @@ -48,10 +48,10 @@ namespace KMail { mDefaultDictionary( 0 ) { reloadCombo(); - connect( this, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotDictionaryChanged( int ) ) ); - connect( this, TQT_SIGNAL( dictionaryChanged( int ) ), - mSpellConfig, TQT_SLOT( sSetDictionary( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotDictionaryChanged( int ) ) ); + connect( this, TQ_SIGNAL( dictionaryChanged( int ) ), + mSpellConfig, TQ_SLOT( sSetDictionary( int ) ) ); } DictionaryComboBox::~DictionaryComboBox() diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp index a7f25c3b..defa47df 100644 --- a/kmail/editorwatcher.cpp +++ b/kmail/editorwatcher.cpp @@ -24,7 +24,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kopenwith.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kuserprofile.h> #include <tqsocketnotifier.h> @@ -63,7 +63,7 @@ EditorWatcher::EditorWatcher(const KURL & url, const TQString &mimeType, bool op mDone( false ) { assert( mUrl.isLocalFile() ); - connect( &mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkEditDone()) ); + connect( &mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkEditDone()) ); } bool EditorWatcher::start() @@ -88,7 +88,7 @@ bool EditorWatcher::start() mInotifyWatch = inotify_add_watch( mInotifyFd, mUrl.path().latin1(), IN_CLOSE | IN_OPEN | IN_MODIFY ); if ( mInotifyWatch >= 0 ) { TQSocketNotifier *sn = new TQSocketNotifier( mInotifyFd, TQSocketNotifier::Read, this ); - connect( sn, TQT_SIGNAL(activated(int)), TQT_SLOT(inotifyEvent()) ); + connect( sn, TQ_SIGNAL(activated(int)), TQ_SLOT(inotifyEvent()) ); mHaveInotify = true; mFileModified = false; } @@ -101,7 +101,7 @@ bool EditorWatcher::start() TQStringList params = KRun::processDesktopExec( *offer, list, false ); mEditor = new TDEProcess( this ); *mEditor << params; - connect( mEditor, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(editorExited()) ); + connect( mEditor, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(editorExited()) ); if ( !mEditor->start() ) return false; mEditorRunning = true; diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp index a3749947..b38ad294 100644 --- a/kmail/expirejob.cpp +++ b/kmail/expirejob.cpp @@ -107,7 +107,7 @@ void ExpireJob::execute() mFolderOpen = true; mCurrentIndex = storage->count()-1; kdDebug(5006) << "ExpireJob: starting to expire in folder " << mSrcFolder->location() << endl; - connect( &mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoWork() ) ); + connect( &mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoWork() ) ); mTimer.start( EXPIREJOB_TIMERINTERVAL ); slotDoWork(); // do nothing here, we might be deleted! @@ -169,8 +169,8 @@ void ExpireJob::done() << mSrcFolder->location() << " " << count << " messages to remove." << endl; KMMoveCommand* cmd = new KMMoveCommand( 0, mRemovedMsgs ); - connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotMessagesMoved( KMCommand * ) ) ); + connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotMessagesMoved( KMCommand * ) ) ); cmd->start(); moving = true; str = i18n( "Removing 1 old message from folder %1...", @@ -191,8 +191,8 @@ void ExpireJob::done() << mRemovedMsgs.count() << " messages to move to " << mMoveToFolder->label() << endl; KMMoveCommand* cmd = new KMMoveCommand( mMoveToFolder, mRemovedMsgs ); - connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotMessagesMoved( KMCommand * ) ) ); + connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotMessagesMoved( KMCommand * ) ) ); cmd->start(); moving = true; str = i18n( "Moving 1 old message from folder %1 to folder %2...", diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp index f1c3274f..76e8d219 100644 --- a/kmail/expirypropertiesdialog.cpp +++ b/kmail/expirypropertiesdialog.cpp @@ -44,8 +44,8 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo expireReadMailCB = new TQCheckBox( privateLayoutWidget, "expireReadMailCB" ); expireReadMailCB->setText( i18n( "Expire read mails after" ) ); - connect( expireReadMailCB, TQT_SIGNAL( toggled( bool )), - this, TQT_SLOT( slotUpdateControls() ) ); + connect( expireReadMailCB, TQ_SIGNAL( toggled( bool )), + this, TQ_SLOT( slotUpdateControls() ) ); readHBox->addWidget( expireReadMailCB ); expireReadMailSB = new TQSpinBox( privateLayoutWidget, "expireReadMailSB" ); @@ -62,8 +62,8 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo expireUnreadMailCB = new TQCheckBox( privateLayoutWidget, "expireUnreadMailCB" ); expireUnreadMailCB->setText( i18n( "Expire unread mails after" ) ); - connect( expireUnreadMailCB, TQT_SIGNAL( toggled( bool )), - this, TQT_SLOT( slotUpdateControls() ) ); + connect( expireUnreadMailCB, TQ_SIGNAL( toggled( bool )), + this, TQ_SLOT( slotUpdateControls() ) ); unreadHBox->addWidget( expireUnreadMailCB ); expireUnreadMailSB = new TQSpinBox( privateLayoutWidget, "expireUnreadMailSB" ); @@ -92,8 +92,8 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo moveToRB = new TQRadioButton( privateLayoutWidget, "moveToRB" ); actionsGroup->insert( moveToRB ); - connect( moveToRB, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUpdateControls() ) ); + connect( moveToRB, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUpdateControls() ) ); moveToRB->setText( i18n( "Move to:" ) ); moveToHBox->addWidget( moveToRB ); diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp index 22d093aa..6e6c56bf 100644 --- a/kmail/favoritefolderview.cpp +++ b/kmail/favoritefolderview.cpp @@ -55,15 +55,15 @@ FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * parent, cons { // same stuff as in KMFolderTreeItem again, this time even with virtual methods working init(); - connect( folder, TQT_SIGNAL(nameChanged()), TQT_SLOT(nameChanged()) ); - connect( folder, TQT_SIGNAL(iconsChanged()), TQT_SLOT(slotIconsChanged()) ); + connect( folder, TQ_SIGNAL(nameChanged()), TQ_SLOT(nameChanged()) ); + connect( folder, TQ_SIGNAL(iconsChanged()), TQ_SLOT(slotIconsChanged()) ); - connect( folder, TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQT_SLOT(updateCount()) ); - connect( folder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), TQT_SLOT(updateCount()) ); - connect( folder, TQT_SIGNAL(msgRemoved(KMFolder*)), TQT_SLOT(updateCount()) ); - connect( folder, TQT_SIGNAL(folderSizeChanged( KMFolder* )), TQT_SLOT(updateCount()) ); + connect( folder, TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQ_SLOT(updateCount()) ); + connect( folder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), TQ_SLOT(updateCount()) ); + connect( folder, TQ_SIGNAL(msgRemoved(KMFolder*)), TQ_SLOT(updateCount()) ); + connect( folder, TQ_SIGNAL(folderSizeChanged( KMFolder* )), TQ_SLOT(updateCount()) ); - TQTimer::singleShot( 0, this, TQT_SLOT(updateCount()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(updateCount()) ); if ( unreadCount() > 0 ) setPixmap( 0, unreadIcon( iconSize() ) ); @@ -97,23 +97,23 @@ FavoriteFolderView::FavoriteFolderView( KMMainWidget *mainWidget, TQWidget * par setSorting( -1 ); setShowSortIndicator( false ); - connect( this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(selectionChanged()) ); - connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(itemClicked(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), TQT_SLOT(dropped(TQDropEvent*,TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), - TQT_SLOT(contextMenu(TQListViewItem*,const TQPoint&)) ); - connect( this, TQT_SIGNAL(moved()), TQT_SLOT(notifyInstancesOnChange()) ); - connect( this, TQT_SIGNAL(triggerRefresh()), TQT_SLOT(refresh()) ); + connect( this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(selectionChanged()) ); + connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(itemClicked(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), TQ_SLOT(dropped(TQDropEvent*,TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), + TQ_SLOT(contextMenu(TQListViewItem*,const TQPoint&)) ); + connect( this, TQ_SIGNAL(moved()), TQ_SLOT(notifyInstancesOnChange()) ); + connect( this, TQ_SIGNAL(triggerRefresh()), TQ_SLOT(refresh()) ); - connect( kmkernel->folderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(initializeFavorites()) ); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(initializeFavorites()) ); - connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(initializeFavorites()) ); - connect( kmkernel->searchFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(initializeFavorites()) ); + connect( kmkernel->folderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(initializeFavorites()) ); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(initializeFavorites()) ); + connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(initializeFavorites()) ); + connect( kmkernel->searchFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(initializeFavorites()) ); - connect( kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(folderRemoved(KMFolder*)) ); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(folderRemoved(KMFolder*)) ); - connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(folderRemoved(KMFolder*)) ); - connect( kmkernel->searchFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(folderRemoved(KMFolder*)) ); + connect( kmkernel->folderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), TQ_SLOT(folderRemoved(KMFolder*)) ); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), TQ_SLOT(folderRemoved(KMFolder*)) ); + connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), TQ_SLOT(folderRemoved(KMFolder*)) ); + connect( kmkernel->searchFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), TQ_SLOT(folderRemoved(KMFolder*)) ); TQFont f = font(); f.setItalic( true ); @@ -153,7 +153,7 @@ void FavoriteFolderView::readConfig() ensureItemVisible( firstChild() ); // folder tree is not yet populated at this point - TQTimer::singleShot( 0, this, TQT_SLOT(initializeFavorites()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(initializeFavorites()) ); readColorConfig(); mReadingConfig = false; @@ -222,7 +222,7 @@ void FavoriteFolderView::handleGroupwareFolder( KMFolderTreeItem *fti ) TQByteArray arg; TQDataStream s( arg, IO_WriteOnly ); s << TQString( "kontact_knotesplugin" ); - kapp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg ); + tdeApp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg ); break; } case KMail::ContentsTypeCalendar: @@ -241,7 +241,7 @@ void FavoriteFolderView::handleGroupwareFolder( KMFolderTreeItem *fti ) s << TQString( "kontact_journalplugin" ); break; default: assert( false ); } - kapp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg ); + tdeApp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg ); break; } default: break; @@ -334,18 +334,18 @@ void FavoriteFolderView::contextMenu(TQListViewItem * item, const TQPoint & poin mainWidget()->action("empty")->plug( &contextMenu ); contextMenu.insertSeparator(); - contextMenu.insertItem( SmallIconSet("configure_shortcuts"), i18n("&Assign Shortcut..."), fti, TQT_SLOT(assignShortcut()) ); - contextMenu.insertItem( i18n("Expire..."), fti, TQT_SLOT(slotShowExpiryProperties()) ); + contextMenu.insertItem( SmallIconSet("configure_shortcuts"), i18n("&Assign Shortcut..."), fti, TQ_SLOT(assignShortcut()) ); + contextMenu.insertItem( i18n("Expire..."), fti, TQ_SLOT(slotShowExpiryProperties()) ); mainWidget()->action("modify")->plug( &contextMenu ); contextMenu.insertSeparator(); contextMenu.insertItem( SmallIconSet("edit-delete"), i18n("Remove From Favorites"), - this, TQT_SLOT(removeFolder()) ); - contextMenu.insertItem( SmallIconSet("edit"), i18n("Rename Favorite"), this, TQT_SLOT(renameFolder()) ); + this, TQ_SLOT(removeFolder()) ); + contextMenu.insertItem( SmallIconSet("edit"), i18n("Rename Favorite"), this, TQ_SLOT(renameFolder()) ); } else { contextMenu.insertItem( SmallIconSet("bookmark_add"), i18n("Add Favorite Folder..."), - this, TQT_SLOT(addFolder()) ); + this, TQ_SLOT(addFolder()) ); } contextMenu.exec( point, 0 ); } diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp index df91b8dc..6703ef1d 100644 --- a/kmail/filterimporterexporter.cpp +++ b/kmail/filterimporterexporter.cpp @@ -66,8 +66,8 @@ FilterSelectionDialog::FilterSelectionDialog( TQWidget * parent ) buttonLayout->addWidget( selectAllButton ); unselectAllButton = new KPushButton( i18n( "Unselect All" ), w ); buttonLayout->addWidget( unselectAllButton ); - connect( selectAllButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSelectAllButton() ) ); - connect( unselectAllButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUnselectAllButton() ) ); + connect( selectAllButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSelectAllButton() ) ); + connect( unselectAllButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUnselectAllButton() ) ); resize( 300, 350 ); } diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp index eaaefd79..6ea6e29d 100644 --- a/kmail/filterlogdlg.cpp +++ b/kmail/filterlogdlg.cpp @@ -73,8 +73,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogActiveBox = new TQCheckBox( i18n("&Log filter activities"), page ); mLogActiveBox->setChecked( FilterLog::instance()->isLogging() ); - connect( mLogActiveBox, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSwitchLogState(void)) ); + connect( mLogActiveBox, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSwitchLogState(void)) ); TQWhatsThis::add( mLogActiveBox, i18n( "You can turn logging of filter activities on and off here. " "Of course, log data is collected and shown only when logging " @@ -82,15 +82,15 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogDetailsBox = new TQVGroupBox( i18n( "Logging Details" ), page ); mLogDetailsBox->setEnabled( mLogActiveBox->isChecked() ); - connect( mLogActiveBox, TQT_SIGNAL( toggled( bool ) ), - mLogDetailsBox, TQT_SLOT( setEnabled( bool ) ) ); + connect( mLogActiveBox, TQ_SIGNAL( toggled( bool ) ), + mLogDetailsBox, TQ_SLOT( setEnabled( bool ) ) ); mLogPatternDescBox = new TQCheckBox( i18n("Log pattern description"), mLogDetailsBox ); mLogPatternDescBox->setChecked( FilterLog::instance()->isContentTypeEnabled( FilterLog::patternDesc ) ); - connect( mLogPatternDescBox, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeLogDetail(void)) ); + connect( mLogPatternDescBox, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeLogDetail(void)) ); // TODO //TQWhatsThis::add( mLogPatternDescBox, // i18n( "" ) ); @@ -99,8 +99,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogDetailsBox ); mLogRuleEvaluationBox->setChecked( FilterLog::instance()->isContentTypeEnabled( FilterLog::ruleResult ) ); - connect( mLogRuleEvaluationBox, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeLogDetail(void)) ); + connect( mLogRuleEvaluationBox, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeLogDetail(void)) ); TQWhatsThis::add( mLogRuleEvaluationBox, i18n( "You can control the feedback in the log concerning the " "evaluation of the filter rules of applied filters: " @@ -113,8 +113,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogDetailsBox ); mLogPatternResultBox->setChecked( FilterLog::instance()->isContentTypeEnabled( FilterLog::patternResult ) ); - connect( mLogPatternResultBox, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeLogDetail(void)) ); + connect( mLogPatternResultBox, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeLogDetail(void)) ); // TODO //TQWhatsThis::add( mLogPatternResultBox, // i18n( "" ) ); @@ -123,8 +123,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogDetailsBox ); mLogFilterActionBox->setChecked( FilterLog::instance()->isContentTypeEnabled( FilterLog::appliedAction ) ); - connect( mLogFilterActionBox, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeLogDetail(void)) ); + connect( mLogFilterActionBox, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeLogDetail(void)) ); // TODO //TQWhatsThis::add( mLogFilterActionBox, // i18n( "" ) ); @@ -138,8 +138,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogMemLimitSpin->setValue( FilterLog::instance()->getMaxLogSize() / 1024 ); mLogMemLimitSpin->setSuffix( " KB" ); mLogMemLimitSpin->setSpecialValueText( i18n("unlimited") ); - connect( mLogMemLimitSpin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotChangeLogMemLimit(int)) ); + connect( mLogMemLimitSpin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotChangeLogMemLimit(int)) ); TQWhatsThis::add( mLogMemLimitSpin, i18n( "Collecting log data uses memory to temporarily store the " "log data; here you can limit the maximum amount of memory " @@ -147,12 +147,12 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) "this limit then the oldest data will be discarded until " "the limit is no longer exceeded. " ) ); - connect(FilterLog::instance(), TQT_SIGNAL(logEntryAdded(TQString)), - this, TQT_SLOT(slotLogEntryAdded(TQString))); - connect(FilterLog::instance(), TQT_SIGNAL(logShrinked(void)), - this, TQT_SLOT(slotLogShrinked(void))); - connect(FilterLog::instance(), TQT_SIGNAL(logStateChanged(void)), - this, TQT_SLOT(slotLogStateChanged(void))); + connect(FilterLog::instance(), TQ_SIGNAL(logEntryAdded(TQString)), + this, TQ_SLOT(slotLogEntryAdded(TQString))); + connect(FilterLog::instance(), TQ_SIGNAL(logShrinked(void)), + this, TQ_SLOT(slotLogShrinked(void))); + connect(FilterLog::instance(), TQ_SIGNAL(logStateChanged(void)), + this, TQ_SLOT(slotLogStateChanged(void))); setInitialSize( TQSize( 500, 500 ) ); #if !KDE_IS_VERSION( 3, 2, 91 ) diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index 43d15a51..94cf2d48 100644 --- a/kmail/folderdiaacltab.cpp +++ b/kmail/folderdiaacltab.cpp @@ -117,9 +117,9 @@ KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQSt TQLabel *noteLabel = new TQLabel( i18n( "<b>Note: </b>Renaming requires write permissions on the parent folder." ), page ); topLayout->addMultiCellWidget( noteLabel, 2, 2, 0, 2 ); - connect( mUserIdLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); - connect( kabBtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelectAddresses() ) ); - connect( mButtonGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotChanged() ) ); + connect( mUserIdLineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); + connect( kabBtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSelectAddresses() ) ); + connect( mButtonGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotChanged() ) ); enableButtonOK( false ); mUserIdLineEdit->setFocus(); @@ -338,12 +338,12 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, mListView->addColumn( i18n( "User Id" ) ); mListView->addColumn( i18n( "Permissions" ) ); - connect( mListView, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotEditACL(TQListViewItem*)) ); - connect( mListView, TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(slotEditACL(TQListViewItem*)) ); - connect( mListView, TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( mListView, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotEditACL(TQListViewItem*)) ); + connect( mListView, TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(slotEditACL(TQListViewItem*)) ); + connect( mListView, TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); TQVBox* buttonBox = new TQVBox( mACLWidget ); buttonBox->setSpacing( KDialog::spacingHint() ); @@ -353,13 +353,13 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, TQWidget *spacer = new TQWidget( buttonBox ); spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - connect( mAddACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddACL() ) ); - connect( mEditACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditACL() ) ); - connect( mRemoveACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemoveACL() ) ); + connect( mAddACL, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAddACL() ) ); + connect( mEditACL, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditACL() ) ); + connect( mRemoveACL, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemoveACL() ) ); mEditACL->setEnabled( false ); mRemoveACL->setEnabled( false ); - connect( this, TQT_SIGNAL( changed(bool) ), TQT_SLOT( slotChanged(bool) ) ); + connect( this, TQ_SIGNAL( changed(bool) ), TQ_SLOT( slotChanged(bool) ) ); } // Warning before save() this will return the url of the _parent_ folder, when creating a new one @@ -457,8 +457,8 @@ void KMail::FolderDiaACLTab::load() if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start slotConnectionResult( -1, TQString() ); } else if ( state == ImapAccountBase::Connecting ) { - connect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); } else { // Connected slotConnectionResult( 0, TQString() ); } @@ -466,8 +466,8 @@ void KMail::FolderDiaACLTab::load() void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString& errorMsg ) { - disconnect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + disconnect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); if ( errorCode ) { if ( errorCode == -1 ) // unspecified error mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) ); @@ -478,8 +478,8 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString } if ( mUserRightsState != KMail::ACLJobs::Ok ) { - connect( mImapAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ), - this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) ); + connect( mImapAccount, TQ_SIGNAL( receivedUserRights( KMFolder* ) ), + this, TQ_SLOT( slotReceivedUserRights( KMFolder* ) ) ); KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); mImapAccount->getUserRights( folder, mImapPath ); } @@ -506,15 +506,15 @@ void KMail::FolderDiaACLTab::startListing() { // List ACLs of folder - or its parent, if creating a new folder mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(), mImapPath ); - connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), - this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); + connect( mImapAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), + this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); } void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& aclList ) { if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) ) { - disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), - this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); + disconnect( mImapAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), + this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); if ( job && job->error() ) { if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) @@ -727,8 +727,8 @@ bool KMail::FolderDiaACLTab::save() if ( mDlg->isNewFolder() ) { // The folder isn't created yet, wait for it // It's a two-step process (mkdir+listDir) so we wait for the dir listing to be complete - connect( parentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ), - this, TQT_SLOT( slotDirectoryListingFinished(KMFolderImap*) ) ); + connect( parentImap, TQ_SIGNAL( directoryListingFinished(KMFolderImap*) ), + this, TQ_SLOT( slotDirectoryListingFinished(KMFolderImap*) ) ); } else { slotDirectoryListingFinished( parentImap ); } @@ -756,10 +756,10 @@ void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f) jd.total = 1; jd.done = 0; jd.parent = 0; mImapAccount->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotMultiSetACLResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(aclChanged( const TQString&, int )), - TQT_SLOT(slotACLChanged( const TQString&, int )) ); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotMultiSetACLResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(aclChanged( const TQString&, int )), + TQ_SLOT(slotACLChanged( const TQString&, int )) ); } void KMail::FolderDiaACLTab::slotMultiSetACLResult(TDEIO::Job* job) diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp index 2fd950b2..3afc0905 100644 --- a/kmail/folderdiaquotatab.cpp +++ b/kmail/folderdiaquotatab.cpp @@ -121,8 +121,8 @@ void KMail::FolderDiaQuotaTab::load() if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start slotConnectionResult( -1, TQString() ); } else if ( state == ImapAccountBase::Connecting ) { - connect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); } else { // Connected slotConnectionResult( 0, TQString() ); } @@ -131,8 +131,8 @@ void KMail::FolderDiaQuotaTab::load() void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQString& errorMsg ) { - disconnect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + disconnect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); if ( errorCode ) { if ( errorCode == -1 ) // unspecified error mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) ); @@ -141,8 +141,8 @@ void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQStri mLabel->setText( TDEIO::buildErrorString( errorCode, errorMsg ) ); return; } - connect( mImapAccount, TQT_SIGNAL( receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ), - this, TQT_SLOT( slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ) ); + connect( mImapAccount, TQ_SIGNAL( receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ), + this, TQ_SLOT( slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ) ); KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); mImapAccount->getStorageQuotaInfo( folder, mImapPath ); } @@ -154,8 +154,8 @@ void KMail::FolderDiaQuotaTab::slotReceivedQuotaInfo( KMFolder* folder, if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) { //KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() ); - disconnect( mImapAccount, TQT_SIGNAL(receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )), - this, TQT_SLOT(slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )) ); + disconnect( mImapAccount, TQ_SIGNAL(receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )), + this, TQ_SLOT(slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )) ); if ( job && job->error() ) { if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) diff --git a/kmail/folderpropertiesdialog.ui b/kmail/folderpropertiesdialog.ui index 80bdfad2..d9532133 100644 --- a/kmail/folderpropertiesdialog.ui +++ b/kmail/folderpropertiesdialog.ui @@ -630,9 +630,9 @@ <variable>TQValueList<TQGuardedPtr<KMFolder> > mFolders;</variable> <variable>KMFolderDir *mFolderDIr;</variable> </variables> -<Q_SLOTS> +<slots> <slot access="protected">slotChangeIcon( TQString )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp index 51fdd790..29c557f9 100644 --- a/kmail/folderrequester.cpp +++ b/kmail/folderrequester.cpp @@ -53,7 +53,7 @@ FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree ) TQToolButton* button = new TQToolButton( this ); button->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "folder", TDEIcon::Small, 0 ) ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenDialog()) ); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpenDialog()) ); setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp index 1c4e79cf..75b77fb5 100644 --- a/kmail/foldershortcutdialog.cpp +++ b/kmail/foldershortcutdialog.cpp @@ -71,8 +71,8 @@ FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder, mKeyButton = new KKeyButton( hb, "FolderShortcutSelector" ); new TQWidget(hb); - connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ), - this, TQT_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) ); + connect( mKeyButton, TQ_SIGNAL( capturedShortcut( const TDEShortcut& ) ), + this, TQ_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) ); mKeyButton->setShortcut( folder->shortcut(), false ); } diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp index f6d1a358..f9605df3 100644 --- a/kmail/folderstorage.cpp +++ b/kmail/folderstorage.cpp @@ -80,20 +80,20 @@ FolderStorage::FolderStorage( KMFolder* folder, const char* aName ) mNoChildren = false; mRDict = 0; mDirtyTimer = new TQTimer(this, "mDirtyTimer"); - connect(mDirtyTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(updateIndex())); + connect(mDirtyTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateIndex())); mHasChildren = HasNoChildren; mContentsType = KMail::ContentsTypeMail; - connect(this, TQT_SIGNAL(closed(KMFolder*)), mFolder, TQT_SIGNAL(closed())); + connect(this, TQ_SIGNAL(closed(KMFolder*)), mFolder, TQ_SIGNAL(closed())); } //----------------------------------------------------------------------------- FolderStorage::~FolderStorage() { mJobList.setAutoDelete( true ); - TQObject::disconnect( TQT_SIGNAL(destroyed(TQObject*)), this, 0 ); + TQObject::disconnect( TQ_SIGNAL(destroyed(TQObject*)), this, 0 ); mJobList.clear(); KMMsgDict::deleteRentry(mRDict); } @@ -118,8 +118,8 @@ TQString FolderStorage::dotEscape(const TQString& aStr) void FolderStorage::addJob( FolderJob* job ) const { - TQObject::connect( job, TQT_SIGNAL(destroyed(TQObject*)), - TQT_SLOT(removeJob(TQObject*)) ); + TQObject::connect( job, TQ_SIGNAL(destroyed(TQObject*)), + TQ_SLOT(removeJob(TQObject*)) ); mJobList.append( job ); } @@ -212,8 +212,8 @@ void FolderStorage::quiet(bool beQuiet) */ if ( !mEmitChangedTimer) { mEmitChangedTimer= new TQTimer( this, "mEmitChangedTimer" ); - connect( mEmitChangedTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotEmitChangedTimer() ) ); + connect( mEmitChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotEmitChangedTimer() ) ); } mQuiet++; } else { @@ -309,8 +309,8 @@ bool FolderStorage::canAddMsgNow(KMMessage* aMsg, int* aIndex_ret) if (!aMsg->isComplete() && msgParent && msgParent->folderType() == KMFolderTypeImap) { FolderJob *job = msgParent->createJob(aMsg); - connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - TQT_SLOT(reallyAddMsg(KMMessage*))); + connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + TQ_SLOT(reallyAddMsg(KMMessage*))); job->start(); aMsg->setTransferInProgress( true ); return false; @@ -1147,7 +1147,7 @@ void FolderStorage::slotProcessNextSearchBatch() bool complete = ( end >= count() ); emit searchResult( folder(), matchingSerNums, mSearchPattern, complete ); if ( !complete ) - TQTimer::singleShot( 0, this, TQT_SLOT(slotProcessNextSearchBatch()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotProcessNextSearchBatch()) ); } //----------------------------------------------------------------------------- diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h index 13f2ba0f..87d63d00 100644 --- a/kmail/folderstorage.h +++ b/kmail/folderstorage.h @@ -208,7 +208,7 @@ public: Emits msgAdded signals */ void emitMsgAddedSignals(int idx); - /** Returns FALSE, if the message has to be retrieved from an IMAP account + /** Returns false, if the message has to be retrieved from an IMAP account * first. In this case this function does this and cares for the rest */ virtual bool canAddMsgNow(KMMessage* aMsg, int* aIndex_ret); @@ -310,14 +310,14 @@ public: on failure. */ virtual int rename(const TQString& newName, KMFolderDir *aParent = 0); - /** Returns TRUE if a table of contents file is automatically created. */ + /** Returns true if a table of contents file is automatically created. */ bool autoCreateIndex() const { return mAutoCreateIndex; } /** Allow/disallow automatic creation of a table of contents file. - Default is TRUE. */ + Default is true. */ virtual void setAutoCreateIndex(bool); - /** Returns TRUE if the table of contents is dirty. This happens when + /** Returns true if the table of contents is dirty. This happens when a message is deleted from the folder. The toc will then be re-created when the folder is closed. */ bool dirty() const { return mDirty; } @@ -325,7 +325,7 @@ public: /** Change the dirty flag. */ void setDirty(bool f); - /** Returns TRUE if the folder contains deleted messages */ + /** Returns true if the folder contains deleted messages */ bool needsCompacting() const { return needsCompact; } virtual void setNeedsCompacting(bool f) { needsCompact = f; } @@ -618,7 +618,7 @@ friend class KMMsgDict; bool mExportsSernums :1; /** if the index is dirty it will be recreated upon close() */ bool mDirty :1; - /** TRUE if the files of the folder are locked (writable) */ + /** true if the files of the folder are locked (writable) */ bool mFilesLocked :1; /** number of unread messages, -1 if not yet set */ diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp index 9d18138a..7415591e 100644 --- a/kmail/foldertreebase.cpp +++ b/kmail/foldertreebase.cpp @@ -74,7 +74,7 @@ void FolderTreeBase::contentsDropEvent(TQDropEvent * e) int FolderTreeBase::dndMode(bool alwaysAsk) { int action = -1; - int keybstate = kapp->keyboardModifiers(); + int keybstate = tdeApp->keyboardModifiers(); if ( keybstate & TDEApplication::ControlModifier ) { action = DRAG_COPY; } else if ( keybstate & TDEApplication::ShiftModifier ) { @@ -108,9 +108,9 @@ void FolderTreeBase::readColorConfig() TDEConfig* conf = KMKernel::config(); // Custom/System color support TDEConfigGroupSaver saver(conf, "Reader"); - TQColor c1=TQColor(kapp->palette().active().text()); + TQColor c1=TQColor(tdeApp->palette().active().text()); TQColor c2=TQColor("blue"); - TQColor c4=TQColor(kapp->palette().active().base()); + TQColor c4=TQColor(tdeApp->palette().active().base()); TQColor c5=TQColor("red"); if (!conf->readBoolEntry("defaultColors",true)) { @@ -125,7 +125,7 @@ void FolderTreeBase::readColorConfig() mPaintInfo.colBack = c4; mPaintInfo.colCloseToQuota = c5; } - TQPalette newPal = kapp->palette(); + TQPalette newPal = tdeApp->palette(); newPal.setColor( TQColorGroup::Base, mPaintInfo.colBack ); newPal.setColor( TQColorGroup::Text, mPaintInfo.colFore ); setPalette( newPal ); @@ -235,7 +235,7 @@ void FolderTreeBase::handleMailListDrop(TQDropEvent * event, KMFolder *destinati else action = dndMode(); if ( action == DRAG_COPY || action == DRAG_MOVE ) { - new MessageCopyHelper( serNums, destination, action == DRAG_MOVE, TQT_TQOBJECT(this) ); + new MessageCopyHelper( serNums, destination, action == DRAG_MOVE, this ); } } } diff --git a/kmail/globalsettings.cpp b/kmail/globalsettings.cpp index c09b0591..4a33d2cb 100644 --- a/kmail/globalsettings.cpp +++ b/kmail/globalsettings.cpp @@ -41,7 +41,7 @@ GlobalSettings *GlobalSettings::self() GlobalSettings::GlobalSettings() { mConfigSyncTimer = new TQTimer( this, "mConfigSyncTimer" ); - connect( mConfigSyncTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSyncNow() ) ); + connect( mConfigSyncTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotSyncNow() ) ); } void GlobalSettings::requestSync() diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp index 210b91b9..ab2491aa 100644 --- a/kmail/headerlistquicksearch.cpp +++ b/kmail/headerlistquicksearch.cpp @@ -57,8 +57,8 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent, TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", - 0, TQT_TQOBJECT(this), - TQT_SLOT( reset() ), + 0, this, + TQ_SLOT( reset() ), actionCollection, "reset_quicksearch" ); resetQuickSearch->plug( parent ); @@ -84,24 +84,24 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent, inserStatus( StatusIgnored ); mStatusCombo->setCurrentItem( 0 ); mStatusCombo->installEventFilter( this ); - connect( mStatusCombo, TQT_SIGNAL ( activated( int ) ), - this, TQT_SLOT( slotStatusChanged( int ) ) ); + connect( mStatusCombo, TQ_SIGNAL ( activated( int ) ), + this, TQ_SLOT( slotStatusChanged( int ) ) ); label->setBuddy( mStatusCombo ); TDEToolBarButton * btn = new TDEToolBarButton( "mail_find", 0, parent, 0, i18n( "Open Full Search" ) ); - connect( btn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( requestFullSearch() ) ); + connect( btn, TQ_SIGNAL( clicked() ), TQ_SIGNAL( requestFullSearch() ) ); /* Disable the signal connected by TDEListViewSearchLine since it will call * itemAdded during KMHeaders::readSortOrder() which will in turn result * in getMsgBaseForItem( item ) wanting to access items which are no longer * there. Rather rely on KMHeaders::msgAdded and its signal. */ - disconnect(listView, TQT_SIGNAL(itemAdded(TQListViewItem *)), - this, TQT_SLOT(itemAdded(TQListViewItem *))); + disconnect(listView, TQ_SIGNAL(itemAdded(TQListViewItem *)), + this, TQ_SLOT(itemAdded(TQListViewItem *))); KMHeaders *headers = static_cast<KMHeaders*>( listView ); - connect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ), - this, TQT_SLOT( itemAdded( TQListViewItem* ) ) ); + connect( headers, TQ_SIGNAL( msgAddedToListView( TQListViewItem* ) ), + this, TQ_SLOT( itemAdded( TQListViewItem* ) ) ); } diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index 6ad867a9..8d289056 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -64,7 +64,7 @@ using namespace KPIM; #include <tqapplication.h> #include <tqregexp.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> namespace KMail { diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp index 91b108c9..a5c9af36 100644 --- a/kmail/identitydialog.cpp +++ b/kmail/identitydialog.cpp @@ -396,8 +396,8 @@ namespace KMail { mTransportCombo->setEnabled( false ); // since !mTransportCheck->isChecked() mTransportCombo->insertStringList( KMail::TransportManager::transportNames() ); glay->addWidget( mTransportCombo, row, 1 ); - connect( mTransportCheck, TQT_SIGNAL(toggled(bool)), - mTransportCombo, TQT_SLOT(setEnabled(bool)) ); + connect( mTransportCheck, TQ_SIGNAL(toggled(bool)), + mTransportCombo, TQ_SLOT(setEnabled(bool)) ); // the last row is a spacer @@ -416,12 +416,12 @@ namespace KMail { mCopyGlobal = new KPushButton( i18n("&Copy global templates"), tab ); mCopyGlobal->setEnabled( false ); btns->addWidget( mCopyGlobal ); - connect( mCustom, TQT_SIGNAL( toggled( bool ) ), - mWidget, TQT_SLOT( setEnabled( bool ) ) ); - connect( mCustom, TQT_SIGNAL( toggled( bool ) ), - mCopyGlobal, TQT_SLOT( setEnabled( bool ) ) ); - connect( mCopyGlobal, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopyGlobal()) ); + connect( mCustom, TQ_SIGNAL( toggled( bool ) ), + mWidget, TQ_SLOT( setEnabled( bool ) ) ); + connect( mCustom, TQ_SIGNAL( toggled( bool ) ), + mCopyGlobal, TQ_SLOT( setEnabled( bool ) ) ); + connect( mCopyGlobal, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopyGlobal()) ); // // Tab Widget: Signature @@ -439,8 +439,8 @@ namespace KMail { resize( geometry.readSizeEntry( "Identity Dialog size" ) ); mNameEdit->setFocus(); - connect( tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), - TQT_SLOT(slotAboutToShow(TQWidget*)) ); + connect( tabWidget, TQ_SIGNAL(currentChanged(TQWidget*)), + TQ_SLOT(slotAboutToShow(TQWidget*)) ); } IdentityDialog::~IdentityDialog() { diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index 40ff81f7..527ad334 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -105,12 +105,12 @@ namespace KMail { { mPort = imapDefaultPort; mBodyPartList.setAutoDelete(true); - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), - this, TQT_SLOT(slotSchedulerSlaveError(TDEIO::Slave *, int, const TQString &))); - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(TDEIO::Slave *)), - this, TQT_SLOT(slotSchedulerSlaveConnected(TDEIO::Slave *))); - connect(&mNoopTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotNoopTimeout())); - connect(&mIdleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotIdleTimeout())); + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), + this, TQ_SLOT(slotSchedulerSlaveError(TDEIO::Slave *, int, const TQString &))); + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveConnected(TDEIO::Slave *)), + this, TQ_SLOT(slotSchedulerSlaveConnected(TDEIO::Slave *))); + connect(&mNoopTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotNoopTimeout())); + connect(&mIdleTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotIdleTimeout())); } ImapAccountBase::~ImapAccountBase() { @@ -385,8 +385,8 @@ namespace KMail { jd.quiet = quiet; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotSubscriptionResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotSubscriptionResult(TDEIO::Job *))); } //----------------------------------------------------------------------------- @@ -437,8 +437,8 @@ namespace KMail { jd.cancellable = true; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotGetUserRightsResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotGetUserRightsResult(TDEIO::Job *))); } void ImapAccountBase::slotGetUserRightsResult( TDEIO::Job* _job ) @@ -481,8 +481,8 @@ namespace KMail { jd.cancellable = true; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotGetACLResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotGetACLResult(TDEIO::Job *))); } void ImapAccountBase::slotGetACLResult( TDEIO::Job* _job ) @@ -509,8 +509,8 @@ namespace KMail { jd.cancellable = true; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotGetStorageQuotaInfoResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotGetStorageQuotaInfoResult(TDEIO::Job *))); } void ImapAccountBase::slotGetStorageQuotaInfoResult( TDEIO::Job* _job ) @@ -536,8 +536,8 @@ namespace KMail { TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false ); TDEIO::Scheduler::assignJobToSlave(mSlave, job); - connect( job, TQT_SIGNAL(result( TDEIO::Job * ) ), - this, TQT_SLOT( slotSimpleResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * ) ), + this, TQ_SLOT( slotSimpleResult( TDEIO::Job * ) ) ); } else { /* Stop the timer, we have disconnected. We have to make sure it is started again when a new slave appears. */ @@ -596,8 +596,8 @@ namespace KMail { emit connectionResult( 0, TQString() ); // success if ( mNamespaces.isEmpty() || mNamespaceToDelimiter.isEmpty() ) { - connect( this, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), - this, TQT_SLOT( slotSaveNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); + connect( this, TQ_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), + this, TQ_SLOT( slotSaveNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); getNamespaces(); } @@ -607,8 +607,8 @@ namespace KMail { stream << (int) 'c'; TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false ); TDEIO::Scheduler::assignJobToSlave( mSlave, job ); - connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job*, const TQString&)), - TQT_SLOT(slotCapabilitiesResult(TDEIO::Job*, const TQString&)) ); + connect( job, TQ_SIGNAL(infoMessage(TDEIO::Job*, const TQString&)), + TQ_SLOT(slotCapabilitiesResult(TDEIO::Job*, const TQString&)) ); } //----------------------------------------------------------------------------- @@ -621,16 +621,16 @@ namespace KMail { //----------------------------------------------------------------------------- void ImapAccountBase::getNamespaces() { - disconnect( this, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( getNamespaces() ) ); + disconnect( this, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( getNamespaces() ) ); if ( makeConnection() != Connected || !mSlave ) { kdDebug(5006) << "getNamespaces - wait for connection" << endl; if ( mNamespaces.isEmpty() || mNamespaceToDelimiter.isEmpty() ) { // when the connection is established slotSchedulerSlaveConnected notifies us } else { // getNamespaces was called by someone else - connect( this, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( getNamespaces() ) ); + connect( this, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( getNamespaces() ) ); } return; } @@ -646,14 +646,14 @@ namespace KMail { TQString(), true, useSSL() || useTLS() ); jd.progressItem->setTotalItems( 1 ); connect ( jd.progressItem, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), this, - TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); + TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false ); TDEIO::Scheduler::assignJobToSlave( mSlave, job ); insertJob( job, jd ); - connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ), - TQT_SLOT( slotNamespaceResult(TDEIO::Job*, const TQString&) ) ); + connect( job, TQ_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ), + TQ_SLOT( slotNamespaceResult(TDEIO::Job*, const TQString&) ) ); } //----------------------------------------------------------------------------- @@ -958,7 +958,7 @@ namespace KMail { if ( errorCode == TDEIO::ERR_SERVER_TIMEOUT || errorCode == TDEIO::ERR_CONNECTION_BROKEN ) { msg = i18n("The connection to the server %1 was unexpectedly closed or timed out. It will be re-established automatically if possible."). arg( name() ); - KMessageBox::information( TQT_TQWIDGET(kapp->activeWindow()), msg, caption, "kmailConnectionBrokenErrorDialog" ); + KMessageBox::information( tdeApp->activeWindow(), msg, caption, "kmailConnectionBrokenErrorDialog" ); // Show it in the status bar, in case the user has ticked "don't show again" if ( errorCode == TDEIO::ERR_CONNECTION_BROKEN ) KPIM::BroadcastStatus::instance()->setStatusMsg( @@ -968,9 +968,9 @@ namespace KMail { i18n( "The connection to account %1 timed out." ).arg( name() ) ); } else { if ( !errors.isEmpty() ) - KMessageBox::detailedError( TQT_TQWIDGET(kapp->activeWindow()), msg, errors.join("\n").prepend("<qt>"), caption ); + KMessageBox::detailedError( tdeApp->activeWindow(), msg, errors.join("\n").prepend("<qt>"), caption ); else - KMessageBox::error( TQT_TQWIDGET(kapp->activeWindow()), msg, caption ); + KMessageBox::error( tdeApp->activeWindow(), msg, caption ); } } else { // i.e. we have a chance to continue, ask the user about it if ( errors.count() >= 3 ) { // there is no detailedWarningContinueCancel... (#86517) @@ -978,7 +978,7 @@ namespace KMail { msg = TQString( "<qt>") + context + error + '\n' + errors[2]; caption = errors[0]; } - int ret = KMessageBox::warningContinueCancel( TQT_TQWIDGET(kapp->activeWindow()), msg, caption ); + int ret = KMessageBox::warningContinueCancel( tdeApp->activeWindow(), msg, caption ); if ( ret == KMessageBox::Cancel ) { jobsKilled = true; killAllJobs( false ); @@ -1031,10 +1031,10 @@ namespace KMail { mCheckingSingleFolder = ( type == Single ); if ( checkingMail() ) { - disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckQueuedFolders() ) ); - connect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckQueuedFolders() ) ); + disconnect( this, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckQueuedFolders() ) ); + connect( this, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckQueuedFolders() ) ); } else { slotCheckQueuedFolders(); } @@ -1043,8 +1043,8 @@ namespace KMail { //----------------------------------------------------------------------------- void ImapAccountBase::slotCheckQueuedFolders() { - disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckQueuedFolders() ) ); + disconnect( this, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckQueuedFolders() ) ); TQValueList<TQGuardedPtr<KMFolder> > mSaveList = mMailCheckFolders; mMailCheckFolders = mFoldersQueuedForChecking; @@ -1214,8 +1214,8 @@ namespace KMail { ImapAccountBase::jobData jd( url.url(), folder ); jd.path = path; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotSetStatusResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotSetStatusResult(TDEIO::Job *))); } void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen) @@ -1236,8 +1236,8 @@ namespace KMail { ImapAccountBase::jobData jd( url.url(), folder ); jd.path = path; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotSetStatusResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotSetStatusResult(TDEIO::Job *))); } //----------------------------------------------------------------------------- @@ -1299,9 +1299,9 @@ namespace KMail { true, useSSL() || useTLS() ); connect ( mListDirProgressItem, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), this, - TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); + TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); // Start with a guessed value of the old folder count plus 5%. As long // as the list of folders doesn't constantly change, that should be good // enough. diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h index 3c97567f..8bb5f097 100644 --- a/kmail/imapaccountbase.h +++ b/kmail/imapaccountbase.h @@ -187,7 +187,7 @@ namespace KMail { void removeJob( TDEIO::Job* job ); /** - * Subscribe (@p subscribe = TRUE) / Unsubscribe the folder + * Subscribe (@p subscribe = true) / Unsubscribe the folder * identified by @p imapPath. * Emits subscriptionChanged signal on success. * Emits subscriptionChangeFailed signal when it fails. @@ -202,7 +202,7 @@ namespace KMail { bool locallySubscribedTo( const TQString& imapPath ); /** - * Locally subscribe (@p subscribe = TRUE) / Unsubscribe the folder + * Locally subscribe (@p subscribe = true) / Unsubscribe the folder * identified by @p imapPath. */ void changeLocalSubscription( const TQString& imapPath, bool subscribe ); diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp index 1f7682b5..ecf2b5e7 100644 --- a/kmail/imapjob.cpp +++ b/kmail/imapjob.cpp @@ -155,19 +155,19 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, true, account->useSSL() || account->useTLS() ); jd.progressItem->setTotalItems( jd.total ); - connect ( jd.progressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), - account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); + connect ( jd.progressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), + account, TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); TDEIO::SimpleJob *job = TDEIO::put( url, 0, false, false, false ); TDEIO::Scheduler::assignJobToSlave( account->slave(), job ); account->insertJob( job, jd ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotPutMessageResult(TDEIO::Job *)) ); - connect( job, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)), - TQT_SLOT(slotPutMessageDataReq(TDEIO::Job *, TQByteArray &)) ); - connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), - TQT_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) ); - connect( job, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), - TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotPutMessageResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)), + TQ_SLOT(slotPutMessageDataReq(TDEIO::Job *, TQByteArray &)) ); + connect( job, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), + TQ_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) ); + connect( job, TQ_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), + TQ_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); } } else if ( jt == tCopyMessage || jt == tMoveMessage ) @@ -196,18 +196,18 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, true, account->useSSL() || account->useTLS() ); jd.progressItem->setTotalItems( jd.total ); - connect ( jd.progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), - account, TQT_SLOT( slotAbortRequested(KPIM::ProgressItem* ) ) ); + connect ( jd.progressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), + account, TQ_SLOT( slotAbortRequested(KPIM::ProgressItem* ) ) ); TDEIO::SimpleJob *simpleJob = TDEIO::special( url, packedArgs, false ); TDEIO::Scheduler::assignJobToSlave( account->slave(), simpleJob ); mJob = simpleJob; account->insertJob( mJob, jd ); - connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotCopyMessageResult(TDEIO::Job *)) ); + connect( mJob, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotCopyMessageResult(TDEIO::Job *)) ); if ( jt == tMoveMessage ) { - connect( mJob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), - TQT_SLOT(slotCopyMessageInfoData(TDEIO::Job *, const TQString &)) ); + connect( mJob, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), + TQ_SLOT(slotCopyMessageInfoData(TDEIO::Job *, const TQString &)) ); } } else { @@ -317,8 +317,8 @@ void ImapJob::slotGetNextMessage() TQStyleSheet::escape( msg->subject() ), true, account->useSSL() || account->useTLS() ); - connect ( jd.progressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), - account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); + connect ( jd.progressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), + account, TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); jd.progressItem->setTotalItems( jd.total ); TDEIO::SimpleJob *simpleJob = TDEIO::get( url, false, false ); @@ -327,18 +327,18 @@ void ImapJob::slotGetNextMessage() account->insertJob( mJob, jd ); if ( mPartSpecifier.find( "STRUCTURE", 0, false ) != -1 ) { - connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotGetBodyStructureResult(TDEIO::Job *)) ); + connect( mJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotGetBodyStructureResult(TDEIO::Job *)) ); } else { - connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotGetMessageResult(TDEIO::Job *)) ); + connect( mJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotGetMessageResult(TDEIO::Job *)) ); } - connect( mJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - msgParent, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)) ); + connect( mJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + msgParent, TQ_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)) ); if ( jd.total > 1 ) { - connect(mJob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), - this, TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); + connect(mJob, TQ_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), + this, TQ_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); } } diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp index 58f9d974..9fe9bbbe 100644 --- a/kmail/importjob.cpp +++ b/kmail/importjob.cpp @@ -174,7 +174,7 @@ void KMail::ImportJob::messageAdded() mCurrentMessage = 0; mCurrentMessageFile = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( importNextMessage() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( importNextMessage() ) ); } void KMail::ImportJob::importNextMessage() @@ -239,8 +239,8 @@ void KMail::ImportJob::importNextMessage() else { ImapJob *imapJob = new ImapJob( mCurrentMessage, ImapJob::tPutMessage, dynamic_cast<KMFolderImap*>( mCurrentFolder->storage() ) ); - connect( imapJob, TQT_SIGNAL(result(KMail::FolderJob*)), - TQT_SLOT(messagePutResult(KMail::FolderJob*)) ); + connect( imapJob, TQ_SIGNAL(result(KMail::FolderJob*)), + TQ_SLOT(messagePutResult(KMail::FolderJob*)) ); imapJob->start(); } } @@ -383,8 +383,8 @@ void KMail::ImportJob::start() TQString(), true ); mProgressItem->setUsesBusyIndicator( true ); - connect( mProgressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), - this, TQT_SLOT(cancelJob()) ); + connect( mProgressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), + this, TQ_SLOT(cancelJob()) ); Folder nextFolder; nextFolder.archiveDir = mArchive->directory(); diff --git a/kmail/index.cpp b/kmail/index.cpp index af4f4cb5..f9b157d2 100644 --- a/kmail/index.cpp +++ b/kmail/index.cpp @@ -91,13 +91,13 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ): mSlowDown( false ) { kdDebug( 5006 ) << "KMMsgIndex::KMMsgIndex()" << endl; - connect( kmkernel->folderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) ); - connect( kmkernel->folderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) ); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) ); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) ); + connect( kmkernel->folderMgr(), TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) ); + connect( kmkernel->folderMgr(), TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) ); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) ); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) ); - connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( act() ) ); - //connect( mSyncTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( syncIndex() ) ); + connect( mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( act() ) ); + //connect( mSyncTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( syncIndex() ) ); #ifdef HAVE_INDEXLIB TDEConfigGroup cfg( KMKernel::config(), "text-index" ); @@ -116,11 +116,11 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ): mIndex = indexlib::open( mIndexPath, indexlib::open_flags::fail_if_nonexistant ).release(); } if ( !mIndex ) { - TQTimer::singleShot( 8000, this, TQT_SLOT( create() ) ); + TQTimer::singleShot( 8000, this, TQ_SLOT( create() ) ); mState = s_willcreate; } else { if ( cfg.readBoolEntry( "creating" ) ) { - TQTimer::singleShot( 8000, this, TQT_SLOT( continueCreation() ) ); + TQTimer::singleShot( 8000, this, TQ_SLOT( continueCreation() ) ); mState = s_creating; } else { mPendingMsgs = TQValueListToVector( cfg.readIntListEntry( "pending" ) ); @@ -182,7 +182,7 @@ void KMMsgIndex::setEnabled( bool e ) { // nothing can be done, probably return; case s_disabled: - TQTimer::singleShot( 8000, this, TQT_SLOT( create() ) ); + TQTimer::singleShot( 8000, this, TQ_SLOT( create() ) ); mState = s_willcreate; } } else { @@ -264,8 +264,8 @@ void KMMsgIndex::clear() { void KMMsgIndex::maintenance() { #ifdef HAVE_INDEXLIB - if ( mState != s_idle || kapp->hasPendingEvents() ) { - TQTimer::singleShot( 8000, this, TQT_SLOT( maintenance() ) ); + if ( mState != s_idle || tdeApp->hasPendingEvents() ) { + TQTimer::singleShot( 8000, this, TQ_SLOT( maintenance() ) ); return; } mIndex->maintenance(); @@ -305,7 +305,7 @@ int KMMsgIndex::addMessage( TQ_UINT32 serNum ) { void KMMsgIndex::act() { kdDebug( 5006 ) << "KMMsgIndex::act()" << endl; - if ( kapp->hasPendingEvents() ) { + if ( tdeApp->hasPendingEvents() ) { //nah, some other time.. mTimer->start( 500 ); mSlowDown = true; @@ -404,10 +404,10 @@ bool KMMsgIndex::startQuery( KMSearch* s ) { kdDebug( 5006 ) << "KMMsgIndex::startQuery( . ) starting query" << endl; Search* search = new Search( s ); - connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SIGNAL( finished( bool ) ) ); - connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SLOT( indexFinished() ) ); - connect( search, TQT_SIGNAL( destroyed( TQObject* ) ), TQT_SLOT( removeSearch( TQObject* ) ) ); - connect( search, TQT_SIGNAL( found( TQ_UINT32 ) ), s, TQT_SIGNAL( found( TQ_UINT32 ) ) ); + connect( search, TQ_SIGNAL( finished( bool ) ), s, TQ_SIGNAL( finished( bool ) ) ); + connect( search, TQ_SIGNAL( finished( bool ) ), s, TQ_SLOT( indexFinished() ) ); + connect( search, TQ_SIGNAL( destroyed( TQObject* ) ), TQ_SLOT( removeSearch( TQObject* ) ) ); + connect( search, TQ_SIGNAL( found( TQ_UINT32 ) ), s, TQ_SIGNAL( found( TQ_UINT32 ) ) ); mSearches.push_back( search ); return true; } @@ -517,7 +517,7 @@ void KMMsgIndex::removeMessage( TQ_UINT32 serNum ) { mIndex->remove_doc( TQString::number( serNum ).latin1() ); ++mMaintenanceCount; if ( mMaintenanceCount > MaintenanceLimit && mRemovedMsgs.empty() ) { - TQTimer::singleShot( 100, this, TQT_SLOT( maintenance() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( maintenance() ) ); } #endif } @@ -535,7 +535,7 @@ KMMsgIndex::Search::Search( KMSearch* s ): mTimer( new TQTimer( this, "mTimer" ) ), mResidual( new KMSearchPattern ), mState( s_starting ) { - connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( act() ) ); + connect( mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( act() ) ); mTimer->start( 0 ); } @@ -561,7 +561,7 @@ void KMMsgIndex::Search::act() { mState = s_emitting; // fall throu case s_emitting: - if ( kapp->hasPendingEvents() ) { + if ( tdeApp->hasPendingEvents() ) { //nah, some other time.. mTimer->start( 250 ); mState = s_emitstopped; diff --git a/kmail/jobscheduler.cpp b/kmail/jobscheduler.cpp index d5374fe4..dc2ef506 100644 --- a/kmail/jobscheduler.cpp +++ b/kmail/jobscheduler.cpp @@ -39,7 +39,7 @@ JobScheduler::JobScheduler( TQObject* parent, const char* name ) mPendingImmediateTasks( 0 ), mCurrentTask( 0 ), mCurrentJob( 0 ) { - connect( &mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotRunNextJob() ) ); + connect( &mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotRunNextJob() ) ); // No need to start the internal timer yet, we wait for a task to be scheduled } @@ -212,7 +212,7 @@ void JobScheduler::runTaskNow( ScheduledTask* task ) } // Register the job in the folder. This makes it autodeleted if the folder is deleted. mCurrentTask->folder()->storage()->addJob( mCurrentJob ); - connect( mCurrentJob, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotJobFinished() ) ); + connect( mCurrentJob, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotJobFinished() ) ); mCurrentJob->start(); } diff --git a/kmail/kcm_kmail.cpp b/kmail/kcm_kmail.cpp index 07dc1d72..19262ae5 100644 --- a/kmail/kcm_kmail.cpp +++ b/kmail/kcm_kmail.cpp @@ -31,7 +31,7 @@ //---------------------------- extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_misc( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_misc( TQWidget *parent, const char * ) { MiscPage *page = new MiscPage( parent, "kcmkmail_config_misc" ); return page; @@ -40,7 +40,7 @@ extern "C" extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_appearance( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_appearance( TQWidget *parent, const char * ) { AppearancePage *page = new AppearancePage( parent, "kcmkmail_config_appearance" ); @@ -50,7 +50,7 @@ extern "C" extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_composer( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_composer( TQWidget *parent, const char * ) { ComposerPage *page = new ComposerPage( parent, "kcmkmail_config_composer" ); return page; @@ -59,7 +59,7 @@ extern "C" extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_identity( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_identity( TQWidget *parent, const char * ) { IdentityPage *page = new IdentityPage( parent, "kcmkmail_config_identity" ); return page; @@ -68,7 +68,7 @@ extern "C" extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_accounts( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_accounts( TQWidget *parent, const char * ) { AccountsPage *page = new AccountsPage( parent, "kcmkmail_config_accounts" ); return page; @@ -77,7 +77,7 @@ extern "C" extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_security( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_security( TQWidget *parent, const char * ) { SecurityPage *page = new SecurityPage( parent, "kcmkmail_config_security" ); return page; diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp index fcd2f279..c0b0cf69 100644 --- a/kmail/keyresolver.cpp +++ b/kmail/keyresolver.cpp @@ -335,7 +335,7 @@ static std::vector<GpgME::Key> trustedOrConfirmed( const std::vector<GpgME::Key> } namespace { - struct IsNotForFormat : public std::unary_function<GpgME::Key,bool> { + struct IsNotForFormat : public std::function<bool(GpgME::Key)> { IsNotForFormat( Kleo::CryptoMessageFormat f ) : format( f ) {} bool operator()( const GpgME::Key & key ) const { @@ -347,7 +347,7 @@ namespace { const Kleo::CryptoMessageFormat format; }; - struct IsForFormat : std::unary_function<GpgME::Key,bool> { + struct IsForFormat : std::function<bool(GpgME::Key)> { explicit IsForFormat( Kleo::CryptoMessageFormat f ) : protocol( isOpenPGP( f ) ? GpgME::Context::OpenPGP : isSMIME( f ) ? GpgME::Context::CMS : @@ -364,7 +364,7 @@ namespace { -class Kleo::KeyResolver::SigningPreferenceCounter : public std::unary_function<Kleo::KeyResolver::Item,void> { +class Kleo::KeyResolver::SigningPreferenceCounter : public std::function<void(Kleo::KeyResolver::Item)> { public: SigningPreferenceCounter() : mTotal( 0 ), @@ -409,7 +409,7 @@ void Kleo::KeyResolver::SigningPreferenceCounter::operator()( const Kleo::KeyRes -class Kleo::KeyResolver::EncryptionPreferenceCounter : public std::unary_function<Item,void> { +class Kleo::KeyResolver::EncryptionPreferenceCounter : public std::function<void(Item)> { const Kleo::KeyResolver * _this; public: EncryptionPreferenceCounter( const Kleo::KeyResolver * kr, EncryptionPreference defaultPreference ) @@ -476,7 +476,7 @@ void Kleo::KeyResolver::EncryptionPreferenceCounter::operator()( Item & item ) { namespace { - class FormatPreferenceCounterBase : public std::unary_function<Kleo::KeyResolver::Item,void> { + class FormatPreferenceCounterBase : public std::function<void(Kleo::KeyResolver::Item)> { public: FormatPreferenceCounterBase() : mTotal( 0 ), @@ -1701,8 +1701,8 @@ std::vector<GpgME::Key> Kleo::KeyResolver::lookup( const TQStringList & patterns std::vector<GpgME::Key> result; if ( mCryptoMessageFormats & (InlineOpenPGPFormat|OpenPGPMIMEFormat) ) if ( const Kleo::CryptoBackend::Protocol * p = Kleo::CryptoBackendFactory::instance()->openpgp() ) { - std::auto_ptr<Kleo::KeyListJob> job( p->keyListJob( false, false, true ) ); // use validating keylisting - if ( job.get() ) { + std::unique_ptr<Kleo::KeyListJob> job( p->keyListJob( false, false, true ) ); // use validating keylisting + if ( job ) { std::vector<GpgME::Key> keys; job->exec( patterns, secret, keys ); result.insert( result.end(), keys.begin(), keys.end() ); @@ -1710,8 +1710,8 @@ std::vector<GpgME::Key> Kleo::KeyResolver::lookup( const TQStringList & patterns } if ( mCryptoMessageFormats & (SMIMEFormat|SMIMEOpaqueFormat) ) if ( const Kleo::CryptoBackend::Protocol * p = Kleo::CryptoBackendFactory::instance()->smime() ) { - std::auto_ptr<Kleo::KeyListJob> job( p->keyListJob( false, false, true ) ); // use validating keylisting - if ( job.get() ) { + std::unique_ptr<Kleo::KeyListJob> job( p->keyListJob( false, false, true ) ); // use validating keylisting + if ( job ) { std::vector<GpgME::Key> keys; job->exec( patterns, secret, keys ); result.insert( result.end(), keys.begin(), keys.end() ); diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index 825e0cef..0d36844a 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -51,8 +51,8 @@ KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent) mPrecommandProcess.setUseShell(true); mPrecommandProcess << precommand; - connect(&mPrecommandProcess, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(precommandExited(TDEProcess *))); + connect(&mPrecommandProcess, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(precommandExited(TDEProcess *))); } //----------------------------------------------------------------------------- @@ -207,7 +207,7 @@ void KMAccount::sendReceipt(KMMessage* aMsg) KMMessage *newMsg = aMsg->createDeliveryReceipt(); if (newMsg) { mReceipts.append(newMsg); - TQTimer::singleShot( 0, this, TQT_SLOT( sendReceipts() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( sendReceipts() ) ); } } @@ -351,7 +351,7 @@ void KMAccount::installTimer() if(!mTimer) { mTimer = new TQTimer(0, "mTimer"); - connect(mTimer,TQT_SIGNAL(timeout()),TQT_SLOT(mailCheck())); + connect(mTimer,TQ_SIGNAL(timeout()),TQ_SLOT(mailCheck())); } else { @@ -380,13 +380,13 @@ bool KMAccount::runPrecommand(const TQString &precommand) BroadcastStatus::instance()->setStatusMsg( i18n("Executing precommand %1").arg(precommand )); - connect(&precommandProcess, TQT_SIGNAL(finished(bool)), - TQT_SLOT(precommandExited(bool))); + connect(&precommandProcess, TQ_SIGNAL(finished(bool)), + TQ_SLOT(precommandExited(bool))); kdDebug(5006) << "Running precommand " << precommand << endl; if (!precommandProcess.start()) return false; - kapp->eventLoop()->enterLoop(); + tdeApp->eventLoop()->enterLoop(); return mPrecommandSuccess; } @@ -395,7 +395,7 @@ bool KMAccount::runPrecommand(const TQString &precommand) void KMAccount::precommandExited(bool success) { mPrecommandSuccess = success; - kapp->eventLoop()->exitLoop(); + tdeApp->eventLoop()->exitLoop(); } //----------------------------------------------------------------------------- diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h index 60a23c51..89d33dcc 100644 --- a/kmail/kmaccount.h +++ b/kmail/kmaccount.h @@ -20,7 +20,7 @@ #ifndef kmaccount_h #define kmaccount_h -#include <kprocess.h> +#include <tdeprocess.h> #include <kaccount.h> #include <tqstring.h> @@ -132,7 +132,7 @@ public: virtual void setTrash(const TQString& aTrash) { mTrash = aTrash; } /** - * Process new mail for this account if one arrived. Returns TRUE if new + * Process new mail for this account if one arrived. Returns true if new * mail has been found. Whether the mail is automatically loaded to * an associated folder or not depends on the type of the account. */ diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp index 9de08019..07c3eb0a 100644 --- a/kmail/kmacctcachedimap.cpp +++ b/kmail/kmacctcachedimap.cpp @@ -49,7 +49,7 @@ using KMail::AccountManager; #include <tdeio/scheduler.h> #include <tdeio/slave.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdeconfig.h> @@ -186,8 +186,8 @@ void KMAcctCachedImap::slotCheckQueuedFolders() mMailCheckFolders.append( mFoldersQueuedForChecking.front() ); mFoldersQueuedForChecking.pop_front(); if ( mFoldersQueuedForChecking.isEmpty() ) - disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckQueuedFolders() ) ); + disconnect( this, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckQueuedFolders() ) ); kmkernel->acctMgr()->singleCheckMail(this, true); mMailCheckFolders.clear(); @@ -246,20 +246,20 @@ void KMAcctCachedImap::processNewMail( KMFolderCachedImap* folder, TQString(), true, // can be cancelled useSSL() || useTLS() ); - connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotProgressItemCanceled( KPIM::ProgressItem* ) ) ); + connect( mMailCheckProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotProgressItemCanceled( KPIM::ProgressItem* ) ) ); folder->setAccount(this); - connect(folder, TQT_SIGNAL(folderComplete(KMFolderCachedImap*, bool)), - this, TQT_SLOT(postProcessNewMail(KMFolderCachedImap*, bool))); + connect(folder, TQ_SIGNAL(folderComplete(KMFolderCachedImap*, bool)), + this, TQ_SLOT(postProcessNewMail(KMFolderCachedImap*, bool))); folder->serverSync( recurse ); } void KMAcctCachedImap::postProcessNewMail( KMFolderCachedImap* folder, bool ) { mNoopTimer.start( 60000 ); // send a noop every minute to avoid "connection broken" errors - disconnect(folder, TQT_SIGNAL(folderComplete(KMFolderCachedImap*, bool)), - this, TQT_SLOT(postProcessNewMail(KMFolderCachedImap*, bool))); + disconnect(folder, TQ_SIGNAL(folderComplete(KMFolderCachedImap*, bool)), + this, TQ_SLOT(postProcessNewMail(KMFolderCachedImap*, bool))); mMailCheckProgressItem->setComplete(); mMailCheckProgressItem = 0; diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp index 8fd2bea0..72f7c183 100644 --- a/kmail/kmacctimap.cpp +++ b/kmail/kmacctimap.cpp @@ -64,9 +64,9 @@ KMAcctImap::KMAcctImap(AccountManager* aOwner, const TQString& aAccountName, uin mScheduler = 0; mNoopTimer.start( 60000 ); // // send a noop every minute mOpenFolders.setAutoDelete(true); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(slotUpdateFolderList())); - connect(&mErrorTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotResetConnectionError())); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(slotUpdateFolderList())); + connect(&mErrorTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotResetConnectionError())); TQString serNumUri = locateLocal( "data", "kmail/unfiltered." + TQString("%1").arg(KAccount::id()) ); @@ -161,7 +161,7 @@ void KMAcctImap::killAllJobs( bool disconnectSlave ) fld->quiet(false); fld->setContentState(KMFolderImap::imapNoInformation); fld->setSubfolderState(KMFolderImap::imapNoInformation); - fld->sendFolderComplete(FALSE); + fld->sendFolderComplete(false); fld->removeJobs(); } if ( (*it).progressItem ) @@ -264,7 +264,7 @@ void KMAcctImap::cancelMailCheck() // KMAccount::checkingMail() to be reset, in case we restart checking mail later. for( TQValueList<KMFolderImap*>::Iterator it = folderList.begin(); it != folderList.end(); ++it ) { KMFolderImap *fld = *it; - fld->sendFolderComplete(FALSE); + fld->sendFolderComplete(false); } } @@ -304,9 +304,9 @@ void KMAcctImap::processNewMail(bool interactive) mMailCheckProgressItem->setTotalItems( mMailCheckFolders.count() ); connect ( mMailCheckProgressItem, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*) ), + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*) ), this, - TQT_SLOT( slotMailCheckCanceled() ) ); + TQ_SLOT( slotMailCheckCanceled() ) ); TQValueList<TQGuardedPtr<KMFolder> >::Iterator it; // first get the current count of unread-messages @@ -336,8 +336,8 @@ void KMAcctImap::processNewMail(bool interactive) mCountRemainChecks++; if (imapFolder->isSelected()) { - connect(imapFolder, TQT_SIGNAL(folderComplete(KMFolderImap*, bool)), - this, TQT_SLOT(postProcessNewMail(KMFolderImap*, bool))); + connect(imapFolder, TQ_SIGNAL(folderComplete(KMFolderImap*, bool)), + this, TQ_SLOT(postProcessNewMail(KMFolderImap*, bool))); imapFolder->getFolder(); } else if ( kmkernel->filterMgr()->atLeastOneIncomingFilterAppliesTo( id() ) && imapFolder->folder()->isSystemFolder() && @@ -345,13 +345,13 @@ void KMAcctImap::processNewMail(bool interactive) imapFolder->open("acctimap"); // will be closed in the folderSelected slot // first get new headers before we select the folder imapFolder->setSelected( true ); - connect( imapFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotFolderSelected( KMFolderImap*, bool) ) ); + connect( imapFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotFolderSelected( KMFolderImap*, bool) ) ); imapFolder->getFolder(); } else { - connect(imapFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(postProcessNewMail(KMFolder*))); + connect(imapFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this, TQ_SLOT(postProcessNewMail(KMFolder*))); bool ok = imapFolder->processNewMail(interactive); if (!ok) { @@ -382,15 +382,15 @@ void KMAcctImap::processNewMail(bool interactive) //----------------------------------------------------------------------------- void KMAcctImap::postProcessNewMail(KMFolderImap* folder, bool) { - disconnect(folder, TQT_SIGNAL(folderComplete(KMFolderImap*, bool)), - this, TQT_SLOT(postProcessNewMail(KMFolderImap*, bool))); + disconnect(folder, TQ_SIGNAL(folderComplete(KMFolderImap*, bool)), + this, TQ_SLOT(postProcessNewMail(KMFolderImap*, bool))); postProcessNewMail(static_cast<KMFolder*>(folder->folder())); } void KMAcctImap::postProcessNewMail( KMFolder * folder ) { - disconnect( folder->storage(), TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(postProcessNewMail(KMFolder*)) ); + disconnect( folder->storage(), TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this, TQ_SLOT(postProcessNewMail(KMFolder*)) ); if ( mMailCheckProgressItem ) { mMailCheckProgressItem->incCompletedItems(); @@ -420,7 +420,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) if (!mScheduler) { mScheduler = new KMail::ActionScheduler( set, filters ); mScheduler->setAccountId( id() ); - connect( mScheduler, TQT_SIGNAL(filtered(TQ_UINT32)), this, TQT_SLOT(slotFiltered(TQ_UINT32)) ); + connect( mScheduler, TQ_SIGNAL(filtered(TQ_UINT32)), this, TQ_SLOT(slotFiltered(TQ_UINT32)) ); } else { mScheduler->setFilterList( filters ); } @@ -469,8 +469,8 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) msg->setTransferInProgress(true); if ( !msg->isComplete() ) { FolderJob *job = folder->createJob(msg); - connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - TQT_SLOT(slotFilterMsg(KMMessage*))); + connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + TQ_SLOT(slotFilterMsg(KMMessage*))); job->start(); } else { mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); @@ -571,8 +571,8 @@ void KMAcctImap::slotResetConnectionError() void KMAcctImap::slotFolderSelected( KMFolderImap* folder, bool ) { folder->setSelected( false ); - disconnect( folder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotFolderSelected( KMFolderImap*, bool) ) ); + disconnect( folder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotFolderSelected( KMFolderImap*, bool) ) ); postProcessNewMail( static_cast<KMFolder*>(folder->folder()) ); folder->close( "acctimap" ); } diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp index e42407e6..fc045a33 100644 --- a/kmail/kmacctlocal.cpp +++ b/kmail/kmacctlocal.cpp @@ -88,7 +88,7 @@ void KMAcctLocal::processNewMail(bool) break; if (t.elapsed() >= 200) { //hardwired constant - kapp->processEvents(); + tdeApp->processEvents(); t.start(); } } diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp index 52b398e8..1770480d 100644 --- a/kmail/kmacctmaildir.cpp +++ b/kmail/kmacctmaildir.cpp @@ -181,7 +181,7 @@ void KMAcctMaildir::processNewMail(bool) } if (t.elapsed() >= 200) { //hardwired constant - kapp->processEvents(); + tdeApp->processEvents(); t.start(); } diff --git a/kmail/kmacctseldlg.cpp b/kmail/kmacctseldlg.cpp index 35f1fc42..cac1f81f 100644 --- a/kmail/kmacctseldlg.cpp +++ b/kmail/kmacctseldlg.cpp @@ -39,7 +39,7 @@ KMAcctSelDlg::KMAcctSelDlg( TQWidget *parent, const char *name, bool modal ) TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQButtonGroup *group = new TQButtonGroup( i18n("Account Type"), page ); - connect(group, TQT_SIGNAL(clicked(int)), TQT_SLOT(buttonClicked(int)) ); + connect(group, TQ_SIGNAL(clicked(int)), TQ_SLOT(buttonClicked(int)) ); topLayout->addWidget( group, 10 ); TQVBoxLayout *vlay = new TQVBoxLayout( group, spacingHint()*2, spacingHint() ); diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg index 922e295c..e12b04b3 100644 --- a/kmail/kmail.kcfg +++ b/kmail/kmail.kcfg @@ -557,10 +557,10 @@ <default>true</default> </entry> <entry name="ForegroundColor" type="Color" key="ForegroundColor"> - <default code="true">kapp->palette().active().text()</default> + <default code="true">tdeApp->palette().active().text()</default> </entry> <entry name="BackgroundColor" type="Color" key="BackgroundColor"> - <default code="true">kapp->palette().active().base()</default> + <default code="true">tdeApp->palette().active().base()</default> </entry> <entry name="FallbackCharacterEncoding" type="String" key="FallbackCharacterEncoding"> <default code="true"> TQCString(TQTextCodec::codecForLocale()->name()).lower() == "eucjp"? TQCString("jis7") : TQCString(TQTextCodec::codecForLocale()->name()).lower()</default> diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index 79eb175c..1add4e7a 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -65,12 +65,12 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, mParentWidget( parentWidget ) { kdDebug(5006) << "KMailPart()" << endl; - kdDebug(5006) << " InstanceName: " << kapp->instanceName() << endl; + kdDebug(5006) << " InstanceName: " << tdeApp->instanceName() << endl; setInstance(KMailFactory::instance()); kdDebug(5006) << "KMailPart()..." << endl; - kdDebug(5006) << " InstanceName: " << kapp->instanceName() << endl; + kdDebug(5006) << " InstanceName: " << tdeApp->instanceName() << endl; // import i18n data and icons from libraries: KMail::insertLibraryCataloguesAndIcons(); @@ -81,7 +81,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, KMail::lockOrDie(); - kapp->dcopClient()->suspend(); // Don't handle DCOP requests yet + tdeApp->dcopClient()->suspend(); // Don't handle DCOP requests yet //local, do the init KMKernel *mKMailKernel = new KMKernel(); @@ -95,7 +95,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, mKMailKernel->recoverDeadLetters(); kmsetSignalHandler(kmsignalHandler); - kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests. + tdeApp->dcopClient()->resume(); // Ok. We are ready for DCOP requests. // create a canvas to insert our widget TQWidget *canvas = new TQWidget(parentWidget, widgetName); @@ -105,8 +105,8 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, #if 0 //It's also possible to make a part out of a readerWin KMReaderWin *mReaderWin = new KMReaderWin( canvas, canvas, actionCollection() ); - connect(mReaderWin, TQT_SIGNAL(urlClicked(const KURL&,int)), - mReaderWin, TQT_SLOT(slotUrlClicked())); + connect(mReaderWin, TQ_SIGNAL(urlClicked(const KURL&,int)), + mReaderWin, TQ_SLOT(slotUrlClicked())); TQVBoxLayout *topLayout = new TQVBoxLayout(canvas); topLayout->addWidget(mReaderWin); mReaderWin->setAutoDelete( true ); @@ -121,7 +121,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, kmkernel->inboxFolder()->close(); #else mainWidget = new KMMainWidget( canvas, "mainWidget", this, actionCollection(), - kapp->config()); + tdeApp->config()); TQVBoxLayout *topLayout = new TQVBoxLayout(canvas); topLayout->addWidget(mainWidget); mainWidget->setFocusPolicy(TQWidget::ClickFocus); @@ -134,26 +134,26 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, // Get to know when the user clicked on a folder in the KMail part and update the headerWidget of Kontact KParts::InfoExtension *ie = new KParts::InfoExtension( this, "KMailInfo" ); - connect( mainWidget->folderTree(), TQT_SIGNAL(folderSelected(KMFolder*)), this, TQT_SLOT(exportFolder(KMFolder*)) ); - connect( mainWidget->folderTree(), TQT_SIGNAL(iconChanged(KMFolderTreeItem*)), - this, TQT_SLOT(slotIconChanged(KMFolderTreeItem*)) ); - connect( mainWidget->folderTree(), TQT_SIGNAL(nameChanged(KMFolderTreeItem*)), - this, TQT_SLOT(slotNameChanged(KMFolderTreeItem*)) ); - connect( this, TQT_SIGNAL(textChanged(const TQString&)), ie, TQT_SIGNAL(textChanged(const TQString&)) ); - connect( this, TQT_SIGNAL(iconChanged(const TQPixmap&)), ie, TQT_SIGNAL(iconChanged(const TQPixmap&)) ); + connect( mainWidget->folderTree(), TQ_SIGNAL(folderSelected(KMFolder*)), this, TQ_SLOT(exportFolder(KMFolder*)) ); + connect( mainWidget->folderTree(), TQ_SIGNAL(iconChanged(KMFolderTreeItem*)), + this, TQ_SLOT(slotIconChanged(KMFolderTreeItem*)) ); + connect( mainWidget->folderTree(), TQ_SIGNAL(nameChanged(KMFolderTreeItem*)), + this, TQ_SLOT(slotNameChanged(KMFolderTreeItem*)) ); + connect( this, TQ_SIGNAL(textChanged(const TQString&)), ie, TQ_SIGNAL(textChanged(const TQString&)) ); + connect( this, TQ_SIGNAL(iconChanged(const TQPixmap&)), ie, TQ_SIGNAL(iconChanged(const TQPixmap&)) ); TDEGlobal::iconLoader()->addAppDir( "kmail" ); setXMLFile( "kmail_part.rc" ); #endif KSettings::Dispatcher::self()->registerInstance( KMailFactory::instance(), mKMailKernel, - TQT_SLOT( slotConfigChanged() ) ); + TQ_SLOT( slotConfigChanged() ) ); } KMailPart::~KMailPart() { kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl; - // Running TDEIO jobs prevent kapp from exiting, so we need to kill them + // Running TDEIO jobs prevent tdeApp from exiting, so we need to kill them // if they are only about checking mail (not important stuff like moving messages) kmkernel->abortMailCheck(); kmkernel->acctMgr()->cancelMailCheck(); diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h index 079cb617..daef055d 100644 --- a/kmail/kmail_part.h +++ b/kmail/kmail_part.h @@ -35,7 +35,7 @@ #include <tdeparts/part.h> #include <tqwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEInstance; class TDEAboutData; @@ -49,7 +49,7 @@ class KMFolderTreeItem; class ActionManager; -class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPartIface +class TDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPartIface { TQ_OBJECT diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp index 8f10be35..a65b6cdd 100644 --- a/kmail/kmailicalifaceimpl.cpp +++ b/kmail/kmailicalifaceimpl.cpp @@ -161,9 +161,9 @@ KMailICalIfaceImpl::KMailICalIfaceImpl() mUseResourceIMAP( false ), mResourceQuiet( false ), mHideFolders( true ) { // Listen to config changes - connect( kmkernel, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( readConfig() ) ); - connect( kmkernel, TQT_SIGNAL( folderRemoved( KMFolder* ) ), - this, TQT_SLOT( slotFolderRemoved( KMFolder* ) ) ); + connect( kmkernel, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( readConfig() ) ); + connect( kmkernel, TQ_SIGNAL( folderRemoved( KMFolder* ) ), + this, TQ_SLOT( slotFolderRemoved( KMFolder* ) ) ); mExtraFolders.setAutoDelete( true ); mAccumulators.setAutoDelete( true ); @@ -1140,8 +1140,8 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder, // TODO: Till, port me if ( unget ) mTheUnGetMes.insert( msg->getMsgSerNum(), true ); FolderJob *job = msg->parent()->createJob( msg ); - connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), - this, TQT_SLOT( slotMessageRetrieved( KMMessage* ) ) ); + connect( job, TQ_SIGNAL( messageRetrieved( KMMessage* ) ), + this, TQ_SLOT( slotMessageRetrieved( KMMessage* ) ) ); job->start(); return; } @@ -1717,10 +1717,10 @@ void KMailICalIfaceImpl::readConfig() Q_ASSERT( account ); if ( account ) { // just in case we were connected already - disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckDone() ) ); - connect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckDone() ) ); + disconnect( account, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckDone() ) ); + connect( account, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckDone() ) ); } mUseResourceIMAP = false; // We can't really call cleanup(), if those folders were completely deleted. @@ -1966,8 +1966,8 @@ void KMailICalIfaceImpl::slotCheckDone() { KMAccount* account = kmkernel->acctMgr()->find( GlobalSettings::self()->theIMAPResourceAccount() ); if ( account ) - disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckDone() ) ); + disconnect( account, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckDone() ) ); readConfig(); } } @@ -2084,32 +2084,32 @@ KMFolder* KMailICalIfaceImpl::initScalixFolder( KMail::FolderContentsType conten void KMailICalIfaceImpl::connectFolder( KMFolder* folder ) { // avoid multiple connections - disconnect( folder, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), - this, TQT_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) ); - disconnect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), - this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) ); - disconnect( folder, TQT_SIGNAL( expunged( KMFolder* ) ), - this, TQT_SLOT( slotRefreshFolder( KMFolder* ) ) ); - disconnect( folder->storage(), TQT_SIGNAL( readOnlyChanged( KMFolder* ) ), - this, TQT_SLOT( slotFolderPropertiesChanged( KMFolder* ) ) ); - disconnect( folder, TQT_SIGNAL( nameChanged() ), - this, TQT_SLOT( slotFolderRenamed() ) ); - disconnect( folder->storage(), TQT_SIGNAL( locationChanged( const TQString&, const TQString&) ), - this, TQT_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) ); + disconnect( folder, TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), + this, TQ_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) ); + disconnect( folder, TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), + this, TQ_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) ); + disconnect( folder, TQ_SIGNAL( expunged( KMFolder* ) ), + this, TQ_SLOT( slotRefreshFolder( KMFolder* ) ) ); + disconnect( folder->storage(), TQ_SIGNAL( readOnlyChanged( KMFolder* ) ), + this, TQ_SLOT( slotFolderPropertiesChanged( KMFolder* ) ) ); + disconnect( folder, TQ_SIGNAL( nameChanged() ), + this, TQ_SLOT( slotFolderRenamed() ) ); + disconnect( folder->storage(), TQ_SIGNAL( locationChanged( const TQString&, const TQString&) ), + this, TQ_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) ); // Setup the signals to listen for changes - connect( folder, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), - this, TQT_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) ); - connect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), - this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) ); - connect( folder, TQT_SIGNAL( expunged( KMFolder* ) ), - this, TQT_SLOT( slotRefreshFolder( KMFolder* ) ) ); - connect( folder->storage(), TQT_SIGNAL( readOnlyChanged( KMFolder* ) ), - this, TQT_SLOT( slotFolderPropertiesChanged( KMFolder* ) ) ); - connect( folder, TQT_SIGNAL( nameChanged() ), - this, TQT_SLOT( slotFolderRenamed() ) ); - connect( folder->storage(), TQT_SIGNAL( locationChanged( const TQString&, const TQString&) ), - this, TQT_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) ); + connect( folder, TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), + this, TQ_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) ); + connect( folder, TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), + this, TQ_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) ); + connect( folder, TQ_SIGNAL( expunged( KMFolder* ) ), + this, TQ_SLOT( slotRefreshFolder( KMFolder* ) ) ); + connect( folder->storage(), TQ_SIGNAL( readOnlyChanged( KMFolder* ) ), + this, TQ_SLOT( slotFolderPropertiesChanged( KMFolder* ) ) ); + connect( folder, TQ_SIGNAL( nameChanged() ), + this, TQ_SLOT( slotFolderRenamed() ) ); + connect( folder->storage(), TQ_SIGNAL( locationChanged( const TQString&, const TQString&) ), + this, TQ_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) ); } diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp index d6a9c4c4..f8a573ed 100644 --- a/kmail/kmatmlistview.cpp +++ b/kmail/kmatmlistview.cpp @@ -18,12 +18,12 @@ KMAtmListViewItem::KMAtmListViewItem( TQListView *parent ) mCBCompress->setShown( true ); updateAllCheckBoxes(); - connect( mCBCompress, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCompress() ) ); - connect( listView()->header(), TQT_SIGNAL( sizeChange(int, int, int) ), - TQT_SLOT( slotHeaderChange( int, int, int ) ) ); - connect( listView()->header(), TQT_SIGNAL( indexChange(int, int, int) ), - TQT_SLOT( slotHeaderChange( int, int, int ) ) ); - connect( listView()->header(), TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotHeaderClick( int ) ) ); + connect( mCBCompress, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCompress() ) ); + connect( listView()->header(), TQ_SIGNAL( sizeChange(int, int, int) ), + TQ_SLOT( slotHeaderChange( int, int, int ) ) ); + connect( listView()->header(), TQ_SIGNAL( indexChange(int, int, int) ), + TQ_SLOT( slotHeaderChange( int, int, int ) ) ); + connect( listView()->header(), TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotHeaderClick( int ) ) ); } KMAtmListViewItem::~KMAtmListViewItem() diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 5239ceda..7f509078 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -71,7 +71,7 @@ #include <kprogress.h> #include <krun.h> #include <kbookmarkmanager.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <tdeimproxy.h> #include <kuserprofile.h> @@ -202,7 +202,7 @@ KMCommand::Result KMCommand::result() void KMCommand::start() { - TQTimer::singleShot( 0, this, TQT_SLOT( slotStart() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotStart() ) ); } @@ -225,8 +225,8 @@ int KMCommand::mCountJobs = 0; void KMCommand::slotStart() { - connect( this, TQT_SIGNAL( messagesTransfered( KMCommand::Result ) ), - this, TQT_SLOT( slotPostTransfer( KMCommand::Result ) ) ); + connect( this, TQ_SIGNAL( messagesTransfered( KMCommand::Result ) ), + this, TQ_SLOT( slotPostTransfer( KMCommand::Result ) ) ); kmkernel->filterMgr()->ref(); if (mMsgList.find(0) != -1) { @@ -261,8 +261,8 @@ void KMCommand::slotStart() void KMCommand::slotPostTransfer( KMCommand::Result result ) { - disconnect( this, TQT_SIGNAL( messagesTransfered( KMCommand::Result ) ), - this, TQT_SLOT( slotPostTransfer( KMCommand::Result ) ) ); + disconnect( this, TQ_SIGNAL( messagesTransfered( KMCommand::Result ) ), + this, TQ_SLOT( slotPostTransfer( KMCommand::Result ) ) ); if ( result == OK ) result = execute(); mResult = result; @@ -339,13 +339,13 @@ void KMCommand::transferSelectedMsgs() job->setCancellable( false ); totalSize += thisMsg->msgSizeServer(); // emitted when the message was transferred successfully - connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - this, TQT_SLOT(slotMsgTransfered(KMMessage*))); + connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + this, TQ_SLOT(slotMsgTransfered(KMMessage*))); // emitted when the job is destroyed - connect(job, TQT_SIGNAL(finished()), - this, TQT_SLOT(slotJobFinished())); - connect(job, TQT_SIGNAL(progress(unsigned long, unsigned long)), - this, TQT_SLOT(slotProgress(unsigned long, unsigned long))); + connect(job, TQ_SIGNAL(finished()), + this, TQ_SLOT(slotJobFinished())); + connect(job, TQ_SIGNAL(progress(unsigned long, unsigned long)), + this, TQ_SLOT(slotProgress(unsigned long, unsigned long))); // msg musn't be deleted thisMsg->setTransferInProgress(true); job->start(); @@ -363,8 +363,8 @@ void KMCommand::transferSelectedMsgs() } else { // wait for the transfer and tell the progressBar the necessary steps if ( mProgressDialog ) { - connect(mProgressDialog, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(slotTransferCancelled())); + connect(mProgressDialog, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(slotTransferCancelled())); mProgressDialog->progressBar()->setTotalSteps(totalSize); } } @@ -645,7 +645,7 @@ KMCommand::Result KMUrlSaveCommand::execute() return Canceled; } TDEIO::Job *job = TDEIO::file_copy(mUrl, saveUrl, -1, true); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotUrlSaveResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotUrlSaveResult(TDEIO::Job*))); setEmitsCompletedItself( true ); return OK; } @@ -845,10 +845,10 @@ KMCommand::Result KMSaveMsgCommand::execute() mJob->slotTotalSize( mTotalSize ); mJob->setAsyncDataEnabled( true ); mJob->setReportDataSent( true ); - connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)), - TQT_SLOT(slotSaveDataReq())); - connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotSaveResult(TDEIO::Job*))); + connect(mJob, TQ_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)), + TQ_SLOT(slotSaveDataReq())); + connect(mJob, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotSaveResult(TDEIO::Job*))); setEmitsCompletedItself( true ); return OK; } @@ -898,8 +898,8 @@ void KMSaveMsgCommand::slotSaveDataReq() if ( msg->parent() && !msg->isComplete() ) { FolderJob *job = msg->parent()->createJob( msg ); job->setCancellable( false ); - connect(job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), - this, TQT_SLOT( slotMessageRetrievedForSaving( KMMessage* ) ) ); + connect(job, TQ_SIGNAL( messageRetrieved( KMMessage* ) ), + this, TQ_SLOT( slotMessageRetrievedForSaving( KMMessage* ) ) ); job->start(); } } @@ -971,10 +971,10 @@ void KMSaveMsgCommand::slotSaveResult(TDEIO::Job *job) mJob->slotTotalSize( mTotalSize ); mJob->setAsyncDataEnabled( true ); mJob->setReportDataSent( true ); - connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)), - TQT_SLOT(slotSaveDataReq())); - connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotSaveResult(TDEIO::Job*))); + connect(mJob, TQ_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)), + TQ_SLOT(slotSaveDataReq())); + connect(mJob, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotSaveResult(TDEIO::Job*))); } } else @@ -1014,10 +1014,10 @@ KMCommand::Result KMOpenMsgCommand::execute() } mJob = TDEIO::get( mUrl, false, false ); mJob->setReportDataSent( true ); - connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( slotDataArrived( TDEIO::Job*, const TQByteArray & ) ) ); - connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( mJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQ_SLOT( slotDataArrived( TDEIO::Job*, const TQByteArray & ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); setEmitsCompletedItself( true ); return OK; } @@ -1705,7 +1705,7 @@ KMCommand::Result KMSeStatusCommand::execute() f->setStatus( (*it2), mStatus, mToggle ); ++it2; } - //kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() ); + //tdeApp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() ); return OK; } @@ -1755,7 +1755,7 @@ KMCommand::Result KMFilterActionCommand::execute() TQString statusMsg = i18n("Filtering message %1 of %2"); statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter ); KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg ); - TDEApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 ); } int filterResult = kmkernel->filterMgr()->process( serNum, mFilter ); @@ -1904,15 +1904,15 @@ void KMMenuCommand::makeFolderMenu(KMFolderNode* node, bool move, // connect the signals if (move) { - disconnect(menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(moveSelectedToFolder(int))); - connect(menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(moveSelectedToFolder(int))); + disconnect(menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(moveSelectedToFolder(int))); + connect(menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(moveSelectedToFolder(int))); } else { - disconnect(menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(copySelectedToFolder(int))); - connect(menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(copySelectedToFolder(int))); + disconnect(menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(copySelectedToFolder(int))); + connect(menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(copySelectedToFolder(int))); } KMFolder *folder = 0; @@ -2036,10 +2036,10 @@ KMCommand::Result KMCopyCommand::execute() FolderJob *job = srcFolder->createJob(newMsg); job->setCancellable( false ); mPendingJobs << job; - connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - mDestFolder, TQT_SLOT(reallyAddCopyOfMsg(KMMessage*))); - connect( job, TQT_SIGNAL(result(KMail::FolderJob*)), - this, TQT_SLOT(slotJobFinished(KMail::FolderJob*)) ); + connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + mDestFolder, TQ_SLOT(reallyAddCopyOfMsg(KMMessage*))); + connect( job, TQ_SIGNAL(result(KMail::FolderJob*)), + this, TQ_SLOT(slotJobFinished(KMail::FolderJob*)) ); job->start(); } else { // local => others @@ -2067,8 +2067,8 @@ KMCommand::Result KMCopyCommand::execute() if ( mPendingJobs.isEmpty() ) { // wait for the end of the copy before closing the folder KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(mDestFolder->storage()); - connect( imapDestFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotFolderComplete( KMFolderImap*, bool ) ) ); + connect( imapDestFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotFolderComplete( KMFolderImap*, bool ) ) ); } } else { deleteNow = list.isEmpty() && mPendingJobs.isEmpty(); // we're done if there are no other mails we need to fetch @@ -2081,8 +2081,8 @@ KMCommand::Result KMCopyCommand::execute() { // copy the message(s); note: the list is empty afterwards! KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(mDestFolder->storage()); - connect( imapDestFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotFolderComplete( KMFolderImap*, bool ) ) ); + connect( imapDestFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotFolderComplete( KMFolderImap*, bool ) ) ); imapDestFolder->copyMsg(list); imapDestFolder->getFolder(); } @@ -2107,8 +2107,8 @@ void KMCopyCommand::slotJobFinished(KMail::FolderJob * job) kdDebug(5006) << k_funcinfo << "folder job failed: " << job->error() << endl; // kill all pending jobs for ( TQValueList<KMail::FolderJob*>::Iterator it = mPendingJobs.begin(); it != mPendingJobs.end(); ++it ) { - disconnect( (*it), TQT_SIGNAL(result(KMail::FolderJob*)), - this, TQT_SLOT(slotJobFinished(KMail::FolderJob*)) ); + disconnect( (*it), TQ_SIGNAL(result(KMail::FolderJob*)), + this, TQ_SLOT(slotJobFinished(KMail::FolderJob*)) ); (*it)->kill(); } mPendingJobs.clear(); @@ -2181,8 +2181,8 @@ KMCommand::Result KMMoveCommand::execute() ProgressManager::createProgressItem ( "move"+ProgressManager::getUniqueID(), mDestFolder ? i18n( "Moving messages" ) : i18n( "Deleting messages" ) ); - connect( mProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotMoveCanceled() ) ); + connect( mProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotMoveCanceled() ) ); KMMessage *msg; int rc = 0; @@ -2192,8 +2192,8 @@ KMCommand::Result KMMoveCommand::execute() mCompleteWithAddedMsg = false; if (mDestFolder) { - connect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32))); + connect (mDestFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32))); mLostBoys = mSerNumList; } mProgressItem->setTotalItems( mSerNumList.count() ); @@ -2235,11 +2235,11 @@ KMCommand::Result KMMoveCommand::execute() * signal so we notice when all the mails should have showed up in it * but haven't for some reason. */ KMFolderImap *imapFolder = static_cast<KMFolderImap*> ( mDestFolder->storage() ); - disconnect (imapFolder, TQT_SIGNAL(folderComplete( KMFolderImap*, bool )), - this, TQT_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); + disconnect (imapFolder, TQ_SIGNAL(folderComplete( KMFolderImap*, bool )), + this, TQ_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); - connect (imapFolder, TQT_SIGNAL(folderComplete( KMFolderImap*, bool )), - this, TQT_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); + connect (imapFolder, TQ_SIGNAL(folderComplete( KMFolderImap*, bool )), + this, TQ_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); list.append(msg); } else { // We are moving to a local folder. @@ -2297,8 +2297,8 @@ KMCommand::Result KMMoveCommand::execute() void KMMoveCommand::slotImapFolderCompleted(KMFolderImap* imapFolder, bool success) { - disconnect (imapFolder, TQT_SIGNAL(folderComplete( KMFolderImap*, bool )), - this, TQT_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); + disconnect (imapFolder, TQ_SIGNAL(folderComplete( KMFolderImap*, bool )), + this, TQ_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); if ( success ) { // the folder was checked successfully but we were still called, so check // if we are still waiting for messages to show up. If so, uidValidity @@ -2327,8 +2327,8 @@ void KMMoveCommand::slotMsgAddedToDestFolder(KMFolder *folder, TQ_UINT32 serNum) mLostBoys.remove(serNum); if ( mLostBoys.isEmpty() ) { // we are done. All messages transferred to the host succesfully - disconnect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32))); + disconnect (mDestFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32))); if (mDestFolder && mDestFolder->folderType() != KMFolderTypeImap) { mDestFolder->sync(); } @@ -2526,8 +2526,8 @@ KMCommand::Result KMSaveAttachmentsCommand::execute() setDeletesItself( true ); // load all parts KMLoadPartsCommand *command = new KMLoadPartsCommand( mAttachmentMap ); - connect( command, TQT_SIGNAL( partsRetrieved() ), - this, TQT_SLOT( slotSaveAll() ) ); + connect( command, TQ_SIGNAL( partsRetrieved() ), + this, TQ_SLOT( slotSaveAll() ) ); command->start(); return OK; @@ -2832,8 +2832,8 @@ void KMLoadPartsCommand::slotStart() curFolder->createJob( it.data(), FolderJob::tGetMessage, 0, it.key()->msgPart().partSpecifier() ); job->setCancellable( false ); - connect( job, TQT_SIGNAL(messageUpdated(KMMessage*, TQString)), - this, TQT_SLOT(slotPartRetrieved(KMMessage*, TQString)) ); + connect( job, TQ_SIGNAL(messageUpdated(KMMessage*, TQString)), + this, TQ_SLOT(slotPartRetrieved(KMMessage*, TQString)) ); job->start(); } else kdWarning(5006) << "KMLoadPartsCommand - msg has no parent" << endl; @@ -2928,8 +2928,8 @@ KMCommand::Result KMMailingListCommand::execute() new KMUrlClickedCommand( lst.first(), mFolder->identity(), 0, false ); } if ( command ) { - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( commandCompleted( KMCommand * ) ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( commandCompleted( KMCommand * ) ) ); setDeletesItself( true ); setEmitsCompletedItself( true ); command->start(); @@ -3049,8 +3049,8 @@ void KMHandleAttachmentCommand::slotStart() // load the part kdDebug(5006) << "load part" << endl; KMLoadPartsCommand *command = new KMLoadPartsCommand( mNode, mMsg ); - connect( command, TQT_SIGNAL( partsRetrieved() ), - this, TQT_SLOT( slotPartComplete() ) ); + connect( command, TQ_SIGNAL( partsRetrieved() ), + this, TQ_SLOT( slotPartComplete() ) ); command->start(); } else { @@ -3239,8 +3239,8 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() if ( !chiasmus ) return; - const STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) ); - if ( !listjob.get() ) { + const STD_NAMESPACE_PREFIX unique_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) ); + if ( !listjob ) { const TQString msg = i18n( "Chiasmus backend does not offer the " "\"x-obtain-keys\" function. Please report this bug." ); KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); @@ -3306,8 +3306,8 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() } mJob = job; - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQVariant&)), - this, TQT_SLOT(slotAtmDecryptWithChiasmusResult(const GpgME::Error&,const TQVariant&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQVariant&)), + this, TQ_SLOT(slotAtmDecryptWithChiasmusResult(const GpgME::Error&,const TQVariant&)) ); } static const TQString chomp( const TQString & base, const TQString & suffix, bool cs ) { @@ -3350,8 +3350,8 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E d.setDisabled( true ); // we got this far, don't delete yet TDEIO::Job * uploadJob = TDEIO::storedPut( result.toByteArray(), url, -1, overwrite, false /*resume*/ ); uploadJob->setWindow( parentWidget() ); - connect( uploadJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotAtmDecryptWithChiasmusUploadResult(TDEIO::Job*)) ); + connect( uploadJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotAtmDecryptWithChiasmusUploadResult(TDEIO::Job*)) ); } void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( TDEIO::Job * job ) @@ -3412,8 +3412,8 @@ void AttachmentModifyCommand::storeChangedMessage(KMMessage * msg) int res = mFolder->addMsg( msg ) != 0; if ( mFolder->folderType() == KMFolderTypeImap ) { KMFolderImap *f = static_cast<KMFolderImap*>( mFolder->storage() ); - connect( f, TQT_SIGNAL(folderComplete(KMFolderImap*,bool)), - TQT_SLOT(messageStoreResult(KMFolderImap*,bool)) ); + connect( f, TQ_SIGNAL(folderComplete(KMFolderImap*,bool)), + TQ_SLOT(messageStoreResult(KMFolderImap*,bool)) ); } else { messageStoreResult( 0, res == 0 ); } @@ -3424,7 +3424,7 @@ void AttachmentModifyCommand::messageStoreResult(KMFolderImap* folder, bool succ Q_UNUSED( folder ); if ( success ) { KMCommand *delCmd = new KMDeleteMsgCommand( mSernum ); - connect( delCmd, TQT_SIGNAL(completed(KMCommand*)), TQT_SLOT(messageDeleteResult(KMCommand*)) ); + connect( delCmd, TQ_SIGNAL(completed(KMCommand*)), TQ_SLOT(messageDeleteResult(KMCommand*)) ); delCmd->start(); return; } @@ -3515,7 +3515,7 @@ KMCommand::Result KMEditAttachmentCommand::doAttachmentModify() new KMail::EditorWatcher( KURL( mTempFile.file()->name() ), part.typeStr() + "/" + part.subtypeStr(), false, this, parentWidget() ); - connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(editDone(KMail::EditorWatcher*)) ); + connect( watcher, TQ_SIGNAL(editDone(KMail::EditorWatcher*)), TQ_SLOT(editDone(KMail::EditorWatcher*)) ); if ( !watcher->start() ) return Failed; setEmitsCompletedItself( true ); @@ -3586,7 +3586,7 @@ KMCommand::Result CreateTodoCommand::execute() tf.file()->writeBlock( msg->asDwString().c_str(), msg->asDwString().length() ); tf.close(); - KCalendarIface_stub *iface = new KCalendarIface_stub( kapp->dcopClient(), "korganizer", "CalendarIface" ); + KCalendarIface_stub *iface = new KCalendarIface_stub( tdeApp->dcopClient(), "korganizer", "CalendarIface" ); iface->openTodoEditor( i18n("Mail: %1").arg( msg->subject() ), txt, uri, tf.name(), TQStringList(), "message/rfc822", true ); delete iface; diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index bf74c909..54d4bf14 100644 --- a/kmail/kmcommands.h +++ b/kmail/kmcommands.h @@ -11,7 +11,7 @@ #include <tdeio/job.h> #include "kmmsgbase.h" // for KMMsgStatus #include <mimelib/string.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <kservice.h> #include <tdetempfile.h> @@ -46,7 +46,7 @@ namespace Kleo { class SpecialJob; } typedef TQMap<int,KMFolder*> KMMenuToFolder; typedef TQMap<partNode*, KMMessage*> PartNodeMessageMap; -class KDE_EXPORT KMCommand : public TQObject +class TDE_EXPORT KMCommand : public TQObject { TQ_OBJECT @@ -160,7 +160,7 @@ private: TQValueList<TQGuardedPtr<KMFolder> > mFolders; }; -class KDE_EXPORT KMMailtoComposeCommand : public KMCommand +class TDE_EXPORT KMMailtoComposeCommand : public KMCommand { TQ_OBJECT @@ -175,7 +175,7 @@ private: KMMessage *mMessage; }; -class KDE_EXPORT KMMailtoReplyCommand : public KMCommand +class TDE_EXPORT KMMailtoReplyCommand : public KMCommand { TQ_OBJECT @@ -191,7 +191,7 @@ private: TQString mSelection; }; -class KDE_EXPORT KMMailtoForwardCommand : public KMCommand +class TDE_EXPORT KMMailtoForwardCommand : public KMCommand { TQ_OBJECT @@ -206,7 +206,7 @@ private: KURL mUrl; }; -class KDE_EXPORT KMMailtoAddAddrBookCommand : public KMCommand +class TDE_EXPORT KMMailtoAddAddrBookCommand : public KMCommand { TQ_OBJECT @@ -220,7 +220,7 @@ private: KURL mUrl; }; -class KDE_EXPORT KMAddBookmarksCommand : public KMCommand +class TDE_EXPORT KMAddBookmarksCommand : public KMCommand { TQ_OBJECT @@ -235,7 +235,7 @@ private: }; -class KDE_EXPORT KMMailtoOpenAddrBookCommand : public KMCommand +class TDE_EXPORT KMMailtoOpenAddrBookCommand : public KMCommand { TQ_OBJECT @@ -249,7 +249,7 @@ private: KURL mUrl; }; -class KDE_EXPORT KMUrlCopyCommand : public KMCommand +class TDE_EXPORT KMUrlCopyCommand : public KMCommand { TQ_OBJECT @@ -264,7 +264,7 @@ private: KMMainWidget *mMainWidget; }; -class KDE_EXPORT KMUrlOpenCommand : public KMCommand +class TDE_EXPORT KMUrlOpenCommand : public KMCommand { TQ_OBJECT @@ -279,7 +279,7 @@ private: KMReaderWin *mReaderWin; }; -class KDE_EXPORT KMUrlSaveCommand : public KMCommand +class TDE_EXPORT KMUrlSaveCommand : public KMCommand { TQ_OBJECT @@ -296,7 +296,7 @@ private: KURL mUrl; }; -class KDE_EXPORT KMEditMsgCommand : public KMCommand +class TDE_EXPORT KMEditMsgCommand : public KMCommand { TQ_OBJECT @@ -308,7 +308,7 @@ private: virtual Result execute(); }; -class KDE_EXPORT KMUseTemplateCommand : public KMCommand +class TDE_EXPORT KMUseTemplateCommand : public KMCommand { TQ_OBJECT @@ -320,7 +320,7 @@ private: virtual Result execute(); }; -class KDE_EXPORT KMShowMsgSrcCommand : public KMCommand +class TDE_EXPORT KMShowMsgSrcCommand : public KMCommand { TQ_OBJECT @@ -335,7 +335,7 @@ private: bool mMsgWasComplete; }; -class KDE_EXPORT KMSaveMsgCommand : public KMCommand +class TDE_EXPORT KMSaveMsgCommand : public KMCommand { TQ_OBJECT @@ -367,7 +367,7 @@ private: TDEIO::TransferJob *mJob; }; -class KDE_EXPORT KMOpenMsgCommand : public KMCommand +class TDE_EXPORT KMOpenMsgCommand : public KMCommand { TQ_OBJECT @@ -391,7 +391,7 @@ private: const TQString mEncoding; }; -class KDE_EXPORT KMSaveAttachmentsCommand : public KMCommand +class TDE_EXPORT KMSaveAttachmentsCommand : public KMCommand { TQ_OBJECT @@ -430,7 +430,7 @@ private: bool mEncoded; }; -class KDE_EXPORT KMReplyToCommand : public KMCommand +class TDE_EXPORT KMReplyToCommand : public KMCommand { TQ_OBJECT @@ -446,7 +446,7 @@ private: TQString mSelection; }; -class KDE_EXPORT KMNoQuoteReplyToCommand : public KMCommand +class TDE_EXPORT KMNoQuoteReplyToCommand : public KMCommand { TQ_OBJECT @@ -474,7 +474,7 @@ private: TQString mSelection; }; -class KDE_EXPORT KMReplyToAllCommand : public KMCommand +class TDE_EXPORT KMReplyToAllCommand : public KMCommand { TQ_OBJECT @@ -490,7 +490,7 @@ private: TQString mSelection; }; -class KDE_EXPORT KMReplyAuthorCommand : public KMCommand +class TDE_EXPORT KMReplyAuthorCommand : public KMCommand { TQ_OBJECT @@ -506,7 +506,7 @@ private: TQString mSelection; }; -class KDE_EXPORT KMForwardInlineCommand : public KMCommand +class TDE_EXPORT KMForwardInlineCommand : public KMCommand { TQ_OBJECT @@ -524,7 +524,7 @@ private: uint mIdentity; }; -class KDE_EXPORT KMForwardAttachedCommand : public KMCommand +class TDE_EXPORT KMForwardAttachedCommand : public KMCommand { TQ_OBJECT @@ -542,7 +542,7 @@ private: TQGuardedPtr<KMail::Composer> mWin; }; -class KDE_EXPORT KMForwardDigestCommand : public KMCommand +class TDE_EXPORT KMForwardDigestCommand : public KMCommand { TQ_OBJECT @@ -560,7 +560,7 @@ private: TQGuardedPtr<KMail::Composer> mWin; }; -class KDE_EXPORT KMRedirectCommand : public KMCommand +class TDE_EXPORT KMRedirectCommand : public KMCommand { TQ_OBJECT @@ -572,7 +572,7 @@ private: virtual Result execute(); }; -class KDE_EXPORT KMCustomReplyToCommand : public KMCommand +class TDE_EXPORT KMCustomReplyToCommand : public KMCommand { TQ_OBJECT @@ -590,7 +590,7 @@ private: TQString mTemplate; }; -class KDE_EXPORT KMCustomReplyAllToCommand : public KMCommand +class TDE_EXPORT KMCustomReplyAllToCommand : public KMCommand { TQ_OBJECT @@ -608,7 +608,7 @@ private: TQString mTemplate; }; -class KDE_EXPORT KMCustomForwardCommand : public KMCommand +class TDE_EXPORT KMCustomForwardCommand : public KMCommand { TQ_OBJECT @@ -626,7 +626,7 @@ private: TQString mTemplate; }; -class KDE_EXPORT KMPrintCommand : public KMCommand +class TDE_EXPORT KMPrintCommand : public KMCommand { TQ_OBJECT @@ -654,7 +654,7 @@ private: TQString mEncoding; }; -class KDE_EXPORT KMSeStatusCommand : public KMCommand +class TDE_EXPORT KMSeStatusCommand : public KMCommand { TQ_OBJECT @@ -673,7 +673,7 @@ private: bool mToggle; }; -class KDE_EXPORT KMFilterCommand : public KMCommand +class TDE_EXPORT KMFilterCommand : public KMCommand { TQ_OBJECT @@ -689,7 +689,7 @@ private: }; -class KDE_EXPORT KMFilterActionCommand : public KMCommand +class TDE_EXPORT KMFilterActionCommand : public KMCommand { TQ_OBJECT @@ -706,7 +706,7 @@ private: }; -class KDE_EXPORT KMMetaFilterActionCommand : public TQObject +class TDE_EXPORT KMMetaFilterActionCommand : public TQObject { TQ_OBJECT @@ -724,7 +724,7 @@ private: KMMainWidget *mMainWidget; }; -class KDE_EXPORT FolderShortcutCommand : public TQObject +class TDE_EXPORT FolderShortcutCommand : public TQObject { TQ_OBJECT @@ -747,7 +747,7 @@ private: }; -class KDE_EXPORT KMMailingListFilterCommand : public KMCommand +class TDE_EXPORT KMMailingListFilterCommand : public KMCommand { TQ_OBJECT @@ -762,12 +762,12 @@ private: /** Returns a popupmenu containing a hierarchy of folder names. Each item in the popupmenu is connected to a slot, if - move is TRUE this slot will cause all selected messages to + move is true this slot will cause all selected messages to be moved into the given folder, otherwise messages will be copied. Am empty KMMenuToFolder must be passed in. */ -class KDE_EXPORT KMMenuCommand : public KMCommand +class TDE_EXPORT KMMenuCommand : public KMCommand { TQ_OBJECT @@ -780,7 +780,7 @@ public: TQObject *receiver, KMMenuToFolder *aMenuToFolder, TQPopupMenu *menu ); }; -class KDE_EXPORT KMCopyCommand : public KMMenuCommand +class TDE_EXPORT KMCopyCommand : public KMMenuCommand { TQ_OBJECT @@ -806,7 +806,7 @@ private: namespace KPIM { class ProgressItem; } -class KDE_EXPORT KMMoveCommand : public KMMenuCommand +class TDE_EXPORT KMMoveCommand : public KMMenuCommand { TQ_OBJECT @@ -842,7 +842,7 @@ private: bool mCompleteWithAddedMsg; }; -class KDE_EXPORT KMDeleteMsgCommand : public KMMoveCommand +class TDE_EXPORT KMDeleteMsgCommand : public KMMoveCommand { TQ_OBJECT @@ -857,7 +857,7 @@ private: }; -class KDE_EXPORT KMUrlClickedCommand : public KMCommand +class TDE_EXPORT KMUrlClickedCommand : public KMCommand { TQ_OBJECT @@ -876,7 +876,7 @@ private: KMMainWidget *mMainWidget; }; -class KDE_EXPORT KMLoadPartsCommand : public KMCommand +class TDE_EXPORT KMLoadPartsCommand : public KMCommand { TQ_OBJECT @@ -902,7 +902,7 @@ private: PartNodeMessageMap mPartMap; }; -class KDE_EXPORT KMResendMessageCommand : public KMCommand +class TDE_EXPORT KMResendMessageCommand : public KMCommand { TQ_OBJECT @@ -914,7 +914,7 @@ private: virtual Result execute(); }; -class KDE_EXPORT KMMailingListCommand : public KMCommand +class TDE_EXPORT KMMailingListCommand : public KMCommand { TQ_OBJECT @@ -930,7 +930,7 @@ protected: KMFolder *mFolder; }; -class KDE_EXPORT KMMailingListPostCommand : public KMMailingListCommand +class TDE_EXPORT KMMailingListPostCommand : public KMMailingListCommand { TQ_OBJECT @@ -940,7 +940,7 @@ protected: virtual KURL::List urls() const; }; -class KDE_EXPORT KMMailingListSubscribeCommand : public KMMailingListCommand +class TDE_EXPORT KMMailingListSubscribeCommand : public KMMailingListCommand { TQ_OBJECT @@ -950,7 +950,7 @@ protected: virtual KURL::List urls() const; }; -class KDE_EXPORT KMMailingListUnsubscribeCommand : public KMMailingListCommand +class TDE_EXPORT KMMailingListUnsubscribeCommand : public KMMailingListCommand { TQ_OBJECT @@ -960,7 +960,7 @@ protected: virtual KURL::List urls() const; }; -class KDE_EXPORT KMMailingListArchivesCommand : public KMMailingListCommand +class TDE_EXPORT KMMailingListArchivesCommand : public KMMailingListCommand { TQ_OBJECT @@ -970,7 +970,7 @@ protected: virtual KURL::List urls() const; }; -class KDE_EXPORT KMMailingListHelpCommand : public KMMailingListCommand +class TDE_EXPORT KMMailingListHelpCommand : public KMMailingListCommand { TQ_OBJECT @@ -980,7 +980,7 @@ protected: virtual KURL::List urls() const; }; -class KDE_EXPORT KMIMChatCommand : public KMCommand +class TDE_EXPORT KMIMChatCommand : public KMCommand { TQ_OBJECT @@ -1001,7 +1001,7 @@ private: KMMessage *mMessage; }; -class KDE_EXPORT KMHandleAttachmentCommand : public KMCommand +class TDE_EXPORT KMHandleAttachmentCommand : public KMCommand { TQ_OBJECT @@ -1088,7 +1088,7 @@ private: /** Base class for commands modifying attachements of existing messages. */ -class KDE_EXPORT AttachmentModifyCommand : public KMCommand +class TDE_EXPORT AttachmentModifyCommand : public KMCommand { TQ_OBJECT @@ -1116,7 +1116,7 @@ class KDE_EXPORT AttachmentModifyCommand : public KMCommand TQGuardedPtr<KMFolder> mFolder; }; -class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand +class TDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand { TQ_OBJECT @@ -1130,7 +1130,7 @@ class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand }; -class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand +class TDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand { TQ_OBJECT @@ -1149,7 +1149,7 @@ class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand KTempFile mTempFile; }; -class KDE_EXPORT CreateTodoCommand : public KMCommand +class TDE_EXPORT CreateTodoCommand : public KMCommand { TQ_OBJECT diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 7e02e403..2202deec 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -103,7 +103,7 @@ using TDERecentAddress::RecentAddresses; #include <kuserprofile.h> #include <krun.h> #include <ktempdir.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> //#include <keditlistbox.h> #include "globalsettings.h" #include "replyphrases.h" @@ -225,8 +225,8 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mEdtReplyTo = new KMLineEdit(true,mHeadersArea, "replyToLine"); TQToolTip::add( mEdtReplyTo, i18n( "Set the \"Reply-To:\" email address for this message" ) ); - connect(mEdtReplyTo,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(mEdtReplyTo,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); if ( mClassicalRecipients ) { mRecipientsEditor = 0; @@ -254,17 +254,17 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mBtnBcc->setFocusPolicy(TQWidget::NoFocus); //mBtnFrom->setFocusPolicy(TQWidget::NoFocus); - connect(mBtnTo,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo())); - connect(mBtnCc,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo())); - connect(mBtnBcc,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo())); - //connect(mBtnFrom,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookFrom())); + connect(mBtnTo,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookTo())); + connect(mBtnCc,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookTo())); + connect(mBtnBcc,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookTo())); + //connect(mBtnFrom,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookFrom())); - connect(mEdtTo,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); - connect(mEdtCc,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); - connect(mEdtBcc,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(mEdtTo,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(mEdtCc,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(mEdtBcc,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); mEdtTo->setFocus(); } else { @@ -283,9 +283,9 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mRecipientsEditor = new RecipientsEditor( mHeadersArea ); connect( mRecipientsEditor, - TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), - TQT_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ) ) ); - connect( mRecipientsEditor, TQT_SIGNAL(sizeHintChanged()), TQT_SLOT(recipientEditorSizeHintChanged()) ); + TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), + TQ_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ) ) ); + connect( mRecipientsEditor, TQ_SIGNAL(sizeHintChanged()), TQ_SLOT(recipientEditorSizeHintChanged()) ); mRecipientsEditor->setFocus(); } @@ -413,20 +413,20 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mAtmListView->setAllColumnsShowFocus( true ); connect( mAtmListView, - TQT_SIGNAL( doubleClicked( TQListViewItem* ) ), - TQT_SLOT( slotAttachEdit() ) ); + TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), + TQ_SLOT( slotAttachEdit() ) ); connect( mAtmListView, - TQT_SIGNAL( rightButtonPressed( TQListViewItem*, const TQPoint&, int ) ), - TQT_SLOT( slotAttachPopupMenu( TQListViewItem*, const TQPoint&, int ) ) ); + TQ_SIGNAL( rightButtonPressed( TQListViewItem*, const TQPoint&, int ) ), + TQ_SLOT( slotAttachPopupMenu( TQListViewItem*, const TQPoint&, int ) ) ); connect( mAtmListView, - TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotUpdateAttachActions() ) ); + TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotUpdateAttachActions() ) ); connect( mAtmListView, - TQT_SIGNAL( attachmentDeleted() ), - TQT_SLOT( slotAttachRemove() ) ); + TQ_SIGNAL( attachmentDeleted() ), + TQ_SLOT( slotAttachRemove() ) ); connect( mAtmListView, - TQT_SIGNAL( dragStarted() ), - TQT_SLOT( slotAttachmentDragStarted() ) ); + TQ_SIGNAL( dragStarted() ), + TQ_SLOT( slotAttachmentDragStarted() ) ); mAttachMenu = 0; readConfig(); @@ -437,32 +437,32 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) applyMainWindowSettings(KMKernel::config(), "Composer"); - connect( mEdtSubject, TQT_SIGNAL( subjectTextSpellChecked() ), - TQT_SLOT( slotSubjectTextSpellChecked() ) ); - connect(mEdtSubject,TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotUpdWinTitle(const TQString&))); - connect(mIdentity,TQT_SIGNAL(identityChanged(uint)), - TQT_SLOT(slotIdentityChanged(uint))); - connect( kmkernel->identityManager(), TQT_SIGNAL(changed(uint)), - TQT_SLOT(slotIdentityChanged(uint))); - - connect(mEdtFrom,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); - connect(kmkernel->folderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)), - TQT_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->imapFolderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)), - TQT_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->dimapFolderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)), - TQT_SLOT(slotFolderRemoved(KMFolder*))); - connect( kmkernel, TQT_SIGNAL( configChanged() ), - TQT_TQOBJECT(this), TQT_SLOT( slotConfigChanged() ) ); - - connect (mEditor, TQT_SIGNAL (spellcheck_done(int)), - this, TQT_SLOT (slotSpellcheckDone (int))); - connect (mEditor, TQT_SIGNAL( attachPNGImageData(const TQByteArray &) ), - this, TQT_SLOT ( slotAttachPNGImageData(const TQByteArray &) ) ); - connect (mEditor, TQT_SIGNAL( focusChanged(bool) ), - this, TQT_SLOT (editorFocusChanged(bool)) ); + connect( mEdtSubject, TQ_SIGNAL( subjectTextSpellChecked() ), + TQ_SLOT( slotSubjectTextSpellChecked() ) ); + connect(mEdtSubject,TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotUpdWinTitle(const TQString&))); + connect(mIdentity,TQ_SIGNAL(identityChanged(uint)), + TQ_SLOT(slotIdentityChanged(uint))); + connect( kmkernel->identityManager(), TQ_SIGNAL(changed(uint)), + TQ_SLOT(slotIdentityChanged(uint))); + + connect(mEdtFrom,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(kmkernel->folderMgr(),TQ_SIGNAL(folderRemoved(KMFolder*)), + TQ_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->imapFolderMgr(),TQ_SIGNAL(folderRemoved(KMFolder*)), + TQ_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->dimapFolderMgr(),TQ_SIGNAL(folderRemoved(KMFolder*)), + TQ_SLOT(slotFolderRemoved(KMFolder*))); + connect( kmkernel, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( slotConfigChanged() ) ); + + connect (mEditor, TQ_SIGNAL (spellcheck_done(int)), + this, TQ_SLOT (slotSpellcheckDone (int))); + connect (mEditor, TQ_SIGNAL( attachPNGImageData(const TQByteArray &) ), + this, TQ_SLOT ( slotAttachPNGImageData(const TQByteArray &) ) ); + connect (mEditor, TQ_SIGNAL( focusChanged(bool) ), + this, TQ_SLOT (editorFocusChanged(bool)) ); mMainWidget->resize(480,510); setCentralWidget(mMainWidget); @@ -553,7 +553,7 @@ void KMComposeWin::addAttachmentsAndSend(const KURL::List &urls, const TQString } mAttachFilesSend = how; mAttachFilesPending = urls; - connect(this, TQT_SIGNAL(attachmentAdded(const KURL&, bool)), TQT_SLOT(slotAttachedFile(const KURL&))); + connect(this, TQ_SIGNAL(attachmentAdded(const KURL&, bool)), TQ_SLOT(slotAttachedFile(const KURL&))); for( KURL::List::ConstIterator itr = urls.begin(); itr != urls.end(); ++itr ) { if (!addAttach( *itr )) mAttachFilesPending.remove(mAttachFilesPending.find(*itr)); // only remove one copy of the url @@ -647,15 +647,15 @@ bool KMComposeWin::event(TQEvent *e) void KMComposeWin::readColorConfig(void) { if ( GlobalSettings::self()->useDefaultColors() ) { - mForeColor = TQColor(kapp->palette().active().text()); - mBackColor = TQColor(kapp->palette().active().base()); + mForeColor = TQColor(tdeApp->palette().active().text()); + mBackColor = TQColor(tdeApp->palette().active().base()); } else { mForeColor = GlobalSettings::self()->foregroundColor(); mBackColor = GlobalSettings::self()->backgroundColor(); } // Color setup - mPalette = kapp->palette(); + mPalette = tdeApp->palette(); TQColorGroup cgrp = mPalette.active(); cgrp.setColor( TQColorGroup::Base, mBackColor); cgrp.setColor( TQColorGroup::Text, mForeColor); @@ -815,8 +815,8 @@ void KMComposeWin::autoSaveMessage() if ( mAutoSaveTimer ) mAutoSaveTimer->stop(); - connect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotContinueAutoSave() ) ); + connect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + this, TQ_SLOT( slotContinueAutoSave() ) ); // This method is called when KMail crashed, so don't try signing/encryption // and don't disable controls because it is also called from a timer and // then the disabling is distracting. @@ -827,8 +827,8 @@ void KMComposeWin::autoSaveMessage() void KMComposeWin::slotContinueAutoSave() { - disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotContinueAutoSave() ) ); + disconnect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + this, TQ_SLOT( slotContinueAutoSave() ) ); // Ok, it's done now - continue dead letter saving if ( mComposedMessages.isEmpty() ) { @@ -1076,22 +1076,22 @@ void KMComposeWin::rethinkFields(bool fromSlot) ++row; if ( showHeaders & HDR_REPLY_TO ) { - connect( mEdtReplyTo, TQT_SIGNAL( focusDown() ), mRecipientsEditor, - TQT_SLOT( setFocusTop() ) ); + connect( mEdtReplyTo, TQ_SIGNAL( focusDown() ), mRecipientsEditor, + TQ_SLOT( setFocusTop() ) ); } else { - connect( mEdtFrom, TQT_SIGNAL( focusDown() ), mRecipientsEditor, - TQT_SLOT( setFocusTop() ) ); + connect( mEdtFrom, TQ_SIGNAL( focusDown() ), mRecipientsEditor, + TQ_SLOT( setFocusTop() ) ); } if ( showHeaders & HDR_REPLY_TO ) { - connect( mRecipientsEditor, TQT_SIGNAL( focusUp() ), mEdtReplyTo, TQT_SLOT( setFocus() ) ); + connect( mRecipientsEditor, TQ_SIGNAL( focusUp() ), mEdtReplyTo, TQ_SLOT( setFocus() ) ); } else { - connect( mRecipientsEditor, TQT_SIGNAL( focusUp() ), mEdtFrom, TQT_SLOT( setFocus() ) ); + connect( mRecipientsEditor, TQ_SIGNAL( focusUp() ), mEdtFrom, TQ_SLOT( setFocus() ) ); } - connect( mRecipientsEditor, TQT_SIGNAL( focusDown() ), mEdtSubject, - TQT_SLOT( setFocus() ) ); - connect( mEdtSubject, TQT_SIGNAL( focusUp() ), mRecipientsEditor, - TQT_SLOT( setFocusBottom() ) ); + connect( mRecipientsEditor, TQ_SIGNAL( focusDown() ), mEdtSubject, + TQ_SLOT( setFocus() ) ); + connect( mEdtSubject, TQ_SIGNAL( focusUp() ), mRecipientsEditor, + TQ_SLOT( setFocusBottom() ) ); prevFocus = mRecipientsEditor; } @@ -1131,8 +1131,8 @@ void KMComposeWin::rethinkFields(bool fromSlot) TQWidget *KMComposeWin::connectFocusMoving( TQWidget *prev, TQWidget *next ) { - connect( prev, TQT_SIGNAL( focusDown() ), next, TQT_SLOT( setFocus() ) ); - connect( next, TQT_SIGNAL( focusUp() ), prev, TQT_SLOT( setFocus() ) ); + connect( prev, TQ_SIGNAL( focusDown() ), next, TQ_SLOT( setFocus() ) ); + connect( next, TQ_SIGNAL( focusUp() ), prev, TQ_SLOT( setFocus() ) ); return next; } @@ -1233,14 +1233,14 @@ void KMComposeWin::setupActions(void) { //default = send now, alternative = queue ( void ) new TDEAction( i18n("&Send Mail"), "mail-send", CTRL+Key_Return, - TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_default"); + this, TQ_SLOT(slotSendNow()), actionCollection(),"send_default"); // FIXME: change to mail_send_via icon when this exits. actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail-send", actionCollection(), "send_default_via" ); - (void) new TDEAction (i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSendLater()), actionCollection(),"send_alternative"); + (void) new TDEAction (i18n("Send &Later"), "queue", 0, this, + TQ_SLOT(slotSendLater()), actionCollection(),"send_alternative"); actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue", actionCollection(), "send_alternative_via" ); @@ -1250,12 +1250,12 @@ void KMComposeWin::setupActions(void) //default = queue, alternative = send now (void) new TDEAction (i18n("Send &Later"), "queue", CTRL+Key_Return, - TQT_TQOBJECT(this), TQT_SLOT(slotSendLater()), actionCollection(),"send_default"); + this, TQ_SLOT(slotSendLater()), actionCollection(),"send_default"); actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue", actionCollection(), "send_default_via" ); ( void ) new TDEAction( i18n("&Send Mail"), "mail-send", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_alternative"); + this, TQ_SLOT(slotSendNow()), actionCollection(),"send_alternative"); // FIXME: change to mail_send_via icon when this exits. actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail-send", @@ -1267,102 +1267,102 @@ void KMComposeWin::setupActions(void) actActionNowMenu->setDelayed(true); actActionLaterMenu->setDelayed(true); - connect( actActionNowMenu, TQT_SIGNAL( activated() ), this, - TQT_SLOT( slotSendNow() ) ); - connect( actActionLaterMenu, TQT_SIGNAL( activated() ), this, - TQT_SLOT( slotSendLater() ) ); + connect( actActionNowMenu, TQ_SIGNAL( activated() ), this, + TQ_SLOT( slotSendNow() ) ); + connect( actActionLaterMenu, TQ_SIGNAL( activated() ), this, + TQ_SLOT( slotSendLater() ) ); mActNowMenu = actActionNowMenu->popupMenu(); mActLaterMenu = actActionLaterMenu->popupMenu(); - connect( mActNowMenu, TQT_SIGNAL( activated( int ) ), this, - TQT_SLOT( slotSendNowVia( int ) ) ); - connect( mActNowMenu, TQT_SIGNAL( aboutToShow() ), this, - TQT_SLOT( getTransportMenu() ) ); + connect( mActNowMenu, TQ_SIGNAL( activated( int ) ), this, + TQ_SLOT( slotSendNowVia( int ) ) ); + connect( mActNowMenu, TQ_SIGNAL( aboutToShow() ), this, + TQ_SLOT( getTransportMenu() ) ); - connect( mActLaterMenu, TQT_SIGNAL( activated( int ) ), this, - TQT_SLOT( slotSendLaterVia( int ) ) ); - connect( mActLaterMenu, TQT_SIGNAL( aboutToShow() ), this, - TQT_SLOT( getTransportMenu() ) ); + connect( mActLaterMenu, TQ_SIGNAL( activated( int ) ), this, + TQ_SLOT( slotSendLaterVia( int ) ) ); + connect( mActLaterMenu, TQ_SIGNAL( aboutToShow() ), this, + TQ_SLOT( getTransportMenu() ) ); (void) new TDEAction (i18n("Save as &Draft"), "document-save", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSaveDraft()), + this, TQ_SLOT(slotSaveDraft()), actionCollection(), "save_in_drafts"); (void) new TDEAction (i18n("Save as &Template"), "document-save", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSaveTemplate()), + this, TQ_SLOT(slotSaveTemplate()), actionCollection(), "save_in_templates"); (void) new TDEAction (i18n("&Insert File..."), "document-open", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()), + this, TQ_SLOT(slotInsertFile()), actionCollection(), "insert_file"); mRecentAction = new TDERecentFilesAction (i18n("&Insert File Recent"), "document-open", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotInsertRecentFile(const KURL&)), + this, TQ_SLOT(slotInsertRecentFile(const KURL&)), actionCollection(), "insert_file_recent"); mRecentAction->loadEntries( KMKernel::config() ); (void) new TDEAction (i18n("&Address Book"), "contents",0, - TQT_TQOBJECT(this), TQT_SLOT(slotAddrBook()), + this, TQ_SLOT(slotAddrBook()), actionCollection(), "addressbook"); (void) new TDEAction (i18n("&New Composer"), "mail-message-new", TDEStdAccel::shortcut(TDEStdAccel::New), - TQT_TQOBJECT(this), TQT_SLOT(slotNewComposer()), + this, TQ_SLOT(slotNewComposer()), actionCollection(), "new_composer"); (void) new TDEAction (i18n("New Main &Window"), "window-new", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()), + this, TQ_SLOT(slotNewMailReader()), actionCollection(), "open_mailreader"); if ( !mClassicalRecipients ) { - new TDEAction( i18n("Select &Recipients..."), CTRL + Key_L, TQT_TQOBJECT(mRecipientsEditor), - TQT_SLOT( selectRecipients() ), actionCollection(), "select_recipients" ); - new TDEAction( i18n("Save &Distribution List..."), 0, TQT_TQOBJECT(mRecipientsEditor), - TQT_SLOT( saveDistributionList() ), actionCollection(), + new TDEAction( i18n("Select &Recipients..."), CTRL + Key_L, mRecipientsEditor, + TQ_SLOT( selectRecipients() ), actionCollection(), "select_recipients" ); + new TDEAction( i18n("Save &Distribution List..."), 0, mRecipientsEditor, + TQ_SLOT( saveDistributionList() ), actionCollection(), "save_distribution_list" ); } - //KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(), actionCollection(), "save_message"); - KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection()); - KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection()); + //KStdAction::save(this, TQ_SLOT(), actionCollection(), "save_message"); + KStdAction::print (this, TQ_SLOT(slotPrint()), actionCollection()); + KStdAction::close (this, TQ_SLOT(slotClose()), actionCollection()); - KStdAction::undo (TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection()); - KStdAction::redo (TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actionCollection()); - KStdAction::cut (TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection()); - KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection()); - KStdAction::pasteText (TQT_TQOBJECT(this), TQT_SLOT(slotPasteClipboard()), actionCollection()); - KStdAction::selectAll (TQT_TQOBJECT(this), TQT_SLOT(slotMarkAll()), actionCollection()); + KStdAction::undo (this, TQ_SLOT(slotUndo()), actionCollection()); + KStdAction::redo (this, TQ_SLOT(slotRedo()), actionCollection()); + KStdAction::cut (this, TQ_SLOT(slotCut()), actionCollection()); + KStdAction::copy (this, TQ_SLOT(slotCopy()), actionCollection()); + KStdAction::pasteText (this, TQ_SLOT(slotPasteClipboard()), actionCollection()); + KStdAction::selectAll (this, TQ_SLOT(slotMarkAll()), actionCollection()); - KStdAction::find (TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection()); - KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotSearchAgain()), actionCollection()); + KStdAction::find (this, TQ_SLOT(slotFind()), actionCollection()); + KStdAction::findNext(this, TQ_SLOT(slotSearchAgain()), actionCollection()); - KStdAction::replace (TQT_TQOBJECT(this), TQT_SLOT(slotReplace()), actionCollection()); - KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection(), "tools-check-spelling"); + KStdAction::replace (this, TQ_SLOT(slotReplace()), actionCollection()); + KStdAction::spelling (this, TQ_SLOT(slotSpellcheck()), actionCollection(), "tools-check-spelling"); - mPasteQuotation = new TDEAction (i18n("Pa&ste as Quotation"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsQuotation()), + mPasteQuotation = new TDEAction (i18n("Pa&ste as Quotation"),0,this,TQ_SLOT( slotPasteClipboardAsQuotation()), actionCollection(), "paste_quoted"); - (void) new TDEAction (i18n("Paste as Attac&hment"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsAttachment()), + (void) new TDEAction (i18n("Paste as Attac&hment"),0,this,TQ_SLOT( slotPasteClipboardAsAttachment()), actionCollection(), "paste_att"); - TDEAction * addq = new TDEAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); - connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)), - addq, TQT_SLOT(setEnabled(bool)) ); + TDEAction * addq = new TDEAction(i18n("Add &Quote Characters"), 0, this, + TQ_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); + connect( mEditor, TQ_SIGNAL(selectionAvailable(bool)), + addq, TQ_SLOT(setEnabled(bool)) ); - TDEAction * remq = new TDEAction(i18n("Re&move Quote Characters"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); - connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)), - remq, TQT_SLOT(setEnabled(bool)) ); + TDEAction * remq = new TDEAction(i18n("Re&move Quote Characters"), 0, this, + TQ_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); + connect( mEditor, TQ_SIGNAL(selectionAvailable(bool)), + remq, TQ_SLOT(setEnabled(bool)) ); - (void) new TDEAction (i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanSpace()), + (void) new TDEAction (i18n("Cl&ean Spaces"), 0, this, TQ_SLOT(slotCleanSpace()), actionCollection(), "clean_spaces"); - mFixedFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" ); + mFixedFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), 0, this, + TQ_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" ); mFixedFontAction->setChecked( GlobalSettings::self()->useFixedFont() ); //these are checkable!!! @@ -1375,16 +1375,16 @@ void KMComposeWin::setupActions(void) mRequestMDNAction->setChecked(GlobalSettings::self()->requestMDN()); //----- Message-Encoding Submenu mEncodingAction = new TDESelectAction( i18n( "Se&t Encoding" ), "charset", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetCharset() ), + 0, this, TQ_SLOT(slotSetCharset() ), actionCollection(), "charsets" ); mWordWrapAction = new TDEToggleAction (i18n("&Wordwrap"), 0, actionCollection(), "wordwrap"); mWordWrapAction->setChecked(GlobalSettings::self()->wordWrap()); - connect(mWordWrapAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotWordWrapToggled(bool))); + connect(mWordWrapAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotWordWrapToggled(bool))); mSnippetAction = new TDEToggleAction ( i18n("&Snippets"), 0, actionCollection(), "snippets"); - connect(mSnippetAction, TQT_SIGNAL(toggled(bool)), mSnippetWidget, TQT_SLOT(setShown(bool)) ); + connect(mSnippetAction, TQ_SIGNAL(toggled(bool)), mSnippetWidget, TQ_SLOT(setShown(bool)) ); mSnippetAction->setChecked( GlobalSettings::self()->showSnippetManager() ); mAutoSpellCheckingAction = @@ -1394,8 +1394,8 @@ void KMComposeWin::setupActions(void) mAutoSpellCheckingAction->setEnabled( !GlobalSettings::self()->useExternalEditor() ); mAutoSpellCheckingAction->setChecked( !GlobalSettings::self()->useExternalEditor() && spellChecking ); slotAutoSpellCheckingToggled( !GlobalSettings::self()->useExternalEditor() && spellChecking ); - connect( mAutoSpellCheckingAction, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotAutoSpellCheckingToggled( bool ) ) ); + connect( mAutoSpellCheckingAction, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotAutoSpellCheckingToggled( bool ) ) ); TQStringList encodings = KMMsgBase::supportedEncodings(true); encodings.prepend( i18n("Auto-Detect")); @@ -1403,84 +1403,84 @@ void KMComposeWin::setupActions(void) mEncodingAction->setCurrentItem( -1 ); //these are checkable!!! - markupAction = new TDEToggleAction (i18n("Formatting (HTML)"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleMarkup()), + markupAction = new TDEToggleAction (i18n("Formatting (HTML)"), 0, this, + TQ_SLOT(slotToggleMarkup()), actionCollection(), "html"); - mAllFieldsAction = new TDEToggleAction (i18n("&All Fields"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mAllFieldsAction = new TDEToggleAction (i18n("&All Fields"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_all_fields"); - mIdentityAction = new TDEToggleAction (i18n("&Identity"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mIdentityAction = new TDEToggleAction (i18n("&Identity"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_identity"); - mDictionaryAction = new TDEToggleAction (i18n("&Dictionary"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mDictionaryAction = new TDEToggleAction (i18n("&Dictionary"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_dictionary"); - mFccAction = new TDEToggleAction (i18n("&Sent-Mail Folder"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mFccAction = new TDEToggleAction (i18n("&Sent-Mail Folder"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_fcc"); - mTransportAction = new TDEToggleAction (i18n("&Mail Transport"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mTransportAction = new TDEToggleAction (i18n("&Mail Transport"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_transport"); - mFromAction = new TDEToggleAction (i18n("&From"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mFromAction = new TDEToggleAction (i18n("&From"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_from"); - mReplyToAction = new TDEToggleAction (i18n("&Reply To"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mReplyToAction = new TDEToggleAction (i18n("&Reply To"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_reply_to"); if ( mClassicalRecipients ) { - mToAction = new TDEToggleAction (i18n("&To"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mToAction = new TDEToggleAction (i18n("&To"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_to"); - mCcAction = new TDEToggleAction (i18n("&CC"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mCcAction = new TDEToggleAction (i18n("&CC"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_cc"); - mBccAction = new TDEToggleAction (i18n("&BCC"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mBccAction = new TDEToggleAction (i18n("&BCC"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_bcc"); } - mSubjectAction = new TDEToggleAction (i18n("S&ubject"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mSubjectAction = new TDEToggleAction (i18n("S&ubject"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_subject"); //end of checkable - mAppendSignatureAction = new TDEAction (i18n("Append S&ignature"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAppendSignature()), + mAppendSignatureAction = new TDEAction (i18n("Append S&ignature"), 0, this, + TQ_SLOT(slotAppendSignature()), actionCollection(), "append_signature"); - mPrependSignatureAction = new TDEAction (i18n("Prepend S&ignature"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotPrependSignature()), + mPrependSignatureAction = new TDEAction (i18n("Prepend S&ignature"), 0, this, + TQ_SLOT(slotPrependSignature()), actionCollection(), "prepend_signature"); - mInsertSignatureAction = new TDEAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInsertSignatureAtCursor()), + mInsertSignatureAction = new TDEAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, this, + TQ_SLOT(slotInsertSignatureAtCursor()), actionCollection(), "insert_signature_at_cursor_position"); - mAttachPK = new TDEAction (i18n("Attach &Public Key..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInsertPublicKey()), + mAttachPK = new TDEAction (i18n("Attach &Public Key..."), 0, this, + TQ_SLOT(slotInsertPublicKey()), actionCollection(), "attach_public_key"); - mAttachMPK = new TDEAction (i18n("Attach &My Public Key"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInsertMyPublicKey()), + mAttachMPK = new TDEAction (i18n("Attach &My Public Key"), 0, this, + TQ_SLOT(slotInsertMyPublicKey()), actionCollection(), "attach_my_public_key"); (void) new TDEAction (i18n("&Attach File..."), "attach", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()), + 0, this, TQ_SLOT(slotAttachFile()), actionCollection(), "attach"); - mAttachRemoveAction = new TDEAction (i18n("&Remove Attachment"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAttachRemove()), + mAttachRemoveAction = new TDEAction (i18n("&Remove Attachment"), 0, this, + TQ_SLOT(slotAttachRemove()), actionCollection(), "remove"); mAttachSaveAction = new TDEAction (i18n("&Save Attachment As..."), "document-save",0, - TQT_TQOBJECT(this), TQT_SLOT(slotAttachSave()), + this, TQ_SLOT(slotAttachSave()), actionCollection(), "attach_save"); - mAttachPropertiesAction = new TDEAction (i18n("Attachment Pr&operties"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAttachProperties()), + mAttachPropertiesAction = new TDEAction (i18n("Attachment Pr&operties"), 0, this, + TQ_SLOT(slotAttachProperties()), actionCollection(), "attach_properties"); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); - KStdAction::preferences(kmkernel, TQT_SLOT(slotShowConfigurationDialog()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotEditKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection()); + KStdAction::preferences(kmkernel, TQ_SLOT(slotShowConfigurationDialog()), actionCollection()); - (void) new TDEAction (i18n("&Spellchecker..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheckConfig()), + (void) new TDEAction (i18n("&Spellchecker..."), 0, this, TQ_SLOT(slotSpellcheckConfig()), actionCollection(), "setup_spellchecker"); if ( Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) ) { @@ -1489,8 +1489,8 @@ void KMComposeWin::setupActions(void) "encrypt_message_chiasmus" ); a->setCheckedState( KGuiItem( i18n( "Encrypt Message with Chiasmus..." ), "chiencrypted" ) ); mEncryptChiasmusAction = a; - connect( mEncryptChiasmusAction, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotEncryptChiasmusToggled(bool)) ); + connect( mEncryptChiasmusAction, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotEncryptChiasmusToggled(bool)) ); } else { mEncryptChiasmusAction = 0; } @@ -1536,17 +1536,17 @@ void KMComposeWin::setupActions(void) setSigning( ( canOpenPGPSign || canSMIMESign ) && GlobalSettings::self()->pgpAutoSign() ); } - connect(mEncryptAction, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotEncryptToggled( bool ))); - connect(mSignAction, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotSignToggled( bool ))); + connect(mEncryptAction, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotEncryptToggled( bool ))); + connect(mSignAction, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotSignToggled( bool ))); TQStringList l; for ( int i = 0 ; i < numCryptoMessageFormats ; ++i ) l.push_back( Kleo::cryptoMessageFormatToLabel( cryptoMessageFormats[i] ) ); mCryptoModuleAction = new TDESelectAction( i18n( "&Cryptographic Message Format" ), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSelectCryptoModule()), + this, TQ_SLOT(slotSelectCryptoModule()), actionCollection(), "options_select_crypto" ); mCryptoModuleAction->setItems( l ); mCryptoModuleAction->setCurrentItem( format2cb( ident.preferredCryptoMessageFormat() ) ); @@ -1566,50 +1566,50 @@ void KMComposeWin::setupActions(void) "text_list" ); listAction->setItems( styleItems ); listAction->setToolTip( i18n( "Select a list style" ) ); - connect( listAction, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotListAction( const TQString& ) ) ); + connect( listAction, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotListAction( const TQString& ) ) ); fontAction = new TDEFontAction( "Select Font", 0, actionCollection(), "text_font" ); fontAction->setToolTip( i18n( "Select a font" ) ); - connect( fontAction, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotFontAction( const TQString& ) ) ); + connect( fontAction, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotFontAction( const TQString& ) ) ); fontSizeAction = new TDEFontSizeAction( "Select Size", 0, actionCollection(), "text_size" ); fontSizeAction->setToolTip( i18n( "Select a font size" ) ); - connect( fontSizeAction, TQT_SIGNAL( fontSizeChanged( int ) ), - TQT_SLOT( slotSizeAction( int ) ) ); + connect( fontSizeAction, TQ_SIGNAL( fontSizeChanged( int ) ), + TQ_SLOT( slotSizeAction( int ) ) ); alignLeftAction = new TDEToggleAction (i18n("Align Left"), "format-text-direction-ltr", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotAlignLeft()), actionCollection(), + this, TQ_SLOT(slotAlignLeft()), actionCollection(), "align_left"); alignLeftAction->setChecked( true ); alignRightAction = new TDEToggleAction (i18n("Align Right"), "format-text-direction-rtl", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotAlignRight()), actionCollection(), + this, TQ_SLOT(slotAlignRight()), actionCollection(), "align_right"); alignCenterAction = new TDEToggleAction (i18n("Align Center"), "text_center", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotAlignCenter()), actionCollection(), + this, TQ_SLOT(slotAlignCenter()), actionCollection(), "align_center"); textBoldAction = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B, - TQT_TQOBJECT(this), TQT_SLOT(slotTextBold()), + this, TQ_SLOT(slotTextBold()), actionCollection(), "format-text-bold"); textItalicAction = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I, - TQT_TQOBJECT(this), TQT_SLOT(slotTextItalic()), + this, TQ_SLOT(slotTextItalic()), actionCollection(), "format-text-italic"); textUnderAction = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U, - TQT_TQOBJECT(this), TQT_SLOT(slotTextUnder()), + this, TQ_SLOT(slotTextUnder()), actionCollection(), "format-text-underline"); actionFormatReset = new TDEAction( i18n( "Reset Font Settings" ), "eraser", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotFormatReset() ), + this, TQ_SLOT( slotFormatReset() ), actionCollection(), "format_reset"); actionFormatColor = new TDEAction( i18n( "Text Color..." ), "colorize", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotTextColor() ), + this, TQ_SLOT( slotTextColor() ), actionCollection(), "format_color"); // editorFocusChanged(false); createGUI("kmcomposerui.rc"); - connect( toolBar("htmlToolBar"), TQT_SIGNAL( visibilityChanged(bool) ), - TQT_TQOBJECT(this), TQT_SLOT( htmlToolBarVisibilityChanged(bool) ) ); + connect( toolBar("htmlToolBar"), TQ_SIGNAL( visibilityChanged(bool) ), + this, TQ_SLOT( htmlToolBarVisibilityChanged(bool) ) ); // In Kontact, this entry would read "Configure Kontact", but bring // up KMail's config dialog. That's sensible, though, so fix the label. @@ -1663,28 +1663,28 @@ void KMComposeWin::setupEditor(void) menu = new TQPopupMenu(this); //#ifdef BROKEN menu->insertItem(i18n("Undo"),mEditor, - TQT_SLOT(undo()), TDEStdAccel::shortcut(TDEStdAccel::Undo)); + TQ_SLOT(undo()), TDEStdAccel::shortcut(TDEStdAccel::Undo)); menu->insertItem(i18n("Redo"),mEditor, - TQT_SLOT(redo()), TDEStdAccel::shortcut(TDEStdAccel::Redo)); + TQ_SLOT(redo()), TDEStdAccel::shortcut(TDEStdAccel::Redo)); menu->insertSeparator(); //#endif //BROKEN - menu->insertItem(i18n("Cut"), this, TQT_SLOT(slotCut())); - menu->insertItem(i18n("Copy"), this, TQT_SLOT(slotCopy())); - menu->insertItem(i18n("Paste"), this, TQT_SLOT(slotPasteClipboard())); - menu->insertItem(i18n("Mark All"),this, TQT_SLOT(slotMarkAll())); + menu->insertItem(i18n("Cut"), this, TQ_SLOT(slotCut())); + menu->insertItem(i18n("Copy"), this, TQ_SLOT(slotCopy())); + menu->insertItem(i18n("Paste"), this, TQ_SLOT(slotPasteClipboard())); + menu->insertItem(i18n("Mark All"),this, TQ_SLOT(slotMarkAll())); menu->insertSeparator(); - menu->insertItem(i18n("Find..."), this, TQT_SLOT(slotFind())); - menu->insertItem(i18n("Replace..."), this, TQT_SLOT(slotReplace())); + menu->insertItem(i18n("Find..."), this, TQ_SLOT(slotFind())); + menu->insertItem(i18n("Replace..."), this, TQ_SLOT(slotReplace())); menu->insertSeparator(); - menu->insertItem(i18n("Fixed Font Widths"), this, TQT_SLOT(slotUpdateFont())); + menu->insertItem(i18n("Fixed Font Widths"), this, TQ_SLOT(slotUpdateFont())); mEditor->installRBPopup(menu); */ updateCursorPosition(); - connect(mEditor,TQT_SIGNAL(CursorPositionChanged()),TQT_SLOT(updateCursorPosition())); - connect( mEditor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ), - TQT_TQOBJECT(this), TQT_SLOT( fontChanged( const TQFont & ) ) ); - connect( mEditor, TQT_SIGNAL( currentAlignmentChanged( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( alignmentChanged( int ) ) ); + connect(mEditor,TQ_SIGNAL(CursorPositionChanged()),TQ_SLOT(updateCursorPosition())); + connect( mEditor, TQ_SIGNAL( currentFontChanged( const TQFont & ) ), + this, TQ_SLOT( fontChanged( const TQFont & ) ) ); + connect( mEditor, TQ_SIGNAL( currentAlignmentChanged( int ) ), + this, TQ_SLOT( alignmentChanged( int ) ) ); } @@ -1874,15 +1874,15 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign, // don't overwrite the header values with identity specific values // unless the identity is sticky if ( !stickyIdentity ) { - disconnect(mIdentity,TQT_SIGNAL(identityChanged(uint)), - TQT_TQOBJECT(this), TQT_SLOT(slotIdentityChanged(uint))); + disconnect(mIdentity,TQ_SIGNAL(identityChanged(uint)), + this, TQ_SLOT(slotIdentityChanged(uint))); } // load the mId into the gui, sticky or not, without emitting mIdentity->setCurrentIdentity( mId ); const uint idToApply = mId; if ( !stickyIdentity ) { - connect(mIdentity,TQT_SIGNAL(identityChanged(uint)), - TQT_TQOBJECT(this), TQT_SLOT(slotIdentityChanged(uint))); + connect(mIdentity,TQ_SIGNAL(identityChanged(uint)), + this, TQ_SLOT(slotIdentityChanged(uint))); } else { // load the message's state into the mId, without applying it to the gui // that's so we can detect that the id changed (because a sticky was set) @@ -2165,11 +2165,11 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign, // Not user friendy if this modal fileseletor opens before the // composer. // - //TQTimer::singleShot( 200, this, TQT_SLOT(slotAppendSignature()) ); + //TQTimer::singleShot( 200, this, TQ_SLOT(slotAppendSignature()) ); if ( GlobalSettings::self()->prependSignature() ) { - TQTimer::singleShot( 0, this, TQT_SLOT(slotPrependSignature()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotPrependSignature()) ); } else { - TQTimer::singleShot( 0, this, TQT_SLOT(slotAppendSignature()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAppendSignature()) ); } } @@ -2240,7 +2240,7 @@ bool KMComposeWin::queryClose () { if ( !mEditor->checkExternalEditorFinished() ) return false; - if ( kmkernel->shuttingDown() || kapp->sessionSaving() ) + if ( kmkernel->shuttingDown() || tdeApp->sessionSaving() ) return true; if ( mComposer && mComposer->isPerformingSignOperation() ) // since the non-gpg-agent gpg plugin gets a passphrase using TQDialog::exec() return false; // the user can try to close the window, which destroys mComposer mid-call. @@ -2358,8 +2358,8 @@ void KMComposeWin::applyChanges( bool dontSignNorEncrypt, bool dontDisable ) // Make new job and execute it mComposer = new MessageComposer( this ); - connect( mComposer, TQT_SIGNAL( done( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotComposerDone( bool ) ) ); + connect( mComposer, TQ_SIGNAL( done( bool ) ), + this, TQ_SLOT( slotComposerDone( bool ) ) ); // TODO: Add a cancel button for the following operations? // Disable any input to the window, so that we have a snapshot of the @@ -2435,10 +2435,10 @@ bool KMComposeWin::addAttach(const KURL aUrl) mMapAtmLoadData.insert(job, ld); mAttachJobs[job] = aUrl; - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotAttachFileResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &))); return true; } @@ -2467,10 +2467,10 @@ void KMComposeWin::addAttach(const KMMessagePart* msgPart) mTempDir = 0; } - connect( lvi, TQT_SIGNAL( compress( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( compressAttach( int ) ) ); - connect( lvi, TQT_SIGNAL( uncompress( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( uncompressAttach( int ) ) ); + connect( lvi, TQ_SIGNAL( compress( int ) ), + this, TQ_SLOT( compressAttach( int ) ) ); + connect( lvi, TQ_SIGNAL( uncompress( int ) ), + this, TQ_SLOT( uncompressAttach( int ) ) ); slotUpdateAttachActions(); } @@ -3019,10 +3019,10 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u) } } mMapAtmLoadData.insert(job, ld); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotAttachFileResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &))); } @@ -3149,8 +3149,8 @@ void KMComposeWin::startPublicKeyExport() { Kleo::ExportJob * job = Kleo::CryptoBackendFactory::instance()->openpgp()->publicKeyExportJob( true ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), - this, TQT_SLOT(slotPublicKeyExportResult(const GpgME::Error&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), + this, TQ_SLOT(slotPublicKeyExportResult(const GpgME::Error&,const TQByteArray&)) ); const GpgME::Error err = job->start( mFingerprint ); if ( err ) @@ -3206,21 +3206,21 @@ void KMComposeWin::slotAttachPopupMenu(TQListViewItem *, const TQPoint &, int) mAttachMenu = new TQPopupMenu(this); mOpenId = mAttachMenu->insertItem(i18n("to open", "Open"), this, - TQT_SLOT(slotAttachOpen())); + TQ_SLOT(slotAttachOpen())); mOpenWithId = mAttachMenu->insertItem(i18n("Open With..."), this, - TQT_SLOT(slotAttachOpenWith())); + TQ_SLOT(slotAttachOpenWith())); mViewId = mAttachMenu->insertItem(i18n("to view", "View"), this, - TQT_SLOT(slotAttachView())); - mEditId = mAttachMenu->insertItem( i18n("Edit"), this, TQT_SLOT(slotAttachEdit()) ); + TQ_SLOT(slotAttachView())); + mEditId = mAttachMenu->insertItem( i18n("Edit"), this, TQ_SLOT(slotAttachEdit()) ); mEditWithId = mAttachMenu->insertItem( i18n("Edit With..."), this, - TQT_SLOT(slotAttachEditWith()) ); - mRemoveId = mAttachMenu->insertItem(i18n("Remove"), this, TQT_SLOT(slotAttachRemove())); + TQ_SLOT(slotAttachEditWith()) ); + mRemoveId = mAttachMenu->insertItem(i18n("Remove"), this, TQ_SLOT(slotAttachRemove())); mSaveAsId = mAttachMenu->insertItem( SmallIconSet("document-save-as"), i18n("Save As..."), this, - TQT_SLOT( slotAttachSave() ) ); + TQ_SLOT( slotAttachSave() ) ); mPropertiesId = mAttachMenu->insertItem( i18n("Properties"), this, - TQT_SLOT( slotAttachProperties() ) ); + TQ_SLOT( slotAttachProperties() ) ); mAttachMenu->insertSeparator(); - mAttachMenu->insertItem(i18n("Add Attachment..."), this, TQT_SLOT(slotAttachFile())); + mAttachMenu->insertItem(i18n("Add Attachment..."), this, TQ_SLOT(slotAttachFile())); } int selectedCount = 0; @@ -3575,8 +3575,8 @@ void KMComposeWin::editAttach(int index, bool openWith) KMail::EditorWatcher *watcher = new KMail::EditorWatcher( KURL( atmTempFile->name() ), contentTypeStr, openWith, - TQT_TQOBJECT(this), this ); - connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(slotEditDone(KMail::EditorWatcher*)) ); + this, this ); + connect( watcher, TQ_SIGNAL(editDone(KMail::EditorWatcher*)), TQ_SLOT(slotEditDone(KMail::EditorWatcher*)) ); if ( watcher->start() ) { mEditorMap.insert( watcher, msgPart ); mEditorTempFiles.insert( watcher, atmTempFile ); @@ -3830,7 +3830,7 @@ void KMComposeWin::slotCopy() #endif TQKeyEvent k(TQEvent::KeyPress, Key_C, 0, ControlButton); - kapp->notify(fw, &k); + tdeApp->notify(fw, &k); } @@ -4082,15 +4082,15 @@ void KMComposeWin::ignoreStickyFields() void KMComposeWin::slotPrint() { mMessageWasModified = isModified(); - connect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotContinuePrint( bool ) ) ); + connect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + this, TQ_SLOT( slotContinuePrint( bool ) ) ); applyChanges( true ); } void KMComposeWin::slotContinuePrint( bool rc ) { - disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotContinuePrint( bool ) ) ); + disconnect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + this, TQ_SLOT( slotContinuePrint( bool ) ) ); if( rc ) { if ( mComposedMessages.isEmpty() ) { @@ -4220,8 +4220,8 @@ void KMComposeWin::doSend( KMail::MessageSender::SendMethod method, const bool neverEncrypt = ( mDisableBreaking && GlobalSettings::self()->neverEncryptDrafts() ) || mSigningAndEncryptionExplicitlyDisabled; - connect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - TQT_SLOT( slotContinueDoSend( bool ) ) ); + connect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + TQ_SLOT( slotContinueDoSend( bool ) ) ); if ( mEditor->textFormat() == TQt::RichText ) mMsg->setHeaderField( "X-KMail-Markup", "true" ); @@ -4333,8 +4333,8 @@ void KMComposeWin::slotContinueDoSend( bool sentOk ) { kdDebug(5006) << "KMComposeWin::slotContinueDoSend( " << sentOk << " )" << endl; - disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotContinueDoSend( bool ) ) ); + disconnect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + this, TQ_SLOT( slotContinueDoSend( bool ) ) ); if ( !sentOk ) { mDisableBreaking = false; @@ -4576,7 +4576,7 @@ void KMComposeWin::insertSignature( SignaturePlacement placement ) //----------------------------------------------------------------------------- void KMComposeWin::slotHelp() { - kapp->invokeHelp(); + tdeApp->invokeHelp(); } //----------------------------------------------------------------------------- @@ -4735,8 +4735,8 @@ void KMComposeWin::slotSpellcheck() mSubjectTextWasSpellChecked = false; mSpellCheckInProgress=true; /* - connect (mEditor, TQT_SIGNAL (spellcheck_progress (unsigned)), - this, TQT_SLOT (spell_progress (unsigned))); + connect (mEditor, TQ_SIGNAL (spellcheck_progress (unsigned)), + this, TQ_SLOT (spell_progress (unsigned))); */ mEditor->spellcheck(); @@ -4791,7 +4791,7 @@ void KMComposeWin::slotSpellcheckDone(int result) statusBar()->changeItem(i18n(" Spell check complete."),0); break; } - TQTimer::singleShot( 2000, this, TQT_SLOT(slotSpellcheckDoneClearStatus()) ); + TQTimer::singleShot( 2000, this, TQ_SLOT(slotSpellcheckDoneClearStatus()) ); } void KMComposeWin::slotSpellcheckDoneClearStatus() @@ -4989,7 +4989,7 @@ void KMComposeWin::slotSpellcheckConfig() { KDialogBase dlg(KDialogBase::Plain, i18n("Spellchecker"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, - TQT_TQWIDGET(this), 0, true, true ); + this, 0, true, true ); KWin twin; TQTabDialog qtd (this, "tabdialog", true); KSpellConfig mKSpellConfig (&qtd); @@ -4998,7 +4998,7 @@ void KMComposeWin::slotSpellcheckConfig() qtd.addTab (&mKSpellConfig, i18n("Spellchecker")); qtd.setCancelButton (); - twin.setIcons (qtd.winId(), kapp->icon(), kapp->miniIcon()); + twin.setIcons (qtd.winId(), tdeApp->icon(), tdeApp->miniIcon()); qtd.setCancelButton(KStdGuiItem::cancel().text()); qtd.setOkButton(KStdGuiItem::ok().text()); @@ -5017,8 +5017,8 @@ void KMComposeWin::slotEditToolbars() saveMainWindowSettings(KMKernel::config(), "Composer"); KEditToolbar dlg(guiFactory(), this); - connect( &dlg, TQT_SIGNAL(newToolbarConfig()), - TQT_SLOT(slotUpdateToolbars()) ); + connect( &dlg, TQ_SIGNAL(newToolbarConfig()), + TQ_SLOT(slotUpdateToolbars()) ); dlg.exec(); } @@ -5078,8 +5078,8 @@ void KMComposeWin::updateAutoSave() else { if ( !mAutoSaveTimer ) { mAutoSaveTimer = new TQTimer( this, "mAutoSaveTimer" ); - connect( mAutoSaveTimer, TQT_SIGNAL( timeout() ), - TQT_TQOBJECT(this), TQT_SLOT( autoSaveMessage() ) ); + connect( mAutoSaveTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( autoSaveMessage() ) ); } mAutoSaveTimer->start( autoSaveInterval() ); } @@ -5310,8 +5310,8 @@ void KMComposeWin::slotEncryptChiasmusToggled( bool on ) { return; } - STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) ); - if ( !job.get() ) { + STD_NAMESPACE_PREFIX unique_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) ); + if ( !job ) { const TQString msg = i18n( "Chiasmus backend does not offer the " "\"x-obtain-keys\" function. Please report this bug." ); KMessageBox::error( this, msg, i18n( "Chiasmus Backend Error" ) ); @@ -5410,7 +5410,7 @@ void KMComposeWin::slotAttachmentDragStarted() void KMComposeWin::recipientEditorSizeHintChanged() { - TQTimer::singleShot( 1, this, TQT_SLOT(setMaximumHeaderSize()) ); + TQTimer::singleShot( 1, this, TQ_SLOT(setMaximumHeaderSize()) ); } void KMComposeWin::setMaximumHeaderSize() diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index 942fc001..76f46060 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -157,8 +157,8 @@ public: // kmkernel, kmcommands, callback * Set the message the composer shall work with. This discards * previous messages without calling applyChanges() on them before. */ - void setMsg(KMMessage* newMsg, bool mayAutoSign=TRUE, - bool allowDecryption=FALSE, bool isModified=FALSE); + void setMsg(KMMessage* newMsg, bool mayAutoSign=true, + bool allowDecryption=false, bool isModified=false); void disableWordWrap(); @@ -215,7 +215,7 @@ private: public: // kmkernel, callback /** * If this flag is set the message of the composer is deleted when - * the composer is closed and the message was not sent. Default: FALSE + * the composer is closed and the message was not sent. Default: false */ inline void setAutoDelete(bool f) { mAutoDeleteMsg = f; } @@ -235,7 +235,7 @@ public: // kmkernel, kmcommand, mailserviceimpl /** * Recode to the specified charset */ - void setCharset(const TQCString& aCharset, bool forceDefault = FALSE); + void setCharset(const TQCString& aCharset, bool forceDefault = false); public: // kmcommand /** @@ -527,7 +527,7 @@ signals: private: /** * Applies the user changes to the message object of the composer - * and signs/encrypts the message if activated. Returns FALSE in + * and signs/encrypts the message if activated. Returns false in * case of an error (e.g. if PGP encryption fails). * Disables the controls of the composer window unless @dontDisable * is true. diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 960eb455..e19b0f46 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -21,7 +21,7 @@ using KPIM::MailListDrag; #include <libemailfunctions/email.h> #include <kcursor.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdepopupmenu.h> #include <kdebug.h> @@ -226,21 +226,21 @@ KMEdit::KMEdit(TQWidget *parent, KMComposeWin* composer, mSpellLineEdit( false ), mPasteMode( TQClipboard::Clipboard ) { - connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); + connect( this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) ); installEventFilter(this); KCursor::setAutoHideCursor( this, true, true ); setOverwriteEnabled( true ); createSpellers(); - connect( mSpellConfig, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( createSpellers() ) ); - connect( mSpeller, TQT_SIGNAL( death() ), - this, TQT_SLOT( spellerDied() ) ); + connect( mSpellConfig, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( createSpellers() ) ); + connect( mSpeller, TQ_SIGNAL( death() ), + this, TQ_SLOT( spellerDied() ) ); } void KMEdit::createSpellers() { delete mSpeller; - mSpeller = new KMSpell( TQT_TQOBJECT(this), TQT_SLOT( spellerReady( KSpell * ) ), mSpellConfig ); + mSpeller = new KMSpell( this, TQ_SLOT( spellerReady( KSpell * ) ), mSpellConfig ); } void KMEdit::initializeAutoSpellChecking() @@ -250,7 +250,7 @@ void KMEdit::initializeAutoSpellChecking() TQColor defaultColor1( 0x00, 0x80, 0x00 ); // defaults from kmreaderwin.cpp TQColor defaultColor2( 0x00, 0x70, 0x00 ); TQColor defaultColor3( 0x00, 0x60, 0x00 ); - TQColor defaultForeground( kapp->palette().active().text() ); + TQColor defaultForeground( tdeApp->palette().active().text() ); TQColor c = TQt::red; TDEConfigGroup readerConfig( KMKernel::config(), "Reader" ); @@ -270,8 +270,8 @@ void KMEdit::initializeAutoSpellChecking() col1, col2, col3, col4, mSpellConfig ); - connect( mHighlighter, TQT_SIGNAL(newSuggestions(const TQString&, const TQStringList&, unsigned int)), - this, TQT_SLOT(addSuggestion(const TQString&, const TQStringList&, unsigned int)) ); + connect( mHighlighter, TQ_SIGNAL(newSuggestions(const TQString&, const TQStringList&, unsigned int)), + this, TQ_SLOT(addSuggestion(const TQString&, const TQStringList&, unsigned int)) ); } @@ -449,17 +449,17 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) *mExtEditorProcess << sysLine.left(sysLine.find(" ")).local8Bit(); sysLine.remove(0, sysLine.find(" ") + 1); } - connect(mExtEditorProcess, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotExternalEditorDone(TDEProcess*))); + connect(mExtEditorProcess, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotExternalEditorDone(TDEProcess*))); if (!mExtEditorProcess->start()) { KMessageBox::error( topLevelWidget(), i18n("Unable to start external editor.") ); killExternalEditor(); } else { - mExtEditorTempFileWatcher = new KDirWatch( TQT_TQOBJECT(this), "mExtEditorTempFileWatcher" ); - connect( mExtEditorTempFileWatcher, TQT_SIGNAL(dirty(const TQString&)), - TQT_SLOT(slotExternalEditorTempFileChanged(const TQString&)) ); + mExtEditorTempFileWatcher = new KDirWatch( this, "mExtEditorTempFileWatcher" ); + connect( mExtEditorTempFileWatcher, TQ_SIGNAL(dirty(const TQString&)), + TQ_SLOT(slotExternalEditorTempFileChanged(const TQString&)) ); mExtEditorTempFileWatcher->addFile( mExtEditorTempFile->name() ); } return true; @@ -542,7 +542,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) if ( mHighlighter ) { // Wait a bit until reloading the highlighter, the mSpeller first needs to finish saving // the personal word list. - TQTimer::singleShot( 200, mHighlighter, TQT_SLOT( slotLocalSpellConfigChanged() ) ); + TQTimer::singleShot( 200, mHighlighter, TQ_SLOT( slotLocalSpellConfigChanged() ) ); } } else if( id > -1 ) @@ -651,28 +651,28 @@ void KMEdit::spellcheck() // if (textFormat() == TQt::RichText ) { // kdDebug(5006) << "KMEdit::spellcheck, spellchecking for RichText" << endl; // mKSpellForDialog = new KSpell(this, i18n("Spellcheck - KMail"), this, -// TQT_SLOT(slotSpellcheck2(KSpell*)),0,true,false,KSpell::HTML); +// TQ_SLOT(slotSpellcheck2(KSpell*)),0,true,false,KSpell::HTML); // } // else { // Don't use mSpellConfig here. Reason is that the spell dialog, KSpellDlg, uses its own // spell config, and therefore the two wouldn't be in sync. - mKSpellForDialog = new KSpell( TQT_TQWIDGET(this), i18n("Spellcheck - KMail"), TQT_TQOBJECT(this), - TQT_SLOT(slotSpellcheck2(KSpell*))/*, mSpellConfig*/ ); + mKSpellForDialog = new KSpell( this, i18n("Spellcheck - KMail"), this, + TQ_SLOT(slotSpellcheck2(KSpell*))/*, mSpellConfig*/ ); // } TQStringList l = KSpellingHighlighter::personalWords(); for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) { mKSpellForDialog->addPersonal( *it ); } - connect (mKSpellForDialog, TQT_SIGNAL( death()), - this, TQT_SLOT (slotSpellDone())); - connect (mKSpellForDialog, TQT_SIGNAL (misspelling (const TQString &, const TQStringList &, unsigned int)), - this, TQT_SLOT (slotMisspelling (const TQString &, const TQStringList &, unsigned int))); - connect (mKSpellForDialog, TQT_SIGNAL (corrected (const TQString &, const TQString &, unsigned int)), - this, TQT_SLOT (slotCorrected (const TQString &, const TQString &, unsigned int))); - connect (mKSpellForDialog, TQT_SIGNAL (done(const TQString &)), - this, TQT_SLOT (slotSpellResult (const TQString&))); + connect (mKSpellForDialog, TQ_SIGNAL( death()), + this, TQ_SLOT (slotSpellDone())); + connect (mKSpellForDialog, TQ_SIGNAL (misspelling (const TQString &, const TQStringList &, unsigned int)), + this, TQ_SLOT (slotMisspelling (const TQString &, const TQStringList &, unsigned int))); + connect (mKSpellForDialog, TQ_SIGNAL (corrected (const TQString &, const TQString &, unsigned int)), + this, TQ_SLOT (slotCorrected (const TQString &, const TQString &, unsigned int))); + connect (mKSpellForDialog, TQ_SIGNAL (done(const TQString &)), + this, TQ_SLOT (slotSpellResult (const TQString&))); } void KMEdit::cut() diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp index fdd444b4..93899599 100644 --- a/kmail/kmfawidgets.cpp +++ b/kmail/kmfawidgets.cpp @@ -14,7 +14,7 @@ #include <kaudioplayer.h> #include <kurlrequester.h> #include <tdefiledialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqlayout.h> #include <tqtooltip.h> @@ -39,10 +39,10 @@ KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* pare TQToolTip::add( mBtn, i18n( "Open Address Book" ) ); hbl->addWidget( mBtn ); - connect( mBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddrBook()) ); - connect( mLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SIGNAL( textChanged(const TQString&) ) ); + connect( mBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddrBook()) ); + connect( mLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SIGNAL( textChanged(const TQString&) ) ); } void KMFilterActionWithAddressWidget::slotAddrBook() @@ -75,14 +75,14 @@ KMSoundTestWidget::KMSoundTestWidget(TQWidget *parent, const char *name) TQHBoxLayout *lay1 = new TQHBoxLayout( this ); m_playButton = new TQPushButton( this, "m_playButton" ); m_playButton->setPixmap( SmallIcon( "1rightarrow" ) ); - connect( m_playButton, TQT_SIGNAL( clicked() ), TQT_SLOT( playSound() )); + connect( m_playButton, TQ_SIGNAL( clicked() ), TQ_SLOT( playSound() )); lay1->addWidget( m_playButton ); m_urlRequester = new KURLRequester( this ); lay1->addWidget( m_urlRequester ); - connect( m_urlRequester, TQT_SIGNAL( openFileDialog( KURLRequester * )), - TQT_SLOT( openSoundDialog( KURLRequester * ))); - connect( m_urlRequester->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & )), TQT_SLOT( slotUrlChanged(const TQString & ))); + connect( m_urlRequester, TQ_SIGNAL( openFileDialog( KURLRequester * )), + TQ_SLOT( openSoundDialog( KURLRequester * ))); + connect( m_urlRequester->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & )), TQ_SLOT( slotUrlChanged(const TQString & ))); slotUrlChanged(m_urlRequester->lineEdit()->text() ); } diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp index d97e5fa7..fb89777f 100644 --- a/kmail/kmfilteraction.cpp +++ b/kmail/kmfilteraction.cpp @@ -39,7 +39,7 @@ using KMail::RegExpLineEdit; #include <tdetempfile.h> #include <kdebug.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kaudioplayer.h> #include <kurlrequester.h> @@ -1423,8 +1423,8 @@ void KMFilterActionCopy::processAsync(KMMessage* msg) const ActionScheduler *handler = MessageProperty::filterHandler( msg ); KMCommand *cmd = new KMCopyCommand( mFolder, msg ); - TQObject::connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - handler, TQT_SLOT( copyMessageFinished( KMCommand * ) ) ); + TQObject::connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + handler, TQ_SLOT( copyMessageFinished( KMCommand * ) ) ); cmd->start(); } @@ -1816,7 +1816,7 @@ void KMFilterActionExtFilter::processAsync(KMMessage* aMsg) const inFile->close(); PipeJob *job = new PipeJob(0, 0, aMsg, commandLine, tempFileName); - TQObject::connect ( job, TQT_SIGNAL( done() ), handler, TQT_SLOT( actionMessage() ) ); + TQObject::connect ( job, TQ_SIGNAL( done() ), handler, TQ_SLOT( actionMessage() ) ); kmkernel->weaver()->enqueue(job); } diff --git a/kmail/kmfilteraction.h b/kmail/kmfilteraction.h index f0705b58..1242a1b3 100644 --- a/kmail/kmfilteraction.h +++ b/kmail/kmfilteraction.h @@ -107,7 +107,7 @@ public: quick test. Eg., actions that have a mail address as parameter shouldn't try real address validation, but only check if the string representation is empty. */ - virtual bool isEmpty() const { return FALSE; } + virtual bool isEmpty() const { return false; } /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ @@ -138,7 +138,7 @@ public: /** Called from the filter when a folder is removed. Tests if the folder @p aFolder is used and changes to @p aNewFolder in this - case. Returns TRUE if a change was made. */ + case. Returns true if a change was made. */ virtual bool folderRemoved(KMFolder* aFolder, KMFolder* aNewFolder); /** Static function that creates a filter action of this type. */ @@ -431,7 +431,7 @@ public: /** Called from the filter when a folder is removed. Tests if the folder @p aFolder is used and changes to @p aNewFolder in this - case. Returns TRUE if a change was made. */ + case. Returns true if a change was made. */ virtual bool folderRemoved(KMFolder* aFolder, KMFolder* aNewFolder); protected: diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index 32eb1492..51fd8ac9 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -134,14 +134,14 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo Ok /* default btn */, false /* separator */), bPopFilter(popFilter) { - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() ); setHelp( (bPopFilter)? KMPopFilterDlgHelpAnchor: KMFilterDlgHelpAnchor ); setButtonText( User1, i18n("Import") ); setButtonText( User2, i18n("Export") ); - connect( this, TQT_SIGNAL(user1Clicked()), - this, TQT_SLOT( slotImportFilters()) ); - connect( this, TQT_SIGNAL(user2Clicked()), - this, TQT_SLOT( slotExportFilters()) ); + connect( this, TQ_SIGNAL(user1Clicked()), + this, TQ_SLOT( slotImportFilters()) ); + connect( this, TQ_SIGNAL(user2Clicked()), + this, TQ_SLOT( slotExportFilters()) ); TQWidget *w = new TQWidget( this ); setMainWidget( w ); @@ -262,81 +262,81 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo vbl->addStretch( 1 ); // load the filter parts into the edit widgets - connect( mFilterList, TQT_SIGNAL(filterSelected(KMFilter*)), - this, TQT_SLOT(slotFilterSelected(KMFilter*)) ); + connect( mFilterList, TQ_SIGNAL(filterSelected(KMFilter*)), + this, TQ_SLOT(slotFilterSelected(KMFilter*)) ); if (bPopFilter){ // set the state of the global setting 'show later msgs' - connect( mShowLaterBtn, TQT_SIGNAL(toggled(bool)), - mFilterList, TQT_SLOT(slotShowLaterToggled(bool))); + connect( mShowLaterBtn, TQ_SIGNAL(toggled(bool)), + mFilterList, TQ_SLOT(slotShowLaterToggled(bool))); // set the action in the filter when changed - connect( mActionGroup, TQT_SIGNAL(actionChanged(const KMPopFilterAction)), - this, TQT_SLOT(slotActionChanged(const KMPopFilterAction)) ); + connect( mActionGroup, TQ_SIGNAL(actionChanged(const KMPopFilterAction)), + this, TQ_SLOT(slotActionChanged(const KMPopFilterAction)) ); } else { // transfer changes from the 'Apply this filter on...' // combo box to the filter - connect( mApplyOnIn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mApplyOnForAll, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mApplyOnForTraditional, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mApplyOnForChecked, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mApplyOnOut, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mApplyOnCtrlJ, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mAccountList, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotApplicableAccountsChanged()) ); - connect( mAccountList, TQT_SIGNAL(spacePressed(TQListViewItem*)), - this, TQT_SLOT(slotApplicableAccountsChanged()) ); + connect( mApplyOnIn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mApplyOnForAll, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mApplyOnForTraditional, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mApplyOnForChecked, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mApplyOnOut, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mApplyOnCtrlJ, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mAccountList, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotApplicableAccountsChanged()) ); + connect( mAccountList, TQ_SIGNAL(spacePressed(TQListViewItem*)), + this, TQ_SLOT(slotApplicableAccountsChanged()) ); // transfer changes from the 'stop processing here' // check box to the filter - connect( mStopProcessingHere, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotStopProcessingButtonToggled(bool)) ); + connect( mStopProcessingHere, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotStopProcessingButtonToggled(bool)) ); - connect( mConfigureShortcut, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotConfigureShortcutButtonToggled(bool)) ); + connect( mConfigureShortcut, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotConfigureShortcutButtonToggled(bool)) ); - connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ), - this, TQT_SLOT( slotCapturedShortcutChanged( const TDEShortcut& ) ) ); + connect( mKeyButton, TQ_SIGNAL( capturedShortcut( const TDEShortcut& ) ), + this, TQ_SLOT( slotCapturedShortcutChanged( const TDEShortcut& ) ) ); - connect( mConfigureToolbar, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotConfigureToolbarButtonToggled(bool)) ); + connect( mConfigureToolbar, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotConfigureToolbarButtonToggled(bool)) ); - connect( mFilterActionIconButton, TQT_SIGNAL( iconChanged( TQString ) ), - this, TQT_SLOT( slotFilterActionIconChanged( TQString ) ) ); + connect( mFilterActionIconButton, TQ_SIGNAL( iconChanged( TQString ) ), + this, TQ_SLOT( slotFilterActionIconChanged( TQString ) ) ); } // reset all widgets here - connect( mFilterList, TQT_SIGNAL(resetWidgets()), - this, TQT_SLOT(slotReset()) ); + connect( mFilterList, TQ_SIGNAL(resetWidgets()), + this, TQ_SLOT(slotReset()) ); - connect( mFilterList, TQT_SIGNAL( applyWidgets() ), - this, TQT_SLOT( slotUpdateFilter() ) ); + connect( mFilterList, TQ_SIGNAL( applyWidgets() ), + this, TQ_SLOT( slotUpdateFilter() ) ); // support auto-naming the filter - connect( mPatternEdit, TQT_SIGNAL(maybeNameChanged()), - mFilterList, TQT_SLOT(slotUpdateFilterName()) ); + connect( mPatternEdit, TQ_SIGNAL(maybeNameChanged()), + mFilterList, TQ_SLOT(slotUpdateFilterName()) ); // apply changes on 'Apply' - connect( this, TQT_SIGNAL(applyClicked()), - mFilterList, TQT_SLOT(slotApplyFilterChanges()) ); + connect( this, TQ_SIGNAL(applyClicked()), + mFilterList, TQ_SLOT(slotApplyFilterChanges()) ); // apply changes on 'OK' - connect( this, TQT_SIGNAL(okClicked()), - mFilterList, TQT_SLOT(slotApplyFilterChanges()) ); + connect( this, TQ_SIGNAL(okClicked()), + mFilterList, TQ_SLOT(slotApplyFilterChanges()) ); // save dialog size on 'OK' - connect( this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(slotSaveSize()) ); + connect( this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(slotSaveSize()) ); // destruct the dialog on OK, close and Cancel - connect( this, TQT_SIGNAL(finished()), - this, TQT_SLOT(slotFinished()) ); + connect( this, TQ_SIGNAL(finished()), + this, TQ_SLOT(slotFinished()) ); TDEConfigGroup geometry( KMKernel::config(), "Geometry"); const char * configKey @@ -642,31 +642,31 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons hb = new TQHBox( this ); hb->setSpacing( 4 ); TQPushButton *btn = new TQPushButton( i18n("Select Source Folders"), hb ); - connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectSourceFolders()) ); + connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectSourceFolders()) ); } //----------- now connect everything - connect( mListBox, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotSelected(int)) ); - connect( mListBox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * )), - this, TQT_SLOT( slotRename()) ); - connect( mBtnTop, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotTop()) ); - connect( mBtnUp, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotUp()) ); - connect( mBtnDown, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDown()) ); - connect( mBtnBot, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotBottom()) ); - connect( mBtnNew, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNew()) ); - connect( mBtnCopy, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopy()) ); - connect( mBtnDelete, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDelete()) ); - connect( mBtnRename, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRename()) ); + connect( mListBox, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotSelected(int)) ); + connect( mListBox, TQ_SIGNAL( doubleClicked ( TQListBoxItem * )), + this, TQ_SLOT( slotRename()) ); + connect( mBtnTop, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotTop()) ); + connect( mBtnUp, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotUp()) ); + connect( mBtnDown, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDown()) ); + connect( mBtnBot, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotBottom()) ); + connect( mBtnNew, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNew()) ); + connect( mBtnCopy, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopy()) ); + connect( mBtnDelete, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDelete()) ); + connect( mBtnRename, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRename()) ); // the dialog should call loadFilterList() // when all signals are connected. @@ -1152,8 +1152,8 @@ KMFilterActionWidget::KMFilterActionWidget( TQWidget *parent, const char* name ) setFocusProxy( mComboBox ); // now connect the combo box and the widget stack - connect( mComboBox, TQT_SIGNAL(activated(int)), - mWidgetStack, TQT_SLOT(raiseWidget(int)) ); + connect( mComboBox, TQ_SIGNAL(activated(int)), + mWidgetStack, TQ_SLOT(raiseWidget(int)) ); } void KMFilterActionWidget::setAction( const KMFilterAction* aAction ) @@ -1306,8 +1306,8 @@ KMPopFilterActionWidget::KMPopFilterActionWidget( const TQString& title, TQWidge mIdMap[id(mActionMap[Down])] = Down; mIdMap[id(mActionMap[Delete])] = Delete; - connect( this, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT( slotActionClicked(int)) ); + connect( this, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT( slotActionClicked(int)) ); } void KMPopFilterActionWidget::setAction( KMPopFilterAction aAction ) diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp index 8c47afc0..f98a78dd 100644 --- a/kmail/kmfiltermgr.cpp +++ b/kmail/kmfiltermgr.cpp @@ -41,8 +41,8 @@ KMFilterMgr::KMFilterMgr( bool popFilter ) mBufferedFolderTarget( true ), mRefCount( 0 ) { - connect( kmkernel, TQT_SIGNAL( folderRemoved( KMFolder* ) ), - this, TQT_SLOT( slotFolderRemoved( KMFolder* ) ) ); + connect( kmkernel, TQ_SIGNAL( folderRemoved( KMFolder* ) ), + this, TQ_SLOT( slotFolderRemoved( KMFolder* ) ) ); } diff --git a/kmail/kmfiltermgr.h b/kmail/kmfiltermgr.h index 70288a3a..a6805172 100644 --- a/kmail/kmfiltermgr.h +++ b/kmail/kmfiltermgr.h @@ -50,7 +50,7 @@ public: void readConfig(void); /** Store filter rules in config file. */ - void writeConfig(bool withSync=TRUE); + void writeConfig(bool withSync=true); /** Open an edit dialog. If checkForEmptyFilterList is true, an empty filter is created to improve the visibility of the dialog in case no filter @@ -157,7 +157,7 @@ public: /** Called from the folder manager when a folder is removed. Tests if the folder aFolder is used in any action. Changes - to aNewFolder folder in this case. Returns TRUE if a change + to aNewFolder folder in this case. Returns true if a change occurred. */ bool folderRemoved(KMFolder* aFolder, KMFolder* aNewFolder); diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp index b1b9c261..4bcd4992 100644 --- a/kmail/kmfolder.cpp +++ b/kmail/kmfolder.cpp @@ -87,53 +87,53 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName, } if ( aParent ) { - connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), - aParent->manager(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) ); - connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), - parent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); - connect( this, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ), - parent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) ); - connect( this, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), - parent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); - connect( mStorage, TQT_SIGNAL( invalidated( KMFolder* ) ), - parent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) ); + connect( mStorage, TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), + aParent->manager(), TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) ); + connect( mStorage, TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), + parent()->manager(), TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); + connect( this, TQ_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ), + parent()->manager(), TQ_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) ); + connect( this, TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), + parent()->manager(), TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); + connect( mStorage, TQ_SIGNAL( invalidated( KMFolder* ) ), + parent()->manager(), TQ_SIGNAL( folderInvalidated( KMFolder* ) ) ); } // Resend all mStorage signals - connect( mStorage, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) ); - connect( mStorage, TQT_SIGNAL( cleared() ), TQT_SIGNAL( cleared() ) ); - connect( mStorage, TQT_SIGNAL( expunged( KMFolder* ) ), - TQT_SIGNAL( expunged( KMFolder* ) ) ); - connect( mStorage, TQT_SIGNAL( nameChanged() ), TQT_SIGNAL( nameChanged() ) ); - connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), - TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); - connect( mStorage, TQT_SIGNAL( msgRemoved( int, TQString ) ), - TQT_SIGNAL( msgRemoved( int, TQString ) ) ); - connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder* ) ), - TQT_SIGNAL( msgRemoved( KMFolder* ) ) ); - connect( mStorage, TQT_SIGNAL( msgAdded( int ) ), TQT_SIGNAL( msgAdded( int ) ) ); - connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), - TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) ); - connect( mStorage, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ), - TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ) ); - connect( mStorage, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), - TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); - connect( mStorage, TQT_SIGNAL( statusMsg( const TQString& ) ), - TQT_SIGNAL( statusMsg( const TQString& ) ) ); - connect( mStorage, TQT_SIGNAL( numUnreadMsgsChanged( KMFolder* ) ), - TQT_SIGNAL( numUnreadMsgsChanged( KMFolder* ) ) ); - connect( mStorage, TQT_SIGNAL( removed( KMFolder*, bool ) ), - TQT_SIGNAL( removed( KMFolder*, bool ) ) ); - connect( mStorage, TQT_SIGNAL(noContentChanged()), - TQT_SIGNAL(noContentChanged()) ); - connect( mStorage, TQT_SIGNAL(syncStateChanged()), - TQT_SIGNAL(syncStateChanged()) ); - - connect( mStorage, TQT_SIGNAL( contentsTypeChanged( KMail::FolderContentsType ) ), - this, TQT_SLOT( slotContentsTypeChanged( KMail::FolderContentsType ) ) ); - - connect( mStorage, TQT_SIGNAL( folderSizeChanged() ), - this, TQT_SLOT( slotFolderSizeChanged() ) ); + connect( mStorage, TQ_SIGNAL( changed() ), TQ_SIGNAL( changed() ) ); + connect( mStorage, TQ_SIGNAL( cleared() ), TQ_SIGNAL( cleared() ) ); + connect( mStorage, TQ_SIGNAL( expunged( KMFolder* ) ), + TQ_SIGNAL( expunged( KMFolder* ) ) ); + connect( mStorage, TQ_SIGNAL( nameChanged() ), TQ_SIGNAL( nameChanged() ) ); + connect( mStorage, TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), + TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); + connect( mStorage, TQ_SIGNAL( msgRemoved( int, TQString ) ), + TQ_SIGNAL( msgRemoved( int, TQString ) ) ); + connect( mStorage, TQ_SIGNAL( msgRemoved( KMFolder* ) ), + TQ_SIGNAL( msgRemoved( KMFolder* ) ) ); + connect( mStorage, TQ_SIGNAL( msgAdded( int ) ), TQ_SIGNAL( msgAdded( int ) ) ); + connect( mStorage, TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), + TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) ); + connect( mStorage, TQ_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ), + TQ_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ) ); + connect( mStorage, TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), + TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); + connect( mStorage, TQ_SIGNAL( statusMsg( const TQString& ) ), + TQ_SIGNAL( statusMsg( const TQString& ) ) ); + connect( mStorage, TQ_SIGNAL( numUnreadMsgsChanged( KMFolder* ) ), + TQ_SIGNAL( numUnreadMsgsChanged( KMFolder* ) ) ); + connect( mStorage, TQ_SIGNAL( removed( KMFolder*, bool ) ), + TQ_SIGNAL( removed( KMFolder*, bool ) ) ); + connect( mStorage, TQ_SIGNAL(noContentChanged()), + TQ_SIGNAL(noContentChanged()) ); + connect( mStorage, TQ_SIGNAL(syncStateChanged()), + TQ_SIGNAL(syncStateChanged()) ); + + connect( mStorage, TQ_SIGNAL( contentsTypeChanged( KMail::FolderContentsType ) ), + this, TQ_SLOT( slotContentsTypeChanged( KMail::FolderContentsType ) ) ); + + connect( mStorage, TQ_SIGNAL( folderSizeChanged() ), + this, TQ_SLOT( slotFolderSizeChanged() ) ); //FIXME: Centralize all the readConfig calls somehow - Zack // Meanwhile, readConfig must be done before registerWithMessageDict, since diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h index d6160880..e1178ee0 100644 --- a/kmail/kmfolder.h +++ b/kmail/kmfolder.h @@ -124,7 +124,7 @@ public: void setAcctList( AccountList* list ) { mAcctList = list; } AccountList* acctList() { return mAcctList; } - /** Returns TRUE if accounts are associated with this folder. */ + /** Returns true if accounts are associated with this folder. */ bool hasAccounts() const { return (mAcctList != 0); } /** This is used by the storage to read the folder specific configuration */ diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp index dcfcbe7f..f7acebf6 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -153,10 +153,10 @@ DImapTroubleShootDialog::DImapTroubleShootDialog( TQWidget* parent, enableButtonSeparator( true ); - connect ( mIndexButton, TQT_SIGNAL(toggled(bool)), mIndexScope, TQT_SLOT(setEnabled(bool)) ); - connect ( mIndexButton, TQT_SIGNAL(toggled(bool)), scopeLabel, TQT_SLOT(setEnabled(bool)) ); - connect( mButtonGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotChanged() ) ); - connect( this, TQT_SIGNAL( okClicked () ), this, TQT_SLOT( slotDone() ) ); + connect ( mIndexButton, TQ_SIGNAL(toggled(bool)), mIndexScope, TQ_SLOT(setEnabled(bool)) ); + connect ( mIndexButton, TQ_SIGNAL(toggled(bool)), scopeLabel, TQ_SLOT(setEnabled(bool)) ); + connect( mButtonGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotChanged() ) ); + connect( this, TQ_SIGNAL( okClicked () ), this, TQ_SLOT( slotDone() ) ); enableButtonOK( false ); } @@ -908,8 +908,8 @@ void KMFolderCachedImap::serverSyncInternal() // kdDebug(5006) << "makeConnection said Connecting, waiting for signal." << endl; newState( mProgress, i18n("Connecting to %1").arg( mAccount->host() ) ); // We'll wait for the connectionResult signal from the account. - connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); break; } else { // Connected @@ -932,8 +932,8 @@ void KMFolderCachedImap::serverSyncInternal() // Check the user's own rights. We do this every time in case they changed. mOldUserRights = mUserRights; newState( mProgress, i18n("Checking permissions")); - connect( mAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ), - this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) ); + connect( mAccount, TQ_SIGNAL( receivedUserRights( KMFolder* ) ), + this, TQ_SLOT( slotReceivedUserRights( KMFolder* ) ) ); mAccount->getUserRights( folder(), imapPath() ); // after connecting, due to the INBOX case break; } @@ -955,8 +955,8 @@ void KMFolderCachedImap::serverSyncInternal() if ( !newName.isEmpty() && !folder()->isSystemFolder() && !isResourceFolder ) { newState( mProgress, i18n("Renaming folder") ); CachedImapJob *job = new CachedImapJob( newName, CachedImapJob::tRenameFolder, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotRenameFolderFinished() ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotRenameFolderFinished() ) ); job->start(); break; } @@ -1043,8 +1043,8 @@ void KMFolderCachedImap::serverSyncInternal() newState( mProgress, i18n("Deleting folders from server")); CachedImapJob* job = new CachedImapJob( foldersForDeletionOnServer, CachedImapJob::tDeleteFolders, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFolderDeletionOnServerFinished() ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotFolderDeletionOnServerFinished() ) ); job->start(); break; } @@ -1082,8 +1082,8 @@ void KMFolderCachedImap::serverSyncInternal() newState( mProgress, i18n("Expunging deleted messages")); CachedImapJob *job = new CachedImapJob( TQString(), CachedImapJob::tExpungeFolder, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) ); job->start(); break; } @@ -1097,10 +1097,10 @@ void KMFolderCachedImap::serverSyncInternal() CachedImapJob *job = new CachedImapJob( mMsgsForDownload, CachedImapJob::tGetMessage, this ); - connect( job, TQT_SIGNAL( progress(unsigned long, unsigned long) ), - this, TQT_SLOT( slotProgress(unsigned long, unsigned long) ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotUpdateLastUid() ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) ); + connect( job, TQ_SIGNAL( progress(unsigned long, unsigned long) ), + this, TQ_SLOT( slotProgress(unsigned long, unsigned long) ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotUpdateLastUid() ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) ); job->start(); mMsgsForDownload.clear(); break; @@ -1153,8 +1153,8 @@ void KMFolderCachedImap::serverSyncInternal() ImapAccountBase::jobData jd( url.url(), folder() ); jd.cancellable = true; // we can always do so later mAccount->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotTestAnnotationResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotTestAnnotationResult(TDEIO::Job *))); break; } @@ -1197,10 +1197,10 @@ void KMFolderCachedImap::serverSyncInternal() jd.cancellable = true; mAccount->insertJob(job, jd); - connect( job, TQT_SIGNAL(annotationResult(const TQString&, const TQString&, bool)), - TQT_SLOT(slotAnnotationResult(const TQString&, const TQString&, bool)) ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotGetAnnotationResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(annotationResult(const TQString&, const TQString&, bool)), + TQ_SLOT(slotAnnotationResult(const TQString&, const TQString&, bool)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotGetAnnotationResult(TDEIO::Job *)) ); break; } } @@ -1238,10 +1238,10 @@ void KMFolderCachedImap::serverSyncInternal() jd.cancellable = true; // we can always do so later mAccount->insertJob(job, jd); - connect(job, TQT_SIGNAL(annotationChanged( const TQString&, const TQString&, const TQString& ) ), - TQT_SLOT( slotAnnotationChanged( const TQString&, const TQString&, const TQString& ) )); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotSetAnnotationResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(annotationChanged( const TQString&, const TQString&, const TQString& ) ), + TQ_SLOT( slotAnnotationChanged( const TQString&, const TQString&, const TQString& ) )); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotSetAnnotationResult(TDEIO::Job *))); break; } } @@ -1264,10 +1264,10 @@ void KMFolderCachedImap::serverSyncInternal() ImapAccountBase::jobData jd( url.url(), folder() ); mAccount->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotMultiSetACLResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(aclChanged( const TQString&, int )), - TQT_SLOT(slotACLChanged( const TQString&, int )) ); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotMultiSetACLResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(aclChanged( const TQString&, int )), + TQ_SLOT(slotACLChanged( const TQString&, int )) ); break; } } @@ -1278,8 +1278,8 @@ void KMFolderCachedImap::serverSyncInternal() if( !mQuotaOnly && !noContent() && mAccount->hasACLSupport() ) { newState( mProgress, i18n( "Retrieving permissions" ) ); mAccount->getACL( folder(), mImapPath ); - connect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), - this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); + connect( mAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), + this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); break; } case SYNC_STATE_FIND_SUBFOLDERS: @@ -1309,10 +1309,10 @@ void KMFolderCachedImap::serverSyncInternal() TDEIO::Job* job = KMail::QuotaJobs::getStorageQuota( mAccount->slave(), url ); ImapAccountBase::jobData jd( url.url(), folder() ); mAccount->insertJob(job, jd); - connect( job, TQT_SIGNAL( storageQuotaResult( const QuotaInfo& ) ), - TQT_SLOT( slotStorageQuotaResult( const QuotaInfo& ) ) ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotQuotaResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL( storageQuotaResult( const QuotaInfo& ) ), + TQ_SLOT( slotStorageQuotaResult( const QuotaInfo& ) ) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotQuotaResult(TDEIO::Job *)) ); break; } case SYNC_STATE_CLOSE: @@ -1365,10 +1365,10 @@ void KMFolderCachedImap::syncNextSubFolder( bool secondSync ) mCurrentSubfolder = mSubfoldersForSync.front(); mSubfoldersForSync.pop_front(); if ( mCurrentSubfolder ) { - connect( mCurrentSubfolder, TQT_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ), - this, TQT_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) ); - connect( mCurrentSubfolder, TQT_SIGNAL( closeToQuotaChanged() ), - this, TQT_SLOT( slotSubFolderCloseToQuotaChanged() ) ); + connect( mCurrentSubfolder, TQ_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ), + this, TQ_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) ); + connect( mCurrentSubfolder, TQ_SIGNAL( closeToQuotaChanged() ), + this, TQ_SLOT( slotSubFolderCloseToQuotaChanged() ) ); //kdDebug(5006) << "Sync'ing subfolder " << mCurrentSubfolder->imapPath() << endl; assert( !mCurrentSubfolder->imapPath().isEmpty() ); @@ -1416,10 +1416,10 @@ void KMFolderCachedImap::buildSubFolderList() void KMFolderCachedImap::disconnectSubFolderSignals() { - disconnect( mCurrentSubfolder, TQT_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ), - this, TQT_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) ); - disconnect( mCurrentSubfolder, TQT_SIGNAL( closeToQuotaChanged() ), - this, TQT_SLOT( slotSubFolderCloseToQuotaChanged() ) ); + disconnect( mCurrentSubfolder, TQ_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ), + this, TQ_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) ); + disconnect( mCurrentSubfolder, TQ_SIGNAL( closeToQuotaChanged() ), + this, TQ_SLOT( slotSubFolderCloseToQuotaChanged() ) ); mCurrentSubfolder = 0; } @@ -1428,8 +1428,8 @@ void KMFolderCachedImap::disconnectSubFolderSignals() */ void KMFolderCachedImap::slotConnectionResult( int errorCode, const TQString& errorMsg ) { - disconnect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + disconnect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); if ( !errorCode ) { // Success mSyncState = SYNC_STATE_GET_USERRIGHTS; @@ -1463,15 +1463,15 @@ void KMFolderCachedImap::uploadNewMessages() if ( mUserRightsState != KMail::ACLJobs::Ok || ( mUserRights & ( KMail::ACLJobs::Insert ) ) ) { newState( mProgress, i18n("Uploading messages to server")); CachedImapJob *job = new CachedImapJob( newMsgs, CachedImapJob::tPutMessage, this ); - connect( job, TQT_SIGNAL( progress( unsigned long, unsigned long) ), - this, TQT_SLOT( slotPutProgress(unsigned long, unsigned long) ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) ); + connect( job, TQ_SIGNAL( progress( unsigned long, unsigned long) ), + this, TQ_SLOT( slotPutProgress(unsigned long, unsigned long) ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) ); job->start(); return; } else { KMCommand *command = rescueUnsyncedMessages(); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( serverSyncInternal() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( serverSyncInternal() ) ); } } else { // nothing to upload if ( mUserRights != mOldUserRights && (mOldUserRights & KMail::ACLJobs::Insert) @@ -1537,8 +1537,8 @@ void KMFolderCachedImap::uploadFlags() // FIXME END DUPLICATED FROM KMFOLDERIMAP if ( mStatusFlagsJobs ) { - connect( mAccount, TQT_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), - this, TQT_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); + connect( mAccount, TQ_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), + this, TQ_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); return; } } @@ -1588,8 +1588,8 @@ void KMFolderCachedImap::uploadSeenFlags() } if ( mStatusFlagsJobs ) { - connect( mAccount, TQT_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), - this, TQT_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); + connect( mAccount, TQ_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), + this, TQ_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); return; } } @@ -1607,8 +1607,8 @@ void KMFolderCachedImap::slotImapStatusChanged(KMFolder* folder, const TQString& if ( folder->storage() == this ) { --mStatusFlagsJobs; if ( mStatusFlagsJobs == 0 || !cont ) // done or aborting - disconnect( mAccount, TQT_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), - this, TQT_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); + disconnect( mAccount, TQ_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), + this, TQ_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); if ( mStatusFlagsJobs == 0 && cont ) { mProgress += 5; serverSyncInternal(); @@ -1646,8 +1646,8 @@ void KMFolderCachedImap::createNewFolders() if( !newFolders.isEmpty() ) { newState( mProgress, i18n("Creating subfolders on server")); CachedImapJob *job = new CachedImapJob( newFolders, CachedImapJob::tAddSubfolders, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) ); job->start(); } else { serverSyncInternal(); @@ -1721,8 +1721,8 @@ bool KMFolderCachedImap::deleteMessages() uidsForDeletionOnServer.clear(); kdDebug(5006) << "Deleting " << sets.count() << " sets of messages from server folder " << imapPath() << endl; CachedImapJob *job = new CachedImapJob( sets, CachedImapJob::tDeleteMessage, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), - this, TQT_SLOT( slotDeleteMessagesResult(KMail::FolderJob *) ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), + this, TQ_SLOT( slotDeleteMessagesResult(KMail::FolderJob *) ) ); job->start(); return true; } else { @@ -1757,9 +1757,9 @@ void KMFolderCachedImap::checkUidValidity() { else { newState( mProgress, i18n("Checking folder validity")); CachedImapJob *job = new CachedImapJob( FolderJob::tCheckUidValidity, this ); - connect( job, TQT_SIGNAL(permanentFlags(int)), TQT_SLOT(slotPermanentFlags(int)) ); - connect( job, TQT_SIGNAL( result( KMail::FolderJob* ) ), - this, TQT_SLOT( slotCheckUidValidityResult( KMail::FolderJob* ) ) ); + connect( job, TQ_SIGNAL(permanentFlags(int)), TQ_SLOT(slotPermanentFlags(int)) ); + connect( job, TQ_SIGNAL( result( KMail::FolderJob* ) ), + this, TQ_SLOT( slotCheckUidValidityResult( KMail::FolderJob* ) ) ); job->start(); } } @@ -1808,8 +1808,8 @@ void KMFolderCachedImap::listMessages() { mFoundAnIMAPDigest = false; CachedImapJob* job = new CachedImapJob( FolderJob::tListMessages, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), - this, TQT_SLOT( slotGetLastMessagesResult(KMail::FolderJob *) ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), + this, TQ_SLOT( slotGetLastMessagesResult(KMail::FolderJob *) ) ); job->start(); } @@ -2038,9 +2038,9 @@ void KMFolderCachedImap::listNamespaces() } KMail::ListJob* job = new KMail::ListJob( mAccount, type, this, mAccount->addPathToNamespace( *it ) ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); } @@ -2060,9 +2060,9 @@ void KMFolderCachedImap::listNamespaces() mAccount->addPathToNamespace( ns ) ); job->setNamespace( ns ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); } @@ -2148,9 +2148,9 @@ bool KMFolderCachedImap::listDirectory() type = ImapAccountBase::ListSubscribed; KMail::ListJob* job = new KMail::ListJob( mAccount, type, this ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); @@ -2347,8 +2347,8 @@ void KMFolderCachedImap::listDirectory2() ImapAccountBase::jobData jd( TQString(), folder() ); jd.cancellable = true; mAccount->insertJob(job, jd); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotMultiUrlGetAnnotationResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotMultiUrlGetAnnotationResult(TDEIO::Job *)) ); } else { createFoldersNewOnServerAndFinishListing( foldersNewOnServer ); @@ -2493,8 +2493,8 @@ void KMFolderCachedImap::slotReceivedUserRights( KMFolder* folder ) { if ( folder->storage() == this ) { - disconnect( mAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ), - this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) ); + disconnect( mAccount, TQ_SIGNAL( receivedUserRights( KMFolder* ) ), + this, TQ_SLOT( slotReceivedUserRights( KMFolder* ) ) ); if ( mUserRightsState == KMail::ACLJobs::Ok ) { setReadOnly( ( mUserRights & KMail::ACLJobs::Insert ) == 0 ); } @@ -2516,8 +2516,8 @@ void KMFolderCachedImap::slotReceivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& aclList ) { if ( folder->storage() == this ) { - disconnect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), - this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); + disconnect( mAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), + this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); mACLListState = job->error() ? KMail::ACLJobs::FetchFailed : KMail::ACLJobs::Ok; mACLList = aclList; serverSyncInternal(); @@ -2695,7 +2695,7 @@ void KMFolderCachedImap::updateAnnotationFolderType() if ( ( newType != oldType || newSubType != oldSubType ) && changingTypeAllowed ) { mAnnotationFolderType = newType + ( newSubType.isEmpty() ? TQString() : "."+newSubType ); mAnnotationFolderTypeChanged = true; // force a "set annotation" on next sync - kdDebug(5006) << mImapPath << ": updateAnnotationFolderType: '" << mAnnotationFolderType << "', was (" << oldType << " " << oldSubType << ") => mAnnotationFolderTypeChanged set to TRUE" << endl; + kdDebug(5006) << mImapPath << ": updateAnnotationFolderType: '" << mAnnotationFolderType << "', was (" << oldType << " " << oldSubType << ") => mAnnotationFolderTypeChanged set to true" << endl; } // Ensure that further readConfig()s don't lose mAnnotationFolderType writeConfigKeysWhichShouldNotGetOverwrittenByReadConfig(); @@ -3166,8 +3166,8 @@ void KMFolderCachedImap::rescueUnsyncedMessagesAndDeleteFolder( KMFolder *folder if ( storage ) { KMCommand *command = storage->rescueUnsyncedMessages(); if ( command ) { - connect( command, TQT_SIGNAL(completed(KMCommand*)), - TQT_SLOT(slotRescueDone(KMCommand*)) ); + connect( command, TQ_SIGNAL(completed(KMCommand*)), + TQ_SLOT(slotRescueDone(KMCommand*)) ); ++mRescueCommandCount; } else { // nothing to rescue, close folder diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h index 1e2af26e..56e3dc27 100644 --- a/kmail/kmfoldercachedimap.h +++ b/kmail/kmfoldercachedimap.h @@ -33,7 +33,7 @@ #define kmfoldercachedimap_h #include <kdialogbase.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqvaluelist.h> #include <tqvaluevector.h> #include <tqptrlist.h> diff --git a/kmail/kmfoldercombobox.cpp b/kmail/kmfoldercombobox.cpp index 499d444f..4b722c75 100644 --- a/kmail/kmfoldercombobox.cpp +++ b/kmail/kmfoldercombobox.cpp @@ -32,15 +32,15 @@ void KMFolderComboBox::init() mOutboxShown = true; mImapShown = true; refreshFolders(); - connect( this, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT( slotActivated(int) ) ); - connect( kmkernel->folderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(refreshFolders()) ); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(refreshFolders()) ); + connect( this, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( slotActivated(int) ) ); + connect( kmkernel->folderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(refreshFolders()) ); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(refreshFolders()) ); if (mImapShown) - connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(refreshFolders()) ); + connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(refreshFolders()) ); } @@ -59,11 +59,11 @@ void KMFolderComboBox::showImapFolders(bool shown) mImapShown = shown; refreshFolders(); if (shown) - connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(refreshFolders()) ); + connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(refreshFolders()) ); else - disconnect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(refreshFolders()) ); + disconnect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(refreshFolders()) ); } //----------------------------------------------------------------------------- diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index d34c731b..ac008ee1 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -88,7 +88,7 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir, const TQString& aName): KDialogBase( KDialogBase::Tabbed, aCap, KDialogBase::Ok|KDialogBase::Cancel, - KDialogBase::Ok, aParent, "KMFolderDialog", TRUE ), + KDialogBase::Ok, aParent, "KMFolderDialog", true ), mFolder( aFolder ), mFolderDir( aFolderDir ), mParentFolder( 0 ), @@ -149,12 +149,12 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir, void KMFolderDialog::addTab( FolderDiaTab* tab ) { - connect( tab, TQT_SIGNAL( readyForAccept() ), - this, TQT_SLOT( slotReadyForAccept() ) ); - connect( tab, TQT_SIGNAL( cancelAccept() ), - this, TQT_SLOT( slotCancelAccept() ) ); - //connect( tab, TQT_SIGNAL(changed( bool )), - // this, TQT_SLOT(slotChanged( bool )) ); + connect( tab, TQ_SIGNAL( readyForAccept() ), + this, TQ_SLOT( slotReadyForAccept() ) ); + connect( tab, TQ_SIGNAL( cancelAccept() ), + this, TQ_SLOT( slotCancelAccept() ) ); + //connect( tab, TQ_SIGNAL(changed( bool )), + // this, TQ_SLOT(slotChanged( bool )) ); mTabs.append( tab ); } @@ -343,8 +343,8 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, } label->setBuddy( mNameEdit ); hl->addWidget( mNameEdit ); - connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotFolderNameChanged( const TQString & ) ) ); + connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotFolderNameChanged( const TQString & ) ) ); //start icons group @@ -388,17 +388,17 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, ihl->addWidget( mUnreadIconButton ); ihl->addStretch( 1 ); - connect( mIconsCheckBox, TQT_SIGNAL(toggled(bool)), - mNormalIconButton, TQT_SLOT(setEnabled(bool)) ); - connect( mIconsCheckBox, TQT_SIGNAL(toggled(bool)), - mUnreadIconButton, TQT_SLOT(setEnabled(bool)) ); - connect( mIconsCheckBox, TQT_SIGNAL(toggled(bool)), - mNormalIconLabel, TQT_SLOT(setEnabled(bool)) ); - connect( mIconsCheckBox, TQT_SIGNAL(toggled(bool)), - mUnreadIconLabel, TQT_SLOT(setEnabled(bool)) ); + connect( mIconsCheckBox, TQ_SIGNAL(toggled(bool)), + mNormalIconButton, TQ_SLOT(setEnabled(bool)) ); + connect( mIconsCheckBox, TQ_SIGNAL(toggled(bool)), + mUnreadIconButton, TQ_SLOT(setEnabled(bool)) ); + connect( mIconsCheckBox, TQ_SIGNAL(toggled(bool)), + mNormalIconLabel, TQ_SLOT(setEnabled(bool)) ); + connect( mIconsCheckBox, TQ_SIGNAL(toggled(bool)), + mUnreadIconLabel, TQ_SLOT(setEnabled(bool)) ); - connect( mNormalIconButton, TQT_SIGNAL(iconChanged(TQString)), - this, TQT_SLOT(slotChangeIcon(TQString)) ); + connect( mNormalIconButton, TQ_SIGNAL(iconChanged(TQString)), + this, TQ_SLOT(slotChangeIcon(TQString)) ); //end icons group addLine( this, topLayout); @@ -510,8 +510,8 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, mContentsComboBox->insertItem( i18n( "Journal" ) ); if ( mDlg->folder() ) mContentsComboBox->setCurrentItem( mDlg->folder()->storage()->contentsType() ); - connect ( mContentsComboBox, TQT_SIGNAL ( activated( int ) ), - this, TQT_SLOT( slotFolderContentsSelectionChanged( int ) ) ); + connect ( mContentsComboBox, TQ_SIGNAL ( activated( int ) ), + this, TQ_SLOT( slotFolderContentsSelectionChanged( int ) ) ); if ( mDlg->folder()->isReadOnly() || mIsResourceFolder ) mContentsComboBox->setEnabled( false ); } else { @@ -816,18 +816,18 @@ KMail::FolderDiaTemplatesTab::FolderDiaTemplatesTab( KMFolderDialog* dlg, mCopyGlobal->setEnabled( false ); btns->addWidget( mCopyGlobal ); - connect( mCustom, TQT_SIGNAL(toggled(bool)), - mWidget, TQT_SLOT(setEnabled(bool)) ); - connect( mCustom, TQT_SIGNAL(toggled(bool)), - mCopyGlobal, TQT_SLOT(setEnabled(bool)) ); + connect( mCustom, TQ_SIGNAL(toggled(bool)), + mWidget, TQ_SLOT(setEnabled(bool)) ); + connect( mCustom, TQ_SIGNAL(toggled(bool)), + mCopyGlobal, TQ_SLOT(setEnabled(bool)) ); - connect( mCopyGlobal, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopyGlobal()) ); + connect( mCopyGlobal, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopyGlobal()) ); initializeWithValuesFromFolder( mDlg->folder() ); - connect( mWidget, TQT_SIGNAL( changed() ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mWidget, TQ_SIGNAL( changed() ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); } void FolderDiaTemplatesTab::load() diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp index 6d673c4b..19baf48f 100644 --- a/kmail/kmfolderdir.cpp +++ b/kmail/kmfolderdir.cpp @@ -13,7 +13,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> //============================================================================= @@ -204,11 +204,11 @@ bool KMFolderDir::reload(void) dir.setFilter(TQDir::Files | TQDir::Dirs | TQDir::Hidden); dir.setNameFilter("*"); - if (!dir.cd(fldPath, TRUE)) + if (!dir.cd(fldPath, true)) { TQString msg = i18n("<qt>Cannot enter folder <b>%1</b>.</qt>").arg(fldPath); KMessageBox::information(0, msg); - return FALSE; + return false; } TQFileInfoList* fiList=(TQFileInfoList*)dir.entryInfoList(); @@ -216,7 +216,7 @@ bool KMFolderDir::reload(void) { TQString msg = i18n("<qt>Folder <b>%1</b> is unreadable.</qt>").arg(fldPath); KMessageBox::information(0, msg); - return FALSE; + return false; } for (fileInfo=fiList->first(); fileInfo; fileInfo=fiList->next()) @@ -335,7 +335,7 @@ bool KMFolderDir::reload(void) addDirToParent( *it, folder ); } } - return TRUE; + return true; } diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h index 30bd529c..18f1cbc5 100644 --- a/kmail/kmfolderdir.h +++ b/kmail/kmfolderdir.h @@ -42,7 +42,7 @@ public: /** URL of the node for visualization purposes. */ virtual TQString prettyURL() const; - /** Create a mail folder in this directory with given name. If sysFldr==TRUE + /** Create a mail folder in this directory with given name. If sysFldr==true the folder is marked as a (KMail) system folder. Returns Folder on success. */ virtual KMFolder* createFolder( const TQString& folderName, diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp index b0686dbb..ee573c17 100644 --- a/kmail/kmfolderimap.cpp +++ b/kmail/kmfolderimap.cpp @@ -82,8 +82,8 @@ KMFolderImap::KMFolderImap(KMFolder* folder, const char* aName) mAddMessageProgressItem = 0; mReadOnly = false; - connect (this, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotCompleteMailCheckProgress()) ); + connect (this, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotCompleteMailCheckProgress()) ); } KMFolderImap::~KMFolderImap() @@ -249,8 +249,8 @@ void KMFolderImap::remove() false, account()->useSSL() || account()->useTLS() ); account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotRemoveFolderResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotRemoveFolderResult(TDEIO::Job *))); } //----------------------------------------------------------------------------- @@ -417,10 +417,10 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex msg = msgParent->getMsg(idx); } imapJob = new ImapJob(msg, ImapJob::tPutMessage, this); - connect(imapJob, TQT_SIGNAL(messageStored(KMMessage*)), - TQT_SLOT(addMsgQuiet(KMMessage*))); - connect(imapJob, TQT_SIGNAL(result(KMail::FolderJob*)), - TQT_SLOT(slotCopyMsgResult(KMail::FolderJob*))); + connect(imapJob, TQ_SIGNAL(messageStored(KMMessage*)), + TQ_SLOT(addMsgQuiet(KMMessage*))); + connect(imapJob, TQ_SIGNAL(result(KMail::FolderJob*)), + TQ_SLOT(slotCopyMsgResult(KMail::FolderJob*))); imapJob->start(); } @@ -439,10 +439,10 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex TQPtrList<KMMessage> temp_msgs = splitMessageList(*it, msgList); if ( temp_msgs.isEmpty() ) kdDebug(5006) << "Wow! KMFolderImap::splitMessageList() returned an empty list!" << endl; imapJob = new ImapJob(temp_msgs, *it, ImapJob::tMoveMessage, this); - connect(imapJob, TQT_SIGNAL(messageCopied(TQPtrList<KMMessage>)), - TQT_SLOT(addMsgQuiet(TQPtrList<KMMessage>))); - connect(imapJob, TQT_SIGNAL(result(KMail::FolderJob*)), - TQT_SLOT(slotCopyMsgResult(KMail::FolderJob*))); + connect(imapJob, TQ_SIGNAL(messageCopied(TQPtrList<KMMessage>)), + TQ_SLOT(addMsgQuiet(TQPtrList<KMMessage>))); + connect(imapJob, TQ_SIGNAL(result(KMail::FolderJob*)), + TQ_SLOT(slotCopyMsgResult(KMail::FolderJob*))); imapJob->start(); } } @@ -492,14 +492,14 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex true, account()->useSSL() || account()->useTLS() ); mAddMessageProgressItem->setTotalItems( msgList.count() ); - connect ( mAddMessageProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), - account(), TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); + connect ( mAddMessageProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), + account(), TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); imapJob->setParentProgressItem( mAddMessageProgressItem ); } - connect( imapJob, TQT_SIGNAL( messageCopied(TQPtrList<KMMessage>) ), - TQT_SLOT( addMsgQuiet(TQPtrList<KMMessage>) ) ); - connect( imapJob, TQT_SIGNAL(result(KMail::FolderJob*)), - TQT_SLOT(slotCopyMsgResult(KMail::FolderJob*)) ); + connect( imapJob, TQ_SIGNAL( messageCopied(TQPtrList<KMMessage>) ), + TQ_SLOT( addMsgQuiet(TQPtrList<KMMessage>) ) ); + connect( imapJob, TQ_SIGNAL(result(KMail::FolderJob*)), + TQ_SLOT(slotCopyMsgResult(KMail::FolderJob*)) ); imapJob->start(); } @@ -534,8 +534,8 @@ void KMFolderImap::copyMsg(TQPtrList<KMMessage>& msgList) TQPtrList<KMMessage> temp_msgs = splitMessageList(*it, msgList); ImapJob *job = new ImapJob(temp_msgs, *it, ImapJob::tCopyMessage, this); - connect(job, TQT_SIGNAL(result(KMail::FolderJob*)), - TQT_SLOT(slotCopyMsgResult(KMail::FolderJob*))); + connect(job, TQ_SIGNAL(result(KMail::FolderJob*)), + TQ_SLOT(slotCopyMsgResult(KMail::FolderJob*))); job->start(); } } @@ -603,8 +603,8 @@ void KMFolderImap::take(TQPtrList<KMMessage> msgList) //----------------------------------------------------------------------------- void KMFolderImap::slotListNamespaces() { - disconnect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotListNamespaces() ) ); + disconnect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotListNamespaces() ) ); if ( account()->makeConnection() == ImapAccountBase::Error ) { kdWarning(5006) << "slotListNamespaces - got no connection" << endl; @@ -613,8 +613,8 @@ void KMFolderImap::slotListNamespaces() { // wait for the connectionResult kdDebug(5006) << "slotListNamespaces - waiting for connection" << endl; - connect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotListNamespaces() ) ); + connect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotListNamespaces() ) ); return; } kdDebug(5006) << "slotListNamespaces" << endl; @@ -636,9 +636,9 @@ void KMFolderImap::slotListNamespaces() account()->addPathToNamespace( *it ) ); job->setNamespace( *it ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); } @@ -650,9 +650,9 @@ void KMFolderImap::slotListNamespaces() { KMail::ListJob* job = new KMail::ListJob( account(), type, this, account()->addPathToNamespace( *it ) ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); } @@ -754,9 +754,9 @@ bool KMFolderImap::listDirectory() KMail::ListJob* job = new KMail::ListJob( account(), type, this ); job->setParentProgressItem( account()->listDirProgressItem() ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); @@ -1034,8 +1034,8 @@ void KMFolderImap::checkValidity() kdDebug(5006) << "KMFolderImap::checkValidity of: " << imapPath() << endl; // Start with a clean slate - disconnect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( checkValidity() ) ); + disconnect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( checkValidity() ) ); KMAcctImap::ConnectionState connectionState = account()->makeConnection(); if ( connectionState == ImapAccountBase::Error ) { @@ -1048,8 +1048,8 @@ void KMFolderImap::checkValidity() // We'll wait for the connectionResult signal from the account. If it // errors, the above will catch it. kdDebug(5006) << "CheckValidity - waiting for connection" << endl; - connect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( checkValidity() ) ); + connect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( checkValidity() ) ); return; } // Only check once at a time. @@ -1079,10 +1079,10 @@ void KMFolderImap::checkValidity() TDEIO::SimpleJob *job = TDEIO::get(url, false, false); TDEIO::Scheduler::assignJobToSlave(account()->slave(), job); account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotCheckValidityResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotCheckValidityResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + TQ_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); // Only check once at a time. mCheckingValidity = true; } @@ -1238,10 +1238,10 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid) ImapAccountBase::jobData jd( url.url(), folder() ); jd.cancellable = true; account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotListFolderResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), - this, TQT_SLOT(slotListFolderEntries(TDEIO::Job *, + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotListFolderResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), + this, TQ_SLOT(slotListFolderEntries(TDEIO::Job *, const TDEIO::UDSEntryList &))); } else { mContentState = imapDownloadInProgress; @@ -1254,10 +1254,10 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid) ImapAccountBase::jobData jd( url.url(), folder() ); jd.cancellable = true; account()->insertJob(newJob, jd); - connect(newJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotGetLastMessagesResult(TDEIO::Job *))); - connect(newJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &))); + connect(newJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotGetLastMessagesResult(TDEIO::Job *))); + connect(newJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &))); } } @@ -1360,12 +1360,12 @@ void KMFolderImap::slotListFolderResult(TDEIO::Job * job) jd.url = url.url(); TDEIO::Scheduler::assignJobToSlave(account()->slave(), newJob); account()->insertJob(newJob, jd); - connect(newJob, TQT_SIGNAL(result(TDEIO::Job *)), + connect(newJob, TQ_SIGNAL(result(TDEIO::Job *)), this, (i == sets.at(sets.count() - 1)) - ? TQT_SLOT(slotGetLastMessagesResult(TDEIO::Job *)) - : TQT_SLOT(slotGetMessagesResult(TDEIO::Job *))); - connect(newJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &))); + ? TQ_SLOT(slotGetLastMessagesResult(TDEIO::Job *)) + : TQ_SLOT(slotGetMessagesResult(TDEIO::Job *))); + connect(newJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &))); } } @@ -1740,8 +1740,8 @@ void KMFolderImap::createFolder(const TQString &name, const TQString& parentPath ImapAccountBase::jobData jd( url.url(), folder() ); jd.items = name; account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotCreateFolderResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotCreateFolderResult(TDEIO::Job *))); } @@ -1841,8 +1841,8 @@ void KMFolderImap::deleteMessage(KMMessage * msg) TDEIO::Scheduler::assignJobToSlave(account()->slave(), job); ImapAccountBase::jobData jd( url.url(), 0 ); account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + account(), TQ_SLOT(slotSimpleResult(TDEIO::Job *))); } void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList) @@ -1874,8 +1874,8 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList) TDEIO::Scheduler::assignJobToSlave(account()->slave(), job); ImapAccountBase::jobData jd( url.url(), 0 ); account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + account(), TQ_SLOT(slotSimpleResult(TDEIO::Job *))); } } @@ -1968,7 +1968,7 @@ void KMFolderImap::setStatus(TQValueList<int>& _ids, KMMsgStatus status, bool to // to make sure that we get the latest flags abort the current listing and // create a new one kdDebug(5006) << "Set status during folder listing, restarting listing." << endl; - disconnect(this, TQT_SLOT(slotListFolderResult(TDEIO::Job *))); + disconnect(this, TQ_SLOT(slotListFolderResult(TDEIO::Job *))); quiet( false ); reallyGetFolder( TQString() ); } @@ -2075,16 +2075,16 @@ void KMFolderImap::expungeFolder(KMFolderImap * aFolder, bool quiet) ImapAccountBase::jobData jd( url.url(), 0 ); jd.quiet = quiet; account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + account(), TQ_SLOT(slotSimpleResult(TDEIO::Job *))); } //----------------------------------------------------------------------------- void KMFolderImap::slotProcessNewMail( int errorCode, const TQString &errorMsg ) { Q_UNUSED( errorMsg ); - disconnect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotProcessNewMail(int, const TQString&) ) ); + disconnect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotProcessNewMail(int, const TQString&) ) ); if ( !errorCode ) processNewMail( false ); else @@ -2114,8 +2114,8 @@ bool KMFolderImap::processNewMail(bool) { // wait kdDebug(5006) << "KMFolderImap::processNewMail - waiting for connection: " << label() << endl; - connect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotProcessNewMail(int, const TQString&) ) ); + connect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotProcessNewMail(int, const TQString&) ) ); return true; } KURL url = account()->getUrl(); @@ -2137,8 +2137,8 @@ bool KMFolderImap::processNewMail(bool) ImapAccountBase::jobData jd(url.url(), folder() ); jd.cancellable = true; account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotStatResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotStatResult(TDEIO::Job *))); return true; } @@ -2247,8 +2247,8 @@ int KMFolderImap::expungeContents() ImapAccountBase::jobData jd( url.url(), 0 ); jd.quiet = true; account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + account(), TQ_SLOT(slotSimpleResult(TDEIO::Job *))); } /* Is the below correct? If we are expunging (in the folder sense, not the imap sense), why delete but not (imap-)expunge? Since the folder is not active there is no concept @@ -2328,8 +2328,8 @@ void KMFolderImap::setAlreadyRemoved( bool removed ) void KMFolderImap::slotCreatePendingFolders( int errorCode, const TQString& errorMsg ) { Q_UNUSED( errorMsg ); - disconnect( account(), TQT_SIGNAL( connectionResult( int, const TQString& ) ), - this, TQT_SLOT( slotCreatePendingFolders( int, const TQString& ) ) ); + disconnect( account(), TQ_SIGNAL( connectionResult( int, const TQString& ) ), + this, TQ_SLOT( slotCreatePendingFolders( int, const TQString& ) ) ); if ( !errorCode ) { TQStringList::Iterator it = mFoldersPendingCreation.begin(); for ( ; it != mFoldersPendingCreation.end(); ++it ) { @@ -2350,8 +2350,8 @@ void KMFolderImap::search( const KMSearchPattern* pattern ) return; } SearchJob* job = new SearchJob( this, account(), pattern ); - connect( job, TQT_SIGNAL( searchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ), - this, TQT_SLOT( slotSearchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) ); + connect( job, TQ_SIGNAL( searchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ), + this, TQ_SLOT( slotSearchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) ); job->start(); } @@ -2373,8 +2373,8 @@ void KMFolderImap::search( const KMSearchPattern* pattern, TQ_UINT32 serNum ) return; } SearchJob* job = new SearchJob( this, account(), pattern, serNum ); - connect( job, TQT_SIGNAL( searchDone( TQ_UINT32, const KMSearchPattern*, bool ) ), - this, TQT_SLOT( slotSearchDone( TQ_UINT32, const KMSearchPattern*, bool ) ) ); + connect( job, TQ_SIGNAL( searchDone( TQ_UINT32, const KMSearchPattern*, bool ) ), + this, TQ_SLOT( slotSearchDone( TQ_UINT32, const KMSearchPattern*, bool ) ) ); job->start(); } diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h index 4113350a..12f2928e 100644 --- a/kmail/kmfolderimap.h +++ b/kmail/kmfolderimap.h @@ -32,7 +32,7 @@ #include "tdeio/job.h" #include "tdeio/global.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqintdict.h> #include <tqdict.h> @@ -125,8 +125,8 @@ public: KMAcctImap* account() const; /** Remove (first occurrence of) given message from the folder. */ - virtual void removeMsg(int i, bool quiet = FALSE); - virtual void removeMsg(const TQPtrList<KMMessage>& msgList, bool quiet = FALSE); + virtual void removeMsg(int i, bool quiet = false); + virtual void removeMsg(const TQPtrList<KMMessage>& msgList, bool quiet = false); virtual int rename( const TQString& newName, KMFolderDir *aParent = 0 ); @@ -152,12 +152,12 @@ public: /** * Retrieve all mails in a folder */ - void getFolder(bool force = FALSE); + void getFolder(bool force = false); /** * same as above but also checks for new mails */ - void getAndCheckFolder(bool force = FALSE); + void getAndCheckFolder(bool force = false); /** * Get the whole message @@ -380,7 +380,7 @@ public slots: * Convert IMAP flags to a message status * @param newMsg specifies whether unseen messages are new or unread */ - static void flagsToStatus(KMMsgBase *msg, int flags, bool newMsg = TRUE, int supportedFalgs = 31 ); + static void flagsToStatus(KMMsgBase *msg, int flags, bool newMsg = true, int supportedFalgs = 31 ); /** * Convert IMAP seen flag to a message status. diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp index 9b60b25c..42b5d0c5 100644 --- a/kmail/kmfolderindex.cpp +++ b/kmail/kmfolderindex.cpp @@ -363,14 +363,14 @@ bool KMFolderIndex::readIndexHeader(int *gv) createIndexFromContents(); return false; } else if(indexVersion > INDEX_VERSION) { - kapp->setOverrideCursor(KCursor::arrowCursor()); + tdeApp->setOverrideCursor(KCursor::arrowCursor()); int r = KMessageBox::questionYesNo(0, i18n( "The mail index for '%1' is from an unknown version of KMail (%2).\n" "This index can be regenerated from your mail folder, but some " "information, including status flags, may be lost. Do you wish " "to downgrade your index file?") .arg(name()) .arg(indexVersion), TQString(), i18n("Downgrade"), i18n("Do Not Downgrade") ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); if (r == KMessageBox::Yes) createIndexFromContents(); return false; @@ -524,11 +524,11 @@ KMMsgInfo* KMFolderIndex::setIndexEntry( int idx, KMMessage *msg ) void KMFolderIndex::recreateIndex( bool readIndexAfterwards ) { - kapp->setOverrideCursor(KCursor::arrowCursor()); + tdeApp->setOverrideCursor(KCursor::arrowCursor()); KMessageBox::information(0, i18n("The mail index for '%1' is corrupted and will be regenerated now, " "but some information, like status flags, might get lost.").arg(name())); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); createIndexFromContents(); if ( readIndexAfterwards ) { readIndex(); diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h index 194d5c97..1f4fb1b5 100644 --- a/kmail/kmfolderindex.h +++ b/kmail/kmfolderindex.h @@ -108,7 +108,7 @@ protected: failure. */ virtual int createIndexFromContents() = 0; - bool updateIndexStreamPtr(bool just_close=FALSE); + bool updateIndexStreamPtr(bool just_close=false); /** Inserts messages into the message dictionary by iterating over the * message list. The messages will get new serial numbers. This is only diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index 9862bb47..62228190 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -1131,8 +1131,8 @@ TQ_INT64 KMFolderMaildir::doFolderSize() const //kdDebug(5006) << k_funcinfo << "Starting dirSizeJob for folder " // << location() << endl; KDirSize* job = KDirSize::dirSizeJob( list ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) ); } return -1; @@ -1163,8 +1163,8 @@ void KMFolderMaildir::slotDirSizeJobResult( TDEIO::Job* job ) //kdDebug(5006) << k_funcinfo << "Starting dirSizeJob for folder " // << entry.first->location() << endl; KDirSize* job = KDirSize::dirSizeJob( entry.second ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - entry.first, TQT_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + entry.first, TQ_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) ); break; } else diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h index 85109490..83aced18 100644 --- a/kmail/kmfoldermaildir.h +++ b/kmail/kmfoldermaildir.h @@ -52,8 +52,8 @@ public: virtual int addMsg(KMMessage* msg, int* index_return = 0); /** Remove (first occurrence of) given message from the folder. */ - virtual void removeMsg(int i, bool imapQuiet = FALSE); - virtual void removeMsg(TQPtrList<KMMessage> msgList, bool imapQuiet = FALSE) + virtual void removeMsg(int i, bool imapQuiet = false); + virtual void removeMsg(TQPtrList<KMMessage> msgList, bool imapQuiet = false) { return KMFolderIndex::removeMsg(msgList, imapQuiet); } // Called by KMMsgBase::setStatus when status of a message has changed @@ -74,7 +74,7 @@ public: /** fsync buffers to disk */ virtual void sync(); - /** Close folder. If force is TRUE the files are closed even if + /** Close folder. If force is true the files are closed even if others still use it (e.g. other mail reader windows). */ virtual void reallyDoClose(const char *owner); diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp index e17f0966..7d1b9927 100644 --- a/kmail/kmfoldermbox.cpp +++ b/kmail/kmfoldermbox.cpp @@ -36,7 +36,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <knotifyclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeconfig.h> #include <ctype.h> diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h index 517d5f19..38348a15 100644 --- a/kmail/kmfoldermbox.h +++ b/kmail/kmfoldermbox.h @@ -149,7 +149,7 @@ protected: private: FILE *mStream; - bool mFilesLocked; // TRUE if the files of the folder are locked (writable) + bool mFilesLocked; // true if the files of the folder are locked (writable) bool mReadOnly; // true if locking failed LockType mLockType; TQString mProcmailLockFileName; diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp index d270e710..3ff8f48b 100644 --- a/kmail/kmfoldermgr.cpp +++ b/kmail/kmfoldermgr.cpp @@ -44,7 +44,7 @@ KMFolderMgr::KMFolderMgr(const TQString& aBasePath, KMFolderDirType dirType): if ( dirType == KMStandardDir ) mDir.setBaseURL( I18N_NOOP("Local Folders") ); mQuiet = 0; - mChanged = FALSE; + mChanged = false; setBasePath(aBasePath); mRemoveOrig = 0; } @@ -361,8 +361,8 @@ void KMFolderMgr::remove(KMFolder* aFolder) void KMFolderMgr::removeFolder(KMFolder* aFolder) { - connect(aFolder, TQT_SIGNAL(removed(KMFolder*, bool)), - this, TQT_SLOT(removeFolderAux(KMFolder*, bool))); + connect(aFolder, TQ_SIGNAL(removed(KMFolder*, bool)), + this, TQ_SLOT(removeFolderAux(KMFolder*, bool))); aFolder->remove(); } @@ -439,7 +439,7 @@ KMFolderRootDir& KMFolderMgr::dir(void) //----------------------------------------------------------------------------- void KMFolderMgr::contentsChanged(void) { - if (mQuiet) mChanged = TRUE; + if (mQuiet) mChanged = true; else emit changed(); } @@ -535,7 +535,7 @@ void KMFolderMgr::quiet(bool beQuiet) { mQuiet = 0; if (mChanged) emit changed(); - mChanged = FALSE; + mChanged = false; } } } @@ -561,7 +561,7 @@ uint KMFolderMgr::createId() int newId; do { - newId = kapp->random(); + newId = tdeApp->random(); } while ( findById( newId ) != 0 ); return newId; @@ -578,10 +578,10 @@ void KMFolderMgr::renameFolder( KMFolder* folder, const TQString& newName, KMFolderDir *newParent ) { RenameJob* job = new RenameJob( folder->storage(), newName, newParent ); - connect( job, TQT_SIGNAL( renameDone( TQString, bool ) ), - this, TQT_SLOT( slotRenameDone( TQString, bool ) ) ); - connect( job, TQT_SIGNAL( renameDone( TQString, bool ) ), - this, TQT_SIGNAL( folderMoveOrCopyOperationFinished() ) ); + connect( job, TQ_SIGNAL( renameDone( TQString, bool ) ), + this, TQ_SLOT( slotRenameDone( TQString, bool ) ) ); + connect( job, TQ_SIGNAL( renameDone( TQString, bool ) ), + this, TQ_SIGNAL( folderMoveOrCopyOperationFinished() ) ); job->start(); } @@ -590,8 +590,8 @@ void KMFolderMgr::copyFolder( KMFolder* folder, KMFolderDir *newParent ) { kdDebug(5006) << "Copy folder: " << folder->prettyURL() << endl; CopyFolderJob* job = new CopyFolderJob( folder->storage(), newParent ); - connect( job, TQT_SIGNAL( folderCopyComplete( bool ) ), - this, TQT_SIGNAL( folderMoveOrCopyOperationFinished() ) ); + connect( job, TQ_SIGNAL( folderCopyComplete( bool ) ), + this, TQ_SIGNAL( folderMoveOrCopyOperationFinished() ) ); job->start(); } diff --git a/kmail/kmfoldermgr.h b/kmail/kmfoldermgr.h index cfafc916..02304ba2 100644 --- a/kmail/kmfoldermgr.h +++ b/kmail/kmfoldermgr.h @@ -32,8 +32,8 @@ public: KMFolderRootDir& dir(); /** Searches folder and returns it. Skips directories - (objects of type KMFolderDir) if foldersOnly is TRUE. */ - virtual KMFolder* find(const TQString& folderName, bool foldersOnly=TRUE); + (objects of type KMFolderDir) if foldersOnly is true. */ + virtual KMFolder* find(const TQString& folderName, bool foldersOnly=true); /** Searches for a folder with the given id, recurses into directories */ virtual KMFolder* findIdString(const TQString& folderId, @@ -43,7 +43,7 @@ public: * created. Directories are skipped. * If an id is passed this searches for it */ - virtual KMFolder* findOrCreate(const TQString& folderName, bool sysFldr=TRUE, + virtual KMFolder* findOrCreate(const TQString& folderName, bool sysFldr=true, const uint id = 0); /** Searches folder by id and returns it. Skips directories @@ -59,7 +59,7 @@ public: /** Create a mail folder in the root folder directory dir() with given name. Returns Folder on success. */ - virtual KMFolder* createFolder(const TQString& fName, bool sysFldr=FALSE, + virtual KMFolder* createFolder(const TQString& fName, bool sysFldr=false, KMFolderType aFolderType=KMFolderTypeMbox, KMFolderDir *aFolderDir = 0); @@ -83,7 +83,7 @@ public: TQValueList<TQGuardedPtr<KMFolder> > *folders, KMFolderDir *adir, const TQString& prefix, - bool i18nized=FALSE ); + bool i18nized=false ); /** Create a list of formatted formatted folder labels and corresponding folders. The system folder names are translated */ diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp index e2a72cb2..d5306b76 100644 --- a/kmail/kmfoldersearch.cpp +++ b/kmail/kmfoldersearch.cpp @@ -81,7 +81,7 @@ KMSearch::KMSearch(TQObject * parent, const char * name) mSearchCount = 0; mProcessNextBatchTimer = new TQTimer(0, "mProcessNextBatchTimer"); - connect(mProcessNextBatchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProcessNextBatch())); + connect(mProcessNextBatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotProcessNextBatch())); } KMSearch::~KMSearch() @@ -262,9 +262,9 @@ void KMSearch::slotProcessNextBatch() folder->open("kmsearch"); mOpenedFolders.append( folder ); connect( folder->storage(), - TQT_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ), + TQ_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ), this, - TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) ); + TQ_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) ); folder->storage()->search( mSearchPattern ); } else --mRemainingFolders; @@ -291,10 +291,10 @@ void KMSearch::slotSearchFolderResult( KMFolder* folder, if ( complete ) { disconnect( folder->storage(), - TQT_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>, + TQ_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ), this, - TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>, + TQ_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) ); --mRemainingFolders; mSearchCount += folder->count(); @@ -325,54 +325,54 @@ KMFolderSearch::KMFolderSearch(KMFolder* folder, const char* name) //Hook up some slots for live updating of search folders //TODO: Optimize folderInvalidated, folderAdded, folderRemoved - connect(kmkernel->folderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), - this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(examineRemovedFolder(KMFolder*))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)), - this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int))); - - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), - this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(examineRemovedFolder(KMFolder*))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)), - this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int))); - - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), - this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(examineRemovedFolder(KMFolder*))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)), - this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), + this, TQ_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderInvalidated(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderAdded(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(examineRemovedFolder(KMFolder*))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)), + this, TQ_SLOT(propagateHeaderChanged(KMFolder*,int))); + + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), + this, TQ_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderInvalidated(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderAdded(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(examineRemovedFolder(KMFolder*))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)), + this, TQ_SLOT(propagateHeaderChanged(KMFolder*,int))); + + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), + this, TQ_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderInvalidated(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderAdded(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(examineRemovedFolder(KMFolder*))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)), + this, TQ_SLOT(propagateHeaderChanged(KMFolder*,int))); mExecuteSearchTimer = new TQTimer(0, "mExecuteSearchTimer"); - connect(mExecuteSearchTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(executeSearch())); + connect(mExecuteSearchTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(executeSearch())); } KMFolderSearch::~KMFolderSearch() @@ -381,7 +381,7 @@ KMFolderSearch::~KMFolderSearch() delete mSearch; mSearch = 0; if (mOpenCount > 0) - close("~foldersearch", TRUE); + close("~foldersearch", true); } void KMFolderSearch::setSearch(KMSearch *search) @@ -399,10 +399,10 @@ void KMFolderSearch::setSearch(KMSearch *search) delete mSearch; mSearch = search; // take ownership if (mSearch) { - TQObject::connect(search, TQT_SIGNAL(found(TQ_UINT32)), - TQT_SLOT(addSerNum(TQ_UINT32))); - TQObject::connect(search, TQT_SIGNAL(finished(bool)), - TQT_SLOT(searchFinished(bool))); + TQObject::connect(search, TQ_SIGNAL(found(TQ_UINT32)), + TQ_SLOT(addSerNum(TQ_UINT32))); + TQObject::connect(search, TQ_SIGNAL(finished(bool)), + TQ_SLOT(searchFinished(bool))); } } if (mSearch) @@ -502,8 +502,8 @@ int KMFolderSearch::addMsg(KMMessage*, int* index_return) bool KMFolderSearch::readSearch() { mSearch = new KMSearch; - TQObject::connect(mSearch, TQT_SIGNAL(found(TQ_UINT32)), TQT_SLOT(addSerNum(TQ_UINT32))); - TQObject::connect(mSearch, TQT_SIGNAL(finished(bool)), TQT_SLOT(searchFinished(bool))); + TQObject::connect(mSearch, TQ_SIGNAL(found(TQ_UINT32)), TQ_SLOT(addSerNum(TQ_UINT32))); + TQObject::connect(mSearch, TQ_SIGNAL(finished(bool)), TQ_SLOT(searchFinished(bool))); return mSearch->read(location()); } @@ -566,7 +566,7 @@ void KMFolderSearch::reallyDoClose(const char* owner) } mFolders.clear(); - clearIndex(TRUE); + clearIndex(true); if (mIdsStream) fclose(mIdsStream); @@ -603,8 +603,8 @@ int KMFolderSearch::create() clearIndex(); if (!mSearch) { mSearch = new KMSearch(); - TQObject::connect(mSearch, TQT_SIGNAL(found(TQ_UINT32)), TQT_SLOT(addSerNum(TQ_UINT32))); - TQObject::connect(mSearch, TQT_SIGNAL(finished(bool)), TQT_SLOT(searchFinished(bool))); + TQObject::connect(mSearch, TQ_SIGNAL(found(TQ_UINT32)), TQ_SLOT(addSerNum(TQ_UINT32))); + TQObject::connect(mSearch, TQ_SIGNAL(finished(bool)), TQ_SLOT(searchFinished(bool))); } mSearch->write(location()); mOpenCount++; @@ -779,8 +779,8 @@ int KMFolderSearch::writeIndex( bool ) if (fclose(tmpIndexStream) != 0) return errno; ::rename(TQFile::encodeName(tempName), TQFile::encodeName(indexLocation())); - mDirty = FALSE; - mUnlinked = FALSE; + mDirty = false; + mUnlinked = false; return 0; } @@ -959,9 +959,9 @@ void KMFolderSearch::examineAddedMessage(KMFolder *aFolder, TQ_UINT32 serNum) mFoldersCurrentlyBeingSearched.replace( folder, count+1 ); } else { connect( folder->storage(), - TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ), + TQ_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ), this, - TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, + TQ_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ) ); mFoldersCurrentlyBeingSearched.insert( folder, 1 ); } @@ -983,10 +983,10 @@ void KMFolderSearch::slotSearchExamineMsgDone( KMFolder* folder, unsigned int count = mFoldersCurrentlyBeingSearched[folder]; if ( count == 1 ) { disconnect( folder->storage(), - TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32, + TQ_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ), this, - TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, + TQ_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ) ); mFoldersCurrentlyBeingSearched.remove( folder ); } else { @@ -1120,9 +1120,9 @@ void KMFolderSearch::propagateHeaderChanged(KMFolder *aFolder, int idx) mFoldersCurrentlyBeingSearched.replace( aFolder, count+1 ); } else { connect( aFolder->storage(), - TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ), + TQ_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ), this, - TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, + TQ_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ) ); mFoldersCurrentlyBeingSearched.insert( aFolder, 1 ); } diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp index b4c9842b..496af0f8 100644 --- a/kmail/kmfolderseldlg.cpp +++ b/kmail/kmfolderseldlg.cpp @@ -62,10 +62,10 @@ KMFolderSelDlg::KMFolderSelDlg( TQWidget * parent, KMFolderTree * tree, void KMFolderSelDlg::init() { mTreeView->setFocus(); - connect( mTreeView, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( slotSelect() ) ); - connect( mTreeView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotUpdateBtnStatus() ) ); + connect( mTreeView, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( slotSelect() ) ); + connect( mTreeView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotUpdateBtnStatus() ) ); readConfig(); } diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index 312f4feb..00fcf6d4 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -281,7 +281,7 @@ void KMFolderTreeItem::slotNoContentChanged() { // reload the folder tree if the no content state changed, needed because // we hide no-content folders if their child nodes are hidden - TQTimer::singleShot( 0, static_cast<KMFolderTree*>( listView() ), TQT_SLOT(reload()) ); + TQTimer::singleShot( 0, static_cast<KMFolderTree*>( listView() ), TQ_SLOT(reload()) ); } //----------------------------------------------------------------------------- @@ -406,12 +406,12 @@ KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent, mPopup = new TDEPopupMenu(this); mPopup->insertTitle(i18n("View Columns")); mPopup->setCheckable(true); - mUnreadPop = mPopup->insertItem(i18n("Unread Column"), this, TQT_SLOT(slotToggleUnreadColumn())); - mTotalPop = mPopup->insertItem(i18n("Total Column"), this, TQT_SLOT(slotToggleTotalColumn())); - mSizePop = mPopup->insertItem(i18n("Size Column"), this, TQT_SLOT(slotToggleSizeColumn())); + mUnreadPop = mPopup->insertItem(i18n("Unread Column"), this, TQ_SLOT(slotToggleUnreadColumn())); + mTotalPop = mPopup->insertItem(i18n("Total Column"), this, TQ_SLOT(slotToggleTotalColumn())); + mSizePop = mPopup->insertItem(i18n("Size Column"), this, TQ_SLOT(slotToggleSizeColumn())); - connect( this, TQT_SIGNAL( triggerRefresh() ), - this, TQT_SLOT( refresh() ) ); + connect( this, TQ_SIGNAL( triggerRefresh() ), + this, TQ_SLOT( refresh() ) ); new FolderViewToolTip( this ); } @@ -420,61 +420,61 @@ KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent, // connects all needed signals to their slots void KMFolderTree::connectSignals() { - connect( mUpdateCountTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotUpdateCountTimeout()) ); + connect( mUpdateCountTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotUpdateCountTimeout()) ); - connect(&mUpdateTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(delayedUpdate())); + connect(&mUpdateTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(delayedUpdate())); - connect(kmkernel->folderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(doFolderListChanged())); + connect(kmkernel->folderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(doFolderListChanged())); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderMoveOrCopyOperationFinished()), - this, TQT_SLOT(slotFolderMoveOrCopyOperationFinished())); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderMoveOrCopyOperationFinished()), + this, TQ_SLOT(slotFolderMoveOrCopyOperationFinished())); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(doFolderListChanged())); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(doFolderListChanged())); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(doFolderListChanged())); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(doFolderListChanged())); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(doFolderListChanged())); + connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(doFolderListChanged())); - connect(kmkernel->acctMgr(), TQT_SIGNAL(accountRemoved(KMAccount*)), - this, TQT_SLOT(slotAccountRemoved(KMAccount*))); + connect(kmkernel->acctMgr(), TQ_SIGNAL(accountRemoved(KMAccount*)), + this, TQ_SLOT(slotAccountRemoved(KMAccount*))); - connect(kmkernel->acctMgr(), TQT_SIGNAL(accountAdded(KMAccount*)), - this, TQT_SLOT(slotUnhideLocalInbox())); + connect(kmkernel->acctMgr(), TQ_SIGNAL(accountAdded(KMAccount*)), + this, TQ_SLOT(slotUnhideLocalInbox())); - connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect( &autoopen_timer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( openFolder() ) ); + connect( &autoopen_timer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( openFolder() ) ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ), - this, TQT_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ), + this, TQ_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) ); - connect( this, TQT_SIGNAL( expanded( TQListViewItem* ) ), - this, TQT_SLOT( slotFolderExpanded( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( expanded( TQListViewItem* ) ), + this, TQ_SLOT( slotFolderExpanded( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( collapsed( TQListViewItem* ) ), - this, TQT_SLOT( slotFolderCollapsed( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( collapsed( TQListViewItem* ) ), + this, TQ_SLOT( slotFolderCollapsed( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString &)), - this, TQT_SLOT( slotRenameFolder( TQListViewItem*, int, const TQString &))); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString &)), + this, TQ_SLOT( slotRenameFolder( TQListViewItem*, int, const TQString &))); - connect( this, TQT_SIGNAL(folderSelected(KMFolder*)), TQT_SLOT(updateCopyActions()) ); + connect( this, TQ_SIGNAL(folderSelected(KMFolder*)), TQ_SLOT(updateCopyActions()) ); } //----------------------------------------------------------------------------- @@ -598,7 +598,7 @@ void KMFolderTree::reload(bool openFolders) { // we open all folders to update the count mUpdateIterator = TQListViewItemIterator (this); - TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateOneCount()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateOneCount()) ); } for ( TQListViewItemIterator it( this ) ; it.current() ; ++it ) { @@ -606,53 +606,53 @@ void KMFolderTree::reload(bool openFolders) if ( !fti || !fti->folder() ) continue; - disconnect(fti->folder(),TQT_SIGNAL(iconsChanged()), - fti,TQT_SLOT(slotIconsChanged())); - connect(fti->folder(),TQT_SIGNAL(iconsChanged()), - fti,TQT_SLOT(slotIconsChanged())); + disconnect(fti->folder(),TQ_SIGNAL(iconsChanged()), + fti,TQ_SLOT(slotIconsChanged())); + connect(fti->folder(),TQ_SIGNAL(iconsChanged()), + fti,TQ_SLOT(slotIconsChanged())); - disconnect(fti->folder(),TQT_SIGNAL(nameChanged()), - fti,TQT_SLOT(slotNameChanged())); - connect(fti->folder(),TQT_SIGNAL(nameChanged()), - fti,TQT_SLOT(slotNameChanged())); + disconnect(fti->folder(),TQ_SIGNAL(nameChanged()), + fti,TQ_SLOT(slotNameChanged())); + connect(fti->folder(),TQ_SIGNAL(nameChanged()), + fti,TQ_SLOT(slotNameChanged())); - disconnect( fti->folder(), TQT_SIGNAL(noContentChanged()), - fti, TQT_SLOT(slotNoContentChanged()) ); - connect( fti->folder(), TQT_SIGNAL(noContentChanged()), - fti, TQT_SLOT(slotNoContentChanged()) ); + disconnect( fti->folder(), TQ_SIGNAL(noContentChanged()), + fti, TQ_SLOT(slotNoContentChanged()) ); + connect( fti->folder(), TQ_SIGNAL(noContentChanged()), + fti, TQ_SLOT(slotNoContentChanged()) ); - disconnect( fti->folder(), TQT_SIGNAL(syncStateChanged()), - this, TQT_SLOT(slotSyncStateChanged()) ); - connect( fti->folder(), TQT_SIGNAL(syncStateChanged()), - this, TQT_SLOT(slotSyncStateChanged()) ); + disconnect( fti->folder(), TQ_SIGNAL(syncStateChanged()), + this, TQ_SLOT(slotSyncStateChanged()) ); + connect( fti->folder(), TQ_SIGNAL(syncStateChanged()), + this, TQ_SLOT(slotSyncStateChanged()) ); // we want to be noticed of changes to update the unread/total columns - disconnect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); - connect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); + disconnect(fti->folder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); + connect(fti->folder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); //} - disconnect(fti->folder(), TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); - connect(fti->folder(), TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); - disconnect(fti->folder(), TQT_SIGNAL(msgRemoved(KMFolder*)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); - connect(fti->folder(), TQT_SIGNAL(msgRemoved(KMFolder*)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); + disconnect(fti->folder(), TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); + connect(fti->folder(), TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); + disconnect(fti->folder(), TQ_SIGNAL(msgRemoved(KMFolder*)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); + connect(fti->folder(), TQ_SIGNAL(msgRemoved(KMFolder*)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); - disconnect(fti->folder(), TQT_SIGNAL(folderSizeChanged( KMFolder* )), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); - connect(fti->folder(), TQT_SIGNAL(folderSizeChanged( KMFolder* )), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); + disconnect(fti->folder(), TQ_SIGNAL(folderSizeChanged( KMFolder* )), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); + connect(fti->folder(), TQ_SIGNAL(folderSizeChanged( KMFolder* )), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); - disconnect(fti->folder(), TQT_SIGNAL(shortcutChanged(KMFolder*)), - mMainWidget, TQT_SLOT( slotShortcutChanged(KMFolder*))); - connect(fti->folder(), TQT_SIGNAL(shortcutChanged(KMFolder*)), - mMainWidget, TQT_SLOT( slotShortcutChanged(KMFolder*))); + disconnect(fti->folder(), TQ_SIGNAL(shortcutChanged(KMFolder*)), + mMainWidget, TQ_SLOT( slotShortcutChanged(KMFolder*))); + connect(fti->folder(), TQ_SIGNAL(shortcutChanged(KMFolder*)), + mMainWidget, TQ_SLOT( slotShortcutChanged(KMFolder*))); if (!openFolders) @@ -696,7 +696,7 @@ void KMFolderTree::slotUpdateOneCount() ++mUpdateIterator; if ( !fti->folder() ) { // next one please - TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateOneCount()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateOneCount()) ); return; } @@ -707,7 +707,7 @@ void KMFolderTree::slotUpdateOneCount() // restore previous state if (!open) fti->folder()->close("updatecount"); - TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateOneCount()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateOneCount()) ); } //----------------------------------------------------------------------------- @@ -737,7 +737,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent ) } else { // hide local inbox if unused if ( kmkernel->inboxFolder() == folder && hideLocalInbox() ) { - connect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQT_SLOT(slotUnhideLocalInbox()) ); + connect( kmkernel->inboxFolder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQ_SLOT(slotUnhideLocalInbox()) ); continue; } @@ -765,14 +765,14 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent ) removeFromFolderToItemMap( folder ); delete fti; // still, it might change in the future, so we better check the change signals - connect ( folder, TQT_SIGNAL(noContentChanged()), TQT_SLOT(delayedReload()) ); + connect ( folder, TQ_SIGNAL(noContentChanged()), TQ_SLOT(delayedReload()) ); continue; } - connect (fti, TQT_SIGNAL(iconChanged(KMFolderTreeItem*)), - this, TQT_SIGNAL(iconChanged(KMFolderTreeItem*))); - connect (fti, TQT_SIGNAL(nameChanged(KMFolderTreeItem*)), - this, TQT_SIGNAL(nameChanged(KMFolderTreeItem*))); + connect (fti, TQ_SIGNAL(iconChanged(KMFolderTreeItem*)), + this, TQ_SIGNAL(iconChanged(KMFolderTreeItem*))); + connect (fti, TQ_SIGNAL(nameChanged(KMFolderTreeItem*)), + this, TQ_SIGNAL(nameChanged(KMFolderTreeItem*))); } // restore last open-state fti->setOpen( readIsListViewItemOpen(fti) ); @@ -1094,7 +1094,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, if ( ( fti->folder() || (fti->text(0) != i18n("Searches")) ) && !multiFolder) folderMenu->insertItem(SmallIconSet("folder-new"), createChild, this, - TQT_SLOT(addChildFolder())); + TQ_SLOT(addChildFolder())); if (!fti->folder()) { mMainWidget->action("compact_all_folders")->plug(folderMenu); @@ -1102,7 +1102,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, } else if (fti->folder()->folderType() == KMFolderTypeImap) { folderMenu->insertItem(SmallIconSet("mail_get"), i18n("Check &Mail"), this, - TQT_SLOT(slotCheckMail())); + TQ_SLOT(slotCheckMail())); } } else { // regular folders @@ -1110,18 +1110,18 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, if ( !fti->folder()->noChildren() && !multiFolder ) { folderMenu->insertItem(SmallIconSet("folder-new"), i18n("&New Subfolder..."), this, - TQT_SLOT(addChildFolder())); + TQ_SLOT(addChildFolder())); } // copy folder TQPopupMenu *copyMenu = new TQPopupMenu( folderMenu ); - folderToPopupMenu( CopyFolder, TQT_TQOBJECT(this), &mMenuToFolder, copyMenu ); + folderToPopupMenu( CopyFolder, this, &mMenuToFolder, copyMenu ); folderMenu->insertItem( i18n("&Copy Folder To"), copyMenu ); if ( fti->folder()->isMoveable() && fti->folder()->canDeleteMessages() ) { TQPopupMenu *moveMenu = new TQPopupMenu( folderMenu ); - folderToPopupMenu( MoveFolder, TQT_TQOBJECT(this), &mMenuToFolder, moveMenu ); + folderToPopupMenu( MoveFolder, this, &mMenuToFolder, moveMenu ); folderMenu->insertItem( i18n("&Move Folder To"), moveMenu ); } @@ -1139,7 +1139,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, if ( GlobalSettings::self()->enableFavoriteFolderView() ) { folderMenu->insertItem( SmallIconSet("bookmark_add"), i18n("Add to Favorite Folders"), - this, TQT_SLOT(slotAddToFavorites()) ); + this, TQ_SLOT(slotAddToFavorites()) ); } folderMenu->insertSeparator(); @@ -1158,24 +1158,24 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, { folderMenu->insertItem(SmallIconSet("bookmark_folder"), i18n("Serverside Subscription..."), mMainWidget, - TQT_SLOT(slotSubscriptionDialog())); + TQ_SLOT(slotSubscriptionDialog())); folderMenu->insertItem(SmallIcon("bookmark_folder"), i18n("Local Subscription..."), mMainWidget, - TQT_SLOT(slotLocalSubscriptionDialog())); + TQ_SLOT(slotLocalSubscriptionDialog())); if (!fti->folder()->noContent()) { mMainWidget->action("refresh_folder")->plug(folderMenu); if ( fti->folder()->folderType() == KMFolderTypeImap && !multiFolder ) { folderMenu->insertItem(SmallIconSet("reload"), i18n("Refresh Folder List"), this, - TQT_SLOT(slotResetFolderList())); + TQ_SLOT(slotResetFolderList())); } } if ( fti->folder()->folderType() == KMFolderTypeCachedImap && !multiFolder ) { KMFolderCachedImap * folder = static_cast<KMFolderCachedImap*>( fti->folder()->storage() ); folderMenu->insertItem( SmallIconSet("wizard"), i18n("&Troubleshoot IMAP Cache..."), - folder, TQT_SLOT(slotTroubleshoot()) ); + folder, TQ_SLOT(slotTroubleshoot()) ); } folderMenu->insertSeparator(); } @@ -1189,11 +1189,11 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, folderMenu->insertItem(SmallIconSet("configure_shortcuts"), i18n("&Assign Shortcut..."), fti, - TQT_SLOT(assignShortcut())); + TQ_SLOT(assignShortcut())); if ( !fti->folder()->noContent() && fti->folder()->canDeleteMessages() ) { folderMenu->insertItem( i18n("Expire..."), fti, - TQT_SLOT( slotShowExpiryProperties() ) ); + TQ_SLOT( slotShowExpiryProperties() ) ); } mMainWidget->action("modify")->plug(folderMenu); } @@ -1860,15 +1860,15 @@ void KMFolderTree::folderToPopupMenu( MenuAction action, TQObject *receiver, // connect the signals if ( action == MoveMessage || action == MoveFolder ) { - disconnect( menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(moveSelectedToFolder(int)) ); - connect( menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(moveSelectedToFolder(int)) ); + disconnect( menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(moveSelectedToFolder(int)) ); + connect( menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(moveSelectedToFolder(int)) ); } else { - disconnect( menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(copySelectedToFolder(int)) ); - connect( menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(copySelectedToFolder(int)) ); + disconnect( menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(copySelectedToFolder(int)) ); + connect( menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(copySelectedToFolder(int)) ); } if ( !item ) { item = firstChild(); @@ -2176,14 +2176,14 @@ void KMFolderTree::slotAddToFavorites() void KMFolderTree::slotUnhideLocalInbox() { - disconnect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), - this, TQT_SLOT(slotUnhideLocalInbox()) ); + disconnect( kmkernel->inboxFolder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), + this, TQ_SLOT(slotUnhideLocalInbox()) ); reload(); } void KMFolderTree::delayedReload() { - TQTimer::singleShot( 0, this, TQT_SLOT(reload()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(reload()) ); } #include "kmfoldertree.moc" diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h index 8184c061..f6e5df11 100644 --- a/kmail/kmfoldertree.h +++ b/kmail/kmfoldertree.h @@ -21,7 +21,7 @@ #include "foldertreebase.h" #include <tdelocale.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tqguardedptr.h> #include <tqwidget.h> @@ -42,7 +42,7 @@ class KMAccount; typedef TQMap<int,KMFolder*> KMMenuToFolder; template <typename T> class TQGuardedPtr; -class KDE_EXPORT KMFolderTreeItem : public TQObject, public KFolderTreeItem +class TDE_EXPORT KMFolderTreeItem : public TQObject, public KFolderTreeItem { TQ_OBJECT diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index eaf045b4..06de88fb 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -140,7 +140,7 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent, mPopup->insertItem(i18n("Size"), KPaintInfo::COL_SIZE); mPopup->insertItem(i18n("Receiver"), KPaintInfo::COL_RECEIVER); - connect(mPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleColumn(int))); + connect(mPopup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotToggleColumn(int))); setShowSortIndicator(true); setFocusPolicy( TQWidget::WheelFocus ); @@ -203,18 +203,18 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent, header()->setResizeEnabled( true, mPaintInfo.senderCol ); header()->setResizeEnabled( true, mPaintInfo.dateCol ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int )), - this, TQT_SLOT( rightButtonPressed( TQListViewItem*, const TQPoint &, int ))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this,TQT_SLOT(selectMessage(TQListViewItem*))); - connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int )), + this, TQ_SLOT( rightButtonPressed( TQListViewItem*, const TQPoint &, int ))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this,TQ_SLOT(selectMessage(TQListViewItem*))); + connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); resetCurrentTime(); mSubjectLists.setAutoDelete( true ); mMoveMessages = false; - connect( this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateActions()) ); + connect( this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateActions()) ); } @@ -428,10 +428,10 @@ void KMHeaders::readColorConfig (void) TDEConfig* config = KMKernel::config(); // Custom/System colors TDEConfigGroupSaver saver(config, "Reader"); - TQColor c1=TQColor(kapp->palette().active().text()); + TQColor c1=TQColor(tdeApp->palette().active().text()); TQColor c2=TQColor("red"); TQColor c3=TQColor("blue"); - TQColor c4=TQColor(kapp->palette().active().base()); + TQColor c4=TQColor(tdeApp->palette().active().base()); TQColor c5=TQColor(0,0x7F,0); TQColor c6=TQColor(0,0x98,0); TQColor c7=TDEGlobalSettings::alternateBackgroundColor(); @@ -439,7 +439,7 @@ void KMHeaders::readColorConfig (void) if (!config->readBoolEntry("defaultColors",true)) { mPaintInfo.colFore = config->readColorEntry("ForegroundColor",&c1); mPaintInfo.colBack = config->readColorEntry("BackgroundColor",&c4); - TQPalette newPal = kapp->palette(); + TQPalette newPal = tdeApp->palette(); newPal.setColor( TQColorGroup::Base, mPaintInfo.colBack ); newPal.setColor( TQColorGroup::Text, mPaintInfo.colFore ); setPalette( newPal ); @@ -452,7 +452,7 @@ void KMHeaders::readColorConfig (void) else { mPaintInfo.colFore = c1; mPaintInfo.colBack = c4; - TQPalette newPal = kapp->palette(); + TQPalette newPal = tdeApp->palette(); newPal.setColor( TQColorGroup::Base, c4 ); newPal.setColor( TQColorGroup::Text, c1 ); setPalette( newPal ); @@ -698,28 +698,28 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) // from this folder, since it's msg's are about to be deleted. highlightMessage(0, false); - disconnect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(setFolderInfoStatus())); + disconnect(mFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this, TQ_SLOT(setFolderInfoStatus())); mFolder->markNewAsUnread(); writeFolderConfig(); - disconnect(mFolder, TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)), - this, TQT_SLOT(msgHeaderChanged(KMFolder*,int))); - disconnect(mFolder, TQT_SIGNAL(msgAdded(int)), - this, TQT_SLOT(msgAdded(int))); - disconnect(mFolder, TQT_SIGNAL( msgRemoved( int, TQString ) ), - this, TQT_SLOT( msgRemoved( int, TQString ) ) ); - disconnect(mFolder, TQT_SIGNAL(changed()), - this, TQT_SLOT(msgChanged())); - disconnect(mFolder, TQT_SIGNAL(cleared()), - this, TQT_SLOT(folderCleared())); - disconnect(mFolder, TQT_SIGNAL(expunged( KMFolder* )), - this, TQT_SLOT(folderCleared())); - disconnect(mFolder, TQT_SIGNAL(closed()), - this, TQT_SLOT(folderClosed())); - disconnect( mFolder, TQT_SIGNAL( statusMsg( const TQString& ) ), - BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) ); - disconnect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset())); + disconnect(mFolder, TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)), + this, TQ_SLOT(msgHeaderChanged(KMFolder*,int))); + disconnect(mFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(msgAdded(int))); + disconnect(mFolder, TQ_SIGNAL( msgRemoved( int, TQString ) ), + this, TQ_SLOT( msgRemoved( int, TQString ) ) ); + disconnect(mFolder, TQ_SIGNAL(changed()), + this, TQ_SLOT(msgChanged())); + disconnect(mFolder, TQ_SIGNAL(cleared()), + this, TQ_SLOT(folderCleared())); + disconnect(mFolder, TQ_SIGNAL(expunged( KMFolder* )), + this, TQ_SLOT(folderCleared())); + disconnect(mFolder, TQ_SIGNAL(closed()), + this, TQ_SLOT(folderClosed())); + disconnect( mFolder, TQ_SIGNAL( statusMsg( const TQString& ) ), + BroadcastStatus::instance(), TQ_SLOT( setStatusMsg( const TQString& ) ) ); + disconnect(mFolder, TQ_SIGNAL(viewConfigChanged()), this, TQ_SLOT(reset())); writeSortOrder(); mFolder->close("kmheaders"); // System folders remain open but we also should write the index from @@ -736,25 +736,25 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) mOwner->messageActions()->replyListAction()->setEnabled( mFolder ? mFolder->isMailingListEnabled() : false ); if ( mFolder ) { - connect(mFolder, TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)), - this, TQT_SLOT(msgHeaderChanged(KMFolder*,int))); - connect(mFolder, TQT_SIGNAL(msgAdded(int)), - this, TQT_SLOT(msgAdded(int))); - connect(mFolder, TQT_SIGNAL(msgRemoved(int,TQString)), - this, TQT_SLOT(msgRemoved(int,TQString))); - connect(mFolder, TQT_SIGNAL(changed()), - this, TQT_SLOT(msgChanged())); - connect(mFolder, TQT_SIGNAL(cleared()), - this, TQT_SLOT(folderCleared())); - connect(mFolder, TQT_SIGNAL(expunged( KMFolder* )), - this, TQT_SLOT(folderCleared())); - connect(mFolder, TQT_SIGNAL(closed()), - this, TQT_SLOT(folderClosed())); - connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)), - BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) ); - connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(setFolderInfoStatus())); - connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset())); + connect(mFolder, TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)), + this, TQ_SLOT(msgHeaderChanged(KMFolder*,int))); + connect(mFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(msgAdded(int))); + connect(mFolder, TQ_SIGNAL(msgRemoved(int,TQString)), + this, TQ_SLOT(msgRemoved(int,TQString))); + connect(mFolder, TQ_SIGNAL(changed()), + this, TQ_SLOT(msgChanged())); + connect(mFolder, TQ_SIGNAL(cleared()), + this, TQ_SLOT(folderCleared())); + connect(mFolder, TQ_SIGNAL(expunged( KMFolder* )), + this, TQ_SLOT(folderCleared())); + connect(mFolder, TQ_SIGNAL(closed()), + this, TQ_SLOT(folderClosed())); + connect(mFolder, TQ_SIGNAL(statusMsg(const TQString&)), + BroadcastStatus::instance(), TQ_SLOT( setStatusMsg( const TQString& ) ) ); + connect(mFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this, TQ_SLOT(setFolderInfoStatus())); + connect(mFolder, TQ_SIGNAL(viewConfigChanged()), this, TQ_SLOT(reset())); // Not very nice, but if we go from nested to non-nested // in the folderConfig below then we need to do this otherwise @@ -844,8 +844,8 @@ void KMHeaders::msgChanged() } // if (!isUpdatesEnabled()) return; // prevent IMAP messages from scrolling to top - disconnect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); updateMessageList(); // do not change the selection @@ -866,8 +866,8 @@ void KMHeaders::msgChanged() } } - connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); // if the current message has changed then emit // the selected signal to force an update @@ -982,8 +982,8 @@ void KMHeaders::msgAdded(int id) /* In case the current item is taken during reparenting, prevent qlistview * from selecting some unrelated item as a result of take() emitting * currentChanged. */ - disconnect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); if ( !msgId.isEmpty() ) { TQPtrListIterator<HeaderItem> it(mImperfectlyThreadedList); @@ -1052,7 +1052,7 @@ void KMHeaders::msgAdded(int id) sci->setItem(hi); } if (mSortInfo.fakeSort) { - TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); + TQObject::disconnect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int))); TDEListView::setSorting(mSortCol, !mSortDescending ); mSortInfo.fakeSort = 0; } @@ -1068,8 +1068,8 @@ void KMHeaders::msgAdded(int id) } /* restore signal */ - connect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + connect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); emit msgAddedToListView( hi ); END_TIMER(msgAdded); @@ -1089,8 +1089,8 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) * item once this one is removed. Sine we have already selected * something in prepare/finalizeMove that's counter productive */ - disconnect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); HeaderItem *removedItem = mItems[id]; if (!removedItem) return; @@ -1137,7 +1137,7 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) } item->setTempKey( key + item->key( mSortCol, !mSortDescending )); if (mSortInfo.fakeSort) { - TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); + TQObject::disconnect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int))); TDEListView::setSorting(mSortCol, !mSortDescending ); mSortInfo.fakeSort = 0; } @@ -1201,8 +1201,8 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) } } /* restore signal */ - connect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + connect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); } @@ -1452,7 +1452,7 @@ void KMHeaders::applyFiltersOnMsg() TQString statusMsg = i18n("Filtering message %1 of %2"); statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter ); KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg ); - TDEApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 ); } KMFolder *folder = 0; @@ -1467,8 +1467,8 @@ void KMHeaders::applyFiltersOnMsg() msg->setTransferInProgress(true); if (!msg->isComplete()) { FolderJob *job = mFolder->createJob(msg); - connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - this, TQT_SLOT(slotFilterMsg(KMMessage*))); + connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + this, TQ_SLOT(slotFilterMsg(KMMessage*))); job->start(); } else { if (slotFilterMsg(msg) == 2) @@ -1518,8 +1518,8 @@ void KMHeaders::deleteMsg () finalizeMove( nextItem, contentX, contentY ); KMCommand *command = new KMDeleteMsgCommand( mFolder, msgList ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotMoveCompleted( KMCommand * ) ) ); command->start(); BroadcastStatus::instance()->setStatusMsg(""); @@ -1540,8 +1540,8 @@ HeaderItem* KMHeaders::prepareMove( int *contentX, int *contentY ) HeaderItem *ret = 0; emit maybeDeleting(); - disconnect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); TQListViewItem *curItem; HeaderItem *item; @@ -1577,8 +1577,8 @@ void KMHeaders::finalizeMove( HeaderItem *item, int contentX, int contentY ) setContentsPos( contentX, contentY ); makeHeaderVisible(); - connect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + connect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); } @@ -1607,8 +1607,8 @@ void KMHeaders::moveMsgToFolder ( KMFolder* destFolder, bool askForConfirmation finalizeMove( nextItem, contentX, contentY ); KMCommand *command = new KMMoveCommand( destFolder, msgList ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotMoveCompleted( KMCommand * ) ) ); command->start(); } @@ -1884,13 +1884,13 @@ void KMHeaders::incCurrentMessage() TQListViewItem *lvi = currentItem(); if ( lvi && lvi->itemBelow() ) { - disconnect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); setCurrentItem( lvi->itemBelow() ); ensureCurrentItemVisible(); setFocus(); - connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); } } @@ -1901,13 +1901,13 @@ void KMHeaders::decCurrentMessage() return; TQListViewItem *lvi = currentItem(); if ( lvi && lvi->itemAbove() ) { - disconnect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); setCurrentItem( lvi->itemAbove() ); ensureCurrentItemVisible(); setFocus(); - connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); } } @@ -2159,7 +2159,7 @@ void KMHeaders::resetCurrentTime() mDate.reset(); // only reset exactly during minute switch TQTimer::singleShot( ( 60-TQTime::currentTime().second() ) * 1000, - this, TQT_SLOT( resetCurrentTime() ) ); + this, TQ_SLOT( resetCurrentTime() ) ); } //----------------------------------------------------------------------------- @@ -2240,8 +2240,8 @@ void KMHeaders::keyPressEvent( TQKeyEvent * e ) if (cntrl) { if (!shft) - disconnect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); switch (e->key()) { case Key_Down: case Key_Up: @@ -2253,8 +2253,8 @@ void KMHeaders::keyPressEvent( TQKeyEvent * e ) TDEListView::keyPressEvent( e ); } if (!shft) - connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); } } @@ -2464,7 +2464,7 @@ void KMHeaders::slotRMB() menu->insertSeparator(); TQPopupMenu *msgCopyMenu = new TQPopupMenu(menu); - mOwner->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this), + mOwner->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this, &mMenuToFolder, msgCopyMenu ); menu->insertItem(i18n("&Copy To"), msgCopyMenu); @@ -2473,7 +2473,7 @@ void KMHeaders::slotRMB() menu->setItemEnabled( id, false ); } else { TQPopupMenu *msgMoveMenu = new TQPopupMenu(menu); - mOwner->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, TQT_TQOBJECT(this), + mOwner->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, this, &mMenuToFolder, msgMoveMenu ); menu->insertItem(i18n("&Move To"), msgMoveMenu); } @@ -2623,7 +2623,7 @@ void KMHeaders::setSorting( int column, bool ascending ) // if (column != mSortCol) // setColumnText( mSortCol, TQIconSet( TQPixmap()), columnText( mSortCol )); if(mSortInfo.dirty || column != mSortInfo.column || ascending != mSortInfo.ascending) { //dirtied - TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); + TQObject::disconnect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int))); mSortInfo.dirty = true; } @@ -2865,7 +2865,7 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi) void KMHeaders::dirtySortOrder(int column) { mSortInfo.dirty = true; - TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); + TQObject::disconnect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int))); setSorting(column, mSortInfo.column == column ? !mSortInfo.ascending : true); } @@ -3109,7 +3109,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) //Hackyness to work around qlistview problems TDEListView::setSorting(-1); header()->setSortIndicator(column, ascending); - TQObject::connect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); + TQObject::connect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int))); //setup mSortInfo here now, as above may change it mSortInfo.dirty = false; mSortInfo.column = (short)column; @@ -3556,7 +3556,7 @@ void KMHeaders::cutMessages() void KMHeaders::pasteMessages() { - new MessageCopyHelper( mCopiedMessages, folder(), mMoveMessages, TQT_TQOBJECT(this) ); + new MessageCopyHelper( mCopiedMessages, folder(), mMoveMessages, this ); if ( mMoveMessages ) { mCopiedMessages.clear(); updateActions(); diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index 473188e6..962271e6 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -60,7 +60,7 @@ using KMail::FolderIface; #include <tdemessagebox.h> #include <knotifyclient.h> #include <kstaticdeleter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <kprogress.h> #include <kpassivepopup.h> @@ -173,8 +173,8 @@ KMKernel::KMKernel (TQObject *parent, const char *name) : #ifdef __TDE_HAVE_TDEHWLIB mNetworkManager = TDEGlobal::networkManager(); if (mNetworkManager) { - connect( mNetworkManager, TQT_SIGNAL( networkDeviceStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ), - this, TQT_SLOT( slotNetworkStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ) ); + connect( mNetworkManager, TQ_SIGNAL( networkDeviceStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ), + this, TQ_SLOT( slotNetworkStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ) ); if (networkStateConnected()) { resumeNetworkJobs(); } @@ -390,7 +390,7 @@ void KMKernel::openReader( bool onlyCheck ) // Activate window - doing this instead of KWin::activateWindow(mWin->winId()); // so that it also works when called from KMailApplication::newInstance() #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY - TDEStartupInfo::setNewStartupId( mWin, kapp->startupId() ); + TDEStartupInfo::setNewStartupId( mWin, tdeApp->startupId() ); #endif } } @@ -460,7 +460,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc, // Activate window - doing this instead of KWin::activateWindow(cWin->winId()); // so that it also works when called from KMailApplication::newInstance() #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY - TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() ); + TDEStartupInfo::setNewStartupId( cWin, tdeApp->startupId() ); #endif } return 1; @@ -607,7 +607,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc, // Activate window - doing this instead of KWin::activateWindow(cWin->winId()); // so that it also works when called from KMailApplication::newInstance() #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY - TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() ); + TDEStartupInfo::setNewStartupId( cWin, tdeApp->startupId() ); #endif } else { cWin->setAutoDeleteWindow( true ); @@ -653,7 +653,7 @@ DCOPRef KMKernel::openComposer(const TQString &to, const TQString &cc, // Activate window - doing this instead of KWin::activateWindow(cWin->winId()); // so that it also works when called from KMailApplication::newInstance() #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY - TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() ); + TDEStartupInfo::setNewStartupId( cWin, tdeApp->startupId() ); #endif } @@ -1357,7 +1357,7 @@ void KMKernel::slotSenderFinished() good, Folder manager go compact sent-mail and outbox clean up stage1 (release folders and config, unregister from dcop) -- another kmail may start now --- - kapp->quit(); + tdeApp->quit(); } */ @@ -1582,17 +1582,17 @@ void KMKernel::init() the_weaverLogger->attach (the_weaver); //#endif - connect( the_folderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ), - this, TQT_SIGNAL( folderRemoved(KMFolder*) ) ); - connect( the_dimapFolderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ), - this, TQT_SIGNAL( folderRemoved(KMFolder*) ) ); - connect( the_imapFolderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ), - this, TQT_SIGNAL( folderRemoved(KMFolder*) ) ); - connect( the_searchFolderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ), - this, TQT_SIGNAL( folderRemoved(KMFolder*) ) ); + connect( the_folderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ), + this, TQ_SIGNAL( folderRemoved(KMFolder*) ) ); + connect( the_dimapFolderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ), + this, TQ_SIGNAL( folderRemoved(KMFolder*) ) ); + connect( the_imapFolderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ), + this, TQ_SIGNAL( folderRemoved(KMFolder*) ) ); + connect( the_searchFolderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ), + this, TQ_SIGNAL( folderRemoved(KMFolder*) ) ); mBackgroundTasksTimer = new TQTimer( this, "mBackgroundTasksTimer" ); - connect( mBackgroundTasksTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRunBackgroundTasks() ) ); + connect( mBackgroundTasksTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotRunBackgroundTasks() ) ); #ifdef DEBUG_SCHEDULER // for debugging, see jobscheduler.h mBackgroundTasksTimer->start( 10000, true ); // 10s, singleshot #else @@ -1744,7 +1744,7 @@ bool KMKernel::doSessionManagement() { // Do session management - if (kapp->isRestored()){ + if (tdeApp->isRestored()){ int n = 1; while (KMMainWin::canBeRestored(n)){ //only restore main windows! (Matthias); @@ -1884,7 +1884,7 @@ bool KMKernel::transferMail( TQString & destinationDir ) #if 0 // disabled for now since moving fails in certain cases (e.g. if symbolic links are involved) - const TQString kmailName = kapp->aboutData()->programName(); + const TQString kmailName = tdeApp->aboutData()->programName(); TQString msg; if ( TDEIO::NetAccess::exists( destinationDir, true, 0 ) ) { // if destinationDir exists, we need to warn about possible @@ -1962,7 +1962,7 @@ void KMKernel::kmailMsgHandler(TQtMsgType aType, const char* aMsg) case TQtFatalMsg: // Hm, what about using kdFatal() here? ungrabPtrKb(); - kdDebug(5006) << kapp->caption() << " fatal error " + kdDebug(5006) << tdeApp->caption() << " fatal error " << aMsg << endl; KMessageBox::error(0, aMsg); abort(); @@ -2020,10 +2020,10 @@ void KMKernel::byteArrayToRemoteFile(const TQByteArray &aData, const KURL &aURL, TDEIO::Job *job = TDEIO::put(aURL, -1, overwrite, false); putData pd; pd.url = aURL; pd.data = aData; pd.offset = 0; mPutJobs.insert(job, pd); - connect(job, TQT_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)), - TQT_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&))); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)), + TQ_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotResult(TDEIO::Job*))); } void KMKernel::slotDataReq(TDEIO::Job *job, TQByteArray &data) @@ -2079,8 +2079,8 @@ void KMKernel::slotShowConfigurationDialog() { if( !mConfigureDialog ) { mConfigureDialog = new ConfigureDialog( 0, "configure", false ); - connect( mConfigureDialog, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( slotConfigChanged() ) ); + connect( mConfigureDialog, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( slotConfigChanged() ) ); } if( KMKernel::getKMMainWidget() == 0 ) @@ -2344,7 +2344,7 @@ void KMKernel::selectFolder( TQString folderPath ) KMMainWidget *KMKernel::getKMMainWidget() { //This could definitely use a speadup - TQWidgetList *l = kapp->topLevelWidgets(); + TQWidgetList *l = tdeApp->topLevelWidgets(); TQWidgetListIt it( *l ); TQWidget *wid; @@ -2420,7 +2420,7 @@ KMFolder* KMKernel::findFolderById( const TQString& idString ) ::KIMProxy* KMKernel::imProxy() { - return KIMProxy::instance( kapp->dcopClient() ); + return KIMProxy::instance( tdeApp->dcopClient() ); } void KMKernel::enableMailCheck() diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index 20d3633b..ea3610bb 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -7,11 +7,11 @@ #include <weaver.h> #include <weaverlogger.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tdeconfig.h> #include <tdeversion.h> #include <tdeimproxy.h> -#include <kdemacros.h> +#include <tdemacros.h> #ifdef __TDE_HAVE_TDEHWLIB # include <tdenetworkconnections.h> @@ -88,7 +88,7 @@ class ConfigureDialog; * (singleton) objects such as the UndoStack, the folder managers and filter * manager, etc. */ -class KDE_EXPORT KMKernel : public TQObject, virtual public KMailIface +class TDE_EXPORT KMKernel : public TQObject, virtual public KMailIface { TQ_OBJECT @@ -285,7 +285,7 @@ public: const KURL &messageFile, const KURL::List &attach, const QCStringList &customHeaders); void byteArrayToRemoteFile(const TQByteArray&, const KURL&, - bool overwrite = FALSE); + bool overwrite = false); bool folderIsDraftOrOutbox( const KMFolder * ); bool folderIsDrafts( const KMFolder * ); bool folderIsTemplates( const KMFolder * ); @@ -486,7 +486,7 @@ private: TQString the_previousVersion; /** is this the first start? read from config */ bool the_firstStart; - /** are we starting up? set in main.cpp directly before kapp->exec() */ + /** are we starting up? set in main.cpp directly before tdeApp->exec() */ bool the_startingUp; /** are we going down? set from here */ bool the_shuttingDown; diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp index 45585147..92cc4f7f 100644 --- a/kmail/kmlineeditspell.cpp +++ b/kmail/kmlineeditspell.cpp @@ -156,7 +156,7 @@ TQPopupMenu *KMLineEdit::createPopupMenu() menu->insertSeparator(); menu->insertItem( i18n( "Edit Recent Addresses..." ), - this, TQT_SLOT( editRecentAddresses() ) ); + this, TQ_SLOT( editRecentAddresses() ) ); return menu; } diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 0b5c6d6f..b1b1a5bb 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -36,7 +36,7 @@ #include <tdefiledialog.h> #include <ktip.h> #include <knotifydialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <dcopclient.h> #include <kaddrbook.h> #include <tdeaccel.h> @@ -203,41 +203,41 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, activatePanners(); - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowStartupFolder() )); + TQTimer::singleShot( 0, this, TQ_SLOT( slotShowStartupFolder() )); - connect( kmkernel->acctMgr(), TQT_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ), - this, TQT_SLOT( slotMailChecked( bool, bool, const TQMap<TQString, int> & ) ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ), + this, TQ_SLOT( slotMailChecked( bool, bool, const TQMap<TQString, int> & ) ) ); - connect( kmkernel->acctMgr(), TQT_SIGNAL( accountAdded( KMAccount* ) ), - this, TQT_SLOT( initializeIMAPActions() ) ); - connect( kmkernel->acctMgr(), TQT_SIGNAL( accountRemoved( KMAccount* ) ), - this, TQT_SLOT( initializeIMAPActions() ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( accountAdded( KMAccount* ) ), + this, TQ_SLOT( initializeIMAPActions() ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( accountRemoved( KMAccount* ) ), + this, TQ_SLOT( initializeIMAPActions() ) ); - connect(kmkernel, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( slotConfigChanged() )); + connect(kmkernel, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( slotConfigChanged() )); // display the full path to the folder in the caption - connect(mFolderTree, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(slotChangeCaption(TQListViewItem*))); - connect(mFolderTree, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(updateFolderMenu()) ); - connect( mFolderTree, TQT_SIGNAL(syncStateChanged()), - TQT_SLOT(updateFolderMenu()) ); + connect(mFolderTree, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(slotChangeCaption(TQListViewItem*))); + connect(mFolderTree, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(updateFolderMenu()) ); + connect( mFolderTree, TQ_SIGNAL(syncStateChanged()), + TQ_SLOT(updateFolderMenu()) ); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect( kmkernel, TQT_SIGNAL( onlineStatusChanged( GlobalSettings::EnumNetworkState::type ) ), - this, TQT_SLOT( slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) ) ); + connect( kmkernel, TQ_SIGNAL( onlineStatusChanged( GlobalSettings::EnumNetworkState::type ) ), + this, TQ_SLOT( slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) ) ); toggleSystemTray(); @@ -249,9 +249,9 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, KStatusBar *sb = mainWin ? mainWin->statusBar() : 0; mVacationScriptIndicator = new KStatusBarLabel( TQString(), 0, sb ); mVacationScriptIndicator->hide(); - connect( mVacationScriptIndicator, TQT_SIGNAL(itemReleased(int)), TQT_SLOT(slotEditVacation()) ); + connect( mVacationScriptIndicator, TQ_SIGNAL(itemReleased(int)), TQ_SLOT(slotEditVacation()) ); if ( GlobalSettings::checkOutOfOfficeOnStartup() ) - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckVacation()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotCheckVacation()) ); } @@ -468,7 +468,7 @@ void KMMainWidget::readConfig(void) bool check = config->readBoolEntry("checkmail-startup", false); if (check) // do it after building the kmmainwin, so that the progressdialog is available - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotCheckMail() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotCheckMail() ) ); } } @@ -609,69 +609,69 @@ void KMMainWidget::createWidgets(void) actionCollection(), "headers quick search line" ); #endif label->setBuddy( mQuickSearchLine ); - connect( mQuickSearchLine, TQT_SIGNAL( requestFullSearch() ), - this, TQT_SLOT( slotRequestFullSearchFromQuickSearch() ) ); + connect( mQuickSearchLine, TQ_SIGNAL( requestFullSearch() ), + this, TQ_SLOT( slotRequestFullSearchFromQuickSearch() ) ); mSearchToolBar->setStretchableWidget( mQuickSearchLine ); - connect( mHeaders, TQT_SIGNAL( messageListUpdated() ), - mQuickSearchLine, TQT_SLOT( updateSearch() ) ); + connect( mHeaders, TQ_SIGNAL( messageListUpdated() ), + mQuickSearchLine, TQ_SLOT( updateSearch() ) ); if ( !GlobalSettings::self()->quickSearchActive() ) mSearchToolBar->hide(); if (mReaderWindowActive) { - connect(mHeaders, TQT_SIGNAL(selected(KMMessage*)), - this, TQT_SLOT(slotMsgSelected(KMMessage*))); + connect(mHeaders, TQ_SIGNAL(selected(KMMessage*)), + this, TQ_SLOT(slotMsgSelected(KMMessage*))); } - connect(mHeaders, TQT_SIGNAL(activated(KMMessage*)), - this, TQT_SLOT(slotMsgActivated(KMMessage*))); - connect( mHeaders, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( startUpdateMessageActionsTimer() ) ); + connect(mHeaders, TQ_SIGNAL(activated(KMMessage*)), + this, TQ_SLOT(slotMsgActivated(KMMessage*))); + connect( mHeaders, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( startUpdateMessageActionsTimer() ) ); TQAccel *accel = actionCollection()->tdeaccel(); accel->connectItem(accel->insertItem(SHIFT+Key_Left), - mHeaders, TQT_SLOT(selectPrevMessage())); + mHeaders, TQ_SLOT(selectPrevMessage())); accel->connectItem(accel->insertItem(SHIFT+Key_Right), - mHeaders, TQT_SLOT(selectNextMessage())); + mHeaders, TQ_SLOT(selectNextMessage())); if (mReaderWindowActive) { - mMsgView = new KMReaderWin(messageParent, TQT_TQWIDGET(this), actionCollection(), 0 ); + mMsgView = new KMReaderWin(messageParent, this, actionCollection(), 0 ); if ( mMsgActions ) { mMsgActions->setMessageView( mMsgView ); } - connect(mMsgView, TQT_SIGNAL(replaceMsgByUnencryptedVersion()), - this, TQT_SLOT(slotReplaceMsgByUnencryptedVersion())); - connect(mMsgView, TQT_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)), - this, TQT_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&))); - connect(mMsgView, TQT_SIGNAL(urlClicked(const KURL&,int)), - mMsgView, TQT_SLOT(slotUrlClicked())); - connect(mHeaders, TQT_SIGNAL(maybeDeleting()), - mMsgView, TQT_SLOT(clearCache())); - connect(mMsgView, TQT_SIGNAL(noDrag()), - mHeaders, TQT_SLOT(slotNoDrag())); + connect(mMsgView, TQ_SIGNAL(replaceMsgByUnencryptedVersion()), + this, TQ_SLOT(slotReplaceMsgByUnencryptedVersion())); + connect(mMsgView, TQ_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)), + this, TQ_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&))); + connect(mMsgView, TQ_SIGNAL(urlClicked(const KURL&,int)), + mMsgView, TQ_SLOT(slotUrlClicked())); + connect(mHeaders, TQ_SIGNAL(maybeDeleting()), + mMsgView, TQ_SLOT(clearCache())); + connect(mMsgView, TQ_SIGNAL(noDrag()), + mHeaders, TQ_SLOT(slotNoDrag())); accel->connectItem(accel->insertItem(Key_Up), - mMsgView, TQT_SLOT(slotScrollUp())); + mMsgView, TQ_SLOT(slotScrollUp())); accel->connectItem(accel->insertItem(Key_Down), - mMsgView, TQT_SLOT(slotScrollDown())); + mMsgView, TQ_SLOT(slotScrollDown())); accel->connectItem(accel->insertItem(Key_Prior), - mMsgView, TQT_SLOT(slotScrollPrior())); + mMsgView, TQ_SLOT(slotScrollPrior())); accel->connectItem(accel->insertItem(Key_Next), - mMsgView, TQT_SLOT(slotScrollNext())); + mMsgView, TQ_SLOT(slotScrollNext())); } else { mMsgView = NULL; } TDEAction *action; - mMoveMsgToFolderAction = new TDEAction( i18n("Move Message to Folder"), Key_M, TQT_TQOBJECT(this), - TQT_SLOT(slotMoveMsg()), actionCollection(), + mMoveMsgToFolderAction = new TDEAction( i18n("Move Message to Folder"), Key_M, this, + TQ_SLOT(slotMoveMsg()), actionCollection(), "move_message_to_folder" ); mMoveMsgToFolderAction->plugAccel( actionCollection()->tdeaccel() ); - action = new TDEAction( i18n("Copy Message to Folder"), Key_C, TQT_TQOBJECT(this), - TQT_SLOT(slotCopyMsg()), actionCollection(), + action = new TDEAction( i18n("Copy Message to Folder"), Key_C, this, + TQ_SLOT(slotCopyMsg()), actionCollection(), "copy_message_to_folder" ); action->plugAccel( actionCollection()->tdeaccel() ); - action = new TDEAction( i18n("Jump to Folder"), Key_J, TQT_TQOBJECT(this), - TQT_SLOT(slotJumpToFolder()), actionCollection(), + action = new TDEAction( i18n("Jump to Folder"), Key_J, this, + TQ_SLOT(slotJumpToFolder()), actionCollection(), "jump_to_folder" ); action->plugAccel( actionCollection()->tdeaccel() ); @@ -680,7 +680,7 @@ void KMMainWidget::createWidgets(void) mFolderViewSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); mFavoriteFolderView = new KMail::FavoriteFolderView( this, mFolderViewSplitter ); if ( mFavoritesCheckMailAction ) - connect( mFavoritesCheckMailAction, TQT_SIGNAL(activated()), mFavoriteFolderView, TQT_SLOT(checkMail()) ); + connect( mFavoritesCheckMailAction, TQ_SIGNAL(activated()), mFavoriteFolderView, TQ_SLOT(checkMail()) ); TQWidget *folderTreeParent = mFolderViewParent; if ( GlobalSettings::enableFavoriteFolderView() ) { folderTreeParent = mFolderViewSplitter; @@ -690,72 +690,72 @@ void KMMainWidget::createWidgets(void) if ( !GlobalSettings::enableFavoriteFolderView() ) { mFolderView = mFolderTree; } - connect( mFolderTree, TQT_SIGNAL(folderSelected(KMFolder*)), - mFavoriteFolderView, TQT_SLOT(folderTreeSelectionChanged(KMFolder*)) ); - - connect(mFolderTree, TQT_SIGNAL(folderSelected(KMFolder*)), - this, TQT_SLOT(folderSelected(KMFolder*))); - connect( mFolderTree, TQT_SIGNAL( folderSelected( KMFolder* ) ), - mQuickSearchLine, TQT_SLOT( reset() ) ); - connect(mFolderTree, TQT_SIGNAL(folderSelectedUnread(KMFolder*)), - this, TQT_SLOT(folderSelectedUnread(KMFolder*))); - connect(mFolderTree, TQT_SIGNAL(folderDrop(KMFolder*)), - this, TQT_SLOT(slotMoveMsgToFolder(KMFolder*))); - connect(mFolderTree, TQT_SIGNAL(folderDropCopy(KMFolder*)), - this, TQT_SLOT(slotCopyMsgToFolder(KMFolder*))); - connect(mFolderTree, TQT_SIGNAL(columnsChanged()), - this, TQT_SLOT(slotFolderTreeColumnsChanged())); + connect( mFolderTree, TQ_SIGNAL(folderSelected(KMFolder*)), + mFavoriteFolderView, TQ_SLOT(folderTreeSelectionChanged(KMFolder*)) ); + + connect(mFolderTree, TQ_SIGNAL(folderSelected(KMFolder*)), + this, TQ_SLOT(folderSelected(KMFolder*))); + connect( mFolderTree, TQ_SIGNAL( folderSelected( KMFolder* ) ), + mQuickSearchLine, TQ_SLOT( reset() ) ); + connect(mFolderTree, TQ_SIGNAL(folderSelectedUnread(KMFolder*)), + this, TQ_SLOT(folderSelectedUnread(KMFolder*))); + connect(mFolderTree, TQ_SIGNAL(folderDrop(KMFolder*)), + this, TQ_SLOT(slotMoveMsgToFolder(KMFolder*))); + connect(mFolderTree, TQ_SIGNAL(folderDropCopy(KMFolder*)), + this, TQ_SLOT(slotCopyMsgToFolder(KMFolder*))); + connect(mFolderTree, TQ_SIGNAL(columnsChanged()), + this, TQ_SLOT(slotFolderTreeColumnsChanged())); if ( mFavoriteFolderView ) { - connect( mFavoriteFolderView, TQT_SIGNAL(folderDrop(KMFolder*)), TQT_SLOT(slotMoveMsgToFolder(KMFolder*)) ); - connect( mFavoriteFolderView, TQT_SIGNAL(folderDropCopy(KMFolder*)), TQT_SLOT(slotCopyMsgToFolder(KMFolder*)) ); + connect( mFavoriteFolderView, TQ_SIGNAL(folderDrop(KMFolder*)), TQ_SLOT(slotMoveMsgToFolder(KMFolder*)) ); + connect( mFavoriteFolderView, TQ_SIGNAL(folderDropCopy(KMFolder*)), TQ_SLOT(slotCopyMsgToFolder(KMFolder*)) ); } //Commands not worthy of menu items, but that deserve configurable keybindings mRemoveDuplicatesAction = new TDEAction( - i18n("Remove Duplicate Messages"), CTRL+Key_Asterisk, TQT_TQOBJECT(this), - TQT_SLOT(removeDuplicates()), actionCollection(), "remove_duplicate_messages"); + i18n("Remove Duplicate Messages"), CTRL+Key_Asterisk, this, + TQ_SLOT(removeDuplicates()), actionCollection(), "remove_duplicate_messages"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Abort Current Operation"), Key_Escape, ProgressManager::instance(), - TQT_SLOT(slotAbortAll()), actionCollection(), "cancel" ); + TQ_SLOT(slotAbortAll()), actionCollection(), "cancel" ); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( - i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(mFolderTree), - TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder"); + i18n("Focus on Next Folder"), CTRL+Key_Right, mFolderTree, + TQ_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( - i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(mFolderTree), - TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder"); + i18n("Focus on Previous Folder"), CTRL+Key_Left, mFolderTree, + TQ_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( - i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(mFolderTree), - TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder"); + i18n("Select Folder with Focus"), CTRL+Key_Space, mFolderTree, + TQ_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( - i18n("Focus on Next Message"), ALT+Key_Right, TQT_TQOBJECT(mHeaders), - TQT_SLOT(incCurrentMessage()), actionCollection(), "inc_current_message"); + i18n("Focus on Next Message"), ALT+Key_Right, mHeaders, + TQ_SLOT(incCurrentMessage()), actionCollection(), "inc_current_message"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( - i18n("Focus on Previous Message"), ALT+Key_Left, TQT_TQOBJECT(mHeaders), - TQT_SLOT(decCurrentMessage()), actionCollection(), "dec_current_message"); + i18n("Focus on Previous Message"), ALT+Key_Left, mHeaders, + TQ_SLOT(decCurrentMessage()), actionCollection(), "dec_current_message"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( - i18n("Select Message with Focus"), ALT+Key_Space, TQT_TQOBJECT(mHeaders), - TQT_SLOT( selectCurrentMessage() ), actionCollection(), "select_current_message"); + i18n("Select Message with Focus"), ALT+Key_Space, mHeaders, + TQ_SLOT( selectCurrentMessage() ), actionCollection(), "select_current_message"); action->plugAccel( actionCollection()->tdeaccel() ); - connect( kmkernel->outboxFolder(), TQT_SIGNAL( msgRemoved(int, TQString) ), - TQT_SLOT( startUpdateMessageActionsTimer() ) ); - connect( kmkernel->outboxFolder(), TQT_SIGNAL( msgAdded(int) ), - TQT_SLOT( startUpdateMessageActionsTimer() ) ); + connect( kmkernel->outboxFolder(), TQ_SIGNAL( msgRemoved(int, TQString) ), + TQ_SLOT( startUpdateMessageActionsTimer() ) ); + connect( kmkernel->outboxFolder(), TQ_SIGNAL( msgAdded(int) ), + TQ_SLOT( startUpdateMessageActionsTimer() ) ); } @@ -764,8 +764,8 @@ void KMMainWidget::activatePanners(void) { if (mMsgView) { TQObject::disconnect( mMsgView->copyAction(), - TQT_SIGNAL( activated() ), - mMsgView, TQT_SLOT( slotCopySelectedText() )); + TQ_SIGNAL( activated() ), + mMsgView, TQ_SLOT( slotCopySelectedText() )); } setupFolderView(); @@ -800,8 +800,8 @@ void KMMainWidget::activatePanners(void) if (mMsgView) { TQObject::connect( mMsgView->copyAction(), - TQT_SIGNAL( activated() ), - mMsgView, TQT_SLOT( slotCopySelectedText() )); + TQ_SIGNAL( activated() ), + mMsgView, TQ_SLOT( slotCopySelectedText() )); } } @@ -825,8 +825,8 @@ void KMMainWidget::slotSearch() if(!mSearchWin) { mSearchWin = new SearchWindow(this, "Search", mFolder, false); - connect(mSearchWin, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(slotSearchClosed())); + connect(mSearchWin, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(slotSearchClosed())); } else { @@ -856,7 +856,7 @@ void KMMainWidget::slotFind() //----------------------------------------------------------------------------- void KMMainWidget::slotHelp() { - kapp->invokeHelp(); + tdeApp->invokeHelp(); } @@ -928,7 +928,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck, if ( !newMail || newInFolder.isEmpty() ) return; - kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() ); + tdeApp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() ); // build summary for new mail message bool showNotification = false; @@ -1716,8 +1716,8 @@ void KMMainWidget::slotCheckVacation() if ( !kmkernel->askToGoOnline() ) return; - Vacation *vac = new Vacation( TQT_TQOBJECT(this), true /* check only */ ); - connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) ); + Vacation *vac = new Vacation( this, true /* check only */ ); + connect( vac, TQ_SIGNAL(scriptActive(bool)), TQ_SLOT(updateVactionScripStatus(bool)) ); } void KMMainWidget::slotEditVacation() @@ -1729,10 +1729,10 @@ void KMMainWidget::slotEditVacation() if ( mVacation ) return; - mVacation = new Vacation( TQT_TQOBJECT(this) ); - connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) ); + mVacation = new Vacation( this ); + connect( mVacation, TQ_SIGNAL(scriptActive(bool)), TQ_SLOT(updateVactionScripStatus(bool)) ); if ( mVacation->isUsable() ) { - connect( mVacation, TQT_SIGNAL(result(bool)), mVacation, TQT_SLOT(deleteLater()) ); + connect( mVacation, TQ_SIGNAL(result(bool)), mVacation, TQ_SLOT(deleteLater()) ); } else { TQString msg = i18n("KMail's Out of Office Reply functionality relies on " "server-side filtering. You have not yet configured an " @@ -1838,7 +1838,7 @@ void KMMainWidget::slotPrintMsg() //----------------------------------------------------------------------------- void KMMainWidget::setupForwardActions() { - disconnect( mForwardActionMenu, TQT_SIGNAL( activated() ), 0, 0 ); + disconnect( mForwardActionMenu, TQ_SIGNAL( activated() ), 0, 0 ); mForwardActionMenu->remove( mForwardInlineAction ); mForwardActionMenu->remove( mForwardAttachedAction ); @@ -1847,16 +1847,16 @@ void KMMainWidget::setupForwardActions() mForwardActionMenu->insert( mForwardAttachedAction, 1 ); mForwardInlineAction->setShortcut( Key_F ); mForwardAttachedAction->setShortcut( SHIFT+Key_F ); - connect( mForwardActionMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), - TQT_SLOT(slotForwardInlineMsg()) ); + connect( mForwardActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotForwardInlineMsg()) ); } else { mForwardActionMenu->insert( mForwardAttachedAction, 0 ); mForwardActionMenu->insert( mForwardInlineAction, 1 ); mForwardInlineAction->setShortcut( SHIFT+Key_F ); mForwardAttachedAction->setShortcut( Key_F ); - connect( mForwardActionMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), - TQT_SLOT(slotForwardAttachedMsg()) ); + connect( mForwardActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotForwardAttachedMsg()) ); } } @@ -2025,14 +2025,14 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread ) if ( newFolder ) writeFolderConfig(); if ( mFolder ) { - disconnect( mFolder, TQT_SIGNAL( changed() ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - disconnect( mFolder, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - disconnect( mFolder, TQT_SIGNAL( msgAdded( int ) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - disconnect( mFolder, TQT_SIGNAL( msgRemoved( KMFolder * ) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); + disconnect( mFolder, TQ_SIGNAL( changed() ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + disconnect( mFolder, TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + disconnect( mFolder, TQ_SIGNAL( msgAdded( int ) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + disconnect( mFolder, TQ_SIGNAL( msgRemoved( KMFolder * ) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); } mFolder = aFolder; @@ -2049,8 +2049,8 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread ) imap->open("mainwidget"); // will be closed in the folderSelected slot // first get new headers before we select the folder imap->setSelected( true ); - connect( imap, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( folderSelected() ) ); + connect( imap, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( folderSelected() ) ); imap->getAndCheckFolder(); mHeaders->setFolder( 0 ); updateFolderMenu(); @@ -2059,26 +2059,26 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread ) // Set a timer to show a splash screen if fetching folder contents // takes more than the amount of seconds configured in the kmailrc (default 1000 msec) mShowBusySplashTimer = new TQTimer( this ); - connect( mShowBusySplashTimer, TQT_SIGNAL( timeout() ), TQT_TQOBJECT(this), TQT_SLOT( slotShowBusySplash() ) ); + connect( mShowBusySplashTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotShowBusySplash() ) ); mShowBusySplashTimer->start( GlobalSettings::self()->folderLoadingTimeout(), true ); return; } else { // the folder is complete now - so go ahead - disconnect( imap, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( folderSelected() ) ); + disconnect( imap, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( folderSelected() ) ); forceJumpToUnread = mForceJumpToUnread; } } if ( mFolder ) { // == 0 -> pointing to toplevel ("Welcome to KMail") folder - connect( mFolder, TQT_SIGNAL( changed() ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - connect( mFolder, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - connect( mFolder, TQT_SIGNAL( msgAdded( int ) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - connect( mFolder, TQT_SIGNAL( msgRemoved(KMFolder *) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); + connect( mFolder, TQ_SIGNAL( changed() ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + connect( mFolder, TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + connect( mFolder, TQ_SIGNAL( msgAdded( int ) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + connect( mFolder, TQ_SIGNAL( msgRemoved(KMFolder *) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); } readFolderConfig(); if (mMsgView) @@ -2132,8 +2132,8 @@ void KMMainWidget::slotMsgSelected(KMMessage *msg) } mJob = msg->parent()->createJob( msg, FolderJob::tGetMessage, 0, "STRUCTURE", mMsgView->attachmentStrategy() ); - connect(mJob, TQT_SIGNAL(messageRetrieved(KMMessage*)), - mMsgView, TQT_SLOT(slotMessageArrived(KMMessage*))); + connect(mJob, TQ_SIGNAL(messageRetrieved(KMMessage*)), + mMsgView, TQ_SLOT(slotMessageArrived(KMMessage*))); mJob->start(); } else { mMsgView->setMsg(msg); @@ -2318,8 +2318,8 @@ void KMMainWidget::slotMsgActivated(KMMessage *msg) if ( !msg ) return; if ( msg->parent() && !msg->isComplete() ) { FolderJob *job = msg->parent()->createJob( msg ); - connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), - TQT_SLOT( slotMsgActivated( KMMessage* ) ) ); + connect( job, TQ_SIGNAL( messageRetrieved( KMMessage* ) ), + TQ_SLOT( slotMsgActivated( KMMessage* ) ) ); job->start(); return; } @@ -2509,26 +2509,26 @@ void KMMainWidget::updateCustomTemplateMenus() new TDEActionMenu( i18n("Forward With Custom Template"), "mail_custom_forward", actionCollection(), "custom_forward" ); - TQSignalMapper *mCustomForwardMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( mCustomForwardMapper, TQT_SIGNAL( mapped( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotCustomForwardMsg( int ) ) ); + TQSignalMapper *mCustomForwardMapper = new TQSignalMapper( this ); + connect( mCustomForwardMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( slotCustomForwardMsg( int ) ) ); mForwardActionMenu->insert( mCustomForwardActionMenu ); mCustomReplyActionMenu = new TDEActionMenu( i18n("Reply With Custom Template"), "mail_custom_reply", actionCollection(), "custom_reply" ); - TQSignalMapper *mCustomReplyMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( mCustomReplyMapper, TQT_SIGNAL( mapped( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotCustomReplyToMsg( int ) ) ); + TQSignalMapper *mCustomReplyMapper = new TQSignalMapper( this ); + connect( mCustomReplyMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( slotCustomReplyToMsg( int ) ) ); mMsgActions->replyMenu()->insert( mCustomReplyActionMenu ); mCustomReplyAllActionMenu = new TDEActionMenu( i18n("Reply to All With Custom Template"), "mail_custom_reply_all", actionCollection(), "custom_reply_all" ); - TQSignalMapper *mCustomReplyAllMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( mCustomReplyAllMapper, TQT_SIGNAL( mapped( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotCustomReplyAllToMsg( int ) ) ); + TQSignalMapper *mCustomReplyAllMapper = new TQSignalMapper( this ); + connect( mCustomReplyAllMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( slotCustomReplyAllToMsg( int ) ) ); mMsgActions->replyMenu()->insert( mCustomReplyAllActionMenu ); mCustomTemplates.clear(); @@ -2549,7 +2549,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut( t.shortcut() ), mCustomReplyMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomReplyMapper->setMapping( action, idx ); @@ -2561,7 +2561,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut( t.shortcut() ), mCustomReplyAllMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomReplyAllMapper->setMapping( action, idx ); @@ -2573,7 +2573,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut( t.shortcut() ), mCustomForwardMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomForwardMapper->setMapping( action, idx ); @@ -2585,7 +2585,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut::null(), mCustomReplyMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomReplyMapper->setMapping( action, idx ); @@ -2595,7 +2595,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut::null(), mCustomReplyAllMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomReplyAllMapper->setMapping( action, idx ); @@ -2605,7 +2605,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut::null(), mCustomForwardMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomForwardMapper->setMapping( action, idx ); @@ -2645,53 +2645,53 @@ void KMMainWidget::setupActions() //----- File Menu mSaveAsAction = new TDEAction( i18n("Save &As..."), "document-save", TDEStdAccel::shortcut(TDEStdAccel::Save), - TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" ); + this, TQ_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" ); - mOpenAction = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenMsg() ), + mOpenAction = KStdAction::open( this, TQ_SLOT( slotOpenMsg() ), actionCollection() ); (void) new TDEAction( i18n("&Compact All Folders"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotCompactAll()), + this, TQ_SLOT(slotCompactAll()), actionCollection(), "compact_all_folders" ); (void) new TDEAction( i18n("&Expire All Folders"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotExpireAll()), + this, TQ_SLOT(slotExpireAll()), actionCollection(), "expire_all_folders" ); (void) new TDEAction( i18n("&Refresh Local IMAP Cache"), "refresh", - TQT_TQOBJECT(this), TQT_SLOT(slotInvalidateIMAPFolders()), + this, TQ_SLOT(slotInvalidateIMAPFolders()), actionCollection(), "file_invalidate_imap_cache" ); (void) new TDEAction( i18n("Empty All &Trash Folders"), 0, - KMKernel::self(), TQT_SLOT(slotEmptyTrash()), + KMKernel::self(), TQ_SLOT(slotEmptyTrash()), actionCollection(), "empty_trash" ); (void) new TDEAction( i18n("Check &Mail"), "mail_get", CTRL+Key_L, - TQT_TQOBJECT(this), TQT_SLOT(slotCheckMail()), + this, TQ_SLOT(slotCheckMail()), actionCollection(), "check_mail" ); mFavoritesCheckMailAction = new TDEAction( i18n("Check Mail in Favorite Folders"), "mail_get", CTRL+SHIFT+Key_L, 0, 0, actionCollection(), "favorite_check_mail" ); if ( mFavoriteFolderView ) - connect( mFavoritesCheckMailAction, TQT_SIGNAL(activated()), mFavoriteFolderView, TQT_SLOT(checkMail()) ); + connect( mFavoritesCheckMailAction, TQ_SIGNAL(activated()), mFavoriteFolderView, TQ_SLOT(checkMail()) ); TDEActionMenu *actActionMenu = new TDEActionMenu( i18n("Check Mail &In"), "mail_get", actionCollection(), "check_mail_in" ); actActionMenu->setDelayed(true); //needed for checking "all accounts" - connect(actActionMenu,TQT_SIGNAL(activated()),this,TQT_SLOT(slotCheckMail())); + connect(actActionMenu,TQ_SIGNAL(activated()),this,TQ_SLOT(slotCheckMail())); mActMenu = actActionMenu->popupMenu(); - connect(mActMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotCheckOneAccount(int))); - connect(mActMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getAccountMenu())); + connect(mActMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotCheckOneAccount(int))); + connect(mActMenu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(getAccountMenu())); - (void) new TDEAction( i18n("&Send Queued Messages"), "mail-send", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued"); + (void) new TDEAction( i18n("&Send Queued Messages"), "mail-send", 0, this, + TQ_SLOT(slotSendQueued()), actionCollection(), "send_queued"); - (void) new TDEAction( i18n("Online Status (unknown)"), "online_status", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotOnlineStatus()), actionCollection(), "online_status"); + (void) new TDEAction( i18n("Online Status (unknown)"), "online_status", 0, this, + TQ_SLOT(slotOnlineStatus()), actionCollection(), "online_status"); TDEActionMenu *sendActionMenu = new TDEActionMenu( i18n("Send Queued Messages Via"), "mail_send_via", actionCollection(), @@ -2699,166 +2699,166 @@ void KMMainWidget::setupActions() sendActionMenu->setDelayed(true); mSendMenu = sendActionMenu->popupMenu(); - connect(mSendMenu,TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendQueuedVia(int))); - connect(mSendMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getTransportMenu())); + connect(mSendMenu,TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSendQueuedVia(int))); + connect(mSendMenu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(getTransportMenu())); TDEAction *act; //----- Tools menu if (parent()->inherits("KMMainWin")) { - act = new TDEAction( i18n("&Address Book..."), "contents", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook" ); + act = new TDEAction( i18n("&Address Book..."), "contents", 0, this, + TQ_SLOT(slotAddrBook()), actionCollection(), "addressbook" ); if (TDEStandardDirs::findExe("kaddressbook").isEmpty()) act->setEnabled(false); } - act = new TDEAction( i18n("Certificate Manager..."), "pgp-keys", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotStartCertManager()), actionCollection(), "tools_start_certman"); + act = new TDEAction( i18n("Certificate Manager..."), "pgp-keys", 0, this, + TQ_SLOT(slotStartCertManager()), actionCollection(), "tools_start_certman"); // disable action if no certman binary is around if (TDEStandardDirs::findExe("kleopatra").isEmpty()) act->setEnabled(false); - act = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); + act = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this, + TQ_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); // disable action if no kwatchgnupg binary is around if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) act->setEnabled(false); - act = new TDEAction( i18n("&Import Messages..."), "document-open", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotImport()), actionCollection(), "import" ); + act = new TDEAction( i18n("&Import Messages..."), "document-open", 0, this, + TQ_SLOT(slotImport()), actionCollection(), "import" ); if (TDEStandardDirs::findExe("kmailcvt").isEmpty()) act->setEnabled(false); #if !defined(NDEBUG) (void) new TDEAction( i18n("&Debug Sieve..."), - "idea", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDebugSieve()), + "idea", 0, this, TQ_SLOT(slotDebugSieve()), actionCollection(), "tools_debug_sieve" ); #endif if ( GlobalSettings::allowOutOfOfficeSettings() ) { (void) new TDEAction( i18n("Edit \"Out of Office\" Replies..."), - "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditVacation()), + "configure", 0, this, TQ_SLOT(slotEditVacation()), actionCollection(), "tools_edit_vacation" ); } - (void) new TDEAction( i18n("Filter &Log Viewer..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFilterLogViewer()), actionCollection(), "filter_log_viewer" ); + (void) new TDEAction( i18n("Filter &Log Viewer..."), 0, this, + TQ_SLOT(slotFilterLogViewer()), actionCollection(), "filter_log_viewer" ); - (void) new TDEAction( i18n("&Anti-Spam Wizard..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAntiSpamWizard()), actionCollection(), "antiSpamWizard" ); - (void) new TDEAction( i18n("&Anti-Virus Wizard..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAntiVirusWizard()), actionCollection(), "antiVirusWizard" ); + (void) new TDEAction( i18n("&Anti-Spam Wizard..."), 0, this, + TQ_SLOT(slotAntiSpamWizard()), actionCollection(), "antiSpamWizard" ); + (void) new TDEAction( i18n("&Anti-Virus Wizard..."), 0, this, + TQ_SLOT(slotAntiVirusWizard()), actionCollection(), "antiVirusWizard" ); //----- Edit Menu mTrashAction = new TDEAction( KGuiItem( i18n("&Move to Trash"), "edittrash", i18n("Move message to trashcan") ), - Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotTrashMsg()), + Key_Delete, this, TQ_SLOT(slotTrashMsg()), actionCollection(), "move_to_trash" ); /* The delete action is nowhere in the gui, by default, so we need to make * sure it is plugged into the TDEAccel now, since that won't happen on * XMLGui construction or manual ->plug(). This is only a problem when run * as a part, though. */ - mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this), - TQT_SLOT(slotDeleteMsg()), actionCollection(), "delete" ); + mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", SHIFT+Key_Delete, this, + TQ_SLOT(slotDeleteMsg()), actionCollection(), "delete" ); mDeleteAction->plugAccel( actionCollection()->tdeaccel() ); mTrashThreadAction = new TDEAction( KGuiItem( i18n("M&ove Thread to Trash"), "edittrash", i18n("Move thread to trashcan") ), - CTRL+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotTrashThread()), + CTRL+Key_Delete, this, TQ_SLOT(slotTrashThread()), actionCollection(), "move_thread_to_trash" ); - mDeleteThreadAction = new TDEAction( i18n("Delete T&hread"), "edit-delete", CTRL+SHIFT+Key_Delete, TQT_TQOBJECT(this), - TQT_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" ); + mDeleteThreadAction = new TDEAction( i18n("Delete T&hread"), "edit-delete", CTRL+SHIFT+Key_Delete, this, + TQ_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" ); - (void) new TDEAction( i18n("&Find Messages..."), "mail_find", Key_S, TQT_TQOBJECT(this), - TQT_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" ); + (void) new TDEAction( i18n("&Find Messages..."), "mail_find", Key_S, this, + TQ_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" ); - mFindInMessageAction = new TDEAction( i18n("&Find in Message..."), "edit-find", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(this), - TQT_SLOT(slotFind()), actionCollection(), "find_in_messages" ); + mFindInMessageAction = new TDEAction( i18n("&Find in Message..."), "edit-find", TDEStdAccel::shortcut(TDEStdAccel::Find), this, + TQ_SLOT(slotFind()), actionCollection(), "find_in_messages" ); - (void) new TDEAction( i18n("Select &All Messages"), TDEStdAccel::selectAll(), TQT_TQOBJECT(this), - TQT_SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" ); + (void) new TDEAction( i18n("Select &All Messages"), TDEStdAccel::selectAll(), this, + TQ_SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" ); //----- Folder Menu - mNewFolderAction = new TDEAction( i18n("&New Folder..."), "folder-new", 0, TQT_TQOBJECT(mFolderTree), - TQT_SLOT(addChildFolder()), actionCollection(), "new_folder" ); + mNewFolderAction = new TDEAction( i18n("&New Folder..."), "folder-new", 0, mFolderTree, + TQ_SLOT(addChildFolder()), actionCollection(), "new_folder" ); - mModifyFolderAction = new TDEAction( i18n("&Properties"), "configure", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotModifyFolder()), actionCollection(), "modify" ); + mModifyFolderAction = new TDEAction( i18n("&Properties"), "configure", 0, this, + TQ_SLOT(slotModifyFolder()), actionCollection(), "modify" ); mFolderMailingListPropertiesAction = new TDEAction( i18n("&Mailing List Management..."), - /*"folder_mailinglist_properties",*/ 0, TQT_TQOBJECT(this), TQT_SLOT( slotFolderMailingListProperties() ), + /*"folder_mailinglist_properties",*/ 0, this, TQ_SLOT( slotFolderMailingListProperties() ), actionCollection(), "folder_mailinglist_properties" ); mFolderShortCutCommandAction = new TDEAction( i18n("&Assign Shortcut..."), "configure_shortcuts", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotFolderShortcutCommand() ), actionCollection(), + 0, this, TQ_SLOT( slotFolderShortcutCommand() ), actionCollection(), "folder_shortcut_command" ); - mMarkAllAsReadAction = new TDEAction( i18n("Mark All Messages as &Read"), "goto", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotMarkAllAsRead()), actionCollection(), "mark_all_as_read" ); + mMarkAllAsReadAction = new TDEAction( i18n("Mark All Messages as &Read"), "goto", 0, this, + TQ_SLOT(slotMarkAllAsRead()), actionCollection(), "mark_all_as_read" ); - mExpireFolderAction = new TDEAction(i18n("&Expiration Settings"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotExpireFolder()), + mExpireFolderAction = new TDEAction(i18n("&Expiration Settings"), 0, this, TQ_SLOT(slotExpireFolder()), actionCollection(), "expire"); - mCompactFolderAction = new TDEAction( i18n("&Compact Folder"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotCompactFolder()), actionCollection(), "compact" ); + mCompactFolderAction = new TDEAction( i18n("&Compact Folder"), 0, this, + TQ_SLOT(slotCompactFolder()), actionCollection(), "compact" ); mRefreshFolderAction = new TDEAction( i18n("Check Mail &in This Folder"), "reload", - TDEStdAccel::shortcut( TDEStdAccel::Reload ), TQT_TQOBJECT(this), - TQT_SLOT(slotRefreshFolder()), + TDEStdAccel::shortcut( TDEStdAccel::Reload ), this, + TQ_SLOT(slotRefreshFolder()), actionCollection(), "refresh_folder" ); mTroubleshootFolderAction = 0; // set in initializeIMAPActions - mEmptyFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotEmptyFolder()), actionCollection(), "empty" ); + mEmptyFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, this, + TQ_SLOT(slotEmptyFolder()), actionCollection(), "empty" ); - mRemoveFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edit-delete", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" ); + mRemoveFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edit-delete", 0, this, + TQ_SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" ); - mArchiveFolderAction = new TDEAction( i18n( "&Archive Folder..." ), "document-save", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotArchiveFolder() ), actionCollection(), + mArchiveFolderAction = new TDEAction( i18n( "&Archive Folder..." ), "document-save", 0, this, + TQ_SLOT( slotArchiveFolder() ), actionCollection(), "archive_folder" ); - mPreferHtmlAction = new TDEToggleAction( i18n("Prefer &HTML to Plain Text"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" ); + mPreferHtmlAction = new TDEToggleAction( i18n("Prefer &HTML to Plain Text"), 0, this, + TQ_SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" ); - mPreferHtmlLoadExtAction = new TDEToggleAction( i18n("Load E&xternal References"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" ); + mPreferHtmlLoadExtAction = new TDEToggleAction( i18n("Load E&xternal References"), 0, this, + TQ_SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" ); - mThreadMessagesAction = new TDEToggleAction( i18n("&Thread Messages"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotOverrideThread()), actionCollection(), "thread_messages" ); + mThreadMessagesAction = new TDEToggleAction( i18n("&Thread Messages"), 0, this, + TQ_SLOT(slotOverrideThread()), actionCollection(), "thread_messages" ); - mThreadBySubjectAction = new TDEToggleAction( i18n("Thread Messages also by &Subject"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleSubjectThreading()), actionCollection(), "thread_messages_by_subject" ); + mThreadBySubjectAction = new TDEToggleAction( i18n("Thread Messages also by &Subject"), 0, this, + TQ_SLOT(slotToggleSubjectThreading()), actionCollection(), "thread_messages_by_subject" ); - new TDEAction( i18n("Copy Folder"), "edit-copy", SHIFT+CTRL+Key_C, TQT_TQOBJECT(folderTree()), - TQT_SLOT(copyFolder()), actionCollection(), "copy_folder" ); - new TDEAction( i18n("Cut Folder"), "edit-cut", SHIFT+CTRL+Key_X, TQT_TQOBJECT(folderTree()), - TQT_SLOT(cutFolder()), actionCollection(), "cut_folder" ); - new TDEAction( i18n("Paste Folder"), "edit-paste", SHIFT+CTRL+Key_V, TQT_TQOBJECT(folderTree()), - TQT_SLOT(pasteFolder()), actionCollection(), "paste_folder" ); + new TDEAction( i18n("Copy Folder"), "edit-copy", SHIFT+CTRL+Key_C, folderTree(), + TQ_SLOT(copyFolder()), actionCollection(), "copy_folder" ); + new TDEAction( i18n("Cut Folder"), "edit-cut", SHIFT+CTRL+Key_X, folderTree(), + TQ_SLOT(cutFolder()), actionCollection(), "cut_folder" ); + new TDEAction( i18n("Paste Folder"), "edit-paste", SHIFT+CTRL+Key_V, folderTree(), + TQ_SLOT(pasteFolder()), actionCollection(), "paste_folder" ); - new TDEAction( i18n("Copy Messages"), "edit-copy", ALT+CTRL+Key_C, TQT_TQOBJECT(headers()), - TQT_SLOT(copyMessages()), actionCollection(), "copy_messages" ); - new TDEAction( i18n("Cut Messages"), "edit-cut", ALT+CTRL+Key_X, TQT_TQOBJECT(headers()), - TQT_SLOT(cutMessages()), actionCollection(), "cut_messages" ); - new TDEAction( i18n("Paste Messages"), "edit-paste", ALT+CTRL+Key_V, TQT_TQOBJECT(headers()), - TQT_SLOT(pasteMessages()), actionCollection(), "paste_messages" ); + new TDEAction( i18n("Copy Messages"), "edit-copy", ALT+CTRL+Key_C, headers(), + TQ_SLOT(copyMessages()), actionCollection(), "copy_messages" ); + new TDEAction( i18n("Cut Messages"), "edit-cut", ALT+CTRL+Key_X, headers(), + TQ_SLOT(cutMessages()), actionCollection(), "cut_messages" ); + new TDEAction( i18n("Paste Messages"), "edit-paste", ALT+CTRL+Key_V, headers(), + TQ_SLOT(pasteMessages()), actionCollection(), "paste_messages" ); //----- Message Menu - (void) new TDEAction( i18n("&New Message..."), "mail-message-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), - TQT_SLOT(slotCompose()), actionCollection(), "new_message" ); + (void) new TDEAction( i18n("&New Message..."), "mail-message-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, + TQ_SLOT(slotCompose()), actionCollection(), "new_message" ); mTemplateMenu = new TDEActionMenu( i18n("New Message From &Template"), "document-new", actionCollection(), "new_from_template" ); mTemplateMenu->setDelayed( true ); - connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), - TQT_SLOT( slotShowNewFromTemplate() ) ); - connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), - TQT_SLOT( slotNewFromTemplate(int) ) ); + connect( mTemplateMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, + TQ_SLOT( slotShowNewFromTemplate() ) ); + connect( mTemplateMenu->popupMenu(), TQ_SIGNAL( activated(int) ), this, + TQ_SLOT( slotNewFromTemplate(int) ) ); TDEAction* newToML = new TDEAction( i18n("New Message t&o Mailing-List..."), "mail_post_to", - CTRL+SHIFT+Key_N, TQT_TQOBJECT(this), - TQT_SLOT(slotPostToML()), actionCollection(), "post_message" ); + CTRL+SHIFT+Key_N, this, + TQ_SLOT(slotPostToML()), actionCollection(), "post_message" ); newToML->plugAccel( actionCollection()->tdeaccel() ); mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"), @@ -2866,26 +2866,26 @@ void KMMainWidget::setupActions() "message_forward" ); mForwardInlineAction = new TDEAction( i18n("&Inline..."), - "mail-forward", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardInlineMsg()), + "mail-forward", 0, this, + TQ_SLOT(slotForwardInlineMsg()), actionCollection(), "message_forward_inline" ); mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), - "mail-forward", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardAttachedMsg()), + "mail-forward", 0, this, + TQ_SLOT(slotForwardAttachedMsg()), actionCollection(), "message_forward_as_attachment" ); mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), - "mail-forward", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardDigestMsg()), + "mail-forward", 0, this, + TQ_SLOT(slotForwardDigestMsg()), actionCollection(), "message_forward_as_digest" ); mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), - "mail-forward", Key_E, TQT_TQOBJECT(this), - TQT_SLOT(slotRedirectMsg()), + "mail-forward", Key_E, this, + TQ_SLOT(slotRedirectMsg()), actionCollection(), "message_forward_redirect" ); @@ -2895,38 +2895,38 @@ void KMMainWidget::setupActions() mForwardActionMenu->insert( mForwardDigestAction ); mForwardActionMenu->insert( mRedirectAction ); - mSendAgainAction = new TDEAction( i18n("Send A&gain..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotResendMsg()), actionCollection(), "send_again" ); + mSendAgainAction = new TDEAction( i18n("Send A&gain..."), 0, this, + TQ_SLOT(slotResendMsg()), actionCollection(), "send_again" ); //----- Create filter actions mFilterMenu = new TDEActionMenu( i18n("&Create Filter"), "filter", actionCollection(), "create_filter" ); - connect( mFilterMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), - TQT_SLOT(slotFilter()) ); - mSubjectFilterAction = new TDEAction( i18n("Filter on &Subject..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSubjectFilter()), + connect( mFilterMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotFilter()) ); + mSubjectFilterAction = new TDEAction( i18n("Filter on &Subject..."), 0, this, + TQ_SLOT(slotSubjectFilter()), actionCollection(), "subject_filter"); mFilterMenu->insert( mSubjectFilterAction ); - mFromFilterAction = new TDEAction( i18n("Filter on &From..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFromFilter()), + mFromFilterAction = new TDEAction( i18n("Filter on &From..."), 0, this, + TQ_SLOT(slotFromFilter()), actionCollection(), "from_filter"); mFilterMenu->insert( mFromFilterAction ); - mToFilterAction = new TDEAction( i18n("Filter on &To..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotToFilter()), + mToFilterAction = new TDEAction( i18n("Filter on &To..."), 0, this, + TQ_SLOT(slotToFilter()), actionCollection(), "to_filter"); mFilterMenu->insert( mToFilterAction ); - mListFilterAction = new TDEAction( i18n("Filter on Mailing-&List..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotMailingListFilter()), actionCollection(), + mListFilterAction = new TDEAction( i18n("Filter on Mailing-&List..."), 0, this, + TQ_SLOT(slotMailingListFilter()), actionCollection(), "mlist_filter"); mFilterMenu->insert( mListFilterAction ); - mPrintAction = KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), actionCollection()); + mPrintAction = KStdAction::print (this, TQ_SLOT(slotPrintMsg()), actionCollection()); mUseAction = new TDEAction( i18n("New Message From &Template"), "document-new", - Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotUseTemplate() ), + Key_N, this, TQ_SLOT( slotUseTemplate() ), actionCollection(), "use_template" ); mUseAction->plugAccel( actionCollection()->tdeaccel() ); @@ -2936,52 +2936,52 @@ void KMMainWidget::setupActions() mMarkThreadAsReadAction = new TDEAction(KGuiItem(i18n("Mark Thread as &Read"), "kmmsgread", i18n("Mark all messages in the selected thread as read")), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusRead()), + 0, this, TQ_SLOT(slotSetThreadStatusRead()), actionCollection(), "thread_read"); mThreadStatusMenu->insert( mMarkThreadAsReadAction ); mMarkThreadAsNewAction = new TDEAction(KGuiItem(i18n("Mark Thread as &New"), "kmmsgnew", i18n("Mark all messages in the selected thread as new")), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusNew()), + 0, this, TQ_SLOT(slotSetThreadStatusNew()), actionCollection(), "thread_new"); mThreadStatusMenu->insert( mMarkThreadAsNewAction ); mMarkThreadAsUnreadAction = new TDEAction(KGuiItem(i18n("Mark Thread as &Unread"), "kmmsgunseen", i18n("Mark all messages in the selected thread as unread")), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusUnread()), + 0, this, TQ_SLOT(slotSetThreadStatusUnread()), actionCollection(), "thread_unread"); mThreadStatusMenu->insert( mMarkThreadAsUnreadAction ); - mThreadStatusMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + mThreadStatusMenu->insert( new TDEActionSeparator( this ) ); //----- "Mark Thread" toggle actions mToggleThreadFlagAction = new TDEToggleAction(i18n("Mark Thread as &Important"), "mail_flag", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusFlag()), + 0, this, TQ_SLOT(slotSetThreadStatusFlag()), actionCollection(), "thread_flag"); mToggleThreadFlagAction->setCheckedState( i18n("Remove &Important Thread Mark") ); mThreadStatusMenu->insert( mToggleThreadFlagAction ); mToggleThreadTodoAction = new TDEToggleAction(i18n("Mark Thread as &Action Item"), "mail_todo", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusTodo()), + 0, this, TQ_SLOT(slotSetThreadStatusTodo()), actionCollection(), "thread_todo"); mToggleThreadTodoAction->setCheckedState( i18n("Remove &Action Item Thread Mark") ); mThreadStatusMenu->insert( mToggleThreadTodoAction ); //------- "Watch and ignore thread" actions mWatchThreadAction = new TDEToggleAction(i18n("&Watch Thread"), "kmmsgwatched", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusWatched()), + 0, this, TQ_SLOT(slotSetThreadStatusWatched()), actionCollection(), "thread_watched"); mIgnoreThreadAction = new TDEToggleAction(i18n("&Ignore Thread"), "mail_ignore", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusIgnored()), + 0, this, TQ_SLOT(slotSetThreadStatusIgnored()), actionCollection(), "thread_ignored"); - mThreadStatusMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + mThreadStatusMenu->insert( new TDEActionSeparator( this ) ); mThreadStatusMenu->insert( mWatchThreadAction ); mThreadStatusMenu->insert( mIgnoreThreadAction ); mSaveAttachmentsAction = new TDEAction( i18n("Save A&ttachments..."), "attach", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachments()), + 0, this, TQ_SLOT(slotSaveAttachments()), actionCollection(), "file_save_attachments" ); mMoveActionMenu = new TDEActionMenu( i18n("&Move To" ), @@ -2991,8 +2991,8 @@ void KMMainWidget::setupActions() actionCollection(), "copy_to" ); mApplyAllFiltersAction = new TDEAction( i18n("Appl&y All Filters"), "filter", - CTRL+Key_J, TQT_TQOBJECT(this), - TQT_SLOT(slotApplyFilters()), + CTRL+Key_J, this, + TQ_SLOT(slotApplyFilters()), actionCollection(), "apply_filters" ); mApplyFilterActionsMenu = new TDEActionMenu( i18n("A&pply Filter" ), @@ -3006,104 +3006,104 @@ void KMMainWidget::setupActions() actionCollection(), "view_unread" ); unreadMenu->setToolTip( i18n("Choose how to display the count of unread messages") ); - mUnreadColumnToggle = new TDERadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleUnread()), + mUnreadColumnToggle = new TDERadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, this, + TQ_SLOT(slotToggleUnread()), actionCollection(), "view_unread_column" ); mUnreadColumnToggle->setExclusiveGroup( "view_unread_group" ); unreadMenu->insert( mUnreadColumnToggle ); - mUnreadTextToggle = new TDERadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleUnread()), + mUnreadTextToggle = new TDERadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, this, + TQ_SLOT(slotToggleUnread()), actionCollection(), "view_unread_text" ); mUnreadTextToggle->setExclusiveGroup( "view_unread_group" ); unreadMenu->insert( mUnreadTextToggle ); // toggle for total column - mTotalColumnToggle = new TDEToggleAction( i18n("View->", "&Total Column"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleTotalColumn()), + mTotalColumnToggle = new TDEToggleAction( i18n("View->", "&Total Column"), 0, this, + TQ_SLOT(slotToggleTotalColumn()), actionCollection(), "view_columns_total" ); mTotalColumnToggle->setToolTip( i18n("Toggle display of column showing the " "total number of messages in folders.") ); - mSizeColumnToggle = new TDEToggleAction( i18n("View->", "&Size Column"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleSizeColumn()), + mSizeColumnToggle = new TDEToggleAction( i18n("View->", "&Size Column"), 0, this, + TQ_SLOT(slotToggleSizeColumn()), actionCollection(), "view_columns_size" ); mSizeColumnToggle->setToolTip( i18n("Toggle display of column showing the " "total size of messages in folders.") ); (void)new TDEAction( KGuiItem( i18n("View->","&Expand Thread"), TQString(), i18n("Expand the current thread") ), - Key_Period, TQT_TQOBJECT(this), - TQT_SLOT(slotExpandThread()), + Key_Period, this, + TQ_SLOT(slotExpandThread()), actionCollection(), "expand_thread" ); (void)new TDEAction( KGuiItem( i18n("View->","&Collapse Thread"), TQString(), i18n("Collapse the current thread") ), - Key_Comma, TQT_TQOBJECT(this), - TQT_SLOT(slotCollapseThread()), + Key_Comma, this, + TQ_SLOT(slotCollapseThread()), actionCollection(), "collapse_thread" ); (void)new TDEAction( KGuiItem( i18n("View->","Ex&pand All Threads"), TQString(), i18n("Expand all threads in the current folder") ), - CTRL+Key_Period, TQT_TQOBJECT(this), - TQT_SLOT(slotExpandAllThreads()), + CTRL+Key_Period, this, + TQ_SLOT(slotExpandAllThreads()), actionCollection(), "expand_all_threads" ); (void)new TDEAction( KGuiItem( i18n("View->","C&ollapse All Threads"), TQString(), i18n("Collapse all threads in the current folder") ), - CTRL+Key_Comma, TQT_TQOBJECT(this), - TQT_SLOT(slotCollapseAllThreads()), + CTRL+Key_Comma, this, + TQ_SLOT(slotCollapseAllThreads()), actionCollection(), "collapse_all_threads" ); - mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this), - TQT_SLOT(slotShowMsgSrc()), actionCollection(), + mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, this, + TQ_SLOT(slotShowMsgSrc()), actionCollection(), "view_source" ); - TDEAction* dukeOfMonmoth = new TDEAction( i18n("&Display Message"), Key_Return, TQT_TQOBJECT(this), - TQT_SLOT( slotDisplayCurrentMessage() ), actionCollection(), + TDEAction* dukeOfMonmoth = new TDEAction( i18n("&Display Message"), Key_Return, this, + TQ_SLOT( slotDisplayCurrentMessage() ), actionCollection(), "display_message" ); dukeOfMonmoth->plugAccel( actionCollection()->tdeaccel() ); //----- Go Menu new TDEAction( KGuiItem( i18n("&Next Message"), TQString(), i18n("Go to the next message") ), - "N;Right", TQT_TQOBJECT(this), TQT_SLOT(slotNextMessage()), + "N;Right", this, TQ_SLOT(slotNextMessage()), actionCollection(), "go_next_message" ); new TDEAction( KGuiItem( i18n("Next &Unread Message"), TQApplication::reverseLayout() ? "go-previous" : "go-next", i18n("Go to the next unread message") ), - Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotNextUnreadMessage()), + Key_Plus, this, TQ_SLOT(slotNextUnreadMessage()), actionCollection(), "go_next_unread_message" ); /* ### needs better support from folders: new TDEAction( KGuiItem( i18n("Next &Important Message"), TQString(), i18n("Go to the next important message") ), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotNextImportantMessage()), + 0, this, TQ_SLOT(slotNextImportantMessage()), actionCollection(), "go_next_important_message" ); */ new TDEAction( KGuiItem( i18n("&Previous Message"), TQString(), i18n("Go to the previous message") ), - "P;Left", TQT_TQOBJECT(this), TQT_SLOT(slotPrevMessage()), + "P;Left", this, TQ_SLOT(slotPrevMessage()), actionCollection(), "go_prev_message" ); new TDEAction( KGuiItem( i18n("Previous Unread &Message"), TQApplication::reverseLayout() ? "go-next" : "go-previous", i18n("Go to the previous unread message") ), - Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotPrevUnreadMessage()), + Key_Minus, this, TQ_SLOT(slotPrevUnreadMessage()), actionCollection(), "go_prev_unread_message" ); /* needs better support from folders: new TDEAction( KGuiItem( i18n("Previous I&mportant Message"), TQString(), i18n("Go to the previous important message") ), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrevImportantMessage()), + 0, this, TQ_SLOT(slotPrevImportantMessage()), actionCollection(), "go_prev_important_message" ); */ TDEAction *action = new TDEAction( KGuiItem( i18n("Next Unread &Folder"), TQString(), i18n("Go to the next folder with unread messages") ), - ALT+Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotNextUnreadFolder()), + ALT+Key_Plus, this, TQ_SLOT(slotNextUnreadFolder()), actionCollection(), "go_next_unread_folder" ); TDEShortcut shortcut = action->shortcut(); shortcut.append( KKey( CTRL+Key_Plus ) ); @@ -3112,7 +3112,7 @@ void KMMainWidget::setupActions() action = new TDEAction( KGuiItem( i18n("Previous Unread F&older"), TQString(), i18n("Go to the previous folder with unread messages") ), - ALT+Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotPrevUnreadFolder()), + ALT+Key_Minus, this, TQ_SLOT(slotPrevUnreadFolder()), actionCollection(), "go_prev_unread_folder" ); shortcut = action->shortcut(); shortcut.append( KKey( CTRL+Key_Minus ) ); @@ -3123,49 +3123,49 @@ void KMMainWidget::setupActions() i18n("Scroll down current message. " "If at end of current message, " "go to next unread message.") ), - Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotReadOn()), + Key_Space, this, TQ_SLOT(slotReadOn()), actionCollection(), "go_next_unread_text" ); //----- Settings Menu mToggleShowQuickSearchAction = new TDEToggleAction(i18n("Show Quick Search"), TQString(), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowQuickSearch()), + 0, this, TQ_SLOT(slotToggleShowQuickSearch()), actionCollection(), "show_quick_search"); mToggleShowQuickSearchAction->setChecked( GlobalSettings::self()->quickSearchActive() ); mToggleShowQuickSearchAction->setWhatsThis( i18n( GlobalSettings::self()->quickSearchActiveItem()->whatsThis().utf8() ) ); - (void) new TDEAction( i18n("Configure &Filters..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFilter()), actionCollection(), "filter" ); - (void) new TDEAction( i18n("Configure &POP Filters..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotPopFilter()), actionCollection(), "popFilter" ); - (void) new TDEAction( i18n("Manage &Sieve Scripts..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotManageSieveScripts()), actionCollection(), "sieveFilters" ); + (void) new TDEAction( i18n("Configure &Filters..."), 0, this, + TQ_SLOT(slotFilter()), actionCollection(), "filter" ); + (void) new TDEAction( i18n("Configure &POP Filters..."), 0, this, + TQ_SLOT(slotPopFilter()), actionCollection(), "popFilter" ); + (void) new TDEAction( i18n("Manage &Sieve Scripts..."), 0, this, + TQ_SLOT(slotManageSieveScripts()), actionCollection(), "sieveFilters" ); (void) new TDEAction( KGuiItem( i18n("KMail &Introduction"), 0, i18n("Display KMail's Welcome Page") ), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotIntro()), + 0, this, TQ_SLOT(slotIntro()), actionCollection(), "help_kmail_welcomepage" ); // ----- Standard Actions -// KStdAction::configureNotifications(this, TQT_SLOT(slotEditNotifications()), actionCollection()); +// KStdAction::configureNotifications(this, TQ_SLOT(slotEditNotifications()), actionCollection()); (void) new TDEAction( i18n("Configure &Notifications..."), - "knotify", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotEditNotifications()), actionCollection(), + "knotify", 0, this, + TQ_SLOT(slotEditNotifications()), actionCollection(), "kmail_configure_notifications" ); -// KStdAction::preferences(this, TQT_SLOT(slotSettings()), actionCollection()); +// KStdAction::preferences(this, TQ_SLOT(slotSettings()), actionCollection()); (void) new TDEAction( i18n("&Configure KMail..."), "configure", 0, kmkernel, - TQT_SLOT(slotShowConfigurationDialog()), actionCollection(), + TQ_SLOT(slotShowConfigurationDialog()), actionCollection(), "kmail_configure_kmail" ); - KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection(), "kmail_undo"); + KStdAction::undo(this, TQ_SLOT(slotUndo()), actionCollection(), "kmail_undo"); - KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection() ); + KStdAction::tipOfDay( this, TQ_SLOT( slotShowTip() ), actionCollection() ); menutimer = new TQTimer( this, "menutimer" ); - connect( menutimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateMessageActions() ) ); + connect( menutimer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateMessageActions() ) ); connect( kmkernel->undoStack(), - TQT_SIGNAL( undoStackChanged() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateUndo() )); + TQ_SIGNAL( undoStackChanged() ), this, TQ_SLOT( slotUpdateUndo() )); initializeIMAPActions( false ); // don't set state, config not read yet updateMessageActions(); @@ -3288,9 +3288,9 @@ void KMMainWidget::copySelectedToFolder(int menuId ) void KMMainWidget::updateMessageMenu() { mMenuToFolder.clear(); - folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, TQT_TQOBJECT(this), + folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, this, &mMenuToFolder, mMoveActionMenu->popupMenu() ); - folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this), + folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this, &mMenuToFolder, mCopyActionMenu->popupMenu() ); updateMessageActions(); } @@ -3547,8 +3547,8 @@ void KMMainWidget::slotShowStartupFolder() mFolderTree->cleanupConfigFile(); } - connect( kmkernel->filterMgr(), TQT_SIGNAL( filterListUpdated() ), - this, TQT_SLOT( initializeFilterActions() )); + connect( kmkernel->filterMgr(), TQ_SIGNAL( filterListUpdated() ), + this, TQ_SLOT( initializeFilterActions() )); // plug shortcut filter actions now initializeFilterActions(); @@ -3724,7 +3724,7 @@ void KMMainWidget::initializeFilterActions() if ( icon.isEmpty() ) icon = "gear"; filterAction = new TDEAction(as, icon, (*it)->shortcut(), filterCommand, - TQT_SLOT(start()), actionCollection(), + TQ_SLOT(start()), actionCollection(), normalizedName.local8Bit()); if(!addedSeparator) { mApplyFilterActionsMenu->popupMenu()->insertSeparator(); @@ -3770,7 +3770,7 @@ void KMMainWidget::initializeIMAPActions( bool setState /* false the first time, if ( !mTroubleshootFolderAction ) { mTroubleshootFolderAction = new TDEAction( i18n("&Troubleshoot IMAP Cache..."), "wizard", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" ); + this, TQ_SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" ); if ( setState ) updateFolderMenu(); // set initial state of the action } else { @@ -3806,7 +3806,7 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder ) TQString actionname = TQString( "FolderShortcut %1").arg( folder->idString() ); TQString normalizedName = actionname.replace(" ", "_"); TDEAction* action = - new TDEAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()), + new TDEAction(actionlabel, folder->shortcut(), c, TQ_SLOT(start()), actionCollection(), normalizedName.local8Bit()); action->setIcon( folder->unreadIconPath() ); c->setAction( action ); // will be deleted along with the command diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h index 06020b7b..dc620fc1 100644 --- a/kmail/kmmainwidget.h +++ b/kmail/kmmainwidget.h @@ -79,7 +79,7 @@ namespace KMail { typedef TQMap<int,KMFolder*> KMMenuToFolder; -class KDE_EXPORT KMMainWidget : public TQWidget +class TDE_EXPORT KMMainWidget : public TQWidget { TQ_OBJECT diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp index cdd76a04..120b1606 100644 --- a/kmail/kmmainwin.cpp +++ b/kmail/kmmainwin.cpp @@ -33,13 +33,13 @@ KMMainWin::KMMainWin(TQWidget *) // modal subdialogs will only affect this dialog, not the other windows setWFlags( getWFlags() | WGroupLeader ); - kapp->ref(); + tdeApp->ref(); (void) new TDEAction( i18n("New &Window"), "window-new", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()), + this, TQ_SLOT(slotNewMailReader()), actionCollection(), "new_mail_client" ); - mKMMainWidget = new KMMainWidget( TQT_TQWIDGET(this), "KMMainWidget", this, actionCollection() ); + mKMMainWidget = new KMMainWidget( this, "KMMainWidget", this, actionCollection() ); mKMMainWidget->resize( 450, 600 ); setCentralWidget(mKMMainWidget); setupStatusBar(); @@ -47,17 +47,17 @@ KMMainWin::KMMainWin(TQWidget *) setInstance( kmkernel->xmlGuiInstance() ); if ( kmkernel->firstInstance() ) - TQTimer::singleShot( 200, this, TQT_SLOT(slotShowTipOnStart()) ); + TQTimer::singleShot( 200, this, TQ_SLOT(slotShowTipOnStart()) ); setStandardToolBarMenuEnabled(true); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), + KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(mKMMainWidget), TQT_SLOT(slotEditKeys()), + KStdAction::keyBindings(mKMMainWidget, TQ_SLOT(slotEditKeys()), actionCollection()); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit( this, TQ_SLOT(slotQuit()), actionCollection()); createGUI( "kmmainwin.rc", false ); // Don't use conserveMemory() because this renders dynamic plugging // of actions unusable! @@ -66,14 +66,14 @@ KMMainWin::KMMainWin(TQWidget *) applyMainWindowSettings(KMKernel::config(), "Main Window"); - connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ), - this, TQT_SLOT( displayStatusMsg(const TQString&) ) ); + connect( KPIM::BroadcastStatus::instance(), TQ_SIGNAL( statusMsg( const TQString& ) ), + this, TQ_SLOT( displayStatusMsg(const TQString&) ) ); - connect(kmkernel, TQT_SIGNAL(configChanged()), - this, TQT_SLOT(slotConfigChanged())); + connect(kmkernel, TQ_SIGNAL(configChanged()), + this, TQ_SLOT(slotConfigChanged())); - connect(mKMMainWidget, TQT_SIGNAL(captionChangeRequest(const TQString&)), - TQT_SLOT(setCaption(const TQString&)) ); + connect(mKMMainWidget, TQ_SIGNAL(captionChangeRequest(const TQString&)), + TQ_SLOT(setCaption(const TQString&)) ); // Enable mail checks again (see destructor) kmkernel->enableMailCheck(); @@ -86,7 +86,7 @@ KMMainWin::~KMMainWin() { saveMainWindowSettings(KMKernel::config(), "Main Window"); KMKernel::config()->sync(); - kapp->deref(); + tdeApp->deref(); if ( !kmkernel->haveSystemTrayApplet() ) { // Check if this was the last KMMainWin @@ -103,7 +103,7 @@ KMMainWin::~KMMainWin() if ( not_withdrawn == 0 ) { kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl; - // Running TDEIO jobs prevent kapp from exiting, so we need to kill them + // Running TDEIO jobs prevent tdeApp from exiting, so we need to kill them // if they are only about checking mail (not important stuff like moving messages) kmkernel->abortMailCheck(); kmkernel->acctMgr()->cancelMailCheck(); @@ -145,8 +145,8 @@ void KMMainWin::slotEditToolbars() saveMainWindowSettings(KMKernel::config(), "Main Window"); KEditToolbar dlg(actionCollection(), "kmmainwin.rc"); - connect( &dlg, TQT_SIGNAL(newToolbarConfig()), - TQT_SLOT(slotUpdateToolbars()) ); + connect( &dlg, TQ_SIGNAL(newToolbarConfig()), + TQ_SLOT(slotUpdateToolbars()) ); dlg.exec(); } @@ -206,10 +206,10 @@ void KMMainWin::slotConfigChanged() //----------------------------------------------------------------------------- bool KMMainWin::queryClose() { - if ( kapp->sessionSaving() ) + if ( tdeApp->sessionSaving() ) writeConfig(); - if ( kmkernel->shuttingDown() || kapp->sessionSaving() || mReallyClose ) + if ( kmkernel->shuttingDown() || tdeApp->sessionSaving() || mReallyClose ) return true; return kmkernel->canQueryClose(); } diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index f9a7f388..b12ae65c 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -28,19 +28,17 @@ using KMail::HeaderStrategy; #include <libkpimidentities/identitymanager.h> #include <libemailfunctions/email.h> -#include <kasciistringtools.h> - #include <kpgpblock.h> #include <kaddrbook.h> #include <tdeapplication.h> +#include <tdeglobal.h> #include <tdeglobalsettings.h> #include <kdebug.h> #include <tdeconfig.h> #include <tdehtml_part.h> #include <kuser.h> #include <kidna.h> -#include <kasciistricmp.h> #include <tqcursor.h> #include <tqtextcodec.h> @@ -4083,7 +4081,7 @@ TQCString KMMessage::defaultCharset() if (retval.isEmpty() || (retval == "locale")) { retval = TQCString(kmkernel->networkCodec()->mimeName()); - KPIM::kAsciiToLower( retval.data() ); + kasciitolower( retval.data() ); } if (retval == "jisx0208.1983-0") retval = "iso-2022-jp"; @@ -4145,7 +4143,7 @@ void KMMessage::setCharset( const TQCString &charset, DwEntity *entity ) mType.SetModified(); TQCString lowerCharset = charset; - KPIM::kAsciiToLower( lowerCharset.data() ); + kasciitolower( lowerCharset.data() ); param->SetValue( DwString( lowerCharset ) ); mType.Assemble(); } diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h index dfe96116..a96470df 100644 --- a/kmail/kmmessage.h +++ b/kmail/kmmessage.h @@ -114,7 +114,7 @@ public: KMMsgBase & toMsgBase() { return *this; } const KMMsgBase & toMsgBase() const { return *this; } - /** Returns TRUE if object is a real message (not KMMsgInfo or KMMsgBase) */ + /** Returns true if object is a real message (not KMMsgInfo or KMMsgBase) */ bool isMessage() const; /** @return whether the priority: or x-priority headers indicate @@ -130,7 +130,7 @@ public: */ void setUnencryptedMsg( KMMessage* unencrypted ); - /** Returns TRUE if the message contains an unencrypted copy of itself. */ + /** Returns true if the message contains an unencrypted copy of itself. */ bool hasUnencryptedMsg() const { return 0 != mUnencryptedMsg; } /** Returns an unencrypted copy of this message or 0 if none exists. */ @@ -713,7 +713,7 @@ public: bool removeLineBreaks = false ); /** Converts the email address(es) to (a) nice HTML mailto: anchor(s). - * If stripped is TRUE then the visible part of the anchor contains + * If stripped is true then the visible part of the anchor contains * only the name part and not the given emailAddr. */ static TQString emailAddrAsAnchor(const TQString& emailAddr, diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp index 779fffd4..56910cb2 100644 --- a/kmail/kmmimeparttree.cpp +++ b/kmail/kmmimeparttree.cpp @@ -68,11 +68,11 @@ KMMimePartTree::KMMimePartTree( KMReaderWin* readerWin, setColumnAlignment( 3, TQt::AlignRight ); restoreLayoutIfPresent(); - connect( this, TQT_SIGNAL( clicked( TQListViewItem* ) ), - this, TQT_SLOT( itemClicked( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, + connect( this, TQ_SIGNAL( clicked( TQListViewItem* ) ), + this, TQ_SLOT( itemClicked( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( itemRightClicked( TQListViewItem*, const TQPoint& ) ) ); + this, TQ_SLOT( itemRightClicked( TQListViewItem*, const TQPoint& ) ) ); setSelectionMode( TQListView::Extended ); setRootIsDecorated( false ); setAllColumnsShowFocus( true ); @@ -131,32 +131,33 @@ void KMMimePartTree::itemRightClicked( TQListViewItem* item, else { TQPopupMenu* popup = new TQPopupMenu; if ( mCurrentContextMenuItem->node()->nodeId() > 2 && - mCurrentContextMenuItem->node()->typeString() != "Multipart" ) { - popup->insertItem( SmallIcon("document-open"), i18n("to open", "Open"), this, TQT_SLOT(slotOpen()) ); - popup->insertItem( i18n("Open With..."), this, TQT_SLOT(slotOpenWith()) ); - popup->insertItem( i18n("to view something", "View"), this, TQT_SLOT(slotView()) ); + mCurrentContextMenuItem->node()->typeString() != "Multipart" || + mCurrentContextMenuItem->node()->subTypeString() == "HTML" ) { + popup->insertItem( SmallIcon("document-open"), i18n("to open", "Open"), this, TQ_SLOT(slotOpen()) ); + popup->insertItem( i18n("Open With..."), this, TQ_SLOT(slotOpenWith()) ); + popup->insertItem( i18n("to view something", "View"), this, TQ_SLOT(slotView()) ); } - popup->insertItem( SmallIcon("document-save-as"),i18n( "Save &As..." ), this, TQT_SLOT( slotSaveAs() ) ); + popup->insertItem( SmallIcon("document-save-as"),i18n( "Save &As..." ), this, TQ_SLOT( slotSaveAs() ) ); /* * FIXME mkae optional? popup->insertItem( i18n( "Save as &Encoded..." ), this, - TQT_SLOT( slotSaveAsEncoded() ) ); + TQ_SLOT( slotSaveAsEncoded() ) ); */ popup->insertItem( i18n( "Save All Attachments..." ), this, - TQT_SLOT( slotSaveAll() ) ); + TQ_SLOT( slotSaveAll() ) ); // edit + delete only for attachments if ( mCurrentContextMenuItem->node()->nodeId() > 2 && mCurrentContextMenuItem->node()->typeString() != "Multipart" ) { - popup->insertItem( SmallIcon("edit-copy"), i18n("Copy"), this, TQT_SLOT(slotCopy()) ); + popup->insertItem( SmallIcon("edit-copy"), i18n("Copy"), this, TQ_SLOT(slotCopy()) ); if ( GlobalSettings::self()->allowAttachmentDeletion() ) popup->insertItem( SmallIcon("edit-delete"), i18n( "Delete Attachment" ), - this, TQT_SLOT( slotDelete() ) ); + this, TQ_SLOT( slotDelete() ) ); if ( GlobalSettings::self()->allowAttachmentEditing() ) popup->insertItem( SmallIcon( "edit" ), i18n( "Edit Attachment" ), - this, TQT_SLOT( slotEdit() ) ); + this, TQ_SLOT( slotEdit() ) ); } if ( mCurrentContextMenuItem->node()->nodeId() > 0 ) - popup->insertItem( i18n("Properties"), this, TQT_SLOT(slotProperties()) ); + popup->insertItem( i18n("Properties"), this, TQ_SLOT(slotProperties()) ); popup->exec( point ); delete popup; mCurrentContextMenuItem = 0; @@ -295,8 +296,8 @@ void KMMimePartTree::startHandleAttachmentCommand(int type) KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node, mReaderWin->message(), node->nodeId(), name, KMHandleAttachmentCommand::AttachmentAction( type ), 0, this ); - connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ), - mReaderWin, TQT_SLOT( slotAtmView( int, const TQString& ) ) ); + connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ), + mReaderWin, TQ_SLOT( slotAtmView( int, const TQString& ) ) ); command->start(); } diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp index abf1ade7..61952a00 100644 --- a/kmail/kmmsgbase.cpp +++ b/kmail/kmmsgbase.cpp @@ -15,13 +15,13 @@ using KMail::MessageProperty; #include <kdebug.h> #include <tdeglobal.h> #include <kcharsets.h> -#include <kasciistringtools.h> #include <kmdcodec.h> #include <krfcdate.h> #include <mimelib/mimepp.h> #include <kmime_codecs.h> +#include <tqglobal.h> #include <tqtextcodec.h> #include <tqdeepcopy.h> #include <tqregexp.h> @@ -575,7 +575,7 @@ const TQTextCodec* KMMsgBase::codecForName(const TQCString& _str) { if (_str.isEmpty()) return 0; TQCString codec = _str; - KPIM::kAsciiToLower(codec.data()); + kasciitolower(codec.data()); return TDEGlobal::charsets()->codecForName(codec); } @@ -790,7 +790,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, if (charset.isEmpty()) { cset = kmkernel->networkCodec()->mimeName(); - KPIM::kAsciiToLower(cset.data()); + kasciitolower(cset.data()); } else cset = charset; @@ -881,7 +881,7 @@ TQCString KMMsgBase::encodeRFC2231String( const TQString& _str, if ( charset.isEmpty() ) { cset = kmkernel->networkCodec()->mimeName(); - KPIM::kAsciiToLower( cset.data() ); + kasciitolower( cset.data() ); } else cset = charset; @@ -1049,7 +1049,7 @@ TQCString KMMsgBase::autoDetectCharset(const TQCString &_encoding, const TQStrin if (encoding == "locale") { encoding = kmkernel->networkCodec()->mimeName(); - KPIM::kAsciiToLower(encoding.data()); + kasciitolower(encoding.data()); } if (text.isEmpty()) return encoding; diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h index 1137bb6e..9ed08445 100644 --- a/kmail/kmmsgbase.h +++ b/kmail/kmmsgbase.h @@ -163,55 +163,55 @@ public: /** Convert the given message status to a string. */ TQString statusToSortRank(); - /** Returns TRUE if object is a real message (not KMMsgInfo or KMMsgBase) */ + /** Returns true if object is a real message (not KMMsgInfo or KMMsgBase) */ virtual bool isMessage(void) const; - /** Returns TRUE if status unread. Note that new messages are not unread.*/ + /** Returns true if status unread. Note that new messages are not unread.*/ virtual bool isUnread(void) const; - /** Returns TRUE if status is new. */ + /** Returns true if status is new. */ virtual bool isNew(void) const; - /** Returns TRUE if status is unknown. */ + /** Returns true if status is unknown. */ virtual bool isOfUnknownStatus(void) const; - /** Returns TRUE if status is old. */ + /** Returns true if status is old. */ virtual bool isOld(void) const; - /** Returns TRUE if status is read. */ + /** Returns true if status is read. */ virtual bool isRead(void) const; - /** Returns TRUE if status is deleted. */ + /** Returns true if status is deleted. */ virtual bool isDeleted(void) const; - /** Returns TRUE if status is replied. */ + /** Returns true if status is replied. */ virtual bool isReplied(void) const; - /** Returns TRUE if status is forwarded. */ + /** Returns true if status is forwarded. */ virtual bool isForwarded(void) const; - /** Returns TRUE if status is queued. */ + /** Returns true if status is queued. */ virtual bool isQueued(void) const; - /** Returns TRUE if status is todo flaged. */ + /** Returns true if status is todo flaged. */ virtual bool isTodo(void) const; - /** Returns TRUE if status is sent. */ + /** Returns true if status is sent. */ virtual bool isSent(void) const; - /** Returns TRUE if status is important. */ + /** Returns true if status is important. */ virtual bool isImportant(void) const; - /** Returns TRUE if status is watched. */ + /** Returns true if status is watched. */ virtual bool isWatched(void) const; - /** Returns TRUE if status is ignored. */ + /** Returns true if status is ignored. */ virtual bool isIgnored(void) const; - /** Returns TRUE if status is spam. */ + /** Returns true if status is spam. */ virtual bool isSpam(void) const; - /** Returns TRUE if status is not spam. */ + /** Returns true if status is not spam. */ virtual bool isHam(void) const; @@ -275,7 +275,7 @@ public: virtual void setDate(const TQCString &aStrDate); virtual void setDate(time_t aUnixTime) = 0; - /** Returns TRUE if changed since last folder-sync. */ + /** Returns true if changed since last folder-sync. */ virtual bool dirty(void) const { return mDirty; } /** Change dirty flag. */ @@ -321,8 +321,8 @@ public: /** Skip leading keyword if keyword has given character at it's end * (e.g. ':' or ',') and skip the then following blanks (if any) too. - * If keywordFound is specified it will be TRUE if a keyword was skipped - * and FALSE otherwise. */ + * If keywordFound is specified it will be true if a keyword was skipped + * and false otherwise. */ static TQString skipKeyword(const TQString& str, TQChar sepChar=':', bool* keywordFound=0); diff --git a/kmail/kmmsgdict.h b/kmail/kmmsgdict.h index 60fabf6c..5598489c 100644 --- a/kmail/kmmsgdict.h +++ b/kmail/kmmsgdict.h @@ -115,7 +115,7 @@ private: /** Returns the name of the .folder.index.ids file. */ static TQString getFolderIdsLocation( const FolderStorage &folder ); - /** Returns TRUE if the .folder.index.ids file should not be read. */ + /** Returns true if the .folder.index.ids file should not be read. */ bool isFolderIdsOutdated( const FolderStorage &folder ); /** Reads the .folder.index.ids file. Returns 0 on success. */ diff --git a/kmail/kmmsginfo.h b/kmail/kmmsginfo.h index 8f557f25..2a4a54fb 100644 --- a/kmail/kmmsginfo.h +++ b/kmail/kmmsginfo.h @@ -36,7 +36,7 @@ public: void compat_fromOldIndexString(const TQCString& str, bool toUtf8); - /** Initialize with given values and set dirty flag to FALSE. */ + /** Initialize with given values and set dirty flag to false. */ virtual void init(const TQCString& subject, const TQCString& from, const TQCString& to, time_t date, KMMsgStatus status, const TQCString& xmark, @@ -50,7 +50,7 @@ public: off_t folderOffset=0, size_t msgSize=0, size_t msgSizeServer = 0, ulong UID = 0); - /** Initialize with given values and set dirty flag to FALSE. */ + /** Initialize with given values and set dirty flag to false. */ virtual void init(const TQCString& subject, const TQCString& from, const TQCString& to, time_t date, KMMsgStatus status, const TQCString& xmark, diff --git a/kmail/kmmsglist.cpp b/kmail/kmmsglist.cpp index 9689467b..c7781148 100644 --- a/kmail/kmmsglist.cpp +++ b/kmail/kmmsglist.cpp @@ -24,7 +24,7 @@ KMMsgList::KMMsgList(int initSize) //----------------------------------------------------------------------------- KMMsgList::~KMMsgList() { - clear(TRUE); + clear(true); } @@ -69,22 +69,22 @@ bool KMMsgList::resize(unsigned int aSize) } // do the resizing - if (!TQMemArray<KMMsgBase*>::resize(aSize)) return FALSE; + if (!TQMemArray<KMMsgBase*>::resize(aSize)) return false; // initialize new elements for (i=oldSize; i<aSize; i++) at(i) = 0; - return TRUE; + return true; } //----------------------------------------------------------------------------- bool KMMsgList::reset(unsigned int aSize) { - if (!resize(aSize)) return FALSE; + if (!resize(aSize)) return false; clear(); - return TRUE; + return true; } diff --git a/kmail/kmmsglist.h b/kmail/kmmsglist.h index 83d9e8db..04ff3176 100644 --- a/kmail/kmmsglist.h +++ b/kmail/kmmsglist.h @@ -64,13 +64,13 @@ public: /** Clear messages. If autoDelete is set (default) the messages are deleted. The array is not resized. If @p syncDict, also updates the message dictionary. */ - void clear(bool autoDelete=TRUE, bool syncDict = false); + void clear(bool autoDelete=true, bool syncDict = false); /** Resize array and initialize new elements if any. Returns - FALSE if memory cannot be allocated. */ + false if memory cannot be allocated. */ bool resize(unsigned int size); - /** Clear the array and resize it to given size. Returns FALSE + /** Clear the array and resize it to given size. Returns false if memory cannot be allocated. */ bool reset(unsigned int size); diff --git a/kmail/kmmsgpart.cpp b/kmail/kmmsgpart.cpp index 596828e2..c7fa30d8 100644 --- a/kmail/kmmsgpart.cpp +++ b/kmail/kmmsgpart.cpp @@ -12,7 +12,6 @@ #include "globalsettings.h" #include "util.h" -#include <kasciistringtools.h> #include <kmime_charfreq.h> #include <kmime_codecs.h> #include <mimelib/enum.h> @@ -21,6 +20,7 @@ #include <kiconloader.h> #include <tqtextcodec.h> +#include <tqglobal.h> #include <assert.h> @@ -41,8 +41,8 @@ KMMessagePart::KMMessagePart( TQDataStream & stream ) stream >> mOriginalContentTypeStr >> mName >> mContentDescription >> mContentDisposition >> mCte >> size >> mPartSpecifier; - KPIM::kAsciiToLower( mContentDisposition.data() ); - KPIM::kAsciiToUpper( mOriginalContentTypeStr.data() ); + kasciitolower( mContentDisposition.data() ); + kasciitoupper( mOriginalContentTypeStr.data() ); // set the type int sep = mOriginalContentTypeStr.find('/'); @@ -435,7 +435,7 @@ void KMMessagePart::magicSetType(bool aAutoDecode) TQString KMMessagePart::iconName( int size ) const { TQCString mimeType( mType + "/" + mSubtype ); - KPIM::kAsciiToLower( mimeType.data() ); + kasciitolower( mimeType.data() ); TQString fileName = KMimeType::mimeType( mimeType )->icon( TQString(), false ); diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h index 452114d4..34939e51 100644 --- a/kmail/kmmsgpart.h +++ b/kmail/kmmsgpart.h @@ -137,9 +137,9 @@ public: void setContentId( const TQCString & aStr ) { mContentId = aStr; } /** Set the 'Content-Type' by mime-magic from the contents of the body. - If autoDecode is TRUE the decoded body will be used for mime type + If autoDecode is true the decoded body will be used for mime type determination (this does not change the body itself). */ - void magicSetType(bool autoDecode=TRUE); + void magicSetType(bool autoDecode=true); /** Get or set a custom content type parameter, consisting of an attribute name and a corresponding value. */ diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp index 869ee015..3b63badc 100644 --- a/kmail/kmmsgpartdlg.cpp +++ b/kmail/kmmsgpartdlg.cpp @@ -71,7 +71,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, // row 0: Type combobox: mMimeType = new KComboBox( true, plainPage() ); mMimeType->setInsertionPolicy( TQComboBox::NoInsertion ); - mMimeType->setValidator( new KMimeTypeValidator( TQT_TQOBJECT(mMimeType) ) ); + mMimeType->setValidator( new KMimeTypeValidator( mMimeType ) ); mMimeType->insertStringList( TQStringList() << TQString::fromLatin1("text/html") << TQString::fromLatin1("text/plain") @@ -81,15 +81,15 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, << TQString::fromLatin1("application/octet-stream") << TQString::fromLatin1("application/x-gunzip") << TQString::fromLatin1("application/zip") ); - connect( mMimeType, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotMimeTypeChanged(const TQString&)) ); + connect( mMimeType, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotMimeTypeChanged(const TQString&)) ); glay->addWidget( mMimeType, 0, 1 ); msg = i18n("<qt><p>The <em>MIME type</em> of the file:</p>" "<p>normally, you do not need to touch this setting, since the " "type of the file is automatically checked; but, sometimes, %1 " "may not detect the type correctly -- here is where you can fix " - "that.</p></qt>").arg( kapp->aboutData()->programName() ); + "that.</p></qt>").arg( tdeApp->aboutData()->programName() ); TQWhatsThis::add( mMimeType, msg ); // row 1: Size label: @@ -102,7 +102,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, "because calculating the exact size would take too much time; " "when this is the case, it will be made visible by adding " "\"(est.)\" to the size displayed.</p></qt>") - .arg( kapp->aboutData()->programName() ); + .arg( tdeApp->aboutData()->programName() ); TQWhatsThis::add( mSize, msg ); // row 2: "Name" lineedit and label: @@ -148,7 +148,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, "binary data, but consists of pure text -- in this case, choosing " "\"quoted-printable\" over the default \"base64\" will save up " "to 25% in resulting message size.</p></qt>") - .arg( kapp->aboutData()->programName() ); + .arg( tdeApp->aboutData()->programName() ); TQWhatsThis::add( label, msg ); TQWhatsThis::add( mEncoding, msg ); diff --git a/kmail/kmmsgpartdlg.h b/kmail/kmmsgpartdlg.h index 2cb9b114..29ccd318 100644 --- a/kmail/kmmsgpartdlg.h +++ b/kmail/kmmsgpartdlg.h @@ -142,7 +142,7 @@ class KMMsgPartDialogCompat : public KMMsgPartDialog { TQ_OBJECT public: - KMMsgPartDialogCompat( TQWidget * parent=0, const char * caption=0, bool=FALSE ); + KMMsgPartDialogCompat( TQWidget * parent=0, const char * caption=0, bool=false ); virtual ~KMMsgPartDialogCompat(); /** Display information about this message part. */ diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp index 3689e663..9e18532d 100644 --- a/kmail/kmpopfiltercnfrmdlg.cpp +++ b/kmail/kmpopfiltercnfrmdlg.cpp @@ -61,8 +61,8 @@ KMPopHeadersView::KMPopHeadersView(TQWidget *aParent, KMPopFilterCnfrmDlg *aDial //we rely on fixed column order, so we forbid this header()->setMovingEnabled(false); - connect(this, TQT_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); } KMPopHeadersView::~KMPopHeadersView() @@ -363,15 +363,15 @@ KMPopFilterCnfrmDlg::KMPopFilterCnfrmDlg(TQPtrList<KMPopHeaders> *aHeaders, cons lowerBox->setTitle(i18n("Ruleset Filtered Messages: %1").arg(rulesetCount)); // connect signals and slots - connect(lv, TQT_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); - connect(mFilteredHeaders, TQT_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); - connect(cb, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggled(bool))); + connect(lv, TQ_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); + connect(mFilteredHeaders, TQ_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); + connect(cb, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggled(bool))); adjustSize(); - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateMinimumSize())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateMinimumSize())); } KMPopFilterCnfrmDlg::~KMPopFilterCnfrmDlg() @@ -459,7 +459,7 @@ void KMPopFilterCnfrmDlg::slotToggled(bool aOn) mFilteredHeaders->hide(); } } - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateMinimumSize())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateMinimumSize())); } void KMPopFilterCnfrmDlg::slotUpdateMinimumSize() diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp index 0d74e87e..db42f3fa 100644 --- a/kmail/kmreadermainwin.cpp +++ b/kmail/kmreadermainwin.cpp @@ -103,8 +103,8 @@ void KMReaderMainWin::initKMReaderMainWin() { toolBar( "mainToolBar" )->hide(); } - connect( kmkernel, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( slotConfigChanged() ) ); + connect( kmkernel, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( slotConfigChanged() ) ); } void KMReaderMainWin::setupForwardingActionsList() @@ -156,7 +156,7 @@ void KMReaderMainWin::showMsg( const TQString & encoding, KMMessage *msg, menuBar()->show(); toolBar( "mainToolBar" )->show(); - connect ( msg->parent(), TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( slotFolderRemoved( TQObject* ) ) ); + connect ( msg->parent(), TQ_SIGNAL( destroyed( TQObject* ) ), this, TQ_SLOT( slotFolderRemoved( TQObject* ) ) ); } @@ -241,8 +241,8 @@ void KMReaderMainWin::slotForwardInlineMsg() } else { command = new KMForwardInlineCommand( this, mReaderWin->message() ); } - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); command->start(); } @@ -256,8 +256,8 @@ void KMReaderMainWin::slotForwardAttachedMsg() } else { command = new KMForwardAttachedCommand( this, mReaderWin->message() ); } - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); command->start(); } @@ -271,8 +271,8 @@ void KMReaderMainWin::slotForwardDigestMsg() } else { command = new KMForwardDigestCommand( this, mReaderWin->message() ); } - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); command->start(); } @@ -280,8 +280,8 @@ void KMReaderMainWin::slotForwardDigestMsg() void KMReaderMainWin::slotRedirectMsg() { KMCommand *command = new KMRedirectCommand( this, mReaderWin->message() ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); command->start(); } @@ -299,7 +299,7 @@ void KMReaderMainWin::slotShowMsgSrc() //----------------------------------------------------------------------------- void KMReaderMainWin::setupForwardActions() { - disconnect( mForwardActionMenu, TQT_SIGNAL( activated() ), 0, 0 ); + disconnect( mForwardActionMenu, TQ_SIGNAL( activated() ), 0, 0 ); mForwardActionMenu->remove( mForwardInlineAction ); mForwardActionMenu->remove( mForwardAttachedAction ); @@ -308,16 +308,16 @@ void KMReaderMainWin::setupForwardActions() mForwardActionMenu->insert( mForwardAttachedAction, 1 ); mForwardInlineAction->setShortcut( Key_F ); mForwardAttachedAction->setShortcut( SHIFT+Key_F ); - connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, - TQT_SLOT(slotForwardInlineMsg()) ); + connect( mForwardActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotForwardInlineMsg()) ); } else { mForwardActionMenu->insert( mForwardAttachedAction, 0 ); mForwardActionMenu->insert( mForwardInlineAction, 1 ); mForwardInlineAction->setShortcut( SHIFT+Key_F ); mForwardAttachedAction->setShortcut( Key_F ); - connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, - TQT_SLOT(slotForwardAttachedMsg()) ); + connect( mForwardActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotForwardAttachedMsg()) ); } } @@ -336,42 +336,42 @@ void KMReaderMainWin::setupAccel() mMsgActions = new KMail::MessageActions( actionCollection(), this ); mMsgActions->setMessageView( mReaderWin ); - connect( mMsgActions, TQT_SIGNAL( replyActionFinished() ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( mMsgActions, TQ_SIGNAL( replyActionFinished() ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); //----- File Menu - //mOpenAction = KStdAction::open( this, TQT_SLOT( slotOpenMsg() ), + //mOpenAction = KStdAction::open( this, TQ_SLOT( slotOpenMsg() ), // actionCollection() ); //mSaveAsAction = new TDEAction( i18n("Save &As..."), "document-save", // TDEStdAccel::shortcut( TDEStdAccel::Save ), - // this, TQT_SLOT( slotSaveMsg() ), + // this, TQ_SLOT( slotSaveMsg() ), // actionCollection(), "file_save_as" ); - mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(mReaderWin), TQT_SLOT( slotSaveMsg() ), + mSaveAsAction = KStdAction::saveAs( mReaderWin, TQ_SLOT( slotSaveMsg() ), actionCollection() ); mSaveAsAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Save ) ); - mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotPrintMsg() ), + mPrintAction = KStdAction::print( this, TQ_SLOT( slotPrintMsg() ), actionCollection() ); - TDEAction *closeAction = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); + TDEAction *closeAction = KStdAction::close( this, TQ_SLOT( close() ), actionCollection() ); TDEShortcut closeShortcut = closeAction->shortcut(); closeShortcut.append( KKey(Key_Escape)); closeAction->setShortcut(closeShortcut); //----- Edit Menu - KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), actionCollection() ); - KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotMarkAll() ), actionCollection() ); - KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection() ); - KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), actionCollection() ); + KStdAction::copy( this, TQ_SLOT( slotCopy() ), actionCollection() ); + KStdAction::selectAll( this, TQ_SLOT( slotMarkAll() ), actionCollection() ); + KStdAction::find( this, TQ_SLOT(slotFind()), actionCollection() ); + KStdAction::findNext( this, TQ_SLOT( slotFindNext() ), actionCollection() ); mTrashAction = new TDEAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash", i18n( "Move message to trashcan" ) ), - Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotTrashMsg() ), + Key_Delete, this, TQ_SLOT( slotTrashMsg() ), actionCollection(), "move_to_trash" ); //----- View Menu - mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this), - TQT_SLOT(slotShowMsgSrc()), actionCollection(), + mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, this, + TQ_SLOT(slotShowMsgSrc()), actionCollection(), "view_source" ); @@ -379,26 +379,26 @@ void KMReaderMainWin::setupAccel() "mail-forward", actionCollection(), "message_forward" ); mForwardInlineAction = new TDEAction( i18n("&Inline..."), - "mail-forward", SHIFT+Key_F, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardInlineMsg()), + "mail-forward", SHIFT+Key_F, this, + TQ_SLOT(slotForwardInlineMsg()), actionCollection(), "message_forward_inline" ); mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), - "mail-forward", Key_F, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardAttachedMsg()), + "mail-forward", Key_F, this, + TQ_SLOT(slotForwardAttachedMsg()), actionCollection(), "message_forward_as_attachment" ); mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), - "mail-forward", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardDigestMsg()), + "mail-forward", 0, this, + TQ_SLOT(slotForwardDigestMsg()), actionCollection(), "message_forward_as_digest" ); mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), - "mail-forward", Key_E, TQT_TQOBJECT(this), - TQT_SLOT(slotRedirectMsg()), + "mail-forward", Key_E, this, + TQ_SLOT(slotRedirectMsg()), actionCollection(), "message_forward_redirect" ); @@ -410,32 +410,32 @@ void KMReaderMainWin::setupAccel() fontAction = new TDEFontAction( "Select Font", 0, actionCollection(), "text_font" ); fontAction->setFont( mReaderWin->cssHelper()->bodyFont().family() ); - connect( fontAction, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotFontAction( const TQString& ) ) ); + connect( fontAction, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotFontAction( const TQString& ) ) ); fontSizeAction = new TDEFontSizeAction( "Select Size", 0, actionCollection(), "text_size" ); fontSizeAction->setFontSize( mReaderWin->cssHelper()->bodyFont().pointSize() ); - connect( fontSizeAction, TQT_SIGNAL( fontSizeChanged( int ) ), - TQT_SLOT( slotSizeAction( int ) ) ); + connect( fontSizeAction, TQ_SIGNAL( fontSizeChanged( int ) ), + TQ_SLOT( slotSizeAction( int ) ) ); TQAccel *accel = new TQAccel(mReaderWin, "showMsg()"); accel->connectItem(accel->insertItem(Key_Up), - mReaderWin, TQT_SLOT(slotScrollUp())); + mReaderWin, TQ_SLOT(slotScrollUp())); accel->connectItem(accel->insertItem(Key_Down), - mReaderWin, TQT_SLOT(slotScrollDown())); + mReaderWin, TQ_SLOT(slotScrollDown())); accel->connectItem(accel->insertItem(Key_Prior), - mReaderWin, TQT_SLOT(slotScrollPrior())); + mReaderWin, TQ_SLOT(slotScrollPrior())); accel->connectItem(accel->insertItem(Key_Next), - mReaderWin, TQT_SLOT(slotScrollNext())); + mReaderWin, TQ_SLOT(slotScrollNext())); accel->connectItem(accel->insertItem(TDEStdAccel::shortcut(TDEStdAccel::Copy)), - mReaderWin, TQT_SLOT(slotCopySelectedText())); - connect( mReaderWin, TQT_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)), - this, TQT_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&))); - connect(mReaderWin, TQT_SIGNAL(urlClicked(const KURL&,int)), - mReaderWin, TQT_SLOT(slotUrlClicked())); + mReaderWin, TQ_SLOT(slotCopySelectedText())); + connect( mReaderWin, TQ_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)), + this, TQ_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&))); + connect(mReaderWin, TQ_SIGNAL(urlClicked(const KURL&,int)), + mReaderWin, TQ_SLOT(slotUrlClicked())); setStandardToolBarMenuEnabled(true); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection()); } @@ -503,7 +503,7 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPo TQPopupMenu* copyMenu = new TQPopupMenu(menu); KMMainWidget* mainwin = kmkernel->getKMMainWidget(); if ( mainwin ) - mainwin->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this), + mainwin->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this, &mMenuToFolder, copyMenu ); menu->insertItem( i18n("&Copy To" ), copyMenu ); menu->insertSeparator(); @@ -513,7 +513,7 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPo menu->insertSeparator(); mPrintAction->plug( menu ); mSaveAsAction->plug( menu ); - menu->insertItem( i18n("Save Attachments..."), mReaderWin, TQT_SLOT(slotSaveAttachments()) ); + menu->insertItem( i18n("Save Attachments..."), mReaderWin, TQ_SLOT(slotSaveAttachments()) ); mMsgActions->createTodoAction()->plug( menu ); } menu->exec(aPoint, 0); @@ -561,7 +561,7 @@ void KMReaderMainWin::slotEditToolbars() { saveMainWindowSettings( KMKernel::config(), "ReaderWindow" ); KEditToolbar dlg( guiFactory(), this ); - connect( &dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(slotUpdateToolbars()) ); + connect( &dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(slotUpdateToolbars()) ); dlg.exec(); } diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 01486496..6a73b261 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -64,7 +64,6 @@ using KMail::FileHtmlWriter; using KMail::TeeHtmlWriter; #endif -#include <kasciistringtools.h> #include <kstringhandler.h> #include <mimelib/mimepp.h> @@ -93,21 +92,21 @@ using KMail::TeeHtmlWriter; #include <kuserprofile.h> #include <kcharsets.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> // Sven's : for access and getpid +#include <tdestandarddirs.h> // Sven's : for access and getpid #include <kcursor.h> #include <kdebug.h> #include <tdefiledialog.h> #include <tdelocale.h> #include <tdemessagebox.h> +#include <tdeglobal.h> #include <tdeglobalsettings.h> #include <krun.h> #include <tdetempfile.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdialog.h> #include <tdeaction.h> #include <kiconloader.h> #include <kmdcodec.h> -#include <kasciistricmp.h> #include <kurldrag.h> #include <tqclipboard.h> @@ -469,14 +468,14 @@ KMReaderWin::KMReaderWin(TQWidget *aParent, mLevelQuote = GlobalSettings::self()->collapseQuoteLevelSpin() - 1; - connect( &mUpdateReaderWinTimer, TQT_SIGNAL(timeout()), - TQT_TQOBJECT(this), TQT_SLOT(updateReaderWin()) ); - connect( &mResizeTimer, TQT_SIGNAL(timeout()), - TQT_TQOBJECT(this), TQT_SLOT(slotDelayedResize()) ); - connect( &mDelayedMarkTimer, TQT_SIGNAL(timeout()), - TQT_TQOBJECT(this), TQT_SLOT(slotTouchMessage()) ); - connect( &mHeaderRefreshTimer, TQT_SIGNAL(timeout()), - TQT_TQOBJECT(this), TQT_SLOT(updateHeader()) ); + connect( &mUpdateReaderWinTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateReaderWin()) ); + connect( &mResizeTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotDelayedResize()) ); + connect( &mDelayedMarkTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTouchMessage()) ); + connect( &mHeaderRefreshTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateHeader()) ); } @@ -491,46 +490,46 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) { new TDEActionMenu( i18n("View->", "&Headers"), ac, "view_headers" ); headerMenu->setToolTip( i18n("Choose display style of message headers") ); - connect( headerMenu, TQT_SIGNAL(activated()), - TQT_TQOBJECT(this), TQT_SLOT(slotCycleHeaderStyles()) ); + connect( headerMenu, TQ_SIGNAL(activated()), + this, TQ_SLOT(slotCycleHeaderStyles()) ); raction = new TDERadioAction( i18n("View->headers->", "&Enterprise Headers"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotEnterpriseHeaders()), + this, TQ_SLOT(slotEnterpriseHeaders()), ac, "view_headers_enterprise" ); raction->setToolTip( i18n("Show the list of headers in Enterprise style") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert(raction); raction = new TDERadioAction( i18n("View->headers->", "&Fancy Headers"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotFancyHeaders()), + this, TQ_SLOT(slotFancyHeaders()), ac, "view_headers_fancy" ); raction->setToolTip( i18n("Show the list of headers in a fancy format") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert( raction ); raction = new TDERadioAction( i18n("View->headers->", "&Brief Headers"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotBriefHeaders()), + this, TQ_SLOT(slotBriefHeaders()), ac, "view_headers_brief" ); raction->setToolTip( i18n("Show brief list of message headers") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert( raction ); raction = new TDERadioAction( i18n("View->headers->", "&Standard Headers"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotStandardHeaders()), + this, TQ_SLOT(slotStandardHeaders()), ac, "view_headers_standard" ); raction->setToolTip( i18n("Show standard list of message headers") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert( raction ); raction = new TDERadioAction( i18n("View->headers->", "&Long Headers"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotLongHeaders()), + this, TQ_SLOT(slotLongHeaders()), ac, "view_headers_long" ); raction->setToolTip( i18n("Show long list of message headers") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert( raction ); raction = new TDERadioAction( i18n("View->headers->", "&All Headers"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotAllHeaders()), + this, TQ_SLOT(slotAllHeaders()), ac, "view_headers_all" ); raction->setToolTip( i18n("Show all message headers") ); raction->setExclusiveGroup( "view_headers_group" ); @@ -540,39 +539,39 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) { TDEActionMenu *attachmentMenu = new TDEActionMenu( i18n("View->", "&Attachments"), ac, "view_attachments" ); attachmentMenu->setToolTip( i18n("Choose display style of attachments") ); - connect( attachmentMenu, TQT_SIGNAL(activated()), - TQT_TQOBJECT(this), TQT_SLOT(slotCycleAttachmentStrategy()) ); + connect( attachmentMenu, TQ_SIGNAL(activated()), + this, TQ_SLOT(slotCycleAttachmentStrategy()) ); raction = new TDERadioAction( i18n("View->attachments->", "&As Icons"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotIconicAttachments()), + this, TQ_SLOT(slotIconicAttachments()), ac, "view_attachments_as_icons" ); raction->setToolTip( i18n("Show all attachments as icons. Click to see them.") ); raction->setExclusiveGroup( "view_attachments_group" ); attachmentMenu->insert( raction ); raction = new TDERadioAction( i18n("View->attachments->", "&Smart"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSmartAttachments()), + this, TQ_SLOT(slotSmartAttachments()), ac, "view_attachments_smart" ); raction->setToolTip( i18n("Show attachments as suggested by sender.") ); raction->setExclusiveGroup( "view_attachments_group" ); attachmentMenu->insert( raction ); raction = new TDERadioAction( i18n("View->attachments->", "&Inline"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotInlineAttachments()), + this, TQ_SLOT(slotInlineAttachments()), ac, "view_attachments_inline" ); raction->setToolTip( i18n("Show all attachments inline (if possible)") ); raction->setExclusiveGroup( "view_attachments_group" ); attachmentMenu->insert( raction ); raction = new TDERadioAction( i18n("View->attachments->", "&Hide"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotHideAttachments()), + this, TQ_SLOT(slotHideAttachments()), ac, "view_attachments_hide" ); raction->setToolTip( i18n("Do not show attachments in the message viewer") ); raction->setExclusiveGroup( "view_attachments_group" ); attachmentMenu->insert( raction ); mHeaderOnlyAttachmentsAction = new TDERadioAction( i18n( "View->attachments->", "In Header &Only" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotHeaderOnlyAttachments() ), + this, TQ_SLOT( slotHeaderOnlyAttachments() ), ac, "view_attachments_headeronly" ); mHeaderOnlyAttachmentsAction->setToolTip( i18n( "Show Attachments only in the header of the mail" ) ); mHeaderOnlyAttachmentsAction->setExclusiveGroup( "view_attachments_group" ); @@ -580,7 +579,7 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) { // Set Encoding submenu mSelectEncodingAction = new TDESelectAction( i18n( "&Set Encoding" ), "charset", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotSetEncoding() ), + this, TQ_SLOT( slotSetEncoding() ), ac, "encoding" ); TQStringList encodings = KMMsgBase::supportedEncodings( false ); encodings.prepend( i18n( "Auto" ) ); @@ -588,45 +587,45 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) { mSelectEncodingAction->setCurrentItem( 0 ); mMailToComposeAction = new TDEAction( i18n("New Message To..."), "mail-message-new", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoCompose()), ac, + 0, this, TQ_SLOT(slotMailtoCompose()), ac, "mailto_compose" ); mMailToReplyAction = new TDEAction( i18n("Reply To..."), "mail-reply-sender", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoReply()), ac, + 0, this, TQ_SLOT(slotMailtoReply()), ac, "mailto_reply" ); mMailToForwardAction = new TDEAction( i18n("Forward To..."), "mail-forward", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoForward()), ac, + 0, this, TQ_SLOT(slotMailtoForward()), ac, "mailto_forward" ); mAddAddrBookAction = new TDEAction( i18n("Add to Address Book"), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoAddAddrBook()), + 0, this, TQ_SLOT(slotMailtoAddAddrBook()), ac, "add_addr_book" ); mOpenAddrBookAction = new TDEAction( i18n("Open in Address Book"), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoOpenAddrBook()), + 0, this, TQ_SLOT(slotMailtoOpenAddrBook()), ac, "openin_addr_book" ); - mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelectedText()), ac, "kmail_copy"); - mSelectAllAction = new TDEAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, TQT_TQOBJECT(this), - TQT_SLOT(selectAll()), ac, "mark_all_text" ); - mCopyURLAction = new TDEAction( i18n("Copy Link Address"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotUrlCopy()), ac, "copy_url" ); - mUrlOpenAction = new TDEAction( i18n("Open URL"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotUrlOpen()), ac, "open_url" ); + mCopyAction = KStdAction::copy( this, TQ_SLOT(slotCopySelectedText()), ac, "kmail_copy"); + mSelectAllAction = new TDEAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, this, + TQ_SLOT(selectAll()), ac, "mark_all_text" ); + mCopyURLAction = new TDEAction( i18n("Copy Link Address"), 0, this, + TQ_SLOT(slotUrlCopy()), ac, "copy_url" ); + mUrlOpenAction = new TDEAction( i18n("Open URL"), 0, this, + TQ_SLOT(slotUrlOpen()), ac, "open_url" ); mAddBookmarksAction = new TDEAction( i18n("Bookmark This Link"), "bookmark_add", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmarks()), + 0, this, TQ_SLOT(slotAddBookmarks()), ac, "add_bookmarks" ); - mUrlSaveAsAction = new TDEAction( i18n("Save Link As..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotUrlSave()), ac, "saveas_url" ); + mUrlSaveAsAction = new TDEAction( i18n("Save Link As..."), 0, this, + TQ_SLOT(slotUrlSave()), ac, "saveas_url" ); mToggleFixFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), - Key_X, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFixedFont()), + Key_X, this, TQ_SLOT(slotToggleFixedFont()), ac, "toggle_fixedfont" ); mToggleMimePartTreeAction = new TDEToggleAction( i18n("Show Message Structure"), 0, ac, "toggle_mimeparttree" ); - connect(mToggleMimePartTreeAction, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotToggleMimePartTree())); + connect(mToggleMimePartTreeAction, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleMimePartTree())); - mStartIMChatAction = new TDEAction( i18n("Chat &With..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotIMChat()), ac, "start_im_chat" ); + mStartIMChatAction = new TDEAction( i18n("Chat &With..."), 0, this, + TQ_SLOT(slotIMChat()), ac, "start_im_chat" ); } // little helper function @@ -1021,17 +1020,17 @@ void KMReaderWin::initHtmlWidget(void) #endif connect(mViewer->browserExtension(), - TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),this, - TQT_SLOT(slotUrlOpen(const KURL &))); + TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),this, + TQ_SLOT(slotUrlOpen(const KURL &))); connect(mViewer->browserExtension(), - TQT_SIGNAL(createNewWindow(const KURL &, const KParts::URLArgs &)),this, - TQT_SLOT(slotUrlOpen(const KURL &))); - connect(mViewer,TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), - TQT_SLOT(slotUrlPopup(const TQString &, const TQPoint &))); - connect( kmkernel->imProxy(), TQT_SIGNAL( sigContactPresenceChanged( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( contactStatusChanged( const TQString & ) ) ); - connect( kmkernel->imProxy(), TQT_SIGNAL( sigPresenceInfoExpired() ), - TQT_TQOBJECT(this), TQT_SLOT( updateReaderWin() ) ); + TQ_SIGNAL(createNewWindow(const KURL &, const KParts::URLArgs &)),this, + TQ_SLOT(slotUrlOpen(const KURL &))); + connect(mViewer,TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)), + TQ_SLOT(slotUrlPopup(const TQString &, const TQPoint &))); + connect( kmkernel->imProxy(), TQ_SIGNAL( sigContactPresenceChanged( const TQString & ) ), + this, TQ_SLOT( contactStatusChanged( const TQString & ) ) ); + connect( kmkernel->imProxy(), TQ_SIGNAL( sigPresenceInfoExpired() ), + this, TQ_SLOT( updateReaderWin() ) ); } void KMReaderWin::contactStatusChanged( const TQString &uid) @@ -1298,7 +1297,7 @@ void KMReaderWin::displaySplashPage( const TQString &info ) TQString location = locate("data", "kmail/about/main.html"); TQString content = KPIM::kFileToString(location); content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); - if ( kapp->reverseLayout() ) + if ( tdeApp->reverseLayout() ) content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else content = content.arg( "" ); @@ -1497,7 +1496,7 @@ void KMReaderWin::displayMessage() { htmlWriter()->queue("</body></html>"); htmlWriter()->flush(); - TQTimer::singleShot( 1, TQT_TQOBJECT(this), TQT_SLOT(injectAttachments()) ); + TQTimer::singleShot( 1, this, TQ_SLOT(injectAttachments()) ); } static bool message_was_saved_decrypted_before( const KMMessage * msg ) { @@ -1775,8 +1774,12 @@ TQString KMReaderWin::writeMessagePartToTempFile( KMMessagePart* aMsgPart, int slashPos = fileName.findRev( '/' ); if( -1 != slashPos ) fileName = fileName.mid( slashPos + 1 ); - if( fileName.isEmpty() ) + if( fileName.isEmpty() ) { fileName = "unnamed"; + // Save html emails with extension + if ( aMsgPart->subtype() == DwMime::kSubtypeHtml ) + fileName += ".html"; + } fname += "/" + fileName; TQByteArray data = aMsgPart->bodyDecodedBinary(); @@ -2065,7 +2068,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo menu->insertItem( i18n("Scroll To"), 10 ); } - connect(menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHandleAttachment(int))); + connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHandleAttachment(int))); menu->exec( p ,0 ); delete menu; } @@ -2105,8 +2108,8 @@ void KMReaderWin::slotHandleAttachment( int choice ) KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node, message(), mAtmCurrent, mAtmCurrentName, KMHandleAttachmentCommand::AttachmentAction( choice ), 0, this ); - connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) ); + connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ), + this, TQ_SLOT( slotAtmView( int, const TQString& ) ) ); command->start(); } else if ( choice == 7 ) { slotDeleteAttachment( node ); @@ -2160,7 +2163,7 @@ void KMReaderWin::slotToggleMimePartTree() //----------------------------------------------------------------------------- void KMReaderWin::slotCopySelectedText() { - kapp->clipboard()->setText( mViewer->selectedText() ); + tdeApp->clipboard()->setText( mViewer->selectedText() ); } @@ -2346,7 +2349,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name ) } TQCString contentTypeStr( msgPart.typeStr() + '/' + msgPart.subtypeStr() ); - KPIM::kAsciiToLower( contentTypeStr.data() ); + kasciitolower( contentTypeStr.data() ); if ( qstrcmp( contentTypeStr, "text/x-vcard" ) == 0 ) { showVCard( &msgPart ); @@ -2393,8 +2396,8 @@ void KMReaderWin::openAttachment( int id, const TQString & name ) KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node, message(), mAtmCurrent, mAtmCurrentName, KMHandleAttachmentCommand::Save, offer, this ); - connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) ); + connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ), + this, TQ_SLOT( slotAtmView( int, const TQString& ) ) ); command->start(); } else if( choice == KMessageBox::No ) { // Open @@ -2403,8 +2406,8 @@ void KMReaderWin::openAttachment( int id, const TQString & name ) mAtmUpdate = true; KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node, message(), mAtmCurrent, mAtmCurrentName, action, offer, this ); - connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) ); + connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ), + this, TQ_SLOT( slotAtmView( int, const TQString& ) ) ); command->start(); } else { // Cancel kdDebug(5006) << "Canceled opening attachment" << endl; @@ -2462,7 +2465,7 @@ void KMReaderWin::slotDocumentChanged() void KMReaderWin::slotTextSelected(bool) { TQString temp = mViewer->selectedText(); - kapp->clipboard()->setText(temp); + tdeApp->clipboard()->setText(temp); } //----------------------------------------------------------------------------- @@ -2686,7 +2689,7 @@ KURL KMReaderWin::tempFileUrlFromPartNode( const partNode * node ) bool ok; int res = path.mid(left + 1, right - left - 1).toInt(&ok); if ( res == node->nodeId() ) - return KURL( path ); + return KURL::fromPathOrURL( path ); } return KURL(); } @@ -2802,7 +2805,7 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e ) // case we started a drag. If the event is missed, the HTML view gets into a wrong // state, in which funny things like unsolicited drags start to happen. TQMouseEvent mouseEvent( TQEvent::MouseButtonRelease, me->pos(), TQt::NoButton, TQt::NoButton ); - TQT_TQOBJECT( mViewer->view() )->eventFilter( mViewer->view()->viewport(), + static_cast<TQObject*>(mViewer->view())->eventFilter( mViewer->view()->viewport(), &mouseEvent ); return true; } @@ -2853,10 +2856,10 @@ void KMReaderWin::slotDeleteAttachment(partNode * node) if ( msg && nodeId != -1 ) { KMDeleteAttachmentCommand* command = new KMDeleteAttachmentCommand( nodeId, msg, this ); command->start(); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - TQT_TQOBJECT(this), TQT_SLOT( updateReaderWin() ) ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - TQT_TQOBJECT(this), TQT_SLOT( disconnectMsgAdded() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( updateReaderWin() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( disconnectMsgAdded() ) ); // ### HACK: Since the command will do delete + add, a new message will arrive. However, we don't // want the selection to change. Therefore, as soon as a new message arrives, select it, and then @@ -2864,8 +2867,8 @@ void KMReaderWin::slotDeleteAttachment(partNode * node) // Of course the are races, another message can arrive before ours, but we take the risk. // And it won't work properly with multiple main windows const KMHeaders * const headers = KMKernel::self()->getKMMainWidget()->headers(); - connect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ), - TQT_TQOBJECT(this), TQT_SLOT( msgAdded( TQListViewItem* ) ) ); + connect( headers, TQ_SIGNAL( msgAddedToListView( TQListViewItem* ) ), + this, TQ_SLOT( msgAdded( TQListViewItem* ) ) ); } // If we are operating on a copy of parts of the message, make sure to update the copy as well. @@ -2890,8 +2893,8 @@ void KMReaderWin::msgAdded( TQListViewItem *item ) void KMReaderWin::disconnectMsgAdded() { const KMHeaders *const headers = KMKernel::self()->getKMMainWidget()->headers(); - disconnect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ), - TQT_TQOBJECT(this), TQT_SLOT( msgAdded( TQListViewItem* ) ) ); + disconnect( headers, TQ_SIGNAL( msgAddedToListView( TQListViewItem* ) ), + this, TQ_SLOT( msgAdded( TQListViewItem* ) ) ); } void KMReaderWin::slotEditAttachment(partNode * node) @@ -3042,10 +3045,15 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor } } else { partNode::AttachmentDisplayInfo info = node->attachmentDisplayInfo(); + + // Write HTML parts and attachments to disk to allow them to be opened + bool writePartToDisk = info.displayInHeader || node->msgPart().subtype() == DwMime::kSubtypeHtml; + if ( writePartToDisk ) + TQString fileName = writeMessagePartToTempFile( &node->msgPart(), node->nodeId() ); + if ( info.displayInHeader ) { html += "<div style=\"float:left;\">"; html += TQString::fromLatin1( "<span style=\"white-space:nowrap; border-width: 0px; border-left-width: 5px; border-color: %1; 2px; border-left-style: solid;\">" ).arg( bgColor.name() ); - TQString fileName = writeMessagePartToTempFile( &node->msgPart(), node->nodeId() ); TQString href = node->asHREF( "header" ); html += TQString::fromLatin1( "<a href=\"" ) + href + TQString::fromLatin1( "\">" ); diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h index fca9c3af..df4d8845 100644 --- a/kmail/kmreaderwin.h +++ b/kmail/kmreaderwin.h @@ -101,7 +101,7 @@ public: /** Read settings from app's config file. */ void readConfig(); - /** Write settings to app's config file. Calls sync() if withSync is TRUE. */ + /** Write settings to app's config file. Calls sync() if withSync is true. */ void writeConfig( bool withSync=true ) const; const KMail::HeaderStyle * headerStyle() const { diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h index 9d517fdf..62058936 100644 --- a/kmail/kmsearchpattern.h +++ b/kmail/kmsearchpattern.h @@ -74,14 +74,14 @@ public: virtual ~KMSearchRule() {}; /** Tries to match the rule against the given KMMessage. - @return TRUE if the rule matched, FALSE otherwise. Must be + @return true if the rule matched, false otherwise. Must be implemented by subclasses. */ virtual bool matches( const KMMessage * msg ) const = 0; /** Optimized version tries to match the rule against the given @see DwString. - @return TRUE if the rule matched, FALSE otherwise. + @return true if the rule matched, false otherwise. */ virtual bool matches( const DwString & str, KMMessage & msg, const DwBoyerMoore * headerField=0, @@ -170,7 +170,7 @@ public: virtual bool matches( const KMMessage * msg ) const; /** Optimized version tries to match the rule against the given DwString. - @return TRUE if the rule matched, FALSE otherwise. + @return true if the rule matched, false otherwise. */ virtual bool matches( const DwString & str, KMMessage & msg, const DwBoyerMoore * headerField=0, @@ -334,7 +334,7 @@ public: own result or else most functionality is lacking, or has to be reimplemented, since the rules are private to this class. - @return TRUE if the match was successful, FALSE otherwise. + @return true if the match was successful, false otherwise. */ bool matches( const KMMessage * msg, bool ignoreBody = false ) const; bool matches( const DwString & str, bool ignoreBody = false ) const; diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp index ffc96841..43f56e95 100644 --- a/kmail/kmsearchpatternedit.cpp +++ b/kmail/kmsearchpatternedit.cpp @@ -116,17 +116,17 @@ void KMSearchRuleWidget::initWidget() RuleWidgetHandlerManager::instance()->createWidgets( mFunctionStack, mValueStack, - TQT_TQOBJECT(this) ); + this ); // redirect focus to the header field combo box setFocusProxy( mRuleField ); - connect( mRuleField, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( slotRuleFieldChanged( const TQString & ) ) ); - connect( mRuleField, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotRuleFieldChanged( const TQString & ) ) ); - connect( mRuleField, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( fieldChanged( const TQString & ) ) ); + connect( mRuleField, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( slotRuleFieldChanged( const TQString & ) ) ); + connect( mRuleField, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotRuleFieldChanged( const TQString & ) ) ); + connect( mRuleField, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( fieldChanged( const TQString & ) ) ); } void KMSearchRuleWidget::setRule( KMSearchRule *aRule ) @@ -426,15 +426,15 @@ void KMSearchPatternEdit::initLayout(bool headersOnly, bool absoluteDates) mRuleLister->slotClear(); //------------connect a few signals - connect( bg, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(slotRadioClicked(int)) ); + connect( bg, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(slotRadioClicked(int)) ); KMSearchRuleWidget *srw = (KMSearchRuleWidget*)mRuleLister->mWidgetList.first(); if ( srw ) { - connect( srw, TQT_SIGNAL(fieldChanged(const TQString &)), - this, TQT_SLOT(slotAutoNameHack()) ); - connect( srw, TQT_SIGNAL(contentsChanged(const TQString &)), - this, TQT_SLOT(slotAutoNameHack()) ); + connect( srw, TQ_SIGNAL(fieldChanged(const TQString &)), + this, TQ_SLOT(slotAutoNameHack()) ); + connect( srw, TQ_SIGNAL(contentsChanged(const TQString &)), + this, TQ_SLOT(slotAutoNameHack()) ); } else kdDebug(5006) << "KMSearchPatternEdit: no first KMSearchRuleWidget, though slotClear() has been called!" << endl; } diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index e63add04..cf1e7272 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -231,8 +231,8 @@ bool KMSender::doSendQueued( const TQString &customTransport ) for( int i = 0 ; i<mTotalMessages ; ++i ) mTotalBytes += mOutboxFolder->getMsgBase(i)->msgSize(); - connect( mOutboxFolder, TQT_SIGNAL(msgAdded(int)), - this, TQT_SLOT(outboxMsgAdded(int)) ); + connect( mOutboxFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(outboxMsgAdded(int)) ); mCurrentMsg = 0; mSentFolder = kmkernel->sentFolder(); @@ -472,9 +472,9 @@ void KMSender::doSendMsg() i18n( "Sending messages" ), i18n("Initiating sender process..."), true ); - connect( mProgressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), - this, TQT_SLOT( slotAbortSend() ) ); - kapp->ref(); + connect( mProgressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), + this, TQ_SLOT( slotAbortSend() ) ); + tdeApp->ref(); mSendInProgress = true; } @@ -520,8 +520,8 @@ void KMSender::doSendMsg() if (!mSendProc) sendProcStarted(false); else { - connect(mSendProc, TQT_SIGNAL(idle()), TQT_SLOT(slotIdle())); - connect(mSendProc, TQT_SIGNAL(started(bool)), TQT_SLOT(sendProcStarted(bool))); + connect(mSendProc, TQ_SIGNAL(idle()), TQ_SLOT(slotIdle())); + connect(mSendProc, TQ_SIGNAL(started(bool)), TQ_SLOT(sendProcStarted(bool))); // Run the precommand if there is one if ( !mTransportInfo->precommand.isEmpty() ) { @@ -541,8 +541,8 @@ void KMSender::doSendMsg() bool KMSender::runPrecommand( const TQString & cmd ) { setStatusMsg( i18n("Executing precommand %1").arg( cmd ) ); mPrecommand = new KMPrecommand( cmd ); - connect( mPrecommand, TQT_SIGNAL(finished(bool)), - TQT_SLOT(slotPrecommandFinished(bool)) ); + connect( mPrecommand, TQ_SIGNAL(finished(bool)), + TQ_SLOT(slotPrecommandFinished(bool)) ); if ( !mPrecommand->start() ) { delete mPrecommand; mPrecommand = 0; return false; @@ -632,7 +632,7 @@ void KMSender::cleanup(void) if (mSendProc && mSendProcStarted) mSendProc->finish(); mSendProc = 0; mSendProcStarted = false; - if (mSendInProgress) kapp->deref(); + if (mSendInProgress) tdeApp->deref(); mSendInProgress = false; if (mCurrentMsg) { @@ -644,8 +644,8 @@ void KMSender::cleanup(void) mSentFolder = 0; } if ( mOutboxFolder ) { - disconnect( mOutboxFolder, TQT_SIGNAL(msgAdded(int)), - this, TQT_SLOT(outboxMsgAdded(int)) ); + disconnect( mOutboxFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(outboxMsgAdded(int)) ); mOutboxFolder->close("dosendoutbox"); if ( mOutboxFolder->count( true ) == 0 ) { mOutboxFolder->expunge(); @@ -947,12 +947,12 @@ bool KMSendSendmail::doStart() { { mMailerProc = new TDEProcess; assert(mMailerProc != 0); - connect(mMailerProc,TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(sendmailExited(TDEProcess*))); - connect(mMailerProc,TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(wroteStdin(TDEProcess*))); - connect(mMailerProc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(receivedStderr(TDEProcess*, char*, int))); + connect(mMailerProc,TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(sendmailExited(TDEProcess*))); + connect(mMailerProc,TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(wroteStdin(TDEProcess*))); + connect(mMailerProc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(receivedStderr(TDEProcess*, char*, int))); } return true; } @@ -1046,8 +1046,8 @@ KMSendSMTP::KMSendSMTP(KMSender *sender) mJob(0), mSlave(0) { - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave *, int, - const TQString &)), this, TQT_SLOT(slaveError(TDEIO::Slave *, int, + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveError(TDEIO::Slave *, int, + const TQString &)), this, TQ_SLOT(slaveError(TDEIO::Slave *, int, const TQString &))); } @@ -1154,9 +1154,9 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const } mJob->addMetaData( "lf2crlf+dotstuff", "slave" ); TDEIO::Scheduler::assignJobToSlave(mSlave, mJob); - connect(mJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(result(TDEIO::Job *))); - connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)), - this, TQT_SLOT(dataReq(TDEIO::Job *, TQByteArray &))); + connect(mJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(result(TDEIO::Job *))); + connect(mJob, TQ_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)), + this, TQ_SLOT(dataReq(TDEIO::Job *, TQByteArray &))); mSendOk = true; mInProcess = true; return true; diff --git a/kmail/kmsender.h b/kmail/kmsender.h index 955bab91..7e2cbf4e 100644 --- a/kmail/kmsender.h +++ b/kmail/kmsender.h @@ -66,10 +66,10 @@ protected: /** Send given message. The message is either queued or sent immediately. The default behaviour, as selected with setSendImmediate(), can be overwritten with the parameter - sendNow (by specifying TRUE or FALSE). + sendNow (by specifying true or false). The sender takes ownership of the given message on success, so DO NOT DELETE OR MODIFY the message further. - Returns TRUE on success. */ + Returns true on success. */ bool doSend(KMMessage* msg, short sendNow); /** Send queued messages, using the specified transport or the @@ -78,11 +78,11 @@ protected: bool doSendQueued( const TQString& transport ); private: - /** Returns TRUE if sending is in progress. */ + /** Returns true if sending is in progress. */ bool sending() const { return mSendInProgress; } public: - /** Shall messages be sent immediately (TRUE), or shall they be + /** Shall messages be sent immediately (true), or shall they be queued and sent later upon call of sendQueued() ? */ bool sendImmediate() const { return mSendImmediate; } void setSendImmediate(bool); @@ -139,8 +139,8 @@ private: void cleanup(); /** Test if all required settings are set. - Reports problems to user via dialogs and returns FALSE. - Returns TRUE if everything is Ok. */ + Reports problems to user via dialogs and returns false. + Returns true if everything is Ok. */ bool settingsOk() const; /** Parse protocol '://' (host port? | mailer) string and diff --git a/kmail/kmsender_p.h b/kmail/kmsender_p.h index f3214eff..da2a2cbd 100644 --- a/kmail/kmsender_p.h +++ b/kmail/kmsender_p.h @@ -43,8 +43,8 @@ public: /** Abort sending the current message. Sets mSending to false */ virtual void abort() = 0; - /** Returns TRUE if send was successful, and FALSE otherwise. - Returns FALSE if sending is still in progress. */ + /** Returns true if send was successful, and false otherwise. + Returns false if sending is still in progress. */ bool sendOk() const { return mSendOk; } /** Returns error message of last call of failed(). */ @@ -61,7 +61,7 @@ signals: protected: /** Called to signal a transmission error. The sender then calls finish() and terminates sending of messages. - Sets mSending to FALSE. */ + Sets mSending to false. */ void failed(const TQString &msg); /** Informs the user about what is going on. */ diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp index 5c11f075..1ef59a3f 100644 --- a/kmail/kmservertest.cpp +++ b/kmail/kmservertest.cpp @@ -51,8 +51,8 @@ KMServerTest::KMServerTest( const TQString & protocol, const TQString & host, in mSSL( false ), mJob( 0 ), mSlave( 0 ), mConnectionErrorCount( 0 ) { TDEIO::Scheduler::connect( - TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), - this, TQT_SLOT(slotSlaveResult(TDEIO::Slave *, int, const TQString &))); + TQ_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), + this, TQ_SLOT(slotSlaveResult(TDEIO::Slave *, int, const TQString &))); if ( port == 993 || port == 995 || port == 465 ) port = 0; @@ -63,7 +63,7 @@ KMServerTest::KMServerTest( const TQString & protocol, const TQString & host, in //----------------------------------------------------------------------------- KMServerTest::~KMServerTest() { - if (mJob) mJob->kill(TRUE); + if (mJob) mJob->kill(true); } @@ -85,8 +85,8 @@ void KMServerTest::startOffSlave( int port ) { slotSlaveResult( 0, 1 ); return; } - connect( mSlave, TQT_SIGNAL(metaData(const TDEIO::MetaData&)), - TQT_SLOT(slotMetaData(const TDEIO::MetaData&)) ); + connect( mSlave, TQ_SIGNAL(metaData(const TDEIO::MetaData&)), + TQ_SLOT(slotMetaData(const TDEIO::MetaData&)) ); TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); @@ -95,9 +95,9 @@ void KMServerTest::startOffSlave( int port ) { mJob = TDEIO::special( url, packedArgs, false ); TDEIO::Scheduler::assignJobToSlave( mSlave, mJob ); - connect( mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)) ); - connect( mJob, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotData(TDEIO::Job*,const TQString&)) ); + connect( mJob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)) ); + connect( mJob, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotData(TDEIO::Job*,const TQString&)) ); } @@ -166,7 +166,7 @@ void KMServerTest::slotSlaveResult(TDEIO::Slave *aSlave, int error, if ( error ) { mJob = 0; - KMessageBox::error( TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::error( tdeApp->activeWindow(), TDEIO::buildErrorString( error, errorText ), i18n("Error") ); emit capabilities( mListNormal, mListSSL ); diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index c1eb6ccb..7fd0ba4f 100644 --- a/kmail/kmstartup.cpp +++ b/kmail/kmstartup.cpp @@ -24,11 +24,11 @@ #include "kcursorsaver.h" #include <tdelocale.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <dcopclient.h> -#include <kcrash.h> +#include <tdecrash.h> #include <tdeglobal.h> #include <tdeapplication.h> #include <tdeaboutdata.h> @@ -137,19 +137,19 @@ void checkConfigUpdates() { void lockOrDie() { // Check and create a lock file to prevent concurrent access to kmail files - TQString appName = kapp->instanceName(); + TQString appName = tdeApp->instanceName(); if ( appName.isEmpty() ) appName = "kmail"; TQString programName; - const TDEAboutData *about = kapp->aboutData(); + const TDEAboutData *about = tdeApp->aboutData(); if ( about ) programName = about->programName(); if ( programName.isEmpty() ) programName = i18n("KMail"); TQString lockLocation = locateLocal("data", "kmail/lock"); - KSimpleConfig config(lockLocation); + TDESimpleConfig config(lockLocation); int oldPid = config.readNumEntry("pid", -1); const TQString oldHostName = config.readEntry("hostname"); const TQString oldAppName = config.readEntry( "appName", appName ); @@ -193,7 +193,7 @@ void lockOrDie() { if ( oldHostName == hostName ) { // this can only happen if the user is running this application on // different displays on the same machine. All other cases will be - // taken care of by KUniqueApplication() + // taken care of by TDEUniqueApplication() if ( oldAppName == appName ) msg = i18n("%1 already seems to be running on another display on " "this machine. Running %2 more than once " @@ -262,7 +262,7 @@ void insertLibraryCataloguesAndIcons() { void cleanup() { const TQString lockLocation = locateLocal("data", "kmail/lock"); - KSimpleConfig config(lockLocation); + TDESimpleConfig config(lockLocation); config.writeEntry("pid", -1); config.sync(); } diff --git a/kmail/kmstartup.h b/kmail/kmstartup.h index 11c840e6..e6208bc7 100644 --- a/kmail/kmstartup.h +++ b/kmail/kmstartup.h @@ -18,22 +18,22 @@ #ifndef KMSTARTUP #define KMSTARTUP -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { -KDE_EXPORT void kmsetSignalHandler(void (*handler)(int)); -KDE_EXPORT void kmsignalHandler(int sigId); -KDE_EXPORT void kmcrashHandler(int sigId); +TDE_EXPORT void kmsetSignalHandler(void (*handler)(int)); +TDE_EXPORT void kmsignalHandler(int sigId); +TDE_EXPORT void kmcrashHandler(int sigId); } namespace KMail { - KDE_EXPORT void checkConfigUpdates(); - KDE_EXPORT void lockOrDie(); - KDE_EXPORT void insertLibraryCataloguesAndIcons(); - KDE_EXPORT void cleanup(); + TDE_EXPORT void checkConfigUpdates(); + TDE_EXPORT void lockOrDie(); + TDE_EXPORT void insertLibraryCataloguesAndIcons(); + TDE_EXPORT void cleanup(); } #endif diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp index f9041222..45d8bfc9 100644 --- a/kmail/kmsystemtray.cpp +++ b/kmail/kmsystemtray.cpp @@ -71,7 +71,7 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name) mLastUpdate = time( 0 ); mUpdateTimer = new TQTimer( this, "systraytimer" ); - connect( mUpdateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateNewMessages() ) ); + connect( mUpdateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateNewMessages() ) ); mDefaultIcon = loadIcon( "kmail" ); mLightIconImage = loadIcon( "kmaillight" ).convertToImage(); @@ -94,15 +94,15 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name) /** Initiate connections between folders and this object */ foldersChanged(); - connect( kmkernel->folderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(foldersChanged())); - connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(foldersChanged())); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(foldersChanged())); - connect( kmkernel->searchFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(foldersChanged())); + connect( kmkernel->folderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(foldersChanged())); + connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(foldersChanged())); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(foldersChanged())); + connect( kmkernel->searchFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(foldersChanged())); - connect( kmkernel->acctMgr(), TQT_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ), - TQT_SLOT( updateNewMessages() ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ), + TQ_SLOT( updateNewMessages() ) ); - connect( this, TQT_SIGNAL( quitSelected() ), TQT_SLOT( tray_quit() ) ); + connect( this, TQ_SIGNAL( quitSelected() ), TQ_SLOT( tray_quit() ) ); } void KMSystemTray::buildPopupMenu() @@ -132,13 +132,13 @@ void KMSystemTray::buildPopupMenu() action->plug( mPopupMenu ); mPopupMenu->insertSeparator(); - mPopupMenu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), this, TQT_SLOT(maybeQuit()) ); + mPopupMenu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), this, TQ_SLOT(maybeQuit()) ); } void KMSystemTray::tray_quit() { // Quit all of KMail - kapp->quit(); + tdeApp->quit(); } KMSystemTray::~KMSystemTray() @@ -275,7 +275,7 @@ void KMSystemTray::foldersChanged() } /** Disconnect all previous connections */ - disconnect(this, TQT_SLOT(updateNewMessageNotification(KMFolder *))); + disconnect(this, TQ_SLOT(updateNewMessageNotification(KMFolder *))); TQStringList folderNames; TQValueList<TQGuardedPtr<KMFolder> > folderList; @@ -297,14 +297,14 @@ void KMSystemTray::foldersChanged() !currentFolder->ignoreNewMail() ) { /** If this is a new folder, start listening for messages */ - connect(currentFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder *)), - this, TQT_SLOT(updateNewMessageNotification(KMFolder *))); + connect(currentFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder *)), + this, TQ_SLOT(updateNewMessageNotification(KMFolder *))); /** Check all new folders to see if we started with any new messages */ updateNewMessageNotification(currentFolder); } else { - disconnect(currentFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder *)), this, TQT_SLOT(updateNewMessageNotification(KMFolder *)) ); + disconnect(currentFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder *)), this, TQ_SLOT(updateNewMessageNotification(KMFolder *)) ); } } } @@ -349,7 +349,7 @@ void KMSystemTray::mousePressEvent(TQMouseEvent *e) kdDebug(5006) << "Adding folder" << endl; mPopupFolders.append( it.key() ); TQString item = prettyName(it.key()) + " (" + TQString::number(it.data()) + ")"; - newMessagesPopup->insertItem(item, this, TQT_SLOT(selectedAccount(int)), 0, i); + newMessagesPopup->insertItem(item, this, TQ_SLOT(selectedAccount(int)), 0, i); ++it; } @@ -545,7 +545,7 @@ void KMSystemTray::updateNewMessages() if(mFoldersWithUnread.count() == 0) { mPopupFolders.clear(); - disconnect(this, TQT_SLOT(selectedAccount(int))); + disconnect(this, TQ_SLOT(selectedAccount(int))); mCount = 0; diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp index 5d6ee830..44c8b3f0 100644 --- a/kmail/kmtransport.cpp +++ b/kmail/kmtransport.cpp @@ -251,7 +251,7 @@ KMTransportSelDlg::KMTransportSelDlg( TQWidget *parent, const char *name, TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQButtonGroup *group = new TQButtonGroup( i18n("Transport"), page ); - connect(group, TQT_SIGNAL(clicked(int)), TQT_SLOT(buttonClicked(int)) ); + connect(group, TQ_SIGNAL(clicked(int)), TQ_SLOT(buttonClicked(int)) ); topLayout->addWidget( group, 10 ); TQVBoxLayout *vlay = new TQVBoxLayout( group, spacingHint()*2, spacingHint() ); @@ -339,11 +339,11 @@ void KMTransportDialog::makeSendmailPage() grid->addWidget( mSendmail.locationEdit, 1, 1 ); mSendmail.chooseButton = new TQPushButton( i18n("Choos&e..."), page ); - connect( mSendmail.chooseButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSendmailChooser()) ); + connect( mSendmail.chooseButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSendmailChooser()) ); - connect( mSendmail.locationEdit, TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT(slotSendmailEditPath(const TQString &)) ); + connect( mSendmail.locationEdit, TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT(slotSendmailEditPath(const TQString &)) ); mSendmail.chooseButton->setAutoDefault( false ); grid->addWidget( mSendmail.chooseButton, 1, 2 ); @@ -401,7 +401,7 @@ void KMTransportDialog::makeSmtpPage() label = new TQLabel( i18n("&Port:"), page1 ); grid->addWidget( label, 4, 0 ); mSmtp.portEdit = new KLineEdit( page1 ); - mSmtp.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) ); + mSmtp.portEdit->setValidator( new TQIntValidator(this) ); TQWhatsThis::add(mSmtp.portEdit, i18n("The port number that the SMTP server " "is listening on. The default port is 25.")); @@ -430,8 +430,8 @@ void KMTransportDialog::makeSmtpPage() "requires authentication before accepting " "mail. This is known as " "'Authenticated SMTP' or simply ASMTP.")); - connect(mSmtp.authCheck, TQT_SIGNAL(clicked()), - TQT_SLOT(slotRequiresAuthClicked())); + connect(mSmtp.authCheck, TQ_SIGNAL(clicked()), + TQ_SLOT(slotRequiresAuthClicked())); grid->addMultiCellWidget( mSmtp.authCheck, 7, 7, 0, 1 ); mSmtp.loginLabel = new TQLabel( i18n("&Login:"), page1 ); @@ -490,10 +490,10 @@ void KMTransportDialog::makeSmtpPage() "identifying itself to the server.")); mSmtp.localHostnameLabel->setBuddy( mSmtp.localHostnameEdit ); grid->addWidget( mSmtp.localHostnameEdit, 13, 1 ); - connect( mSmtp.specifyHostnameCheck, TQT_SIGNAL(toggled(bool)), - mSmtp.localHostnameEdit, TQT_SLOT(setEnabled(bool))); - connect( mSmtp.specifyHostnameCheck, TQT_SIGNAL(toggled(bool)), - mSmtp.localHostnameLabel, TQT_SLOT(setEnabled(bool))); + connect( mSmtp.specifyHostnameCheck, TQ_SIGNAL(toggled(bool)), + mSmtp.localHostnameEdit, TQ_SLOT(setEnabled(bool))); + connect( mSmtp.specifyHostnameCheck, TQ_SIGNAL(toggled(bool)), + mSmtp.localHostnameLabel, TQ_SLOT(setEnabled(bool))); TQWidget *page2 = new TQWidget( tabWidget ); tabWidget->addTab( page2, i18n("S&ecurity") ); @@ -502,12 +502,12 @@ void KMTransportDialog::makeSmtpPage() i18n("Encryption"), page2 ); mSmtp.encryptionNone = new TQRadioButton( i18n("&None"), mSmtp.encryptionGroup ); - mSmtp.encryptionSSL = - new TQRadioButton( i18n("&SSL"), mSmtp.encryptionGroup ); mSmtp.encryptionTLS = - new TQRadioButton( i18n("&TLS"), mSmtp.encryptionGroup ); - connect(mSmtp.encryptionGroup, TQT_SIGNAL(clicked(int)), - TQT_SLOT(slotSmtpEncryptionChanged(int))); + new TQRadioButton( i18n("Use &StartTLS"), mSmtp.encryptionGroup ); + mSmtp.encryptionSSL = + new TQRadioButton( i18n("Enforce SSL/&TLS"), mSmtp.encryptionGroup ); + connect(mSmtp.encryptionGroup, TQ_SIGNAL(clicked(int)), + TQ_SLOT(slotSmtpEncryptionChanged(int))); vlay->addWidget( mSmtp.encryptionGroup ); mSmtp.authGroup = new TQButtonGroup( 1, TQt::Horizontal, @@ -533,8 +533,8 @@ void KMTransportDialog::makeSmtpPage() TQHBoxLayout *buttonLay = new TQHBoxLayout( vlay ); mSmtp.checkCapabilities = new TQPushButton( i18n("Check &What the Server Supports"), page2 ); - connect(mSmtp.checkCapabilities, TQT_SIGNAL(clicked()), - TQT_SLOT(slotCheckSmtpCapabilities())); + connect(mSmtp.checkCapabilities, TQ_SIGNAL(clicked()), + TQ_SLOT(slotCheckSmtpCapabilities())); buttonLay->addStretch(); buttonLay->addWidget( mSmtp.checkCapabilities ); } @@ -652,13 +652,13 @@ void KMTransportDialog::slotRequiresAuthClicked() void KMTransportDialog::slotSmtpEncryptionChanged(int id) { kdDebug(5006) << "KMTransportDialog::slotSmtpEncryptionChanged( " << id << " )" << endl; - // adjust SSL port: - if (id == SSL || mSmtp.portEdit->text() == "465") - mSmtp.portEdit->setText((id == SSL) ? "465" : "25"); + // adjust SSL/TLS port: + if (id == EnforceSSL || mSmtp.portEdit->text() == "465") + mSmtp.portEdit->setText((id == EnforceSSL) ? "465" : "25"); // switch supported auth methods: TQButton * old = mSmtp.authGroup->selected(); - int authMethods = id == TLS ? mAuthTLS : id == SSL ? mAuthSSL : mAuthNone ; + int authMethods = id == StartTLS ? mAuthTLS : id == EnforceSSL ? mAuthSSL : mAuthNone ; enableAuthMethods( authMethods ); if ( !old->isEnabled() ) checkHighest( mSmtp.authGroup ); @@ -720,11 +720,11 @@ void KMTransportDialog::slotCheckSmtpCapabilities() mServerTest = new KMServerTest(SMTP_PROTOCOL, mSmtp.hostEdit->text(), mSmtp.portEdit->text().toInt()); connect( mServerTest, - TQT_SIGNAL( capabilities( const TQStringList &, const TQStringList &, + TQ_SIGNAL( capabilities( const TQStringList &, const TQStringList &, const TQString &, const TQString &, const TQString & )), this, - TQT_SLOT( slotSmtpCapabilities( const TQStringList &, + TQ_SLOT( slotSmtpCapabilities( const TQStringList &, const TQStringList &, const TQString &, const TQString &, const TQString & ) ) ); mSmtp.checkCapabilities->setEnabled(false); diff --git a/kmail/kmtransport.h b/kmail/kmtransport.h index 7f0cd41b..5f0efdee 100644 --- a/kmail/kmtransport.h +++ b/kmail/kmtransport.h @@ -67,7 +67,7 @@ class KMTransportSelDlg : public KDialogBase public: - KMTransportSelDlg( TQWidget *parent=0, const char *name=0, bool modal=TRUE ); + KMTransportSelDlg( TQWidget *parent=0, const char *name=0, bool modal=true ); int selected() const; private slots: @@ -84,7 +84,7 @@ class KMTransportDialog : public KDialogBase public: KMTransportDialog( const TQString & caption, KMTransportInfo *transportInfo, - TQWidget *parent=0, const char *name=0, bool modal=TRUE ); + TQWidget *parent=0, const char *name=0, bool modal=true ); virtual ~KMTransportDialog(); private slots: @@ -151,8 +151,8 @@ private: KMTransportInfo *mTransportInfo; enum EncryptionMethods { NoEncryption = 0, - SSL = 1, - TLS = 2 + StartTLS = 1, + EnforceSSL = 2 }; enum AuthMethods { NoAuth = 0, diff --git a/kmail/korghelper.cpp b/kmail/korghelper.cpp index 17097126..a33e02be 100644 --- a/kmail/korghelper.cpp +++ b/kmail/korghelper.cpp @@ -35,12 +35,12 @@ void KMail::KorgHelper::ensureRunning() // [that's not the case when kontact was already running, but korganizer not loaded into it...] static const char* const dcopObjectId = "KOrganizerIface"; TQCString dummy; - if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { - DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper + if ( !tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { + DCOPRef ref( dcopService, dcopService ); // talk to the TDEUniqueApplication or its kontact wrapper DCOPReply reply = ref.call( "load()" ); if ( reply.isValid() && (bool)reply ) { kdDebug() << "Loaded " << dcopService << " successfully" << endl; - Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); + Q_ASSERT( tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); } else kdWarning() << "Error loading " << dcopService << endl; } diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp index 75e4dee5..6c189293 100644 --- a/kmail/listjob.cpp +++ b/kmail/listjob.cpp @@ -76,8 +76,8 @@ void ListJob::execute() { // We'll wait for the connectionResult signal from the account. kdDebug(5006) << "ListJob - waiting for connection" << endl; - connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); return; } // this is needed until we have a common base class for d(imap) @@ -145,10 +145,10 @@ void ListJob::execute() TDEIO::SimpleJob *job = TDEIO::listDir( url, false ); TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job ); mAccount->insertJob( job, jd ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotListResult(TDEIO::Job *)) ); - connect( job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), - this, TQT_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotListResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), + this, TQ_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)) ); } void ListJob::slotConnectionResult( int errorCode, const TQString& errorMsg ) diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp index 2f6e839e..166cd406 100644 --- a/kmail/localsubscriptiondialog.cpp +++ b/kmail/localsubscriptiondialog.cpp @@ -76,7 +76,7 @@ void LocalSubscriptionDialog::processFolderListing() if (done == 1000) { emit listChanged(); - TQTimer::singleShot(0, this, TQT_SLOT(processItems())); + TQTimer::singleShot(0, this, TQ_SLOT(processItems())); return; } ++mCount; diff --git a/kmail/maildirjob.cpp b/kmail/maildirjob.cpp index 4c3b520c..11f6edfb 100644 --- a/kmail/maildirjob.cpp +++ b/kmail/maildirjob.cpp @@ -74,7 +74,7 @@ void MaildirJob::setParentFolder( const KMFolderMaildir* parent ) //----------------------------------------------------------------------------- void MaildirJob::execute() { - TQTimer::singleShot( 0, this, TQT_SLOT(startJob()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(startJob()) ); } //----------------------------------------------------------------------------- diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp index 08d76a58..ab984161 100644 --- a/kmail/mailinglistpropertiesdialog.cpp +++ b/kmail/mailinglistpropertiesdialog.cpp @@ -65,23 +65,23 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* setMainWidget( mlGroup ); mHoldsMailingList = new TQCheckBox( i18n("&Folder holds a mailing list"), mlGroup ); - connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotHoldsML(bool)) ); + connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotHoldsML(bool)) ); groupLayout->addMultiCellWidget( mHoldsMailingList, 0, 0, 0, 2 ); groupLayout->addItem( new TQSpacerItem( 0, 10 ), 1, 0 ); mDetectButton = new TQPushButton( i18n("Detect Automatically"), mlGroup ); mDetectButton->setEnabled( false ); - connect( mDetectButton, TQT_SIGNAL(pressed()), TQT_SLOT(slotDetectMailingList()) ); + connect( mDetectButton, TQ_SIGNAL(pressed()), TQ_SLOT(slotDetectMailingList()) ); groupLayout->addWidget( mDetectButton, 2, 1 ); groupLayout->addItem( new TQSpacerItem( 0, 10 ), 3, 0 ); label = new TQLabel( i18n("Mailing list description:"), mlGroup ); label->setEnabled( false ); - connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); groupLayout->addWidget( label, 4, 0 ); mMLId = new TQLabel( label, "", mlGroup ); groupLayout->addMultiCellWidget( mMLId, 4, 4, 1, 2 ); @@ -90,22 +90,22 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* //FIXME: add TQWhatsThis label = new TQLabel( i18n("Preferred handler:"), mlGroup ); label->setEnabled(false); - connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); groupLayout->addWidget( label, 5, 0 ); mMLHandlerCombo = new TQComboBox( mlGroup ); mMLHandlerCombo->insertItem( i18n("KMail"), MailingList::KMail ); mMLHandlerCombo->insertItem( i18n("Browser"), MailingList::Browser ); mMLHandlerCombo->setEnabled( false ); groupLayout->addMultiCellWidget( mMLHandlerCombo, 5, 5, 1, 2 ); - connect( mMLHandlerCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotMLHandling(int)) ); + connect( mMLHandlerCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotMLHandling(int)) ); label->setBuddy( mMLHandlerCombo ); label = new TQLabel( i18n("&Address type:"), mlGroup ); label->setEnabled(false); - connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); groupLayout->addWidget( label, 6, 0 ); mAddressCombo = new TQComboBox( mlGroup ); label->setBuddy( mAddressCombo ); @@ -119,10 +119,10 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* handleButton->setEnabled( false ); if( mFolder) { - connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)), - handleButton, TQT_SLOT(setEnabled(bool)) ); - connect( handleButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotInvokeHandler()) ); + connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)), + handleButton, TQ_SLOT(setEnabled(bool)) ); + connect( handleButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotInvokeHandler()) ); } groupLayout->addWidget( handleButton, 6, 2 ); @@ -140,8 +140,8 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* << i18n( "List Archives" ) << i18n( "List Help" ); mAddressCombo->insertStringList( el ); - connect( mAddressCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotAddressChanged(int)) ); + connect( mAddressCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotAddressChanged(int)) ); load(); resize( TQSize(295, 204).expandedTo(minimumSizeHint()) ); diff --git a/kmail/mailserviceimpl.cpp b/kmail/mailserviceimpl.cpp index 79af5eaf..cfd5a4a9 100644 --- a/kmail/mailserviceimpl.cpp +++ b/kmail/mailserviceimpl.cpp @@ -73,7 +73,7 @@ bool MailServiceImpl::sendMessage( const TQString& from, const TQString& to, if ( !body.isEmpty() ) msg->setBody( body.utf8() ); KMail::Composer * cWin = KMail::makeComposer( msg ); - cWin->setCharset("", TRUE); + cWin->setCharset("", true); cWin->addAttachmentsAndSend(attachments, "", 1);//send now return true; @@ -116,7 +116,7 @@ bool MailServiceImpl::sendMessage( const TQString& from, const TQString& to, msg->addBodyPart( part ); KMail::Composer * cWin = KMail::makeComposer( msg ); - cWin->setCharset("", TRUE); + cWin->setCharset("", true); return true; } diff --git a/kmail/mailsourceviewer.cpp b/kmail/mailsourceviewer.cpp index 7a06f970..ac6d60bc 100644 --- a/kmail/mailsourceviewer.cpp +++ b/kmail/mailsourceviewer.cpp @@ -58,10 +58,10 @@ MailSourceViewer::MailSourceViewer( TQWidget *parent, const char *name ) { setWFlags( WDestructiveClose ); TQAccel *accel = new TQAccel( this, "browser close-accel" ); - accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQT_SLOT( close() )); - accel->connectItem( accel->insertItem( TQt::Key_W+CTRL ), this , TQT_SLOT( close() )); + accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQ_SLOT( close() )); + accel->connectItem( accel->insertItem( TQt::Key_W+CTRL ), this , TQ_SLOT( close() )); setWordWrap( KTextBrowser::NoWrap ); - KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); + KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon()); } MailSourceViewer::~MailSourceViewer() diff --git a/kmail/main.cpp b/kmail/main.cpp index 8b40e555..24de19cd 100644 --- a/kmail/main.cpp +++ b/kmail/main.cpp @@ -19,7 +19,7 @@ */ #include <config.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tdeglobal.h> #include <knotifyclient.h> #include <dcopclient.h> @@ -36,10 +36,10 @@ //----------------------------------------------------------------------------- -class KMailApplication : public KUniqueApplication +class KMailApplication : public TDEUniqueApplication { public: - KMailApplication() : KUniqueApplication() { }; + KMailApplication() : TDEUniqueApplication() { }; virtual int newInstance(); void commitData(TQSessionManager& sm); @@ -58,15 +58,15 @@ int KMailApplication::newInstance() if (!kmkernel) return 0; - if (!kmkernel->firstInstance() || !kapp->isRestored()) + if (!kmkernel->firstInstance() || !tdeApp->isRestored()) kmkernel->handleCommandLine( true ); - kmkernel->setFirstInstance(FALSE); + kmkernel->setFirstInstance(false); return 0; } int main(int argc, char *argv[]) { - // WABA: KMail is a KUniqueApplication. Unfortunately this makes debugging + // WABA: KMail is a TDEUniqueApplication. Unfortunately this makes debugging // a bit harder: You should pass --nofork as commandline argument when using // a debugger. In gdb you can do this by typing "set args --nofork" before // typing "run". @@ -87,14 +87,14 @@ int main(int argc, char *argv[]) // using KMail without KDE) KNotifyClient::startDaemon(); - kapp->dcopClient()->suspend(); // Don't handle DCOP requests yet + tdeApp->dcopClient()->suspend(); // Don't handle DCOP requests yet KMail::lockOrDie(); //local, do the init KMKernel kmailKernel; kmailKernel.init(); - kapp->dcopClient()->setDefaultObject( kmailKernel.objId() ); + tdeApp->dcopClient()->setDefaultObject( kmailKernel.objId() ); // and session management kmailKernel.doSessionManagement(); @@ -104,10 +104,10 @@ int main(int argc, char *argv[]) kmsetSignalHandler(kmsignalHandler); - kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests. + tdeApp->dcopClient()->resume(); // Ok. We are ready for DCOP requests. kmailKernel.setStartingUp( false ); // Starting up is finished // Go! - int ret = kapp->exec(); + int ret = tdeApp->exec(); // clean up kmailKernel.cleanup(); diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp index 560fac90..509a39b5 100644 --- a/kmail/managesievescriptsdialog.cpp +++ b/kmail/managesievescriptsdialog.cpp @@ -37,7 +37,7 @@ KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * parent, co mWasActive( false ) { setWFlags( WGroupLeader|WDestructiveClose ); - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() ); TQVBoxLayout * vlay = new TQVBoxLayout( plainPage(), 0, 0 ); @@ -46,12 +46,12 @@ KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * parent, co mListView->setResizeMode( TQListView::LastColumn ); mListView->setRootIsDecorated( true ); mListView->setSelectionMode( TQListView::Single ); - connect( mListView, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), - this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) ); - connect( mListView, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - this, TQT_SLOT(slotDoubleClicked(TQListViewItem*)) ); - connect( mListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( mListView, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), + this, TQ_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) ); + connect( mListView, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + this, TQ_SLOT(slotDoubleClicked(TQListViewItem*)) ); + connect( mListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); vlay->addWidget( mListView ); resize( 2 * sizeHint().width(), sizeHint().height() ); @@ -111,10 +111,10 @@ void KMail::ManageSieveScriptsDialog::slotRefresh() { if ( u.isEmpty() ) continue; SieveJob * job = SieveJob::list( u ); - connect( job, TQT_SIGNAL(item(KMail::SieveJob*,const TQString&,bool)), - this, TQT_SLOT(slotItem(KMail::SieveJob*,const TQString&,bool)) ); - connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), - this, TQT_SLOT(slotResult(KMail::SieveJob*,bool,const TQString&,bool)) ); + connect( job, TQ_SIGNAL(item(KMail::SieveJob*,const TQString&,bool)), + this, TQ_SLOT(slotItem(KMail::SieveJob*,const TQString&,bool)) ); + connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), + this, TQ_SLOT(slotResult(KMail::SieveJob*,bool,const TQString&,bool)) ); mJobs.insert( job, last ); mUrls.insert( last, u ); } else { @@ -162,12 +162,12 @@ void KMail::ManageSieveScriptsDialog::slotContextMenuRequested( TQListViewItem * mContextMenuItem = item; if ( item->depth() ) { // script items: - menu.insertItem( i18n( "Delete Script" ), this, TQT_SLOT(slotDeleteScript()) ); - menu.insertItem( i18n( "Edit Script..." ), this, TQT_SLOT(slotEditScript()) ); - menu.insertItem( i18n( "Deactivate Script" ), this, TQT_SLOT(slotDeactivateScript()) ); + menu.insertItem( i18n( "Delete Script" ), this, TQ_SLOT(slotDeleteScript()) ); + menu.insertItem( i18n( "Edit Script..." ), this, TQ_SLOT(slotEditScript()) ); + menu.insertItem( i18n( "Deactivate Script" ), this, TQ_SLOT(slotDeactivateScript()) ); } else { // top-levels: - menu.insertItem( i18n( "New Script..." ), this, TQT_SLOT(slotNewScript()) ); + menu.insertItem( i18n( "New Script..." ), this, TQ_SLOT(slotNewScript()) ); } menu.exec( p ); mContextMenuItem = 0; @@ -219,8 +219,8 @@ void KMail::ManageSieveScriptsDialog::changeActiveScript( TQCheckListItem * item job = SieveJob::activate( u ); else job = SieveJob::desactivate( u ); - connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), - this, TQT_SLOT(slotRefresh()) ); + connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), + this, TQ_SLOT(slotRefresh()) ); } void KMail::ManageSieveScriptsDialog::slotDoubleClicked( TQListViewItem * i ) { @@ -259,8 +259,8 @@ void KMail::ManageSieveScriptsDialog::slotDeleteScript() { != KMessageBox::Continue ) return; SieveJob * job = SieveJob::del( u ); - connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), - this, TQT_SLOT(slotRefresh()) ); + connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), + this, TQ_SLOT(slotRefresh()) ); } void KMail::ManageSieveScriptsDialog::slotEditScript() { @@ -277,8 +277,8 @@ void KMail::ManageSieveScriptsDialog::slotEditScript() { url.setFileName( mContextMenuItem->text( 0 ) ); mCurrentURL = url; SieveJob * job = SieveJob::get( url ); - connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), - this, TQT_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) ); + connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), + this, TQ_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) ); } void KMail::ManageSieveScriptsDialog::slotNewScript() { @@ -321,7 +321,7 @@ KMail::SieveEditor::SieveEditor( TQWidget * parent, const char * name ) mTextEdit->setTextFormat( TQTextEdit::PlainText ); mTextEdit->setWordWrap( TQTextEdit::NoWrap ); mTextEdit->setFont( TDEGlobalSettings::fixedFont() ); - connect( mTextEdit, TQT_SIGNAL( textChanged () ), TQT_SLOT( slotTextChanged() ) ); + connect( mTextEdit, TQ_SIGNAL( textChanged () ), TQ_SLOT( slotTextChanged() ) ); resize( 3 * sizeHint() ); } @@ -342,8 +342,8 @@ void KMail::ManageSieveScriptsDialog::slotGetResult( KMail::SieveJob *, bool suc mSieveEditor = new SieveEditor( this ); mSieveEditor->setScript( script ); - connect( mSieveEditor, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotSieveEditorOkClicked()) ); - connect( mSieveEditor, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotSieveEditorCancelClicked()) ); + connect( mSieveEditor, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotSieveEditorOkClicked()) ); + connect( mSieveEditor, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotSieveEditorCancelClicked()) ); mSieveEditor->show(); mWasActive = isActive; } @@ -352,8 +352,8 @@ void KMail::ManageSieveScriptsDialog::slotSieveEditorOkClicked() { if ( !mSieveEditor ) return; SieveJob * job = SieveJob::put( mCurrentURL,mSieveEditor->script(), mWasActive, mWasActive ); - connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), - this, TQT_SLOT(slotPutResult(KMail::SieveJob*,bool)) ); + connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), + this, TQ_SLOT(slotPutResult(KMail::SieveJob*,bool)) ); } void KMail::ManageSieveScriptsDialog::slotSieveEditorCancelClicked() { diff --git a/kmail/mboxjob.cpp b/kmail/mboxjob.cpp index df25a8ad..b591108f 100644 --- a/kmail/mboxjob.cpp +++ b/kmail/mboxjob.cpp @@ -67,7 +67,7 @@ MboxJob::~MboxJob() void MboxJob::execute() { - TQTimer::singleShot( 0, this, TQT_SLOT(startJob()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(startJob()) ); } //----------------------------------------------------------------------------- diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp index be2d4c9d..e7233d3e 100644 --- a/kmail/messageactions.cpp +++ b/kmail/messageactions.cpp @@ -42,36 +42,36 @@ MessageActions::MessageActions( TDEActionCollection *ac, TQWidget * parent ) : mReplyActionMenu = new TDEActionMenu( i18n("Message->","&Reply"), "mail-reply-sender", mActionCollection, "message_reply_menu" ); - connect( mReplyActionMenu, TQT_SIGNAL(activated()), this, - TQT_SLOT(slotReplyToMsg()) ); + connect( mReplyActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotReplyToMsg()) ); mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", Key_R, this, - TQT_SLOT(slotReplyToMsg()), mActionCollection, "reply" ); + TQ_SLOT(slotReplyToMsg()), mActionCollection, "reply" ); mReplyActionMenu->insert( mReplyAction ); mReplyAuthorAction = new TDEAction( i18n("Reply to A&uthor..."), "mail-reply-sender", SHIFT+Key_A, this, - TQT_SLOT(slotReplyAuthorToMsg()), + TQ_SLOT(slotReplyAuthorToMsg()), mActionCollection, "reply_author" ); mReplyActionMenu->insert( mReplyAuthorAction ); mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail-reply-all", - Key_A, this, TQT_SLOT(slotReplyAllToMsg()), + Key_A, this, TQ_SLOT(slotReplyAllToMsg()), mActionCollection, "reply_all" ); mReplyActionMenu->insert( mReplyAllAction ); mReplyListAction = new TDEAction( i18n("Reply to Mailing-&List..."), "mail_replylist", Key_L, this, - TQT_SLOT(slotReplyListToMsg()), mActionCollection, + TQ_SLOT(slotReplyListToMsg()), mActionCollection, "reply_list" ); mReplyActionMenu->insert( mReplyListAction ); mNoQuoteReplyAction = new TDEAction( i18n("Reply Without &Quote..."), SHIFT+Key_R, - this, TQT_SLOT(slotNoQuoteReplyToMsg()), mActionCollection, "noquotereply" ); + this, TQ_SLOT(slotNoQuoteReplyToMsg()), mActionCollection, "noquotereply" ); mCreateTodoAction = new TDEAction( i18n("Create Task/Reminder..."), "mail_todo", - 0, this, TQT_SLOT(slotCreateTodo()), mActionCollection, + 0, this, TQ_SLOT(slotCreateTodo()), mActionCollection, "create_todo" ); @@ -80,35 +80,35 @@ MessageActions::MessageActions( TDEActionCollection *ac, TQWidget * parent ) : mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &Read"), "kmmsgread", i18n("Mark selected messages as read")), - 0, this, TQT_SLOT(slotSetMsgStatusRead()), + 0, this, TQ_SLOT(slotSetMsgStatusRead()), mActionCollection, "status_read")); mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &New"), "kmmsgnew", i18n("Mark selected messages as new")), - 0, this, TQT_SLOT(slotSetMsgStatusNew()), + 0, this, TQ_SLOT(slotSetMsgStatusNew()), mActionCollection, "status_new" )); mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &Unread"), "kmmsgunseen", i18n("Mark selected messages as unread")), - 0, this, TQT_SLOT(slotSetMsgStatusUnread()), + 0, this, TQ_SLOT(slotSetMsgStatusUnread()), mActionCollection, "status_unread")); mStatusMenu->insert( new TDEActionSeparator( this ) ); mToggleFlagAction = new TDEToggleAction(i18n("Mark Message as &Important"), "mail_flag", - 0, this, TQT_SLOT(slotSetMsgStatusFlag()), + 0, this, TQ_SLOT(slotSetMsgStatusFlag()), mActionCollection, "status_flag"); mToggleFlagAction->setCheckedState( i18n("Remove &Important Message Mark") ); mStatusMenu->insert( mToggleFlagAction ); mToggleTodoAction = new TDEToggleAction(i18n("Mark Message as &Action Item"), "mail_todo", - 0, this, TQT_SLOT(slotSetMsgStatusTodo()), + 0, this, TQ_SLOT(slotSetMsgStatusTodo()), mActionCollection, "status_todo"); mToggleTodoAction->setCheckedState( i18n("Remove &Action Item Message Mark") ); mStatusMenu->insert( mToggleTodoAction ); mEditAction = new TDEAction( i18n("&Edit Message"), "edit", Key_T, this, - TQT_SLOT(editCurrentMessage()), mActionCollection, "edit" ); + TQ_SLOT(editCurrentMessage()), mActionCollection, "edit" ); mEditAction->plugAccel( mActionCollection->tdeaccel() ); updateActions(); @@ -174,8 +174,8 @@ template<typename T> void MessageActions::replyCommand() return; const TQString text = mMessageView ? mMessageView->copyText() : ""; KMCommand *command = new T( mParent, mCurrentMessage, text ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SIGNAL( replyActionFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SIGNAL( replyActionFinished() ) ); command->start(); } diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp index 60ceed94..1cc0cd33 100644 --- a/kmail/messagecomposer.cpp +++ b/kmail/messagecomposer.cpp @@ -373,7 +373,7 @@ void MessageComposer::doNextJob() } // We have more jobs to do, but allow others to come first - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoNextJob() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoNextJob() ) ); } void MessageComposer::emitDone( bool b ) @@ -552,8 +552,8 @@ bool MessageComposer::encryptWithChiasmus( const Kleo::CryptoBackend::Protocol * const TQByteArray& body, TQByteArray& resultData ) { - std::auto_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-encrypt", TQStringVariantMap() ) ); - if ( !job.get() ) { + std::unique_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-encrypt", TQStringVariantMap() ) ); + if ( !job ) { const TQString msg = i18n( "Chiasmus backend does not offer the " "\"x-encrypt\" function. Please report this bug." ); KMessageBox::error( mComposeWin, msg, i18n( "Chiasmus Backend Error" ) ); @@ -2162,10 +2162,10 @@ void MessageComposer::pgpSignedMsg( const TQByteArray& cText, Kleo::CryptoMessag = isSMIME( format ) ? cpf->smime() : cpf->openpgp() ; assert( proto ); /// hmmm.....? - std::auto_ptr<Kleo::SignJob> job( proto->signJob( armor( format ), + std::unique_ptr<Kleo::SignJob> job( proto->signJob( armor( format ), textMode( format ) ) ); - if ( !job.get() ) { + if ( !job ) { KMessageBox::sorry( mComposeWin, i18n("This message could not be signed, " "since the chosen backend does not seem to support " @@ -2218,9 +2218,9 @@ Kpgp::Result MessageComposer::pgpEncryptedMsg( TQByteArray & encryptedBody, = isSMIME( format ) ? cpf->smime() : cpf->openpgp() ; assert( proto ); // hmmmm....? - std::auto_ptr<Kleo::EncryptJob> job( proto->encryptJob( armor( format ), + std::unique_ptr<Kleo::EncryptJob> job( proto->encryptJob( armor( format ), textMode( format ) ) ); - if ( !job.get() ) { + if ( !job ) { KMessageBox::sorry( mComposeWin, i18n("This message could not be encrypted, " "since the chosen backend does not seem to support " @@ -2266,9 +2266,9 @@ Kpgp::Result MessageComposer::pgpSignedAndEncryptedMsg( TQByteArray & encryptedB = isSMIME( format ) ? cpf->smime() : cpf->openpgp() ; assert( proto ); // hmmmm....? - std::auto_ptr<Kleo::SignEncryptJob> job( proto->signEncryptJob( armor( format ), + std::unique_ptr<Kleo::SignEncryptJob> job( proto->signEncryptJob( armor( format ), textMode( format ) ) ); - if ( !job.get() ) { + if ( !job ) { KMessageBox::sorry( mComposeWin, i18n("This message could not be signed and encrypted, " "since the chosen backend does not seem to support " diff --git a/kmail/messagecomposer.h b/kmail/messagecomposer.h index 924b5bf4..24123759 100644 --- a/kmail/messagecomposer.h +++ b/kmail/messagecomposer.h @@ -77,7 +77,7 @@ public: /** * Applies the user changes to the message object of the composer - * and signs/encrypts the message if activated. Returns FALSE in + * and signs/encrypts the message if activated. Returns false in * case of an error (e.g. if PGP encryption fails). * If backgroundMode is true then no functions which might require * user interaction (like signing/encrypting) are performed diff --git a/kmail/messagecopyhelper.cpp b/kmail/messagecopyhelper.cpp index 0257aa0b..4b46141f 100644 --- a/kmail/messagecopyhelper.cpp +++ b/kmail/messagecopyhelper.cpp @@ -62,7 +62,7 @@ MessageCopyHelper::MessageCopyHelper( const TQValueList< TQ_UINT32 > & msgs, command = new KMCopyCommand( dest, list ); } - connect( command, TQT_SIGNAL(completed(KMCommand*)), TQT_SLOT(copyCompleted(KMCommand*)) ); + connect( command, TQ_SIGNAL(completed(KMCommand*)), TQ_SLOT(copyCompleted(KMCommand*)) ); command->start(); } diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp index 0643cbbc..862833f0 100644 --- a/kmail/newfolderdialog.cpp +++ b/kmail/newfolderdialog.cpp @@ -86,7 +86,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder ) mNameLineEdit->setFocus(); mNameHBox->addWidget( mNameLineEdit ); mTopLevelLayout->addLayout( mNameHBox ); - connect( mNameLineEdit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotFolderNameChanged( const TQString & ) ) ); + connect( mNameLineEdit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotFolderNameChanged( const TQString & ) ) ); if ( !mFolder || ( mFolder->folderType() != KMFolderTypeImap && diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index 39b7ac00..de0faee2 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -91,7 +91,7 @@ #include <tdeglobal.h> #include <tdehtml_part.h> #include <tdetempfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdemessagebox.h> #include <kiconloader.h> @@ -609,7 +609,7 @@ namespace KMail { if ( key.numUserIDs() > 0 && key.userID( 0 ).id() ) messagePart.signer = Kleo::DN( key.userID( 0 ).id() ).prettyDN(); for ( uint iMail = 0; iMail < key.numUserIDs(); ++iMail ) { - // The following if /should/ always result in TRUE but we + // The following if /should/ always result in true but we // won't trust implicitely the plugin that gave us these data. if ( key.userID( iMail ).email() ) { TQString email = TQString::fromUtf8( key.userID( iMail ).email() ); @@ -1652,7 +1652,7 @@ namespace KMail { const TQByteArray certData = node->msgPart().bodyDecodedBinary(); - const STD_NAMESPACE_PREFIX auto_ptr<Kleo::ImportJob> import( smimeCrypto->importJob() ); + const STD_NAMESPACE_PREFIX unique_ptr<Kleo::ImportJob> import( smimeCrypto->importJob() ); const GpgME::ImportResult res = import->exec( certData ); if ( res.error() ) { htmlWriter()->queue( i18n( "Sorry, certificate could not be imported.<br>" @@ -1853,8 +1853,8 @@ bool ObjectTreeParser::decryptChiasmus( const TQByteArray& data, TQByteArray& bo if ( !chiasmus ) return false; - const STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) ); - if ( !listjob.get() ) { + const STD_NAMESPACE_PREFIX unique_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) ); + if ( !listjob ) { errorText = i18n( "Chiasmus backend does not offer the " "\"x-obtain-keys\" function. Please report this bug." ); return false; @@ -1892,8 +1892,8 @@ bool ObjectTreeParser::decryptChiasmus( const TQByteArray& data, TQByteArray& bo GlobalSettings::setChiasmusDecryptionKey( selectorDlg.key() ); assert( !GlobalSettings::chiasmusDecryptionKey().isEmpty() ); - const STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-decrypt", TQStringVariantMap() ) ); - if ( !job.get() ) { + const STD_NAMESPACE_PREFIX unique_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-decrypt", TQStringVariantMap() ) ); + if ( !job ) { errorText = i18n( "Chiasmus backend does not offer the " "\"x-decrypt\" function. Please report this bug." ); return false; @@ -2982,7 +2982,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) TQString line; /* search next occurrence of '\n' */ - pos = s.find('\n', beg, FALSE); + pos = s.find('\n', beg, false); if (pos == (unsigned int)(-1)) pos = length; diff --git a/kmail/objecttreeparser_p.cpp b/kmail/objecttreeparser_p.cpp index 683d3c4c..fbd2b4df 100644 --- a/kmail/objecttreeparser_p.cpp +++ b/kmail/objecttreeparser_p.cpp @@ -89,8 +89,8 @@ bool DecryptVerifyBodyPartMemento::start() { m_dr = DecryptionResult( err ); return false; } - connect( m_job, TQT_SIGNAL(result(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const TQByteArray&)), - this, TQT_SLOT(slotResult(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const TQByteArray&)) ); + connect( m_job, TQ_SIGNAL(result(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const TQByteArray&)), + this, TQ_SLOT(slotResult(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const TQByteArray&)) ); setRunning( true ); return true; } @@ -155,8 +155,8 @@ bool VerifyDetachedBodyPartMemento::start() { m_vr = VerificationResult( err ); return false; } - connect( m_job, TQT_SIGNAL(result(const GpgME::VerificationResult&)), - this, TQT_SLOT(slotResult(const GpgME::VerificationResult&)) ); + connect( m_job, TQ_SIGNAL(result(const GpgME::VerificationResult&)), + this, TQ_SLOT(slotResult(const GpgME::VerificationResult&)) ); setRunning( true ); return true; } @@ -218,9 +218,9 @@ bool VerifyDetachedBodyPartMemento::startKeyListJob() assert( canStartKeyListJob() ); if ( const GpgME::Error err = m_keylistjob->start( keyListPattern() ) ) return false; - connect( m_keylistjob, TQT_SIGNAL(done()), this, TQT_SLOT(slotKeyListJobDone()) ); - connect( m_keylistjob, TQT_SIGNAL(nextKey(const GpgME::Key&)), - this, TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( m_keylistjob, TQ_SIGNAL(done()), this, TQ_SLOT(slotKeyListJobDone()) ); + connect( m_keylistjob, TQ_SIGNAL(nextKey(const GpgME::Key&)), + this, TQ_SLOT(slotNextKey(const GpgME::Key&)) ); return true; } @@ -261,8 +261,8 @@ bool VerifyOpaqueBodyPartMemento::start() { m_vr = VerificationResult( err ); return false; } - connect( m_job, TQT_SIGNAL(result(const GpgME::VerificationResult&,const TQByteArray&)), - this, TQT_SLOT(slotResult(const GpgME::VerificationResult&,const TQByteArray&)) ); + connect( m_job, TQ_SIGNAL(result(const GpgME::VerificationResult&,const TQByteArray&)), + this, TQ_SLOT(slotResult(const GpgME::VerificationResult&,const TQByteArray&)) ); setRunning( true ); return true; } @@ -328,9 +328,9 @@ bool VerifyOpaqueBodyPartMemento::startKeyListJob() assert( canStartKeyListJob() ); if ( const GpgME::Error err = m_keylistjob->start( keyListPattern() ) ) return false; - connect( m_keylistjob, TQT_SIGNAL(done()), this, TQT_SLOT(slotKeyListJobDone()) ); - connect( m_keylistjob, TQT_SIGNAL(nextKey(const GpgME::Key&)), - this, TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( m_keylistjob, TQ_SIGNAL(done()), this, TQ_SLOT(slotKeyListJobDone()) ); + connect( m_keylistjob, TQ_SIGNAL(nextKey(const GpgME::Key&)), + this, TQ_SLOT(slotNextKey(const GpgME::Key&)) ); return true; } diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp index b39bc65f..31b94d68 100644 --- a/kmail/partNode.cpp +++ b/kmail/partNode.cpp @@ -39,7 +39,6 @@ #include "kmmimeparttree.h" #include <mimelib/utility.h> #include <tqregexp.h> -#include <kasciistricmp.h> #include "util.h" /* diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp index b455cc54..12af2bdc 100644 --- a/kmail/popaccount.cpp +++ b/kmail/popaccount.cpp @@ -38,7 +38,7 @@ using KPIM::BroadcastStatus; #include "accountmanager.h" #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <tdemainwindow.h> @@ -72,10 +72,10 @@ PopAccount::PopAccount(AccountManager* aOwner, const TQString& aAccountName, uin mUidsOfNextSeenMsgsDict.setAutoDelete( false ); headersOnServer.setAutoDelete(true); - connect(&processMsgsTimer,TQT_SIGNAL(timeout()),TQT_SLOT(slotProcessPendingMsgs())); + connect(&processMsgsTimer,TQ_SIGNAL(timeout()),TQ_SLOT(slotProcessPendingMsgs())); TDEIO::Scheduler::connect( - TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), - this, TQT_SLOT(slotSlaveError(TDEIO::Slave *, int, const TQString &))); + TQ_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), + this, TQ_SLOT(slotSlaveError(TDEIO::Slave *, int, const TQString &))); mHeaderDeleteUids.clear(); mHeaderDownUids.clear(); @@ -286,12 +286,12 @@ void PopAccount::setFilterOnServerCheckSize(unsigned int aSize) //----------------------------------------------------------------------------- void PopAccount::connectJob() { TDEIO::Scheduler::assignJobToSlave(mSlave, job); - connect(job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); - connect(job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); - connect(job, TQT_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )), - TQT_SLOT( slotMsgRetrieved(TDEIO::Job*, const TQString &))); + connect(job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); + connect(job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); + connect(job, TQ_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )), + TQ_SLOT( slotMsgRetrieved(TDEIO::Job*, const TQString &))); } @@ -353,8 +353,8 @@ void PopAccount::slotAbortRequested() { if (stage == Idle) return; if ( mMailCheckProgressItem ) - disconnect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotAbortRequested() ) ); + disconnect( mMailCheckProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotAbortRequested() ) ); stage = Quit; if (job) job->kill(); job = 0; @@ -404,8 +404,8 @@ void PopAccount::startJob() i18n("Preparing transmission from \"%1\"...").arg( escapedName ), true, // can be canceled useSSL() || useTLS() ); - connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotAbortRequested() ) ); + connect( mMailCheckProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotAbortRequested() ) ); numBytes = 0; numBytesRead = 0; @@ -1064,7 +1064,7 @@ void PopAccount::slotSlaveError(TDEIO::Slave *aSlave, int error, /* We need a timer, otherwise slotSlaveError of the next account is also executed, if it reuses the slave, because the slave member variable is changed too early */ - TQTimer::singleShot(0, this, TQT_SLOT(slotCancel())); + TQTimer::singleShot(0, this, TQ_SLOT(slotCancel())); } //----------------------------------------------------------------------------- diff --git a/kmail/popaccount.h b/kmail/popaccount.h index ef329982..cb68ab38 100644 --- a/kmail/popaccount.h +++ b/kmail/popaccount.h @@ -47,8 +47,8 @@ public: virtual void setUsePipelining(bool); /** - * Shall messages be left on the server upon retreival (TRUE) - * or deleted (FALSE). + * Shall messages be left on the server upon retreival (true) + * or deleted (false). */ bool leaveOnServer(void) const { return mLeaveOnServer; } virtual void setLeaveOnServer(bool); @@ -72,8 +72,8 @@ public: virtual void setLeaveOnServerSize(int); /** - * Shall messages be filter on the server (TRUE) - * or not (FALSE). + * Shall messages be filter on the server (true) + * or not (false). */ bool filterOnServer(void) const { return mFilterOnServer; } virtual void setFilterOnServer(bool); diff --git a/kmail/quotajobs.cpp b/kmail/quotajobs.cpp index f8272cac..215a657c 100644 --- a/kmail/quotajobs.cpp +++ b/kmail/quotajobs.cpp @@ -51,8 +51,8 @@ QuotaJobs::GetQuotarootJob::GetQuotarootJob( const KURL& url, bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); + connect( this, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); } void QuotaJobs::GetQuotarootJob::slotInfoMessage( TDEIO::Job*, const TQString& str ) @@ -106,10 +106,10 @@ QuotaJobs::GetStorageQuotaJob::GetStorageQuotaJob( TDEIO::Slave* slave, const KU QuotaJobs::GetQuotarootJob *job = new QuotaJobs::GetQuotarootJob( url, packedArgs, false ); - connect(job, TQT_SIGNAL(quotaInfoReceived(const QuotaInfoList&)), - TQT_SLOT(slotQuotaInfoReceived(const QuotaInfoList&))); - connect(job, TQT_SIGNAL(quotaRootResult(const TQStringList&)), - TQT_SLOT(slotQuotarootResult(const TQStringList&))); + connect(job, TQ_SIGNAL(quotaInfoReceived(const QuotaInfoList&)), + TQ_SLOT(slotQuotaInfoReceived(const QuotaInfoList&))); + connect(job, TQ_SIGNAL(quotaRootResult(const TQStringList&)), + TQ_SLOT(slotQuotarootResult(const TQStringList&))); TDEIO::Scheduler::assignJobToSlave( slave, job ); addSubjob( job ); } diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp index 7497a460..4525bb97 100644 --- a/kmail/recipientseditor.cpp +++ b/kmail/recipientseditor.cpp @@ -162,24 +162,24 @@ RecipientLine::RecipientLine( TQWidget *parent ) TQToolTip::add( mEdit, i18n( "Set the list of email addresses to receive this message" ) ); topLayout->addWidget( mEdit ); - connect( mEdit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotReturnPressed() ) ); - connect( mEdit, TQT_SIGNAL( deleteMe() ), TQT_SLOT( slotPropagateDeletion() ) ); - connect( mEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( analyzeLine( const TQString & ) ) ); - connect( mEdit, TQT_SIGNAL( focusUp() ), TQT_SLOT( slotFocusUp() ) ); - connect( mEdit, TQT_SIGNAL( focusDown() ), TQT_SLOT( slotFocusDown() ) ); - connect( mEdit, TQT_SIGNAL( rightPressed() ), TQT_SIGNAL( rightPressed() ) ); + connect( mEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotReturnPressed() ) ); + connect( mEdit, TQ_SIGNAL( deleteMe() ), TQ_SLOT( slotPropagateDeletion() ) ); + connect( mEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( analyzeLine( const TQString & ) ) ); + connect( mEdit, TQ_SIGNAL( focusUp() ), TQ_SLOT( slotFocusUp() ) ); + connect( mEdit, TQ_SIGNAL( focusDown() ), TQ_SLOT( slotFocusDown() ) ); + connect( mEdit, TQ_SIGNAL( rightPressed() ), TQ_SIGNAL( rightPressed() ) ); - connect( mEdit, TQT_SIGNAL( leftPressed() ), mCombo, TQT_SLOT( setFocus() ) ); - connect( mCombo, TQT_SIGNAL( rightPressed() ), mEdit, TQT_SLOT( setFocus() ) ); + connect( mEdit, TQ_SIGNAL( leftPressed() ), mCombo, TQ_SLOT( setFocus() ) ); + connect( mCombo, TQ_SIGNAL( rightPressed() ), mEdit, TQ_SLOT( setFocus() ) ); - connect( mCombo, TQT_SIGNAL( activated ( int ) ), - this, TQT_SLOT( slotTypeModified() ) ); + connect( mCombo, TQ_SIGNAL( activated ( int ) ), + this, TQ_SLOT( slotTypeModified() ) ); mRemoveButton = new TQPushButton( this ); mRemoveButton->setIconSet( TDEApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) ); topLayout->addWidget( mRemoveButton ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPropagateDeletion() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotPropagateDeletion() ) ); TQToolTip::add( mRemoveButton, i18n("Remove recipient line") ); } @@ -357,20 +357,20 @@ RecipientLine *RecipientsView::addLine() addChild( line, 0, mLines.count() * mLineHeight ); line->mEdit->setCompletionMode( mCompletionMode ); line->show(); - connect( line, TQT_SIGNAL( returnPressed( RecipientLine * ) ), - TQT_SLOT( slotReturnPressed( RecipientLine * ) ) ); - connect( line, TQT_SIGNAL( upPressed( RecipientLine * ) ), - TQT_SLOT( slotUpPressed( RecipientLine * ) ) ); - connect( line, TQT_SIGNAL( downPressed( RecipientLine * ) ), - TQT_SLOT( slotDownPressed( RecipientLine * ) ) ); - connect( line, TQT_SIGNAL( rightPressed() ), TQT_SIGNAL( focusRight() ) ); - connect( line, TQT_SIGNAL( deleteLine( RecipientLine * ) ), - TQT_SLOT( slotDecideLineDeletion( RecipientLine * ) ) ); - connect( line, TQT_SIGNAL( countChanged() ), TQT_SLOT( calculateTotal() ) ); - connect( line, TQT_SIGNAL( typeModified( RecipientLine * ) ), - TQT_SLOT( slotTypeModified( RecipientLine * ) ) ); - connect( line->mEdit, TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), - TQT_SLOT( setCompletionMode( TDEGlobalSettings::Completion ) ) ); + connect( line, TQ_SIGNAL( returnPressed( RecipientLine * ) ), + TQ_SLOT( slotReturnPressed( RecipientLine * ) ) ); + connect( line, TQ_SIGNAL( upPressed( RecipientLine * ) ), + TQ_SLOT( slotUpPressed( RecipientLine * ) ) ); + connect( line, TQ_SIGNAL( downPressed( RecipientLine * ) ), + TQ_SLOT( slotDownPressed( RecipientLine * ) ) ); + connect( line, TQ_SIGNAL( rightPressed() ), TQ_SIGNAL( focusRight() ) ); + connect( line, TQ_SIGNAL( deleteLine( RecipientLine * ) ), + TQ_SLOT( slotDecideLineDeletion( RecipientLine * ) ) ); + connect( line, TQ_SIGNAL( countChanged() ), TQ_SLOT( calculateTotal() ) ); + connect( line, TQ_SIGNAL( typeModified( RecipientLine * ) ), + TQ_SLOT( slotTypeModified( RecipientLine * ) ) ); + connect( line->mEdit, TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), + TQ_SLOT( setCompletionMode( TDEGlobalSettings::Completion ) ) ); if ( mLines.last() ) { if ( mLines.count() == 1 ) { @@ -482,7 +482,7 @@ void RecipientsView::slotDecideLineDeletion( RecipientLine *line ) line->clear(); } else { mCurDelLine = line; - TQTimer::singleShot( 0, this, TQT_SLOT( slotDeleteLine( ) ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDeleteLine( ) ) ); } } @@ -538,7 +538,7 @@ void RecipientsView::resizeView() parentWidget()->layout()->activate(); emit sizeHintChanged(); - TQTimer::singleShot( 0, this, TQT_SLOT(moveCompletionPopup()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(moveCompletionPopup()) ); } void RecipientsView::activateLine( RecipientLine *line ) @@ -768,14 +768,14 @@ SideWidget::SideWidget( RecipientsView *view, TQWidget *parent ) mDistributionListButton = new TQPushButton( i18n("Save List..."), this ); topLayout->addWidget( mDistributionListButton ); mDistributionListButton->hide(); - connect( mDistributionListButton, TQT_SIGNAL( clicked() ), - TQT_SIGNAL( saveDistributionList() ) ); + connect( mDistributionListButton, TQ_SIGNAL( clicked() ), + TQ_SIGNAL( saveDistributionList() ) ); TQToolTip::add( mDistributionListButton, i18n("Save recipients as distribution list") ); mSelectButton = new TQPushButton( i18n("Se&lect..."), this ); topLayout->addWidget( mSelectButton ); - connect( mSelectButton, TQT_SIGNAL( clicked() ), TQT_SLOT( pickRecipient() ) ); + connect( mSelectButton, TQ_SIGNAL( clicked() ), TQ_SLOT( pickRecipient() ) ); TQToolTip::add( mSelectButton, i18n("Select recipients from address book") ); } @@ -789,8 +789,8 @@ RecipientsPicker* SideWidget::picker() const // hacks to allow picker() to be const in the presence of lazy loading SideWidget *non_const_this = const_cast<SideWidget*>( this ); mRecipientPicker = new RecipientsPicker( non_const_this ); - connect( mRecipientPicker, TQT_SIGNAL( pickedRecipient( const Recipient & ) ), - non_const_this, TQT_SIGNAL( pickedRecipient( const Recipient & ) ) ); + connect( mRecipientPicker, TQ_SIGNAL( pickedRecipient( const Recipient & ) ), + non_const_this, TQ_SIGNAL( pickedRecipient( const Recipient & ) ) ); mPickerPositioner = new KWindowPositioner( non_const_this, mRecipientPicker ); } return mRecipientPicker; @@ -845,25 +845,25 @@ RecipientsEditor::RecipientsEditor( TQWidget *parent ) mRecipientsView = new RecipientsView( this ); topLayout->addWidget( mRecipientsView ); - connect( mRecipientsView, TQT_SIGNAL( focusUp() ), TQT_SIGNAL( focusUp() ) ); - connect( mRecipientsView, TQT_SIGNAL( focusDown() ), TQT_SIGNAL( focusDown() ) ); - connect( mRecipientsView, TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), - TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ) ); + connect( mRecipientsView, TQ_SIGNAL( focusUp() ), TQ_SIGNAL( focusUp() ) ); + connect( mRecipientsView, TQ_SIGNAL( focusDown() ), TQ_SIGNAL( focusDown() ) ); + connect( mRecipientsView, TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), + TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ) ); mSideWidget = new SideWidget( mRecipientsView, this ); topLayout->addWidget( mSideWidget ); - connect( mSideWidget, TQT_SIGNAL( pickedRecipient( const Recipient & ) ), - TQT_SLOT( slotPickedRecipient( const Recipient & ) ) ); - connect( mSideWidget, TQT_SIGNAL( saveDistributionList() ), - TQT_SLOT( saveDistributionList() ) ); - - connect( mRecipientsView, TQT_SIGNAL( totalChanged( int, int ) ), - mSideWidget, TQT_SLOT( setTotal( int, int ) ) ); - connect( mRecipientsView, TQT_SIGNAL( focusRight() ), - mSideWidget, TQT_SLOT( setFocus() ) ); - - connect( mRecipientsView, TQT_SIGNAL(sizeHintChanged()), - TQT_SIGNAL(sizeHintChanged()) ); + connect( mSideWidget, TQ_SIGNAL( pickedRecipient( const Recipient & ) ), + TQ_SLOT( slotPickedRecipient( const Recipient & ) ) ); + connect( mSideWidget, TQ_SIGNAL( saveDistributionList() ), + TQ_SLOT( saveDistributionList() ) ); + + connect( mRecipientsView, TQ_SIGNAL( totalChanged( int, int ) ), + mSideWidget, TQ_SLOT( setTotal( int, int ) ) ); + connect( mRecipientsView, TQ_SIGNAL( focusRight() ), + mSideWidget, TQ_SLOT( setFocus() ) ); + + connect( mRecipientsView, TQ_SIGNAL(sizeHintChanged()), + TQ_SIGNAL(sizeHintChanged()) ); } RecipientsEditor::~RecipientsEditor() diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp index 50ea58a2..8c3a4d64 100644 --- a/kmail/recipientseditortest.cpp +++ b/kmail/recipientseditortest.cpp @@ -64,7 +64,7 @@ Composer::Composer( TQWidget *parent ) TQPushButton *button = new TQPushButton( "&Close", this ); topLayout->addMultiCellWidget( button, 3, 3, 0, 1 ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClose() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotClose() ) ); } void Composer::slotClose() @@ -96,7 +96,7 @@ int main( int argc, char **argv ) TDEApplication app; - TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); TQWidget *wid = new Composer( 0 ); diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index e549c789..24679d8e 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -364,10 +364,10 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent ) resLayout->addWidget( mCollectionCombo ); resLayout->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Expanding)); -// connect( mCollectionCombo, TQT_SIGNAL( highlighted( int ) ), -// TQT_SLOT( updateList() ) ); - connect( mCollectionCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( updateList() ) ); +// connect( mCollectionCombo, TQ_SIGNAL( highlighted( int ) ), +// TQ_SLOT( updateList() ) ); + connect( mCollectionCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( updateList() ) ); TQBoxLayout *searchLayout = new TQHBoxLayout( topLayout ); @@ -375,7 +375,7 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent ) button->setIconSet( TDEGlobal::iconLoader()->loadIconSet( TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", TDEIcon::Small, 0 ) ); searchLayout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( resetSearch() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( resetSearch() ) ); label = new TQLabel( i18n("&Search:"), this ); searchLayout->addWidget( label ); @@ -388,21 +388,21 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent ) mRecipientList->addColumn( i18n("->") ); mRecipientList->addColumn( i18n("Name") ); mRecipientList->addColumn( i18n("Email") ); - connect( mRecipientList, TQT_SIGNAL( doubleClicked( TQListViewItem *, - const TQPoint &, int ) ), TQT_SLOT( slotPicked() ) ); - connect( mRecipientList, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - TQT_SLOT( slotPicked() ) ); + connect( mRecipientList, TQ_SIGNAL( doubleClicked( TQListViewItem *, + const TQPoint &, int ) ), TQ_SLOT( slotPicked() ) ); + connect( mRecipientList, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + TQ_SLOT( slotPicked() ) ); new RecipientsListToolTip( mRecipientList->viewport(), mRecipientList ); mSearchLine = new SearchLine( this, mRecipientList ); searchLayout->addWidget( mSearchLine ); label->setBuddy( label ); - connect( mSearchLine, TQT_SIGNAL( downPressed() ), TQT_SLOT( setFocusList() ) ); + connect( mSearchLine, TQ_SIGNAL( downPressed() ), TQ_SLOT( setFocusList() ) ); mSearchLDAPButton = new TQPushButton( i18n("Search &Directory Service"), this ); searchLayout->addWidget( mSearchLDAPButton ); - connect( mSearchLDAPButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSearchLDAP() ) ); + connect( mSearchLDAPButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSearchLDAP() ) ); TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout ); @@ -410,27 +410,27 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent ) mToButton = new TQPushButton( i18n("Add as To"), this ); buttonLayout->addWidget( mToButton ); - connect( mToButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotToClicked() ) ); + connect( mToButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotToClicked() ) ); mCcButton = new TQPushButton( i18n("Add as CC"), this ); buttonLayout->addWidget( mCcButton ); - connect( mCcButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCcClicked() ) ); + connect( mCcButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCcClicked() ) ); mBccButton = new TQPushButton( i18n("Add as BCC"), this ); buttonLayout->addWidget( mBccButton ); - connect( mBccButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotBccClicked() ) ); + connect( mBccButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotBccClicked() ) ); // BCC isn't commonly used, so hide it for now //mBccButton->hide(); TQPushButton *closeButton = new TQPushButton( i18n("&Cancel"), this ); buttonLayout->addWidget( closeButton ); - connect( closeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( close() ) ); + connect( closeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( close() ) ); { using namespace TDEABC; mAddressBook = TDEABC::StdAddressBook::self( true ); - connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), - this, TQT_SLOT( insertAddressBook( AddressBook * ) ) ); + connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook * ) ), + this, TQ_SLOT( insertAddressBook( AddressBook * ) ) ); } initCollections(); @@ -845,8 +845,8 @@ void RecipientsPicker::slotSearchLDAP() { if ( !mLdapSearchDialog ) { mLdapSearchDialog = new KPIM::LDAPSearchDialog( this ); - connect( mLdapSearchDialog, TQT_SIGNAL( addresseesAdded() ), - TQT_SLOT(ldapSearchResult() ) ); + connect( mLdapSearchDialog, TQ_SIGNAL( addresseesAdded() ), + TQ_SLOT(ldapSearchResult() ) ); } mLdapSearchDialog->setSearchText( mSearchLine->text() ); mLdapSearchDialog->show(); diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp index 0426bf15..371f8b76 100644 --- a/kmail/redirectdialog.cpp +++ b/kmail/redirectdialog.cpp @@ -74,9 +74,9 @@ RedirectDialog::RedirectDialog( TQWidget *parent, const char *name, "where you can select recipients out " "of all available addresses." ) ); - connect( mBtnTo, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddrBook()) ); + connect( mBtnTo, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddrBook()) ); - connect( mEditTo, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotEmailChanged( const TQString & ) ) ); + connect( mEditTo, TQ_SIGNAL( textChanged ( const TQString & ) ), TQ_SLOT( slotEmailChanged( const TQString & ) ) ); mLabelTo->setBuddy( mBtnTo ); mEditTo->setFocus(); diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp index 1ce0237b..e99528a9 100644 --- a/kmail/regexplineedit.cpp +++ b/kmail/regexplineedit.cpp @@ -76,8 +76,8 @@ namespace KMail { setFocusProxy( mLineEdit ); hlay->addWidget( mLineEdit ); - connect( mLineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( textChanged( const TQString & ) ) ); + connect( mLineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( textChanged( const TQString & ) ) ); if( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) { mRegExpEditButton = new TQPushButton( i18n("Edit..."), this, @@ -86,8 +86,8 @@ namespace KMail { TQSizePolicy::Fixed ); hlay->addWidget( mRegExpEditButton ); - connect( mRegExpEditButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotEditRegExp() ) ); + connect( mRegExpEditButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotEditRegExp() ) ); } } @@ -120,7 +120,7 @@ namespace KMail { void RegExpLineEdit::slotEditRegExp() { if ( !mRegExpEditDialog ) - mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); + mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this ); KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( mRegExpEditDialog->tqt_cast( "KRegExpEditorInterface" ) ); diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp index 15c2778f..1c3cbef0 100644 --- a/kmail/renamejob.cpp +++ b/kmail/renamejob.cpp @@ -110,7 +110,7 @@ void RenameJob::execute() } // copy to the new folder mCopyFolderJob = new CopyFolderJob( mStorage, mNewParent ); - connect( mCopyFolderJob, TQT_SIGNAL(folderCopyComplete(bool)), TQT_SLOT(folderCopyComplete(bool)) ); + connect( mCopyFolderJob, TQ_SIGNAL(folderCopyComplete(bool)), TQ_SLOT(folderCopyComplete(bool)) ); mCopyFolderJob->execute(); } else @@ -149,8 +149,8 @@ void RenameJob::execute() ImapAccountBase::jobData jd( src.url() ); account->insertJob( job, jd ); TDEIO::Scheduler::assignJobToSlave( account->slave(), job ); - connect( job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotRenameResult(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotRenameResult(TDEIO::Job*)) ); } } diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp index 2f64abbf..27aa68bc 100644 --- a/kmail/rulewidgethandlermanager.cpp +++ b/kmail/rulewidgethandlermanager.cpp @@ -251,7 +251,7 @@ void KMail::RuleWidgetHandlerManager::createWidgets( TQWidgetStack *functionStac for ( int i = 0; ( w = (*it)->createFunctionWidget( i, functionStack, receiver ) ); ++i ) { - if ( childCount( TQT_TQOBJECT(functionStack), w->name() ) < 2 ) { + if ( childCount( functionStack, w->name() ) < 2 ) { // there wasn't already a widget with this name, so add this widget functionStack->addWidget( w ); } @@ -266,7 +266,7 @@ void KMail::RuleWidgetHandlerManager::createWidgets( TQWidgetStack *functionStac for ( int i = 0; ( w = (*it)->createValueWidget( i, valueStack, receiver ) ); ++i ) { - if ( childCount( TQT_TQOBJECT(valueStack), w->name() ) < 2 ) { + if ( childCount( valueStack, w->name() ) < 2 ) { // there wasn't already a widget with this name, so add this widget valueStack->addWidget( w ); } @@ -431,8 +431,8 @@ namespace { funcCombo->insertItem( i18n( TextFunctions[i].displayName ) ); } funcCombo->adjustSize(); - TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotFunctionChanged() ) ); + TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotFunctionChanged() ) ); return funcCombo; } @@ -445,8 +445,8 @@ namespace { if ( number == 0 ) { RegExpLineEdit *lineEdit = new RegExpLineEdit( valueStack, "regExpLineEdit" ); - TQObject::connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - receiver, TQT_SLOT( slotValueChanged() ) ); + TQObject::connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + receiver, TQ_SLOT( slotValueChanged() ) ); return lineEdit; } @@ -459,8 +459,8 @@ namespace { TQComboBox *combo = new TQComboBox( valueStack, "categoryCombo" ); TQStringList categories = KabcBridge::categories(); combo->insertStringList( categories ); - TQObject::connect( combo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotValueChanged() ) ); + TQObject::connect( combo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotValueChanged() ) ); return combo; } @@ -646,14 +646,14 @@ namespace { if ( func == KMSearchRule::FuncIsInAddressbook || func == KMSearchRule::FuncIsNotInAddressbook ) { TQWidget *w = - TQT_TQWIDGET( valueStack->child( "textRuleValueHider", + static_cast<TQWidget*>( valueStack->child( "textRuleValueHider", 0, false ) ); valueStack->raiseWidget( w ); } else if ( func == KMSearchRule::FuncIsInCategory || func == KMSearchRule::FuncIsNotInCategory) { TQComboBox *combo = - static_cast<TQComboBox*>( TQT_TQWIDGET(valueStack->child( "categoryCombo", + static_cast<TQComboBox*>( static_cast<TQWidget*>(valueStack->child( "categoryCombo", 0, false )) ); combo->blockSignals( true ); for ( i = 0; i < combo->count(); ++i ) @@ -692,7 +692,7 @@ namespace { { // raise the correct function widget functionStack->raiseWidget( - TQT_TQWIDGET( functionStack->child( "textRuleFuncCombo", + static_cast<TQWidget*>( functionStack->child( "textRuleFuncCombo", 0, false ) ) ); // raise the correct value widget @@ -700,13 +700,13 @@ namespace { if ( func == KMSearchRule::FuncIsInAddressbook || func == KMSearchRule::FuncIsNotInAddressbook ) { valueStack->raiseWidget( - TQT_TQWIDGET( valueStack->child( "textRuleValueHider", + static_cast<TQWidget*>( valueStack->child( "textRuleValueHider", 0, false ) ) ); } else if ( func == KMSearchRule::FuncIsInCategory || func == KMSearchRule::FuncIsNotInCategory) { valueStack->raiseWidget( - TQT_TQWIDGET( valueStack->child( "categoryCombo", + static_cast<TQWidget*>( valueStack->child( "categoryCombo", 0, false ) ) ); } else { @@ -762,8 +762,8 @@ namespace { funcCombo->insertItem( i18n( MessageFunctions[i].displayName ) ); } funcCombo->adjustSize(); - TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotFunctionChanged() ) ); + TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotFunctionChanged() ) ); return funcCombo; } @@ -776,8 +776,8 @@ namespace { if ( number == 0 ) { RegExpLineEdit *lineEdit = new RegExpLineEdit( valueStack, "regExpLineEdit" ); - TQObject::connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - receiver, TQT_SLOT( slotValueChanged() ) ); + TQObject::connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + receiver, TQ_SLOT( slotValueChanged() ) ); return lineEdit; } @@ -947,7 +947,7 @@ namespace { if ( func == KMSearchRule::FuncHasAttachment || func == KMSearchRule::FuncHasNoAttachment ) { TQWidget *w = - TQT_TQWIDGET( valueStack->child( "textRuleValueHider", + static_cast<TQWidget*>( valueStack->child( "textRuleValueHider", 0, false ) ); valueStack->raiseWidget( w ); } @@ -978,7 +978,7 @@ namespace { return false; // raise the correct function widget functionStack->raiseWidget( - TQT_TQWIDGET( functionStack->child( "messageRuleFuncCombo", + static_cast<TQWidget*>( functionStack->child( "messageRuleFuncCombo", 0, false ) ) ); // raise the correct value widget @@ -986,7 +986,7 @@ namespace { if ( func == KMSearchRule::FuncHasAttachment || func == KMSearchRule::FuncHasNoAttachment ) { TQWidget *w = - TQT_TQWIDGET( valueStack->child( "textRuleValueHider", + static_cast<TQWidget*>( valueStack->child( "textRuleValueHider", 0, false ) ); valueStack->raiseWidget( w ); } @@ -1038,8 +1038,8 @@ namespace { funcCombo->insertItem( i18n( StatusFunctions[i].displayName ) ); } funcCombo->adjustSize(); - TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotFunctionChanged() ) ); + TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotFunctionChanged() ) ); return funcCombo; } @@ -1058,8 +1058,8 @@ namespace { statusCombo->insertItem( UserIcon( KMail::StatusValues[ i ].icon ), i18n( KMail::StatusValues[ i ].text ) ); } statusCombo->adjustSize(); - TQObject::connect( statusCombo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotValueChanged() ) ); + TQObject::connect( statusCombo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotValueChanged() ) ); return statusCombo; } @@ -1249,12 +1249,12 @@ namespace { // raise the correct function widget functionStack->raiseWidget( - TQT_TQWIDGET( functionStack->child( "statusRuleFuncCombo", + static_cast<TQWidget*>( functionStack->child( "statusRuleFuncCombo", 0, false ) ) ); // raise the correct value widget valueStack->raiseWidget( - TQT_TQWIDGET( valueStack->child( "statusRuleValueCombo", + static_cast<TQWidget*>( valueStack->child( "statusRuleValueCombo", 0, false ) ) ); return true; } @@ -1298,8 +1298,8 @@ namespace { funcCombo->insertItem( i18n( NumericFunctions[i].displayName ) ); } funcCombo->adjustSize(); - TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotFunctionChanged() ) ); + TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotFunctionChanged() ) ); return funcCombo; } @@ -1313,8 +1313,8 @@ namespace { return 0; KIntNumInput *numInput = new KIntNumInput( valueStack, "KIntNumInput" ); - TQObject::connect( numInput, TQT_SIGNAL( valueChanged( int ) ), - receiver, TQT_SLOT( slotValueChanged() ) ); + TQObject::connect( numInput, TQ_SIGNAL( valueChanged( int ) ), + receiver, TQ_SLOT( slotValueChanged() ) ); return numInput; } @@ -1502,7 +1502,7 @@ namespace { // raise the correct function widget functionStack->raiseWidget( - TQT_TQWIDGET( functionStack->child( "numericRuleFuncCombo", + static_cast<TQWidget*>( functionStack->child( "numericRuleFuncCombo", 0, false ) ) ); // raise the correct value widget diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp index b0b1d9de..7b0b5558 100644 --- a/kmail/searchjob.cpp +++ b/kmail/searchjob.cpp @@ -92,10 +92,10 @@ void SearchJob::searchCompleteFolder() if ( mFolder->imapPath() != TQString( "/" ) ) { TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job ); - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - TQT_SLOT( slotSearchData( TDEIO::Job*, const TQString& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotSearchResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + TQ_SLOT( slotSearchData( TDEIO::Job*, const TQString& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotSearchResult( TDEIO::Job * ) ) ); } else { // for the "/ folder" of an imap account, searching blocks the tdeioslave @@ -199,8 +199,8 @@ void SearchJob::slotSearchData( TDEIO::Job* job, const TQString& data ) } else { // get the folder to make sure we have all messages - connect ( mFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotSearchFolder()) ); + connect ( mFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotSearchFolder()) ); mFolder->getFolder(); } } @@ -221,8 +221,8 @@ bool SearchJob::canMapAllUIDs() //----------------------------------------------------------------------------- void SearchJob::slotSearchFolder() { - disconnect ( mFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotSearchFolder()) ); + disconnect ( mFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotSearchFolder()) ); if ( mLocalSearchPattern->isEmpty() ) { // pure imap search - now get the serial number for the UIDs @@ -271,8 +271,8 @@ void SearchJob::slotSearchFolder() true, mAccount->useSSL() || mAccount->useTLS() ); mProgress->setTotalItems( numMsgs ); - connect ( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), - this, TQT_SLOT( slotAbortSearch( KPIM::ProgressItem* ) ) ); + connect ( mProgress, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), + this, TQ_SLOT( slotAbortSearch( KPIM::ProgressItem* ) ) ); for ( unsigned int i = 0; i < numMsgs ; ++i ) { KMMessage * msg = mFolder->getMsg( i ); @@ -280,8 +280,8 @@ void SearchJob::slotSearchFolder() ImapJob *job = new ImapJob( msg ); job->setParentFolder( mFolder ); job->setParentProgressItem( mProgress ); - connect( job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - this, TQT_SLOT(slotSearchMessageArrived(KMMessage*)) ); + connect( job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + this, TQ_SLOT(slotSearchMessageArrived(KMMessage*)) ); job->start(); } else { slotSearchMessageArrived( msg ); @@ -387,10 +387,10 @@ void SearchJob::searchSingleMessage() stream << (int) 'E' << url; TDEIO::SimpleJob *job = TDEIO::special( url, packedArgs, false ); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), job); - connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotSearchDataSingleMessage(TDEIO::Job*,const TQString&)) ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotSearchResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotSearchDataSingleMessage(TDEIO::Job*,const TQString&)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotSearchResult(TDEIO::Job *)) ); } } @@ -420,8 +420,8 @@ void SearchJob::slotSearchDataSingleMessage( TDEIO::Job* job, const TQString& da if ( needsDownload() ) { ImapJob *job = new ImapJob( msg ); job->setParentFolder( mFolder ); - connect( job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - this, TQT_SLOT(slotSearchMessageArrived(KMMessage*)) ); + connect( job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + this, TQ_SLOT(slotSearchMessageArrived(KMMessage*)) ); job->start(); } else { slotSearchMessageArrived( msg ); diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp index 94035059..84f0d385 100644 --- a/kmail/searchwindow.cpp +++ b/kmail/searchwindow.cpp @@ -127,7 +127,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, // proper fix in KWin (l.lunak@kde.org) XDeleteProperty( tqt_xdisplay(), winId(), XA_WM_TRANSIENT_FOR ); #endif - KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); + KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon()); TDEConfig* config = KMKernel::config(); config->setGroup("SearchDialog"); @@ -189,17 +189,17 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, object = list->first(); delete list; if (!searchFolder && object && ::tqt_cast<TQComboBox*>(object)) - static_cast<TQComboBox*>(TQT_TQWIDGET(object))->setCurrentText(i18n("Subject")); + static_cast<TQComboBox*>(object)->setCurrentText(i18n("Subject")); vbl->addWidget( mPatternEdit ); // enable/disable widgets depending on radio buttons: - connect( mChkbxSpecificFolders, TQT_SIGNAL(toggled(bool)), - mCbxFolders, TQT_SLOT(setEnabled(bool)) ); - connect( mChkbxSpecificFolders, TQT_SIGNAL(toggled(bool)), - mChkSubFolders, TQT_SLOT(setEnabled(bool)) ); - connect( mChkbxAllFolders, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(setEnabledSearchButton(bool)) ); + connect( mChkbxSpecificFolders, TQ_SIGNAL(toggled(bool)), + mCbxFolders, TQ_SLOT(setEnabled(bool)) ); + connect( mChkbxSpecificFolders, TQ_SIGNAL(toggled(bool)), + mChkSubFolders, TQ_SLOT(setEnabled(bool)) ); + connect( mChkbxAllFolders, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setEnabledSearchButton(bool)) ); mLbxMatches = new MatchListView(searchWidget, this, "Find Messages"); @@ -236,14 +236,14 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, mLbxMatches->setDragEnabled( true ); - connect( mLbxMatches, TQT_SIGNAL(clicked(TQListViewItem *)), - TQT_TQOBJECT(this), TQT_SLOT(slotShowMsg(TQListViewItem *)) ); - connect( mLbxMatches, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - TQT_TQOBJECT(this), TQT_SLOT(slotViewMsg(TQListViewItem *)) ); - connect( mLbxMatches, TQT_SIGNAL(currentChanged(TQListViewItem *)), - TQT_TQOBJECT(this), TQT_SLOT(slotCurrentChanged(TQListViewItem *)) ); - connect( mLbxMatches, TQT_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)), - TQT_TQOBJECT(this), TQT_SLOT(slotContextMenuRequested(TQListViewItem *,const TQPoint &,int)) ); + connect( mLbxMatches, TQ_SIGNAL(clicked(TQListViewItem *)), + this, TQ_SLOT(slotShowMsg(TQListViewItem *)) ); + connect( mLbxMatches, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQ_SLOT(slotViewMsg(TQListViewItem *)) ); + connect( mLbxMatches, TQ_SIGNAL(currentChanged(TQListViewItem *)), + this, TQ_SLOT(slotCurrentChanged(TQListViewItem *)) ); + connect( mLbxMatches, TQ_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)), + this, TQ_SLOT(slotContextMenuRequested(TQListViewItem *,const TQPoint &,int)) ); vbl->addWidget( mLbxMatches ); TQHBoxLayout *hbl2 = new TQHBoxLayout( vbl, spacingHint(), "kmfs_hbl2" ); @@ -260,17 +260,17 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, mSearchFolderOpenBtn = new TQPushButton(i18n("Op&en Search Folder"), searchWidget); mSearchFolderOpenBtn->setEnabled(false); hbl2->addWidget(mSearchFolderOpenBtn); - connect( mSearchFolderEdt, TQT_SIGNAL( textChanged( const TQString &)), - TQT_TQOBJECT(this), TQT_SLOT( scheduleRename( const TQString & ))); - connect( &mRenameTimer, TQT_SIGNAL( timeout() ), - TQT_TQOBJECT(this), TQT_SLOT( renameSearchFolder() )); - connect( mSearchFolderOpenBtn, TQT_SIGNAL( clicked() ), - TQT_TQOBJECT(this), TQT_SLOT( openSearchFolder() )); + connect( mSearchFolderEdt, TQ_SIGNAL( textChanged( const TQString &)), + this, TQ_SLOT( scheduleRename( const TQString & ))); + connect( &mRenameTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( renameSearchFolder() )); + connect( mSearchFolderOpenBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( openSearchFolder() )); mSearchResultOpenBtn = new TQPushButton(i18n("Open &Message"), searchWidget); mSearchResultOpenBtn->setEnabled(false); hbl2->addWidget(mSearchResultOpenBtn); - connect( mSearchResultOpenBtn, TQT_SIGNAL( clicked() ), - TQT_TQOBJECT(this), TQT_SLOT( slotViewSelectedMsg() )); + connect( mSearchResultOpenBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotViewSelectedMsg() )); mStatusBar = new KStatusBar(searchWidget); mStatusBar->insertFixedItem(i18n("AMiddleLengthText..."), 0, true); mStatusBar->changeItem(i18n("Ready."), 0); @@ -292,14 +292,14 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, mBtnStop = actionButton(KDialogBase::User2); mBtnStop->setEnabled(false); - connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotSearch())); - connect(this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(slotStop())); - connect(this, TQT_SIGNAL(finished()), TQT_TQOBJECT(this), TQT_SLOT(deleteLater())); + connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotSearch())); + connect(this, TQ_SIGNAL(user2Clicked()), TQ_SLOT(slotStop())); + connect(this, TQ_SIGNAL(finished()), this, TQ_SLOT(deleteLater())); // give focus to the value field of the first search rule object = mPatternEdit->child( "regExpLineEdit" ); if ( object && object->isWidgetType() ) { - TQT_TQWIDGET(object)->setFocus(); + static_cast<TQWidget*>(object)->setFocus(); //kdDebug(5006) << "SearchWindow: focus has been given to widget " // << object->name() << endl; } @@ -309,27 +309,27 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, //set up actions TDEActionCollection *ac = actionCollection(); ac->setWidget( this ); - mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotReplyToMsg()), ac, "search_reply" ); + mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", 0, this, + TQ_SLOT(slotReplyToMsg()), ac, "search_reply" ); mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail-reply-all", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplyAllToMsg()), + 0, this, TQ_SLOT(slotReplyAllToMsg()), ac, "search_reply_all" ); mReplyListAction = new TDEAction( i18n("Reply to Mailing-&List..."), - "mail_replylist", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotReplyListToMsg()), ac, + "mail_replylist", 0, this, + TQ_SLOT(slotReplyListToMsg()), ac, "search_reply_list" ); mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"), "mail-forward", ac, "search_message_forward" ); - connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, - TQT_SLOT(slotForwardInlineMsg()) ); + connect( mForwardActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotForwardInlineMsg()) ); mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), - "mail-forward", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardAttachedMsg()), ac, + "mail-forward", 0, this, + TQ_SLOT(slotForwardAttachedMsg()), ac, "search_message_forward_as_attachment" ); mForwardInlineAction = new TDEAction( i18n("&Inline..."), - "mail-forward", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardInlineMsg()), ac, + "mail-forward", 0, this, + TQ_SLOT(slotForwardInlineMsg()), ac, "search_message_forward_inline" ); if ( GlobalSettings::self()->forwardingInlineByDefault() ) { mForwardActionMenu->insert( mForwardInlineAction ); @@ -340,32 +340,32 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, } mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), - "mail-forward", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardDigestMsg()), ac, + "mail-forward", 0, this, + TQ_SLOT(slotForwardDigestMsg()), ac, "search_message_forward_as_digest" ); mForwardActionMenu->insert( mForwardDigestAction ); mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), - "mail-forward", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotRedirectMsg()), ac, + "mail-forward", 0, this, + TQ_SLOT(slotRedirectMsg()), ac, "search_message_forward_redirect" ); mForwardActionMenu->insert( mRedirectAction ); - mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), ac, "search_file_save_as" ); + mSaveAsAction = KStdAction::saveAs( this, TQ_SLOT(slotSaveMsg()), ac, "search_file_save_as" ); mSaveAtchAction = new TDEAction( i18n("Save Attachments..."), "attach", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachments()), ac, "search_save_attachments" ); + this, TQ_SLOT(slotSaveAttachments()), ac, "search_save_attachments" ); - mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), ac, "search_print" ); - mClearAction = new TDEAction( i18n("Clear Selection"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotClearSelection()), ac, "search_clear_selection" ); + mPrintAction = KStdAction::print( this, TQ_SLOT(slotPrintMsg()), ac, "search_print" ); + mClearAction = new TDEAction( i18n("Clear Selection"), 0, 0, this, + TQ_SLOT(slotClearSelection()), ac, "search_clear_selection" ); - mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" ); - mCutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(slotCutMsgs()), ac, "search_cut_messages" ); + mCopyAction = KStdAction::copy( this, TQ_SLOT(slotCopyMsgs()), ac, "search_copy_messages" ); + mCutAction = KStdAction::cut( this, TQ_SLOT(slotCutMsgs()), ac, "search_cut_messages" ); - connect(mTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updStatus())); - connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)), - TQT_TQOBJECT(this), TQT_SLOT(folderInvalidated(KMFolder*))); + connect(mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updStatus())); + connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(folderInvalidated(KMFolder*)), + this, TQ_SLOT(folderInvalidated(KMFolder*))); - connect(mCbxFolders, TQT_SIGNAL(folderChanged(KMFolder*)), - TQT_TQOBJECT(this), TQT_SLOT(slotFolderActivated())); + connect(mCbxFolders, TQ_SIGNAL(folderChanged(KMFolder*)), + this, TQ_SLOT(slotFolderActivated())); } @@ -507,18 +507,18 @@ void SearchWindow::slotSearch() mFolder = dynamic_cast<KMFolderSearch*>( folder->storage() ); } mFolder->stopSearch(); - disconnect(mFolder, TQT_SIGNAL(msgAdded(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotAddMsg(int))); - disconnect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), - TQT_TQOBJECT(this), TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32))); - connect(mFolder, TQT_SIGNAL(msgAdded(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotAddMsg(int))); - connect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), - TQT_TQOBJECT(this), TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32))); + disconnect(mFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(slotAddMsg(int))); + disconnect(mFolder, TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32))); + connect(mFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(slotAddMsg(int))); + connect(mFolder, TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32))); mSearchFolderEdt->setEnabled(false); KMSearch *search = new KMSearch(); - connect(search, TQT_SIGNAL(finished(bool)), - TQT_TQOBJECT(this), TQT_SLOT(searchDone())); + connect(search, TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(searchDone())); if (mChkbxAllFolders->isChecked()) { search->setRecursive(true); } else { @@ -543,7 +543,7 @@ void SearchWindow::searchDone() mTimer->stop(); updStatus(); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(enableGUI())); + TQTimer::singleShot(0, this, TQ_SLOT(enableGUI())); if(mLastFocus) mLastFocus->setFocus(); if (mCloseRequested) @@ -623,7 +623,7 @@ void SearchWindow::closeEvent(TQCloseEvent *e) //Cancel search in progress by setting the search folder search to //the null search mFolder->setSearch(new KMSearch()); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotClose())); + TQTimer::singleShot(0, this, TQ_SLOT(slotClose())); } else { KDialogBase::closeEvent(e); } @@ -676,8 +676,8 @@ void SearchWindow::folderInvalidated(KMFolder *folder) if (folder->storage() == mFolder) { mLbxMatches->clear(); if (mFolder->search()) - connect(mFolder->search(), TQT_SIGNAL(finished(bool)), - TQT_TQOBJECT(this), TQT_SLOT(searchDone())); + connect(mFolder->search(), TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(searchDone())); mTimer->start(200); enableGUI(); } @@ -840,10 +840,10 @@ void SearchWindow::slotContextMenuRequested( TQListViewItem *lvi, const TQPoint mMenuToFolder.clear(); TQPopupMenu *msgMoveMenu = new TQPopupMenu(menu); mKMMainWidget->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, - TQT_TQOBJECT(this), &mMenuToFolder, msgMoveMenu ); + this, &mMenuToFolder, msgMoveMenu ); TQPopupMenu *msgCopyMenu = new TQPopupMenu(menu); mKMMainWidget->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, - TQT_TQOBJECT(this), &mMenuToFolder, msgCopyMenu ); + this, &mMenuToFolder, msgCopyMenu ); // show most used actions mReplyAction->plug(menu); diff --git a/kmail/secondarywindow.cpp b/kmail/secondarywindow.cpp index a421209a..cd4a9162 100644 --- a/kmail/secondarywindow.cpp +++ b/kmail/secondarywindow.cpp @@ -45,14 +45,14 @@ namespace KMail { // modal subdialogs will only affect this window, not the other windows setWFlags( getWFlags() | WGroupLeader ); - kapp->ref(); + tdeApp->ref(); } //--------------------------------------------------------------------------- SecondaryWindow::~SecondaryWindow() { - kapp->deref(); + tdeApp->deref(); } diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp index a787e06a..9bd137bb 100644 --- a/kmail/sieveconfig.cpp +++ b/kmail/sieveconfig.cpp @@ -70,7 +70,7 @@ namespace KMail { mManagesieveCheck = new TQCheckBox( i18n("&Server supports Sieve"), this ); glay->addMultiCellWidget( mManagesieveCheck, row, row, 0, 1 ); - connect( mManagesieveCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnableWidgets()) ); + connect( mManagesieveCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnableWidgets()) ); // "reuse host and login config" checkbox: ++row; @@ -79,7 +79,7 @@ namespace KMail { mSameConfigCheck->setEnabled( false ); glay->addMultiCellWidget( mSameConfigCheck, row, row, 0, 1 ); - connect( mSameConfigCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnableWidgets()) ); + connect( mSameConfigCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnableWidgets()) ); // "Managesieve port" spinbox and label: ++row; diff --git a/kmail/sievedebugdialog.cpp b/kmail/sievedebugdialog.cpp index cd3ebdfc..09d7d3fa 100644 --- a/kmail/sievedebugdialog.cpp +++ b/kmail/sievedebugdialog.cpp @@ -206,7 +206,7 @@ SieveDebugDialog::SieveDebugDialog( TQWidget *parent, const char *name ) setInitialSize( TQSize( 640, 480 ) ); if ( !mAccountList.isEmpty() ) - TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextAccount() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextAccount() ) ); } SieveDebugDialog::~SieveDebugDialog() @@ -268,8 +268,8 @@ void SieveDebugDialog::slotDiagNextAccount() mSieveJob = SieveJob::list( mUrl ); - connect( mSieveJob, TQT_SIGNAL( gotList( KMail::SieveJob *, bool, const TQStringList &, const TQString & ) ), - TQT_SLOT( slotGetScriptList( KMail::SieveJob *, bool, const TQStringList &, const TQString & ) ) ); + connect( mSieveJob, TQ_SIGNAL( gotList( KMail::SieveJob *, bool, const TQStringList &, const TQString & ) ), + TQ_SLOT( slotGetScriptList( KMail::SieveJob *, bool, const TQStringList &, const TQString & ) ) ); // Bypass the singleShot timer -- it's fired when we get our data return; @@ -279,7 +279,7 @@ void SieveDebugDialog::slotDiagNextAccount() } // Handle next account async - TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextAccount() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextAccount() ) ); } void SieveDebugDialog::slotDiagNextScript() @@ -288,7 +288,7 @@ void SieveDebugDialog::slotDiagNextScript() { // Continue handling accounts instead mScriptList.clear(); - TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextAccount() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextAccount() ) ); return; } @@ -302,8 +302,8 @@ void SieveDebugDialog::slotDiagNextScript() mSieveJob = SieveJob::get( mUrl ); - connect( mSieveJob, TQT_SIGNAL( gotScript( KMail::SieveJob *, bool, const TQString &, bool ) ), - TQT_SLOT( slotGetScript( KMail::SieveJob *, bool, const TQString &, bool ) ) ); + connect( mSieveJob, TQ_SIGNAL( gotScript( KMail::SieveJob *, bool, const TQString &, bool ) ), + TQ_SLOT( slotGetScript( KMail::SieveJob *, bool, const TQString &, bool ) ) ); } void SieveDebugDialog::slotGetScript( SieveJob * /* job */, bool success, @@ -328,7 +328,7 @@ void SieveDebugDialog::slotGetScript( SieveJob * /* job */, bool success, } // Fetch next script - TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextScript() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextScript() ) ); } void SieveDebugDialog::slotGetScriptList( SieveJob *job, bool success, @@ -367,7 +367,7 @@ void SieveDebugDialog::slotGetScriptList( SieveJob *job, bool success, } // Handle next job: dump scripts for this server - TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextScript() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextScript() ) ); } void SieveDebugDialog::slotDialogOk() diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp index 290e2d71..fc7b92cf 100644 --- a/kmail/sievejob.cpp +++ b/kmail/sievejob.cpp @@ -72,14 +72,14 @@ namespace KMail { case Get: kdDebug(5006) << "SieveJob::schedule: get( " << mUrl.prettyURL() << " )" << endl; mJob = TDEIO::get( mUrl, false /*reload*/, showProgressInfo ); - connect( mJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) ); + connect( mJob, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) ); break; case Put: kdDebug(5006) << "SieveJob::schedule: put( " << mUrl.prettyURL() << " )" << endl; mJob = TDEIO::put( mUrl, 0600, true /*overwrite*/, false /*resume*/, showProgressInfo ); - connect( mJob, TQT_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)), - TQT_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&)) ); + connect( mJob, TQ_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)), + TQ_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&)) ); break; case Activate: kdDebug(5006) << "SieveJob::schedule: chmod( " << mUrl.prettyURL() << ", 0700 )" @@ -102,16 +102,16 @@ namespace KMail { kdDebug(5006) << "SieveJob::schedule: listDir's real URL: " << url.prettyURL() << endl; mJob = TDEIO::listDir( url, showProgressInfo ); - connect( mJob, TQT_SIGNAL(entries(TDEIO::Job*,const TDEIO::UDSEntryList&)), - TQT_SLOT(slotEntries(TDEIO::Job*,const TDEIO::UDSEntryList&)) ); + connect( mJob, TQ_SIGNAL(entries(TDEIO::Job*,const TDEIO::UDSEntryList&)), + TQ_SLOT(slotEntries(TDEIO::Job*,const TDEIO::UDSEntryList&)) ); break; } case List: kdDebug(5006) << "SieveJob::schedule: listDir( " << mUrl.prettyURL() << " )" << endl; { mJob = TDEIO::listDir( mUrl, showProgressInfo ); - connect( mJob, TQT_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList & ) ), - TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) ); + connect( mJob, TQ_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList & ) ), + TQ_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) ); break; } case Delete: @@ -123,7 +123,7 @@ namespace KMail { } mJob->setInteractive(showProgressInfo); // common to all jobs: - connect( mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect( mJob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)) ); } void SieveJob::slotData( Job *, const TQByteArray & data ) { diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp index 209e18c1..4b7faca3 100644 --- a/kmail/signatureconfigurator.cpp +++ b/kmail/signatureconfigurator.cpp @@ -85,19 +85,19 @@ namespace KMail { TQWidgetStack * widgetStack = new TQWidgetStack( this ); widgetStack->setEnabled( false ); // since !mEnableCheck->isChecked() vlay->addWidget( widgetStack, 1 ); - connect( mSourceCombo, TQT_SIGNAL(highlighted(int)), - widgetStack, TQT_SLOT(raiseWidget(int)) ); + connect( mSourceCombo, TQ_SIGNAL(highlighted(int)), + widgetStack, TQ_SLOT(raiseWidget(int)) ); // connects for the enabling of the widgets depending on // signatureEnabled: - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - mSourceCombo, TQT_SLOT(setEnabled(bool)) ); - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - widgetStack, TQT_SLOT(setEnabled(bool)) ); - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + mSourceCombo, TQ_SLOT(setEnabled(bool)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + widgetStack, TQ_SLOT(setEnabled(bool)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); // The focus might be still in the widget that is disabled - connect( mEnableCheck, TQT_SIGNAL(clicked()), - mEnableCheck, TQT_SLOT(setFocus()) ); + connect( mEnableCheck, TQ_SIGNAL(clicked()), + mEnableCheck, TQ_SLOT(setFocus()) ); int pageno = 0; // page 0: input field for direct entering: @@ -126,11 +126,11 @@ namespace KMail { i18n("S&pecify file:"), page ) ); hlay->addWidget( mFileRequester, 1 ); mFileRequester->button()->setAutoDefault( false ); - connect( mFileRequester, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotEnableEditButton(const TQString &)) ); + connect( mFileRequester, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotEnableEditButton(const TQString &)) ); mEditButton = new TQPushButton( i18n("Edit &File"), page ); TQWhatsThis::add(mEditButton, i18n("Opens the specified file in a text editor.")); - connect( mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit()) ); + connect( mEditButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEdit()) ); mEditButton->setAutoDefault( false ); mEditButton->setEnabled( false ); // initially nothing to edit hlay->addWidget( mEditButton ); diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp index c37ea13f..c62b73ae 100644 --- a/kmail/simplestringlisteditor.cpp +++ b/kmail/simplestringlisteditor.cpp @@ -87,8 +87,8 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, mAddButton = new TQPushButton( addLabel, this ); mAddButton->setAutoDefault( false ); vlay->addWidget( mAddButton ); - connect( mAddButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAdd()) ); + connect( mAddButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAdd()) ); } if ( buttons & Remove ) { @@ -99,8 +99,8 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, mRemoveButton->setAutoDefault( false ); mRemoveButton->setEnabled( false ); // no selection yet vlay->addWidget( mRemoveButton ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemove()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemove()) ); } if ( buttons & Modify ) { @@ -111,10 +111,10 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, mModifyButton->setAutoDefault( false ); mModifyButton->setEnabled( false ); // no selection yet vlay->addWidget( mModifyButton ); - connect( mModifyButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotModify()) ); - connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ), - this, TQT_SLOT( slotModify() ) ); + connect( mModifyButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotModify()) ); + connect( mListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ), + this, TQ_SLOT( slotModify() ) ); } if ( buttons & Up ) { @@ -126,8 +126,8 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, mUpButton->setAutoDefault( false ); mUpButton->setEnabled( false ); // no selection yet vlay->addWidget( mUpButton ); - connect( mUpButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotUp()) ); + connect( mUpButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotUp()) ); } if ( buttons & Down ) { @@ -139,14 +139,14 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, mDownButton->setAutoDefault( false ); mDownButton->setEnabled( false ); // no selection yet vlay->addWidget( mDownButton ); - connect( mDownButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDown()) ); + connect( mDownButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDown()) ); } vlay->addStretch( 1 ); // spacer - connect( mListBox, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged()) ); + connect( mListBox, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged()) ); } void SimpleStringListEditor::setStringList( const TQStringList & strings ) { diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp index 60bf689e..7e1df3b7 100644 --- a/kmail/snippetdlg.cpp +++ b/kmail/snippetdlg.cpp @@ -30,7 +30,7 @@ * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ SnippetDlg::SnippetDlg( TDEActionCollection* ac, TQWidget* parent, const char* name, bool modal, WFlags fl ) : SnippetDlgBase( parent, name, modal, fl ), actionCollection( ac ) @@ -40,14 +40,14 @@ SnippetDlg::SnippetDlg( TDEActionCollection* ac, TQWidget* parent, const char* n textLabel3 = new TQLabel( this, "textLabel3" ); keyButton = new KKeyButton( this ); - connect( keyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ), - this, TQT_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) ); + connect( keyButton, TQ_SIGNAL( capturedShortcut( const TDEShortcut& ) ), + this, TQ_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) ); btnAdd->setEnabled( false ); - connect( snippetName, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotTextChanged(const TQString &)) ); - connect( snippetName, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotReturnPressed()) ); + connect( snippetName, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotTextChanged(const TQString &)) ); + connect( snippetName, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotReturnPressed()) ); layout3->addWidget( textLabel3, 7, 0 ); layout3->addWidget( keyButton, 7, 1 ); diff --git a/kmail/snippetdlg.h b/kmail/snippetdlg.h index 3717cc86..8ae34df4 100644 --- a/kmail/snippetdlg.h +++ b/kmail/snippetdlg.h @@ -22,7 +22,7 @@ class SnippetDlg : public SnippetDlgBase public: - SnippetDlg( TDEActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SnippetDlg( TDEActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~SnippetDlg(); void setShowShortcut( bool show ); diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index e16b4884..406632b6 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -49,7 +49,7 @@ SnippetWidget::SnippetWidget(KMEdit* editor, TDEActionCollection* actionCollecti mEditor( editor ), mActionCollection( actionCollection ) { // init the TQPtrList - _list.setAutoDelete(TRUE); + _list.setAutoDelete(true); // init the TDEListView setSorting( -1 ); @@ -62,22 +62,22 @@ SnippetWidget::SnippetWidget(KMEdit* editor, TDEActionCollection* actionCollecti setRootIsDecorated(true); //connect the signals - connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), - this, TQT_SLOT( showPopupMenu(TQListViewItem *, const TQPoint & , int ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), + this, TQ_SLOT( showPopupMenu(TQListViewItem *, const TQPoint & , int ) ) ); - connect( this, TQT_SIGNAL( doubleClicked (TQListViewItem *) ), - this, TQT_SLOT( slotEdit( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( returnPressed (TQListViewItem *) ), - this, TQT_SLOT( slotExecuted( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( doubleClicked (TQListViewItem *) ), + this, TQ_SLOT( slotEdit( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( returnPressed (TQListViewItem *) ), + this, TQ_SLOT( slotExecuted( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( dropped(TQDropEvent *, TQListViewItem *) ), - this, TQT_SLOT( slotDropped(TQDropEvent *, TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( dropped(TQDropEvent *, TQListViewItem *) ), + this, TQ_SLOT( slotDropped(TQDropEvent *, TQListViewItem *) ) ); - connect( editor, TQT_SIGNAL( insertSnippet() ), this, TQT_SLOT( slotExecute() )); + connect( editor, TQ_SIGNAL( insertSnippet() ), this, TQ_SLOT( slotExecute() )); _cfg = 0; - TQTimer::singleShot(0, this, TQT_SLOT(initConfig())); + TQTimer::singleShot(0, this, TQ_SLOT(initConfig())); } SnippetWidget::~SnippetWidget() @@ -149,11 +149,11 @@ SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString normalizedName = TQString(actionName).replace(" ", "_"); if ( !mActionCollection->action(normalizedName.utf8().data() ) ) { TDEAction * action = new TDEAction( actionName, shortcut, item, - TQT_SLOT( slotExecute() ), mActionCollection, + TQ_SLOT( slotExecute() ), mActionCollection, normalizedName.utf8() ); item->setAction(action); - connect( item, TQT_SIGNAL( execute( TQListViewItem* ) ), - this, TQT_SLOT( slotExecuted( TQListViewItem* ) ) ); + connect( item, TQ_SIGNAL( execute( TQListViewItem* ) ), + this, TQ_SLOT( slotExecuted( TQListViewItem* ) ) ); } return item; } @@ -263,7 +263,7 @@ void SnippetWidget::slotEdit( TQListViewItem* item ) pSnippet->resetParent(); } - setSelected(item, TRUE); + setSelected(item, true); } } @@ -286,7 +286,7 @@ void SnippetWidget::slotEditGroup() dlg.snippetName->setText(pGroup->getName()); dlg.snippetText->setText(pGroup->getText()); dlg.btnAdd->setText(i18n("&Apply")); - dlg.snippetText->setEnabled(FALSE); + dlg.snippetText->setEnabled(false); dlg.setCaption(i18n("Edit Group")); dlg.cbGroup->insertItem(i18n("All")); @@ -295,7 +295,7 @@ void SnippetWidget::slotEditGroup() item->setText( 0, dlg.snippetName->text() ); pGroup->setName( dlg.snippetName->text() ); - setSelected(item, TRUE); + setSelected(item, true); } } @@ -542,18 +542,18 @@ void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int if ( item ) { popup.insertTitle( selectedItem->getName() ); if (dynamic_cast<SnippetGroup*>(item)) { - popup.insertItem( i18n("Edit &group..."), this, TQT_SLOT( slotEditGroup() ) ); + popup.insertItem( i18n("Edit &group..."), this, TQ_SLOT( slotEditGroup() ) ); } else { - popup.insertItem( SmallIconSet("edit-paste"), i18n("&Paste"), this, TQT_SLOT( slotExecuted() ) ); - popup.insertItem( SmallIconSet("edit"), i18n("&Edit..."), this, TQT_SLOT( slotEdit() ) ); + popup.insertItem( SmallIconSet("edit-paste"), i18n("&Paste"), this, TQ_SLOT( slotExecuted() ) ); + popup.insertItem( SmallIconSet("edit"), i18n("&Edit..."), this, TQ_SLOT( slotEdit() ) ); } - popup.insertItem( SmallIconSet("edit-delete"), i18n("&Remove"), this, TQT_SLOT( slotRemove() ) ); + popup.insertItem( SmallIconSet("edit-delete"), i18n("&Remove"), this, TQ_SLOT( slotRemove() ) ); popup.insertSeparator(); } else { popup.insertTitle(i18n("Text Snippets")); } - popup.insertItem( i18n("&Add Snippet..."), this, TQT_SLOT( slotAdd() ) ); - popup.insertItem( i18n("Add G&roup..."), this, TQT_SLOT( slotAddGroup() ) ); + popup.insertItem( i18n("&Add Snippet..."), this, TQ_SLOT( slotAdd() ) ); + popup.insertItem( i18n("Add G&roup..."), this, TQ_SLOT( slotAddGroup() ) ); popup.exec(p); } @@ -683,7 +683,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ continue; cb = new TQCheckBox( &dlg, "cbVar" ); - cb->setChecked( FALSE ); + cb->setChecked( false ); cb->setText(it.key()); layoutVar->addWidget( cb, i ,0, TQt::AlignTop ); @@ -691,7 +691,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ layoutVar->addWidget( te, i, 1, TQt::AlignTop ); if ((*mapSave)[it.key()].length() > 0) { - cb->setChecked( TRUE ); + cb->setChecked( true ); te->setText((*mapSave)[it.key()]); } @@ -713,7 +713,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ layoutBtn->addWidget( btn1, 0, 0 ); KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" ); - btn2->setDefault( TRUE ); + btn2->setDefault( true ); btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btn2->sizePolicy().hasHeightForWidth() ) ); layoutBtn->addWidget( btn2, 0, 1 ); @@ -722,8 +722,8 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots - connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) ); - connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) ); + connect(btn1, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(reject()) ); + connect(btn2, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(accept()) ); //prepare to execute the dialog bool bReturn = false; @@ -804,14 +804,14 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri cb = new TQCheckBox( &dlg, "cbVar" ); - cb->setChecked( FALSE ); + cb->setChecked( false ); cb->setText(i18n( "Make value &default" )); te = new KTextEdit( &dlg, "teVar" ); layoutVar->addWidget( te, 0, 1, TQt::AlignTop); layoutVar->addWidget( cb, 1, 1, TQt::AlignTop); if ((*mapSave)[var].length() > 0) { - cb->setChecked( TRUE ); + cb->setChecked( true ); te->setText((*mapSave)[var]); } @@ -826,7 +826,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri layoutBtn->addWidget( btn1, 0, 0 ); KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" ); - btn2->setDefault( TRUE ); + btn2->setDefault( true ); layoutBtn->addWidget( btn2, 0, 1 ); layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); @@ -834,8 +834,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots - connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) ); - connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) ); + connect(btn1, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(reject()) ); + connect(btn2, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(accept()) ); //execute the dialog TQString strReturn = ""; @@ -882,18 +882,18 @@ bool SnippetWidget::acceptDrag (TQDropEvent *event) const if (item && TQString(event->format()).startsWith("text/plain") && static_cast<SnippetWidget *>(event->source()) != this) { - ///kdDebug(5006) << "returning TRUE " << endl; - return TRUE; + ///kdDebug(5006) << "returning true " << endl; + return true; } else if(item && TQString(event->format()).startsWith("x-kmailsnippet") && static_cast<SnippetWidget *>(event->source()) != this) { - //kdDebug(5006) << "returning TRUE " << endl; - return TRUE; + //kdDebug(5006) << "returning true " << endl; + return true; } else { - //kdDebug(5006) << "returning FALSE" << endl; - event->acceptAction(FALSE); - return FALSE; + //kdDebug(5006) << "returning false" << endl; + event->acceptAction(false); + return false; } } diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp index 93f92a79..8687096c 100644 --- a/kmail/subscriptiondialog.cpp +++ b/kmail/subscriptiondialog.cpp @@ -55,14 +55,14 @@ SubscriptionDialogBase::SubscriptionDialogBase( TQWidget *parent, const TQString hideNewOnlyCheckbox(); // ok-button - connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotSave())); + connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotSave())); // reload-list button - connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotLoadFolders())); + connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotLoadFolders())); // get the folders, delayed execution style, otherwise there's bother // with virtuals from ctors and whatnot - TQTimer::singleShot(0, this, TQT_SLOT(slotLoadFolders())); + TQTimer::singleShot(0, this, TQ_SLOT(slotLoadFolders())); } //------------------------------------------------------------------------------ @@ -234,8 +234,8 @@ void SubscriptionDialogBase::slotLoadFolders() { // We'll wait for the connectionResult signal from the account. kdDebug(5006) << "SubscriptionDialog - waiting for connection" << endl; - connect( ai, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( ai, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); return; } // clear the views @@ -286,9 +286,9 @@ void SubscriptionDialogBase::processNext() // kdDebug(5006) << "process " << mCurrentNamespace << ",subscribed=" << mSubscribed << endl; ListJob* job = new ListJob( ai, type, 0, ai->addPathToNamespace( mCurrentNamespace ), completeListing ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotListDirectory(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotListDirectory(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); } @@ -418,7 +418,7 @@ void SubscriptionDialog::processItems() if (done == 1000) { emit listChanged(); - TQTimer::singleShot(0, this, TQT_SLOT(processItems())); + TQTimer::singleShot(0, this, TQ_SLOT(processItems())); return; } ++mCount; diff --git a/kmail/tdehtmlparthtmlwriter.cpp b/kmail/tdehtmlparthtmlwriter.cpp index 2fcf29ba..f75e17bf 100644 --- a/kmail/tdehtmlparthtmlwriter.cpp +++ b/kmail/tdehtmlparthtmlwriter.cpp @@ -52,7 +52,7 @@ namespace KMail { mHtmlPart( part ), mHtmlTimer( 0, "mHtmlTimer" ), mState( Ended ) { assert( part ); - connect( &mHtmlTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotWriteNextHtmlChunk()) ); + connect( &mHtmlTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotWriteNextHtmlChunk()) ); } KHtmlPartHtmlWriter::~KHtmlPartHtmlWriter() { diff --git a/kmail/tdelistboxdialog.cpp b/kmail/tdelistboxdialog.cpp index 89fd0093..d6aabce7 100644 --- a/kmail/tdelistboxdialog.cpp +++ b/kmail/tdelistboxdialog.cpp @@ -39,10 +39,10 @@ TDEListBoxDialog::TDEListBoxDialog( TQString& _selectedString, commentBelowLA->hide(); // signals and slots connections - connect( entriesLB, TQT_SIGNAL( highlighted( const TQString& ) ), - this, TQT_SLOT( highlighted( const TQString& ) ) ); - connect( entriesLB, TQT_SIGNAL( selected(int) ), - TQT_SLOT( slotOk() ) ); + connect( entriesLB, TQ_SIGNAL( highlighted( const TQString& ) ), + this, TQ_SLOT( highlighted( const TQString& ) ) ); + connect( entriesLB, TQ_SIGNAL( selected(int) ), + TQ_SLOT( slotOk() ) ); // buddies labelAboveLA->setBuddy( entriesLB ); } diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp index d2dbd318..0094b13b 100644 --- a/kmail/templateparser.cpp +++ b/kmail/templateparser.cpp @@ -26,7 +26,7 @@ #include <kcalendarsystem.h> #include <kmime_util.h> #include <tdeglobal.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqregexp.h> #include <tqfile.h> #include <tdemessagebox.h> @@ -1125,12 +1125,12 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) proc << KShell::splitArgs( cmd, KShell::TildeExpand ); proc.setUseShell( true ); - connect( &proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( onReceivedStdout( TDEProcess *, char *, int ) ) ); - connect( &proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( onReceivedStderr( TDEProcess *, char *, int ) ) ); - connect( &proc, TQT_SIGNAL( wroteStdin( TDEProcess * ) ), - this, TQT_SLOT( onWroteStdin( TDEProcess * ) ) ); + connect( &proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( onReceivedStdout( TDEProcess *, char *, int ) ) ); + connect( &proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( onReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( &proc, TQ_SIGNAL( wroteStdin( TDEProcess * ) ), + this, TQ_SLOT( onWroteStdin( TDEProcess * ) ) ); if ( proc.start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) { diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp index 1b79c521..3dc2d189 100644 --- a/kmail/templatesconfiguration.cpp +++ b/kmail/templatesconfiguration.cpp @@ -50,19 +50,19 @@ TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *na setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); sizeHint(); - connect( textEdit_new, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( textEdit_reply, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( textEdit_reply_all, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( textEdit_forward, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( lineEdit_quote, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - - connect( mInsertCommand, TQT_SIGNAL( insertCommand(TQString, int) ), - this, TQT_SLOT( slotInsertCommand(TQString, int) ) ); + connect( textEdit_new, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( textEdit_reply, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( textEdit_reply_all, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( textEdit_forward, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( lineEdit_quote, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + + connect( mInsertCommand, TQ_SIGNAL( insertCommand(TQString, int) ), + this, TQ_SLOT( slotInsertCommand(TQString, int) ) ); TQString help; if ( TQString( name ) == "folder-templates" ) { diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp index 2b195c6d..8817711c 100644 --- a/kmail/templatesinsertcommand.cpp +++ b/kmail/templatesinsertcommand.cpp @@ -35,127 +35,127 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent, : TQPushButton( parent, name ) { setText( i18n( "&Insert Command..." ) ); - connect( this, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClicked() ) ); + connect( this, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClicked() ) ); TDEAction *action; TDEActionMenu *menu; - TQSignalMapper *mapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( mapper, TQT_SIGNAL( mapped(int) ), - this, TQT_SLOT( slotMapped(int) ) ); + TQSignalMapper *mapper = new TQSignalMapper( this ); + connect( mapper, TQ_SIGNAL( mapped(int) ), + this, TQ_SLOT( slotMapped(int) ) ); - mMenu = new TDEActionMenu( i18n( "Insert Command..." ), TQT_TQOBJECT(this) ); + mMenu = new TDEActionMenu( i18n( "Insert Command..." ), this ); // ****************************************************** menu = new TDEActionMenu( i18n( "Original Message" ), mMenu ); mMenu->insert( menu ); action = new TDEAction( i18n("Quoted Message"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CQuote ); menu->insert( action ); action = new TDEAction( i18n("Message Text as Is"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CText ); menu->insert( action ); action = new TDEAction( i18n("Message Id"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COMsgId ); menu->insert( action ); action = new TDEAction( i18n("Date"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CODate ); menu->insert( action ); action = new TDEAction( i18n("Date in Short Format"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CODateShort ); menu->insert( action ); action = new TDEAction( i18n("Date in C Locale"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CODateEn ); menu->insert( action ); action = new TDEAction( i18n("Day of Week"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CODow ); menu->insert( action ); action = new TDEAction( i18n("Time"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COTime ); menu->insert( action ); action = new TDEAction( i18n("Time in Long Format"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COTimeLong ); menu->insert( action ); action = new TDEAction( i18n("Time in C Locale"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COTimeLongEn ); menu->insert( action ); action = new TDEAction( i18n("To Field Address"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COToAddr ); menu->insert( action ); action = new TDEAction( i18n("To Field Name"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COToName ); menu->insert( action ); action = new TDEAction( i18n("To Field First Name"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COToFName ); menu->insert( action ); action = new TDEAction( i18n("To Field Last Name"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COToLName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Address" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COCCAddr ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COCCName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field First Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COCCFName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Last Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COCCLName ); menu->insert( action ); action = new TDEAction( i18n( "From Field Address" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COFromAddr ); menu->insert( action ); action = new TDEAction( i18n( "From Field Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COFromName ); menu->insert( action ); action = new TDEAction( i18n( "From Field First Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COFromFName ); menu->insert( action ); action = new TDEAction( i18n( "From Field Last Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COFromLName ); menu->insert( action ); action = new TDEAction( i18n( "Addresses of all original recipients" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COAddresseesAddr ); action = new TDEAction( i18n( "Subject" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COFullSubject ); menu->insert( action ); action = new TDEAction( i18n( "Quoted Headers" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CTQHeaders ); menu->insert( action ); action = new TDEAction( i18n( "Headers as Is" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CHeaders ); menu->insert( action ); action = new TDEAction( i18n( "Header Content" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COHeader ); menu->insert( action ); @@ -164,91 +164,91 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent, mMenu->insert( menu ); action = new TDEAction( i18n( "Message Id" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CMsgId ); menu->insert( action ); action = new TDEAction( i18n( "Date" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDate ); menu->insert( action ); action = new TDEAction( i18n( "Date in Short Format" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDateShort ); menu->insert( action ); action = new TDEAction( i18n( "Date in C Locale" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDateEn ); menu->insert( action ); action = new TDEAction( i18n( "Day of Week" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDow ); menu->insert( action ); action = new TDEAction( i18n( "Time" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CTime ); menu->insert( action ); action = new TDEAction( i18n( "Time in Long Format" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CTimeLong ); menu->insert( action ); action = new TDEAction( i18n( "Time in C Locale" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CTimeLongEn ); menu->insert( action ); action = new TDEAction( i18n( "To Field Address" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CToAddr ); menu->insert( action ); action = new TDEAction( i18n( "To Field Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CToName ); menu->insert( action ); action = new TDEAction( i18n( "To Field First Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CToFName ); menu->insert( action ); action = new TDEAction( i18n( "To Field Last Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CToLName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Address" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CCCAddr ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CCCName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field First Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CCCFName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Last Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CCCLName ); menu->insert( action ); action = new TDEAction( i18n( "From Field Address" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CFromAddr ); menu->insert( action ); action = new TDEAction( i18n( "From Field Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CFromName ); menu->insert( action ); action = new TDEAction( i18n( "From Field First Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CFromFName ); menu->insert( action ); action = new TDEAction( i18n( "From Field Last Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CFromLName ); menu->insert( action ); action = new TDEAction( i18n( "Subject" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CFullSubject ); menu->insert( action ); action = new TDEAction( i18n( "Header Content" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CHeader ); menu->insert( action ); @@ -257,27 +257,27 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent, mMenu->insert( menu ); action = new TDEAction( i18n( "Insert Result of Command" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CSystem ); menu->insert( action ); action = new TDEAction( i18n( "Pipe Original Message Body and Insert Result as Quoted Text" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CQuotePipe ); menu->insert( action ); action = new TDEAction( i18n( "Pipe Original Message Body and Insert Result as Is" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CTextPipe ); menu->insert( action ); action = new TDEAction( i18n( "Pipe Original Message with Headers and Insert Result as Is" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CMsgPipe ); menu->insert( action ); action = new TDEAction( i18n( "Pipe Current Message Body and Insert Result as Is" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CBodyPipe ); menu->insert( action ); action = new TDEAction( i18n( "Pipe Current Message Body and Replace with Result" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CClearPipe ); menu->insert( action ); @@ -286,35 +286,35 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent, mMenu->insert( menu ); action = new TDEAction( i18n( "Set Cursor Position" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CCursor ); menu->insert( action ); action = new TDEAction( i18n( "Insert File Content" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CInsert ); menu->insert( action ); action = new TDEAction( i18n( "DNL" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDnl ); menu->insert( action ); action = new TDEAction( i18n( "Template Comment" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CRem ); menu->insert( action ); action = new TDEAction( i18n( "No Operation" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CNop ); menu->insert( action ); action = new TDEAction( i18n( "Clear Generated Message" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CClear ); menu->insert( action ); action = new TDEAction( i18n( "Turn Debug On" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDebug ); menu->insert( action ); action = new TDEAction( i18n( "Turn Debug Off" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDebugOff ); menu->insert( action ); } diff --git a/kmail/transportmanager.cpp b/kmail/transportmanager.cpp index 7cb9d9ac..cd42388f 100644 --- a/kmail/transportmanager.cpp +++ b/kmail/transportmanager.cpp @@ -59,7 +59,7 @@ namespace KMail { int newId; do { - newId = kapp->random(); + newId = tdeApp->random(); } while ( usedIds.find(newId) != usedIds.end() ); return newId; diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp index 1e23a007..f9b88c82 100644 --- a/kmail/treebase.cpp +++ b/kmail/treebase.cpp @@ -35,10 +35,10 @@ TreeBase::TreeBase( TQWidget *parent, KMFolderTree *folderTree, Q_UNUSED( mustBeReadWrite ); kdDebug(5006) << k_funcinfo << endl; - connect(this, TQT_SIGNAL(collapsed(TQListViewItem*)), TQT_SLOT(recolorRows())); - connect(this, TQT_SIGNAL(expanded(TQListViewItem*)), TQT_SLOT(recolorRows())); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ), - this, TQT_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) ); + connect(this, TQ_SIGNAL(collapsed(TQListViewItem*)), TQ_SLOT(recolorRows())); + connect(this, TQ_SIGNAL(expanded(TQListViewItem*)), TQ_SLOT(recolorRows())); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ), + this, TQ_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) ); } @@ -86,7 +86,7 @@ void TreeBase::slotContextMenuRequested( TQListViewItem *lvi, const TQPoint &p if (!lvi) return; setCurrentItem( lvi ); - setSelected( lvi, TRUE ); + setSelected( lvi, true ); const KMFolder * folder = dynamic_cast<TreeItemBase*>( lvi )->folder(); if ( !folder || folder->noContent() || folder->noChildren() ) @@ -97,7 +97,7 @@ void TreeBase::slotContextMenuRequested( TQListViewItem *lvi, const TQPoint &p folderMenu->insertSeparator(); folderMenu->insertItem(SmallIconSet("folder-new"), i18n("&New Subfolder..."), this, - TQT_SLOT(addChildFolder())); + TQ_SLOT(addChildFolder())); kmkernel->setContextMenuShown( true ); folderMenu->exec (p, 0); kmkernel->setContextMenuShown( false ); diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp index dde2944e..927f6a2e 100644 --- a/kmail/urlhandlermanager.cpp +++ b/kmail/urlhandlermanager.cpp @@ -45,7 +45,7 @@ #include "callback.h" #include "stl_util.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurldrag.h> #include <tdeimproxy.h> #include <kurl.h> @@ -397,7 +397,7 @@ TQString KMail::URLHandlerManager::statusBarMessage( const KURL & url, KMReaderW #include <ui/messagebox.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdemessagebox.h> #include <tdehtml_part.h> diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp index 383daa94..7ad0728c 100644 --- a/kmail/vacation.cpp +++ b/kmail/vacation.cpp @@ -436,8 +436,8 @@ namespace KMail { if ( mUrl.isEmpty() ) // nothing to do... return; mSieveJob = SieveJob::get( mUrl, !checkOnly ); - connect( mSieveJob, TQT_SIGNAL(gotScript(KMail::SieveJob*,bool,const TQString&,bool)), - TQT_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) ); + connect( mSieveJob, TQ_SIGNAL(gotScript(KMail::SieveJob*,bool,const TQString&,bool)), + TQ_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) ); } Vacation::~Vacation() { @@ -645,9 +645,9 @@ namespace KMail { mDialog->setDomainName( domainName ); mDialog->enableDomainAndSendForSpam( !GlobalSettings::allowOutOfOfficeUploadButNoSettings() ); - connect( mDialog, TQT_SIGNAL(okClicked()), TQT_SLOT(slotDialogOk()) ); - connect( mDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotDialogCancel()) ); - connect( mDialog, TQT_SIGNAL(defaultClicked()), TQT_SLOT(slotDialogDefaults()) ); + connect( mDialog, TQ_SIGNAL(okClicked()), TQ_SLOT(slotDialogOk()) ); + connect( mDialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotDialogCancel()) ); + connect( mDialog, TQ_SIGNAL(defaultClicked()), TQ_SLOT(slotDialogDefaults()) ); mDialog->show(); } @@ -690,10 +690,10 @@ namespace KMail { // and commit the dialog's settings to the server: mSieveJob = SieveJob::put( mUrl, script, active, mWasActive ); - connect( mSieveJob, TQT_SIGNAL(gotScript(KMail::SieveJob*,bool,const TQString&,bool)), + connect( mSieveJob, TQ_SIGNAL(gotScript(KMail::SieveJob*,bool,const TQString&,bool)), active - ? TQT_SLOT(slotPutActiveResult(KMail::SieveJob*,bool)) - : TQT_SLOT(slotPutInactiveResult(KMail::SieveJob*,bool)) ); + ? TQ_SLOT(slotPutActiveResult(KMail::SieveJob*,bool)) + : TQ_SLOT(slotPutInactiveResult(KMail::SieveJob*,bool)) ); // destroy the dialog: mDialog->delayedDestruct(); diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp index 6e74ab5b..3b1c4932 100644 --- a/kmail/vacationdialog.cpp +++ b/kmail/vacationdialog.cpp @@ -43,7 +43,7 @@ namespace KMail { const char * name, bool modal ) : KDialogBase( Plain, caption, Ok|Cancel|Default, Ok, parent, name, modal ) { - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() ); static const int rows = 7; int row = -1; @@ -74,7 +74,7 @@ namespace KMail { int defDayInterval = 7; //default day interval mIntervalSpin = new KIntSpinBox( 1, 356, 1, defDayInterval, 10, plainPage(), "mIntervalSpin" ); mIntervalSpin->setSuffix( i18n(" day", " days", defDayInterval) ); - connect(mIntervalSpin, TQT_SIGNAL( valueChanged( int )), TQT_SLOT( slotIntervalSpinChanged( int ) ) ); + connect(mIntervalSpin, TQ_SIGNAL( valueChanged( int )), TQ_SLOT( slotIntervalSpinChanged( int ) ) ); glay->addWidget( new TQLabel( mIntervalSpin, i18n("&Resend notification only after:"), plainPage() ), row, 0 ); glay->addWidget( mIntervalSpin, row, 1 ); @@ -96,11 +96,11 @@ namespace KMail { mDomainCheck->setChecked( false ); mDomainEdit = new TQLineEdit( plainPage(), "mDomainEdit" ); mDomainEdit->setEnabled( false ); - mDomainEdit->setValidator( new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), TQT_TQOBJECT(mDomainEdit) ) ); + mDomainEdit->setValidator( new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), mDomainEdit ) ); glay->addWidget( mDomainCheck, row, 0 ); glay->addWidget( mDomainEdit, row, 1 ); - connect( mDomainCheck, TQT_SIGNAL(toggled(bool)), - mDomainEdit, TQT_SLOT(setEnabled(bool)) ); + connect( mDomainCheck, TQ_SIGNAL(toggled(bool)), + mDomainEdit, TQ_SLOT(setEnabled(bool)) ); Q_ASSERT( row == rows - 1 ); } diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp index 593e86ed..bc77041a 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/kmail/xfaceconfigurator.cpp @@ -126,17 +126,17 @@ namespace KMail { TQWidgetStack * widgetStack = new TQWidgetStack( this ); widgetStack->setEnabled( false ); // since !mEnableCheck->isChecked() vlay->addWidget( widgetStack, 1 ); - connect( mSourceCombo, TQT_SIGNAL(highlighted(int)), - widgetStack, TQT_SLOT(raiseWidget(int)) ); - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - mSourceCombo, TQT_SLOT(setEnabled(bool)) ); - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - widgetStack, TQT_SLOT(setEnabled(bool)) ); - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mSourceCombo, TQ_SIGNAL(highlighted(int)), + widgetStack, TQ_SLOT(raiseWidget(int)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + mSourceCombo, TQ_SLOT(setEnabled(bool)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + widgetStack, TQ_SLOT(setEnabled(bool)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); // The focus might be still in the widget that is disabled - connect( mEnableCheck, TQT_SIGNAL(clicked()), - mEnableCheck, TQT_SLOT(setFocus()) ); + connect( mEnableCheck, TQ_SIGNAL(clicked()), + mEnableCheck, TQ_SLOT(setFocus()) ); int pageno = 0; // page 0: create X-Face from image file or address book entry @@ -151,16 +151,16 @@ namespace KMail { "A light background helps improve the result." ) ); mFromFileBtn->setAutoDefault( false ); page_vlay->addWidget( mFromFileBtn, 1 ); - connect( mFromFileBtn, TQT_SIGNAL(released()), - this, TQT_SLOT(slotSelectFile()) ); + connect( mFromFileBtn, TQ_SIGNAL(released()), + this, TQ_SLOT(slotSelectFile()) ); mFromAddrbkBtn = new TQPushButton( i18n("Set From Address Book"), page ); TQWhatsThis::add( mFromAddrbkBtn, i18n( "You can use a scaled-down version of the picture " "you have set in your address book entry." ) ); mFromAddrbkBtn->setAutoDefault( false ); page_vlay->addWidget( mFromAddrbkBtn, 1 ); - connect( mFromAddrbkBtn, TQT_SIGNAL(released()), - this, TQT_SLOT(slotSelectFromAddressbook()) ); + connect( mFromAddrbkBtn, TQ_SIGNAL(released()), + this, TQ_SLOT(slotSelectFromAddressbook()) ); label1 = new TQLabel( i18n("<qt>KMail can send a small (48x48 pixels), low-quality, " "monochrome picture with every message. " "For example, this could be a picture of you or a glyph. " @@ -185,7 +185,7 @@ namespace KMail { page_vlay->addWidget( label2 ); - connect(mTextEdit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotUpdateXFace())); + connect(mTextEdit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotUpdateXFace())); } XFaceConfigurator::~XFaceConfigurator() { diff --git a/kmailcvt/filter_evolution_v2.cpp b/kmailcvt/filter_evolution_v2.cpp index a4c6203c..e0eb6d31 100644 --- a/kmailcvt/filter_evolution_v2.cpp +++ b/kmailcvt/filter_evolution_v2.cpp @@ -208,7 +208,7 @@ void FilterEvolution_v2::importMBox(FilterInfo *info, const TQString& mboxName, if(!targetDir.isNull()) { if(_targetDir.contains(".sbd")) _targetDir.remove(".sbd"); - destFolder += "Evolution-Import/" + _targetDir + "/" + filenameInfo.baseName(TRUE); // mboxName; + destFolder += "Evolution-Import/" + _targetDir + "/" + filenameInfo.baseName(true); // mboxName; } else { destFolder = "Evolution-Import/" + rootDir; if(destFolder.contains(".sbd")) diff --git a/kmailcvt/filter_kmail_maildir.cpp b/kmailcvt/filter_kmail_maildir.cpp index f24ef7af..df432925 100644 --- a/kmailcvt/filter_kmail_maildir.cpp +++ b/kmailcvt/filter_kmail_maildir.cpp @@ -176,8 +176,8 @@ void FilterKMail_maildir::importFiles( FilterInfo *info, const TQString& dirName if(!generatedPath) { _path = "KMail-Import"; TQString _tmp = dir.filePath(*mailFile); - _tmp = _tmp.remove( mailDir ,TRUE); - TQStringList subFList = TQStringList::split("/",_tmp,FALSE); + _tmp = _tmp.remove( mailDir ,true); + TQStringList subFList = TQStringList::split("/",_tmp,false); for ( TQStringList::Iterator it = subFList.begin(); it != subFList.end(); ++it ) { TQString _cat = *it; if(!(_cat == *mailFile)) { diff --git a/kmailcvt/filter_lnotes.cpp b/kmailcvt/filter_lnotes.cpp index 7733c1c1..7c50f4c1 100644 --- a/kmailcvt/filter_lnotes.cpp +++ b/kmailcvt/filter_lnotes.cpp @@ -95,7 +95,7 @@ void FilterLNotes::ImportLNotes(const TQString& file) { // Get folder name TQFileInfo filenameInfo( file ); - TQString folder("LNotes-Import/" + filenameInfo.baseName(TRUE)); + TQString folder("LNotes-Import/" + filenameInfo.baseName(true)); inf->setTo(folder); // State machine to read the data in. The fgetc usage is probably terribly slow ... diff --git a/kmailcvt/filter_mbox.cpp b/kmailcvt/filter_mbox.cpp index c5f87e51..feb62a51 100644 --- a/kmailcvt/filter_mbox.cpp +++ b/kmailcvt/filter_mbox.cpp @@ -54,7 +54,7 @@ void FilterMBox::import(FilterInfo *info) info->alert( i18n("Unable to open %1, skipping").arg( *filename ) ); } else { TQFileInfo filenameInfo( *filename ); - TQString folderName( "MBOX-" + filenameInfo.baseName(TRUE) ); + TQString folderName( "MBOX-" + filenameInfo.baseName(true) ); info->setCurrent(0); info->addLog( i18n("Importing emails from %1...").arg( *filename ) ); diff --git a/kmailcvt/filter_oe.cpp b/kmailcvt/filter_oe.cpp index 47002d96..476b09d2 100644 --- a/kmailcvt/filter_oe.cpp +++ b/kmailcvt/filter_oe.cpp @@ -126,7 +126,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) TQ_UINT32 sig_block1, sig_block2; mailbox >> sig_block1 >> sig_block2; if (sig_block1 == OE4_SIG_1 && sig_block2 == OE4_SIG_2) { - folderName = "OE-Import/" + mailfileinfo.baseName(TRUE); + folderName = "OE-Import/" + mailfileinfo.baseName(true); info->addLog(i18n("Importing OE4 Mailbox %1").arg( "../" + _nameOfFile)); info->setTo(folderName); mbxImport(info, mailbox); @@ -136,7 +136,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) mailbox >> sig_block3 >> sig_block4; if (sig_block1 == OE5_SIG_1 && sig_block3 == OE5_SIG_3 && sig_block4 == OE5_SIG_4) { if (sig_block2 == OE5_EMAIL_SIG_2) { - folderName = "OE-Import/" + mailfileinfo.baseName(TRUE); + folderName = "OE-Import/" + mailfileinfo.baseName(true); if(parsedFolder) { TQString _tmpFolder = getFolderName(_nameOfFile); if(!_tmpFolder.isEmpty()) folderName = "OE-Import/" + _tmpFolder; diff --git a/kmailcvt/filter_sylpheed.cpp b/kmailcvt/filter_sylpheed.cpp index bf8427c2..9d8570e3 100644 --- a/kmailcvt/filter_sylpheed.cpp +++ b/kmailcvt/filter_sylpheed.cpp @@ -135,7 +135,7 @@ void FilterSylpheed::importFiles( FilterInfo *info, const TQString& dirName) _path = "Sylpheed-Import/"; TQString _tmp = dir.filePath(*mailFile); _tmp = _tmp.remove(_tmp.length() - _mfile.length() -1, _mfile.length()+1); - _path += _tmp.remove( mailDir ,TRUE); + _path += _tmp.remove( mailDir ,true); TQString _info = _path; info->addLog(i18n("Import folder %1...").arg(_info.remove(0,15))); diff --git a/kmailcvt/filter_thebat.cpp b/kmailcvt/filter_thebat.cpp index a255f352..6a9642a1 100644 --- a/kmailcvt/filter_thebat.cpp +++ b/kmailcvt/filter_thebat.cpp @@ -194,7 +194,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) TQString _path = "TheBat-Import/"; TQString _tmp = FileName; _tmp = _tmp.remove(_tmp.length() - 13, 13); - _path += _tmp.remove( mailDir ,TRUE); + _path += _tmp.remove( mailDir ,true); TQString _info = _path; info->addLog(i18n("Import folder %1...").arg(_info.remove(0,14))); info->setTo(_path); diff --git a/kmailcvt/filter_thunderbird.cpp b/kmailcvt/filter_thunderbird.cpp index e5f21d14..69aacca4 100644 --- a/kmailcvt/filter_thunderbird.cpp +++ b/kmailcvt/filter_thunderbird.cpp @@ -209,7 +209,7 @@ void FilterThunderbird::importMBox(FilterInfo *info, const TQString& mboxName, c if(!targetDir.isNull()) { if(_targetDir.contains(".sbd")) _targetDir.remove(".sbd"); - destFolder += "Thunderbird-Import/" + _targetDir + "/" + filenameInfo.baseName(TRUE);// mboxName; + destFolder += "Thunderbird-Import/" + _targetDir + "/" + filenameInfo.baseName(true);// mboxName; } else { destFolder = "Thunderbird-Import/" + rootDir; if(destFolder.contains(".sbd")) diff --git a/kmailcvt/filters.cpp b/kmailcvt/filters.cpp index 2c43ff43..0b5c9937 100644 --- a/kmailcvt/filters.cpp +++ b/kmailcvt/filters.cpp @@ -65,13 +65,13 @@ void FilterInfo::setTo( const TQString& to ) void FilterInfo::setCurrent( const TQString& current ) { m_dlg->_current->setText( current ); - kapp->processEvents(); + tdeApp->processEvents(); } void FilterInfo::setCurrent( int percent ) { m_dlg->_done_current->setProgress( percent ); - kapp->processEvents(); // Be careful - back & finish buttons disabled, so only user event that can happen is cancel/close button + tdeApp->processEvents(); // Be careful - back & finish buttons disabled, so only user event that can happen is cancel/close button } void FilterInfo::setOverall( int percent ) @@ -84,7 +84,7 @@ void FilterInfo::addLog( const TQString& log ) m_dlg->_log->insertItem( log ); m_dlg->_log->setCurrentItem( m_dlg->_log->count() - 1 ); m_dlg->_log->centerCurrentItem(); - kapp->processEvents(); + tdeApp->processEvents(); } void FilterInfo::clear() @@ -135,7 +135,7 @@ bool Filter::addMessage( FilterInfo* info, const TQString& folderName, KURL msgURL; msgURL.setPath( msgPath ); - if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) ) + if ( !tdeApp->dcopClient()->isApplicationRegistered( "kmail" ) ) TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage", folderName, msgURL, msgStatusFlags ); @@ -171,7 +171,7 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName KURL msgURL; msgURL.setPath( msgPath ); - if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) ) + if ( !tdeApp->dcopClient()->isApplicationRegistered( "kmail" ) ) TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage_fastImport", folderName, msgURL, msgStatusFlags ); @@ -199,7 +199,7 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName void Filter::showKMailImportArchiveDialog( FilterInfo* info ) { - if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) ) + if ( !tdeApp->dcopClient()->isApplicationRegistered( "kmail" ) ) TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "showImportArchiveDialog" ); diff --git a/kmailcvt/kimportpage.cpp b/kmailcvt/kimportpage.cpp index 90da2e9c..bc6d784d 100644 --- a/kmailcvt/kimportpage.cpp +++ b/kmailcvt/kimportpage.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqlabel.h> #include "kimportpage.h" diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp index 39ba423e..6ae6982d 100644 --- a/kmailcvt/kmailcvt.cpp +++ b/kmailcvt/kmailcvt.cpp @@ -40,7 +40,7 @@ KMailCVT::~KMailCVT() { } void KMailCVT::endImport() { - if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) ) + if ( !tdeApp->dcopClient()->isApplicationRegistered( "kmail" ) ) TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage", TQString(), TQString(), TQString()); diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp index 118124f7..f121ff77 100644 --- a/kmailcvt/kselfilterpage.cpp +++ b/kmailcvt/kselfilterpage.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqtextedit.h> #include <tqcheckbox.h> #include <tdelocale.h> @@ -42,8 +42,8 @@ KSelFilterPage::KSelFilterPage(TQWidget *parent, const char *name ) : KSelFilterPageDlg(parent,name) { mIntroSidebar->setPixmap(locate("data", "kmailcvt/pics/step1.png")); - mFilterList.setAutoDelete( TRUE ); - connect(mFilterCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(filterSelected(int))); + mFilterList.setAutoDelete( true ); + connect(mFilterCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(filterSelected(int))); // Add new filters below. If this annoys you, please rewrite the stuff to use a factory. // The former approach was overengineered and only worked around problems in the design diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp index ceadf241..68b085c1 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.cpp +++ b/kmobile/devices/gnokii/gnokii_mobile.cpp @@ -27,7 +27,7 @@ #include <klibloader.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdeio/global.h> #include <kdebug.h> diff --git a/kmobile/devices/gnokii/gnokiiconfig.cpp b/kmobile/devices/gnokii/gnokiiconfig.cpp index 07bc46f4..4be8fb36 100644 --- a/kmobile/devices/gnokii/gnokiiconfig.cpp +++ b/kmobile/devices/gnokii/gnokiiconfig.cpp @@ -72,7 +72,7 @@ void GnokiiConfig::setValues(const TQString &model, const TQString &connection, slotCheckValues(); - connect( cb_Connection, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckValues(const TQString &)) ); + connect( cb_Connection, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckValues(const TQString &)) ); } void GnokiiConfig::getValues(TQString &model, TQString &connection, TQString &port, TQString &baud) const diff --git a/kmobile/devices/gnokii/gnokiiconfig.h b/kmobile/devices/gnokii/gnokiiconfig.h index a3f3b04b..be76188b 100644 --- a/kmobile/devices/gnokii/gnokiiconfig.h +++ b/kmobile/devices/gnokii/gnokiiconfig.h @@ -28,7 +28,7 @@ class GnokiiConfig : public GnokiiConfigUI TQ_OBJECT public: - GnokiiConfig( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + GnokiiConfig( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~GnokiiConfig(); void setValues(const TQString &model, const TQString &connection, const TQString &port, const TQString &baud); diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp index 1b70016f..f0744aef 100644 --- a/kmobile/devices/skeleton/skeleton.cpp +++ b/kmobile/devices/skeleton/skeleton.cpp @@ -21,7 +21,7 @@ #include <tqstringlist.h> #include <klibloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdeio/global.h> diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp index 379a17cd..3e41e6dd 100644 --- a/kmobile/kmobile.cpp +++ b/kmobile/kmobile.cpp @@ -42,7 +42,7 @@ #include <kpushbutton.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "kmobile.h" #include "pref.h" @@ -74,8 +74,8 @@ KMobile::KMobile() setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); // restore all configured devices restoreAll(); @@ -83,7 +83,7 @@ KMobile::KMobile() // setup the system tray m_systemTray = new SystemTray(this, "systemTray"); m_systemTray->show(); - connect(m_systemTray, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotQuit())); + connect(m_systemTray, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotQuit())); } KMobile::~KMobile() @@ -93,29 +93,29 @@ KMobile::~KMobile() void KMobile::setupActions() { - KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(dockApplication()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::close(this, TQ_SLOT(dockApplication()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); optionsShowToolbar(); - m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); new TDEAction(i18n("&Add Device..."), "folder-new", 0, - TQT_TQOBJECT(this), TQT_SLOT(addDevice()), actionCollection(), "device_add"); + this, TQ_SLOT(addDevice()), actionCollection(), "device_add"); new TDEAction( KGuiItem( i18n("&Remove Device"), "edittrash", i18n("Remove this device") ), - "Delete", TQT_TQOBJECT(this), TQT_SLOT(removeDevice()), actionCollection(), "device_remove"); + "Delete", this, TQ_SLOT(removeDevice()), actionCollection(), "device_remove"); new TDEAction(i18n("Re&name Device..."), 0, Key_F2, - TQT_TQOBJECT(this), TQT_SLOT(renameDevice()), actionCollection(), "device_rename"); + this, TQ_SLOT(renameDevice()), actionCollection(), "device_rename"); new TDEAction(i18n("&Configure Device..."), "configure", 0, - TQT_TQOBJECT(this), TQT_SLOT(configDevice()), actionCollection(), "device_configure"); + this, TQ_SLOT(configDevice()), actionCollection(), "device_configure"); createGUI(); - connect( kapp, TQT_SIGNAL(aboutToQuit()), TQT_TQOBJECT(this), TQT_SLOT(saveAll()) ); + connect( tdeApp, TQ_SIGNAL(aboutToQuit()), this, TQ_SLOT(saveAll()) ); } @@ -139,7 +139,7 @@ bool KMobile::queryExit() void KMobile::slotQuit() { - kapp->quit(); + tdeApp->quit(); } void KMobile::showMinimized() @@ -261,11 +261,11 @@ void KMobile::addDevice() dialog->helpText->setText( i18n("Please select the category to which your new device belongs:") ); dialog->addButton->setText( i18n("&Scan for New Devices...") ); dialog->addButton->setDisabled(true); - dialog->iconView->connect( dialog->iconView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)), - dialog, TQT_SLOT(accept()) ); + dialog->iconView->connect( dialog->iconView, TQ_SIGNAL(doubleClicked(TQIconViewItem*)), + dialog, TQ_SLOT(accept()) ); dialog->selectButton->setText( i18n("&Add") ); - dialog->selectButton->connect( dialog->selectButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(accept()) ); - dialog->cancelButton->connect( dialog->cancelButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(reject()) ); + dialog->selectButton->connect( dialog->selectButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(accept()) ); + dialog->cancelButton->connect( dialog->cancelButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(reject()) ); TDETrader::OfferList list = KMobileItem::getMobileDevicesList(); TDETrader::OfferListIterator it; @@ -304,7 +304,7 @@ void KMobile::addDevice() "Please use the Skeleton- or Gnokii Device Driver during development.<p>" "This driver will still be visible, but you won't be able to access it " "from Konqueror or any other application.</qt>").arg(ptr->name()), - kapp->name()); + tdeApp->name()); } saveAll(); @@ -344,11 +344,11 @@ KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent, if (!dialog) return 0L; - dialog->addButton->connect( dialog->addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddDevice()) ); - dialog->iconView->connect( dialog->iconView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)), - dialog, TQT_SLOT(accept()) ); - dialog->selectButton->connect( dialog->selectButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(accept()) ); - dialog->cancelButton->connect( dialog->cancelButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(reject()) ); + dialog->addButton->connect( dialog->addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddDevice()) ); + dialog->iconView->connect( dialog->iconView, TQ_SIGNAL(doubleClicked(TQIconViewItem*)), + dialog, TQ_SLOT(accept()) ); + dialog->selectButton->connect( dialog->selectButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(accept()) ); + dialog->cancelButton->connect( dialog->cancelButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(reject()) ); for (int i=0; i<countDevices(); i++) { KService::Ptr ptr; diff --git a/kmobile/kmobileclient.h b/kmobile/kmobileclient.h index bdb5b19a..c52bf936 100644 --- a/kmobile/kmobileclient.h +++ b/kmobile/kmobileclient.h @@ -6,9 +6,9 @@ #define _KMOBILECLIENT_H_ #include <dcopclient.h> -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT KMobileClient : public DCOPClient +class TDE_EXPORT KMobileClient : public DCOPClient { TQ_OBJECT diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp index 72394647..4fb07c86 100644 --- a/kmobile/kmobiledevice.cpp +++ b/kmobile/kmobiledevice.cpp @@ -31,7 +31,7 @@ #include <tqfile.h> #include <klibloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "kmobiledevice.h" #include <tdemessagebox.h> #include <tdeconfig.h> diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h index 6647ab73..00c43ee9 100644 --- a/kmobile/kmobiledevice.h +++ b/kmobile/kmobiledevice.h @@ -24,7 +24,7 @@ #include <tqstringlist.h> #include <tqmutex.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <klibloader.h> #include <tdeabc/addressee.h> @@ -62,7 +62,7 @@ class TDEConfig; * @author Helge Deller <deller@kde.org> */ -class KDE_EXPORT KMobileDevice : public KLibFactory +class TDE_EXPORT KMobileDevice : public KLibFactory { TQ_OBJECT @@ -381,7 +381,7 @@ signals: * * @param info See @ref AuthInfo. * @param errorMsg Error message to show - * @return @p TRUE if user clicks on "OK", @p FALSE otherwsie. + * @return @p true if user clicks on "OK", @p false otherwsie. * @since 3.1 */ bool openPassDlg( TDEIO::AuthInfo& info, const TQString &errorMsg ); diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp index 87f691d9..6bd5b883 100644 --- a/kmobile/kmobileview.cpp +++ b/kmobile/kmobileview.cpp @@ -24,7 +24,7 @@ #include <klibloader.h> #include <tdelocale.h> #include <tdeabc/vcardconverter.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <tdeconfig.h> @@ -39,8 +39,8 @@ KMobileView::KMobileView(TQWidget *parent, TDEConfig *_config) setSelectionMode(TQIconView::Single); setResizeMode(TQIconView::Adjust); setAutoArrange(true); - connect(this, TQT_SIGNAL(doubleClicked(TQIconViewItem *)), - TQT_SLOT(slotDoubleClicked(TQIconViewItem *))); + connect(this, TQ_SIGNAL(doubleClicked(TQIconViewItem *)), + TQ_SLOT(slotDoubleClicked(TQIconViewItem *))); } KMobileView::~KMobileView() diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h index d8862b85..a0cfebff 100644 --- a/kmobile/kmobileview.h +++ b/kmobile/kmobileview.h @@ -9,7 +9,7 @@ #include "kmobileiface.h" -#include <kdemacros.h> +#include <tdemacros.h> class TDEConfig; class KMobileItem; @@ -20,7 +20,7 @@ class KMobileItem; * @author Helge Deller <deller@kde.org> * @version 0.1 */ -class KDE_EXPORT KMobileView : public TQIconView, public kmobileIface +class TDE_EXPORT KMobileView : public TQIconView, public kmobileIface { TQ_OBJECT diff --git a/kmobile/main.cpp b/kmobile/main.cpp index 6fe97df3..c1e9cae9 100644 --- a/kmobile/main.cpp +++ b/kmobile/main.cpp @@ -18,7 +18,7 @@ */ #include "kmobile.h" -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <dcopclient.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> @@ -42,7 +42,7 @@ int main(int argc, char **argv) about.addAuthor( "Helge Deller", 0, "deller@kde.org" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); - KUniqueApplication app; + TDEUniqueApplication app; // register ourselves as a dcop client app.dcopClient()->registerAs(app.name(), false); diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp index f3e8b8a2..020aec1c 100644 --- a/kmobile/systemtray.cpp +++ b/kmobile/systemtray.cpp @@ -60,7 +60,7 @@ SystemTray::~SystemTray() void SystemTray::contextMenuAboutToShow(TDEPopupMenu *menu) { - KMobile *main = static_cast<KMobile *>(TQT_TQWIDGET(parent())); + KMobile *main = static_cast<KMobile *>(parent()); const int pos = 3; while (menu->idAt(pos)>=SYSTEMTRAY_STARTID && @@ -74,9 +74,9 @@ void SystemTray::contextMenuAboutToShow(TDEPopupMenu *menu) TQString iconName = main->mainView()->iconFileName(devName); TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon(iconName, TDEIcon::Small); menu->insertItem(pm, devName, SYSTEMTRAY_STARTID+no, 3+no); - menu->connectItem(SYSTEMTRAY_STARTID+no, this, TQT_SLOT(menuItemSelected())); + menu->connectItem(SYSTEMTRAY_STARTID+no, this, TQ_SLOT(menuItemSelected())); } - connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int))); + connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuItemActivated(int))); } void SystemTray::menuItemSelected() @@ -84,7 +84,7 @@ void SystemTray::menuItemSelected() if (m_menuID<SYSTEMTRAY_STARTID || m_menuID>SYSTEMTRAY_STARTID+1000) return; TQString devName = contextMenu()->text(m_menuID); - KMobile *main = static_cast<KMobile *>(TQT_TQWIDGET(parent())); + KMobile *main = static_cast<KMobile *>(parent()); main->mainView()->startKonqueror(devName); } diff --git a/kmobile/tdeioslave/tdeio_mobile.cpp b/kmobile/tdeioslave/tdeio_mobile.cpp index 7b254410..de946d4c 100644 --- a/kmobile/tdeioslave/tdeio_mobile.cpp +++ b/kmobile/tdeioslave/tdeio_mobile.cpp @@ -28,19 +28,19 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeabc/vcardconverter.h> #include "tdeio_mobile.h" -#include <kdemacros.h> +#include <tdemacros.h> using namespace TDEIO; #define TDEIO_MOBILE_DEBUG_AREA 7126 #define PRINT_DEBUG kdDebug(TDEIO_MOBILE_DEBUG_AREA) << "tdeio_mobile: " -extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } +extern "C" { TDE_EXPORT int kdemain(int argc, char **argv); } /** * The main program. diff --git a/knode/CMakeLists.txt b/knode/CMakeLists.txt index a21deffb..ae3c46c9 100644 --- a/knode/CMakeLists.txt +++ b/knode/CMakeLists.txt @@ -84,7 +84,7 @@ tde_add_library( knodecommon SHARED AUTOMOC kncollectionview.cpp articlewidget.cpp csshelper.cpp smtpaccountwidget_base.ui VERSION 3.0.0 - LINK emailfunctions-static tdepim-shared kpgp-shared tdehtml-shared + LINK tdecore-shared tdepim-shared kpgp-shared tdehtml-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/knode/aboutdata.h b/knode/aboutdata.h index 50faa6dc..013c23e2 100644 --- a/knode/aboutdata.h +++ b/knode/aboutdata.h @@ -15,14 +15,14 @@ */ #include <tdeaboutdata.h> -#include <kdemacros.h> +#include <tdemacros.h> #ifndef KNODE_ABOUTDATA_H #define KNODE_ABOUTDATA_H namespace KNode { - class KDE_EXPORT AboutData : public TDEAboutData + class TDE_EXPORT AboutData : public TDEAboutData { public: AboutData(); diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index 852707ff..60ac8e9a 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -40,12 +40,12 @@ #include <tdemessagebox.h> #include <kmimetype.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <kurl.h> +#include <tdeglobal.h> #include <libemailfunctions/email.h> -#include <libemailfunctions/kasciistringtools.h> #include <libkpgp/kpgp.h> #include <libkpgp/kpgpblock.h> @@ -105,13 +105,13 @@ ArticleWidget::ArticleWidget( TQWidget *parent, mViewer->setMetaRefreshEnabled( false ); mViewer->setOnlyLocalReferences( true ); mViewer->view()->setFocusPolicy( TQWidget::WheelFocus ); - connect( mViewer->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), - TQT_SLOT(slotURLClicked(const KURL&)) ); - connect( mViewer, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), - TQT_SLOT(slotURLPopup(const TQString&, const TQPoint&)) ); + connect( mViewer->browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), + TQ_SLOT(slotURLClicked(const KURL&)) ); + connect( mViewer, TQ_SIGNAL(popupMenu(const TQString&, const TQPoint&)), + TQ_SLOT(slotURLPopup(const TQString&, const TQPoint&)) ); mTimer = new TQTimer( this ); - connect( mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); + connect( mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) ); initActions(); readConfig(); @@ -134,58 +134,58 @@ ArticleWidget::~ArticleWidget() void ArticleWidget::initActions() { - mSaveAction = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT(slotSave()), mActionCollection ); + mSaveAction = KStdAction::save( this, TQ_SLOT(slotSave()), mActionCollection ); mSaveAction->setText( KStdGuiItem::saveAs().text() ); - mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), mActionCollection ); - mCopySelectionAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelection()), mActionCollection ); - mSelectAllAction = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), mActionCollection ); - mFindAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotFind()), mActionCollection, "find_in_article" ); + mPrintAction = KStdAction::print( this, TQ_SLOT(slotPrint()), mActionCollection ); + mCopySelectionAction = KStdAction::copy( this, TQ_SLOT(slotCopySelection()), mActionCollection ); + mSelectAllAction = KStdAction::selectAll( this, TQ_SLOT(slotSelectAll()), mActionCollection ); + mFindAction = KStdAction::find( this, TQ_SLOT(slotFind()), mActionCollection, "find_in_article" ); mFindAction->setText( i18n("F&ind in Article...") ); - mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V , TQT_TQOBJECT(this), - TQT_SLOT(slotViewSource()), mActionCollection, "article_viewSource" ); + mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V , this, + TQ_SLOT(slotViewSource()), mActionCollection, "article_viewSource" ); mReplyAction = new TDEAction( i18n("&Followup to Newsgroup..."), "message_reply", - Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotReply()), mActionCollection, "article_postReply" ); + Key_R, this, TQ_SLOT(slotReply()), mActionCollection, "article_postReply" ); mRemailAction = new TDEAction( i18n("Reply by E&mail..."), "mail-reply-sender", - Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotRemail()), mActionCollection, "article_mailReply" ); + Key_A, this, TQ_SLOT(slotRemail()), mActionCollection, "article_mailReply" ); mForwardAction = new TDEAction( i18n("Forw&ard by Email..."), "mail-forward", - Key_F, TQT_TQOBJECT(this), TQT_SLOT(slotForward()), mActionCollection, "article_forward" ); + Key_F, this, TQ_SLOT(slotForward()), mActionCollection, "article_forward" ); mCancelAction = new TDEAction( i18n("article","&Cancel Article"), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotCancel()), mActionCollection, "article_cancel" ); + 0, this, TQ_SLOT(slotCancel()), mActionCollection, "article_cancel" ); mSupersedeAction = new TDEAction(i18n("S&upersede Article"), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSupersede()), mActionCollection, "article_supersede" ); + 0, this, TQ_SLOT(slotSupersede()), mActionCollection, "article_supersede" ); mFixedFontToggle = new TDEToggleAction( i18n("U&se Fixed Font"), - Key_X ,TQT_TQOBJECT(this), TQT_SLOT(slotToggleFixedFont()), mActionCollection, "view_useFixedFont" ); + Key_X ,this, TQ_SLOT(slotToggleFixedFont()), mActionCollection, "view_useFixedFont" ); mFancyToggle = new TDEToggleAction( i18n("Fancy Formating"), - Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFancyFormating()), mActionCollection, "view_fancyFormating" ); - mRot13Toggle = new TDEToggleAction( i18n("&Unscramble (Rot 13)"), "decrypted", 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotToggleRot13()), mActionCollection, "view_rot13" ); + Key_Y, this, TQ_SLOT(slotToggleFancyFormating()), mActionCollection, "view_fancyFormating" ); + mRot13Toggle = new TDEToggleAction( i18n("&Unscramble (Rot 13)"), "decrypted", 0 , this, + TQ_SLOT(slotToggleRot13()), mActionCollection, "view_rot13" ); mRot13Toggle->setChecked( false ); TDERadioAction *ra; mHeaderStyleMenu = new TDEActionMenu( i18n("&Headers"), mActionCollection, "view_headers" ); - ra = new TDERadioAction( i18n("&Fancy Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFancyHeaders()), + ra = new TDERadioAction( i18n("&Fancy Headers"), 0, this, TQ_SLOT(slotFancyHeaders()), mActionCollection, "view_headers_fancy" ); ra->setExclusiveGroup( "view_headers" ); mHeaderStyleMenu->insert( ra ); - ra = new TDERadioAction( i18n("&Standard Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotStandardHeaders()), + ra = new TDERadioAction( i18n("&Standard Headers"), 0, this, TQ_SLOT(slotStandardHeaders()), mActionCollection, "view_headers_standard" ); ra->setExclusiveGroup( "view_headers" ); mHeaderStyleMenu->insert( ra ); - ra = new TDERadioAction( i18n("&All Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAllHeaders()), + ra = new TDERadioAction( i18n("&All Headers"), 0, this, TQ_SLOT(slotAllHeaders()), mActionCollection, "view_headers_all" ); ra->setExclusiveGroup( "view_headers" ); mHeaderStyleMenu->insert( ra ); mAttachmentStyleMenu = new TDEActionMenu( i18n("&Attachments"), mActionCollection, "view_attachments" ); - ra = new TDERadioAction( i18n("&As Icon"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotIconAttachments()), + ra = new TDERadioAction( i18n("&As Icon"), 0, this, TQ_SLOT(slotIconAttachments()), mActionCollection, "view_attachments_icon" ); ra->setExclusiveGroup( "view_attachments" ); mAttachmentStyleMenu->insert( ra ); - ra = new TDERadioAction( i18n("&Inline"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInlineAttachments()), + ra = new TDERadioAction( i18n("&Inline"), 0, this, TQ_SLOT(slotInlineAttachments()), mActionCollection, "view_attachments_inline" ); ra->setExclusiveGroup( "view_attachments" ); mAttachmentStyleMenu->insert( ra ); - ra = new TDERadioAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHideAttachments()), + ra = new TDERadioAction( i18n("&Hide"), 0, this, TQ_SLOT(slotHideAttachments()), mActionCollection, "view_attachments_hide" ); ra->setExclusiveGroup( "view_attachments" ); mAttachmentStyleMenu->insert( ra ); @@ -196,23 +196,23 @@ void ArticleWidget::initActions() cs.prepend( i18n("Automatic") ); mCharsetSelect->setItems( cs ); mCharsetSelect->setCurrentItem( 0 ); - connect( mCharsetSelect, TQT_SIGNAL(activated(const TQString&)),TQT_SLOT(slotSetCharset(const TQString&)) ); - mCharsetSelectKeyb = new TDEAction( i18n("Charset"), Key_C, TQT_TQOBJECT(this), - TQT_SLOT(slotSetCharsetKeyboard()), mActionCollection, "set_charset_keyboard" ); + connect( mCharsetSelect, TQ_SIGNAL(activated(const TQString&)),TQ_SLOT(slotSetCharset(const TQString&)) ); + mCharsetSelectKeyb = new TDEAction( i18n("Charset"), Key_C, this, + TQ_SLOT(slotSetCharsetKeyboard()), mActionCollection, "set_charset_keyboard" ); - new TDEAction( i18n("&Open URL"), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenURL()), + new TDEAction( i18n("&Open URL"), "document-open", 0, this, TQ_SLOT(slotOpenURL()), mActionCollection, "open_url" ); - new TDEAction( i18n("&Copy Link Address"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL()), + new TDEAction( i18n("&Copy Link Address"), "edit-copy", 0, this, TQ_SLOT( slotCopyURL()), mActionCollection, "copy_url" ); - new TDEAction( i18n("&Bookmark This Link"), "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmark()), + new TDEAction( i18n("&Bookmark This Link"), "bookmark_add", 0, this, TQ_SLOT(slotAddBookmark()), mActionCollection, "add_bookmark" ); - new TDEAction( i18n("&Add to Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddToAddressBook()), + new TDEAction( i18n("&Add to Address Book"), 0, this, TQ_SLOT(slotAddToAddressBook()), mActionCollection, "add_addr_book" ); - new TDEAction( i18n("&Open in Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInAddressBook()), + new TDEAction( i18n("&Open in Address Book"), 0, this, TQ_SLOT(slotOpenInAddressBook()), mActionCollection, "openin_addr_book" ); - new TDEAction( i18n("&Open Attachment"), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenAttachment()), + new TDEAction( i18n("&Open Attachment"), "document-open", 0, this, TQ_SLOT(slotOpenAttachment()), mActionCollection, "open_attachment" ); - new TDEAction( i18n("&Save Attachment As..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachment()), + new TDEAction( i18n("&Save Attachment As..."), "document-save-as", 0, this, TQ_SLOT(slotSaveAttachment()), mActionCollection, "save_attachment" ); } @@ -881,7 +881,7 @@ void ArticleWidget::displayAttachment( KMime::Content *att, int partNum ) } } else { // icon TQCString mimetype = ct->mimeType(); - KPIM::kAsciiToLower( mimetype.data() ); + kasciitolower( mimetype.data() ); TQString iconName = KMimeType::mimeType( mimetype )->icon( TQString(), false ); TQString iconFile = TDEGlobal::instance()->iconLoader()->iconPath( iconName, TDEIcon::Desktop ); html += "<div><a href=\"" + href + "\"><img src=\"" + @@ -1228,7 +1228,7 @@ void ArticleWidget::slotPrint( ) void ArticleWidget::slotCopySelection( ) { - kapp->clipboard()->setText( mViewer->selectedText() ); + tdeApp->clipboard()->setText( mViewer->selectedText() ); } diff --git a/knode/headerview.cpp b/knode/headerview.cpp index d30cc5a3..cae8da28 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -65,9 +65,9 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) : setColumnAlignment( mPaintInfo.scoreCol, TQt::AlignRight ); // due to our own column text squeezing we need to repaint on column resizing - disconnect( header(), TQT_SIGNAL(sizeChange(int, int, int)) ); - connect( header(), TQT_SIGNAL(sizeChange(int, int, int)), - TQT_SLOT(slotSizeChanged(int, int, int)) ); + disconnect( header(), TQ_SIGNAL(sizeChange(int, int, int)) ); + connect( header(), TQ_SIGNAL(sizeChange(int, int, int)), + TQ_SLOT(slotSizeChanged(int, int, int)) ); // column selection RMB menu mPopup = new TDEPopupMenu( this ); @@ -76,11 +76,11 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) : mPopup->insertItem( i18n("Line Count"), KPaintInfo::COL_SIZE ); mPopup->insertItem( i18n("Score"), KPaintInfo::COL_SCORE ); - connect( mPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggleColumn(int)) ); + connect( mPopup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(toggleColumn(int)) ); // connect to the article manager - connect( knGlobals.articleManager(), TQT_SIGNAL(aboutToShowGroup()), TQT_SLOT(prepareForGroup()) ); - connect( knGlobals.articleManager(), TQT_SIGNAL(aboutToShowFolder()), TQT_SLOT(prepareForFolder()) ); + connect( knGlobals.articleManager(), TQ_SIGNAL(aboutToShowGroup()), TQ_SLOT(prepareForGroup()) ); + connect( knGlobals.articleManager(), TQ_SIGNAL(aboutToShowFolder()), TQ_SLOT(prepareForFolder()) ); new KNHeaderViewToolTip( this ); @@ -188,7 +188,7 @@ void KNHeaderView::ensureItemVisibleWithMargin( const TQListViewItem *i ) { ensureVisible( contentsX(), y + h/2, 0, h/2 ); mDelayedCenter = y + h/2; - TQTimer::singleShot( 300, this, TQT_SLOT(slotCenterDelayed()) ); + TQTimer::singleShot( 300, this, TQ_SLOT(slotCenterDelayed()) ); } else { ensureVisible( contentsX(), y + h/2, 0, h/2 ); } @@ -576,7 +576,7 @@ void KNHeaderView::focusOutEvent(TQFocusEvent *e) void KNHeaderView::resetCurrentTime() { mDateFormatter.reset(); - TQTimer::singleShot( 1000, this, TQT_SLOT(resetCurrentTime()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(resetCurrentTime()) ); } diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp index 77b97288..c3cf7804 100644 --- a/knode/knaccountmanager.cpp +++ b/knode/knaccountmanager.cpp @@ -17,10 +17,10 @@ #include <tqdir.h> #include <kdebug.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdewallet.h> #include "kngroupmanager.h" @@ -228,7 +228,7 @@ void KNAccountManager::loadPasswordsAsync() else mWallet = Wallet::openWallet( Wallet::NetworkWallet(), 0, Wallet::Asynchronous ); if ( mWallet ) { - connect( mWallet, TQT_SIGNAL(walletOpened(bool)), TQT_SLOT(slotWalletOpened(bool)) ); + connect( mWallet, TQ_SIGNAL(walletOpened(bool)), TQ_SLOT(slotWalletOpened(bool)) ); mAsyncOpening = true; } else { diff --git a/knode/knapplication.cpp b/knode/knapplication.cpp index b74f41cf..c64ada84 100644 --- a/knode/knapplication.cpp +++ b/knode/knapplication.cpp @@ -75,7 +75,7 @@ int KNApplication::newInstance() } // Handle window activation and startup notification - KUniqueApplication::newInstance(); + TDEUniqueApplication::newInstance(); // process URLs... KNMainWidget *w = static_cast<KNMainWindow*>(mainWidget())->mainWidget(); diff --git a/knode/knapplication.h b/knode/knapplication.h index c65c010d..13a12357 100644 --- a/knode/knapplication.h +++ b/knode/knapplication.h @@ -17,14 +17,14 @@ #ifndef KNAPPLICATION_H #define KNAPPLICATION_H -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> -class KNApplication : public KUniqueApplication +class KNApplication : public TDEUniqueApplication { TQ_OBJECT public: - KNApplication(): KUniqueApplication() { }; + KNApplication(): TDEUniqueApplication() { }; /** Create new instance of KNode. Make the existing diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp index 78d39149..44e7bed8 100644 --- a/knode/knarticlefactory.cpp +++ b/knode/knarticlefactory.cpp @@ -65,7 +65,7 @@ void KNArticleFactory::createPosting(KNNntpAccount *a) KNComposer *c = new KNComposer( art, TQString(), sig, TQString(), true ); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -94,7 +94,7 @@ void KNArticleFactory::createPosting(KNGroup *g) KNComposer *c=new KNComposer(art, TQString(), sig, TQString(), true); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -264,7 +264,7 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo //open composer KNComposer *c=new KNComposer(art, quoted, sig, notRewraped, true, authorDislikesMailCopies, authorWantsMailCopies); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -349,7 +349,7 @@ void KNArticleFactory::createForward(KNArticle *a) //open composer KNComposer *c=new KNComposer(art, fwd, sig, TQString(), true); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -500,7 +500,7 @@ void KNArticleFactory::createSupersede(KNArticle *a) //open composer KNComposer *c=new KNComposer(art, text, sig); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -525,7 +525,7 @@ void KNArticleFactory::createMail(KMime::Headers::AddressField *address) //open composer KNComposer *c=new KNComposer(art, TQString(), sig, TQString(), true); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -556,7 +556,7 @@ void KNArticleFactory::sendMailExternal(const TQString &address, const TQString if (!query.isEmpty()) mailtoURL.setQuery(query); - kapp->invokeMailer(mailtoURL); + tdeApp->invokeMailer(mailtoURL); } @@ -604,7 +604,7 @@ void KNArticleFactory::edit(KNLocalArticle *a) .arg(id->getSigGeneratorStdErr())); mCompList.append( com ); - connect(com, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(com, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); com->show(); } @@ -990,7 +990,7 @@ void KNArticleFactory::showSendErrorDialog() { if(!s_endErrDlg) { s_endErrDlg=new KNSendErrorDialog(); - connect(s_endErrDlg, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(slotSendErrorDialogDone())); + connect(s_endErrDlg, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(slotSendErrorDialogDone())); } s_endErrDlg->show(); } @@ -1075,7 +1075,7 @@ KNSendErrorDialog::KNSendErrorDialog() j_obs=new KNDialogListBox(true, page); e_rror=new TQLabel(TQString(), page); - connect(j_obs, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHighlighted(int))); + connect(j_obs, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHighlighted(int))); KNHelper::restoreWindowSize("sendDlg", this, TQSize(320,250)); } diff --git a/knode/knarticlefilter.cpp b/knode/knarticlefilter.cpp index 8a708e29..d55da9dc 100644 --- a/knode/knarticlefilter.cpp +++ b/knode/knarticlefilter.cpp @@ -12,8 +12,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> #include <kdebug.h> @@ -78,7 +78,7 @@ bool KNArticleFilter::loadInfo() if (fname.isNull()) return false; - KSimpleConfig conf(fname,true); + TDESimpleConfig conf(fname,true); conf.setGroup("GENERAL"); n_ame=conf.readEntry("name"); @@ -98,7 +98,7 @@ void KNArticleFilter::load() if (fname.isNull()) return; - KSimpleConfig conf(fname,true); + TDESimpleConfig conf(fname,true); conf.setGroup("STATUS"); status.load(&conf); @@ -141,7 +141,7 @@ void KNArticleFilter::save() KNHelper::displayInternalFileError(); return; } - KSimpleConfig conf(dir+TQString("%1.fltr").arg(i_d)); + TDESimpleConfig conf(dir+TQString("%1.fltr").arg(i_d)); conf.setGroup("GENERAL"); conf.writeEntry("name", TQString(n_ame)); diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp index 86c58cc6..332690c2 100644 --- a/knode/knarticlemanager.cpp +++ b/knode/knarticlemanager.cpp @@ -53,8 +53,8 @@ KNArticleManager::KNArticleManager() : TQObject(0,0) s_earchDlg=0; d_isableExpander=false; - connect(f_ilterMgr, TQT_SIGNAL(filterChanged(KNArticleFilter*)), this, - TQT_SLOT(slotFilterChanged(KNArticleFilter*))); + connect(f_ilterMgr, TQ_SIGNAL(filterChanged(KNArticleFilter*)), this, + TQ_SLOT(slotFilterChanged(KNArticleFilter*))); } @@ -390,10 +390,10 @@ void KNArticleManager::search() KWin::activateWindow(s_earchDlg->winId()); } else { s_earchDlg=new KNSearchDialog(KNSearchDialog::STgroupSearch, 0); - connect(s_earchDlg, TQT_SIGNAL(doSearch(KNArticleFilter*)), this, - TQT_SLOT(slotFilterChanged(KNArticleFilter*))); - connect(s_earchDlg, TQT_SIGNAL(dialogDone()), this, - TQT_SLOT(slotSearchDialogDone())); + connect(s_earchDlg, TQ_SIGNAL(doSearch(KNArticleFilter*)), this, + TQ_SLOT(slotFilterChanged(KNArticleFilter*))); + connect(s_earchDlg, TQ_SIGNAL(dialogDone()), this, + TQ_SLOT(slotSearchDialogDone())); s_earchDlg->show(); } } @@ -1081,8 +1081,8 @@ void KNArticleManager::slotItemExpanded(TQListViewItem *p) void KNArticleManager::setView(KNHeaderView* v) { v_iew = v; if(v) { - connect(v, TQT_SIGNAL(expanded(TQListViewItem*)), this, - TQT_SLOT(slotItemExpanded(TQListViewItem*))); + connect(v, TQ_SIGNAL(expanded(TQListViewItem*)), this, + TQ_SLOT(slotItemExpanded(TQListViewItem*))); } } diff --git a/knode/knarticlewindow.cpp b/knode/knarticlewindow.cpp index 53b81089..4a4235e8 100644 --- a/knode/knarticlewindow.cpp +++ b/knode/knarticlewindow.cpp @@ -100,10 +100,10 @@ KNArticleWindow::KNArticleWindow(KNArticle *art) mInstances.append( this ); // file menu - KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() ); + KStdAction::close( this, TQ_SLOT(close()), actionCollection() ); // settings menu - KStdAction::preferences(TQT_TQOBJECT(knGlobals.top), TQT_SLOT(slotSettings()), actionCollection()); + KStdAction::preferences(knGlobals.top, TQ_SLOT(slotSettings()), actionCollection()); TDEAccel *accel = new TDEAccel( this ); artW->setCharsetKeyboardAction()->plugAccel( accel ); diff --git a/knode/kncleanup.cpp b/knode/kncleanup.cpp index 8b2849a9..089ebfef 100644 --- a/knode/kncleanup.cpp +++ b/knode/kncleanup.cpp @@ -57,13 +57,13 @@ void KNCleanUp::start() for ( TQValueList<KNArticleCollection*>::Iterator it = mColList.begin(); it != mColList.end(); ++it ) { if ( (*it)->type() == KNCollection::CTgroup ) { d_lg->showMessage( i18n("Deleting expired articles in <b>%1</b>").arg( (*it)->name() ) ); - kapp->processEvents(); + tdeApp->processEvents(); expireGroup( static_cast<KNGroup*>( (*it) ) ); d_lg->doProgress(); } else if ( (*it)->type() == KNCollection::CTfolder ) { d_lg->showMessage( i18n("Compacting folder <b>%1</b>").arg( (*it)->name() ) ); - kapp->processEvents(); + tdeApp->processEvents(); compactFolder( static_cast<KNFolder*>( (*it) ) ); d_lg->doProgress(); } @@ -255,7 +255,7 @@ KNCleanUp::ProgressDialog::ProgressDialog(int steps) p_rogress=0; s_teps=steps; - setCaption(kapp->makeStdCaption(i18n("Cleaning Up"))); + setCaption(tdeApp->makeStdCaption(i18n("Cleaning Up"))); setFixedSize(w,h); TQFrame *top=new TQFrame(this); diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp index ad952552..e7f9aa87 100644 --- a/knode/kncollectionview.cpp +++ b/knode/kncollectionview.cpp @@ -49,8 +49,8 @@ KNCollectionView::KNCollectionView(TQWidget *parent, const char* name) : mPopup = new TDEPopupMenu( this ); mPopup->insertTitle( i18n("View Columns") ); mPopup->setCheckable( true ); - mUnreadPop = mPopup->insertItem( i18n("Unread Column"), this, TQT_SLOT(toggleUnreadColumn()) ); - mTotalPop = mPopup->insertItem( i18n("Total Column"), this, TQT_SLOT(toggleTotalColumn()) ); + mUnreadPop = mPopup->insertItem( i18n("Unread Column"), this, TQ_SLOT(toggleUnreadColumn()) ); + mTotalPop = mPopup->insertItem( i18n("Total Column"), this, TQ_SLOT(toggleTotalColumn()) ); // add unread and total columns if necessary readConfig(); @@ -61,21 +61,21 @@ KNCollectionView::KNCollectionView(TQWidget *parent, const char* name) : // connect to the account manager KNAccountManager* am = knGlobals.accountManager(); - connect(am, TQT_SIGNAL(accountAdded(KNNntpAccount*)), TQT_SLOT(addAccount(KNNntpAccount*))); - connect(am, TQT_SIGNAL(accountRemoved(KNNntpAccount*)), TQT_SLOT(removeAccount(KNNntpAccount*))); - connect(am, TQT_SIGNAL(accountModified(KNNntpAccount*)), TQT_SLOT(updateAccount(KNNntpAccount*))); + connect(am, TQ_SIGNAL(accountAdded(KNNntpAccount*)), TQ_SLOT(addAccount(KNNntpAccount*))); + connect(am, TQ_SIGNAL(accountRemoved(KNNntpAccount*)), TQ_SLOT(removeAccount(KNNntpAccount*))); + connect(am, TQ_SIGNAL(accountModified(KNNntpAccount*)), TQ_SLOT(updateAccount(KNNntpAccount*))); // connect to the group manager KNGroupManager* gm = knGlobals.groupManager(); - connect(gm, TQT_SIGNAL(groupAdded(KNGroup*)), TQT_SLOT(addGroup(KNGroup*))); - connect(gm, TQT_SIGNAL(groupRemoved(KNGroup*)), TQT_SLOT(removeGroup(KNGroup*))); - connect(gm, TQT_SIGNAL(groupUpdated(KNGroup*)), TQT_SLOT(updateGroup(KNGroup*))); + connect(gm, TQ_SIGNAL(groupAdded(KNGroup*)), TQ_SLOT(addGroup(KNGroup*))); + connect(gm, TQ_SIGNAL(groupRemoved(KNGroup*)), TQ_SLOT(removeGroup(KNGroup*))); + connect(gm, TQ_SIGNAL(groupUpdated(KNGroup*)), TQ_SLOT(updateGroup(KNGroup*))); // connect to the folder manager KNFolderManager* fm = knGlobals.folderManager(); - connect(fm, TQT_SIGNAL(folderAdded(KNFolder*)), TQT_SLOT(addPendingFolders())); - connect(fm, TQT_SIGNAL(folderRemoved(KNFolder*)), TQT_SLOT(removeFolder(KNFolder*))); - connect(fm, TQT_SIGNAL(folderActivated(KNFolder*)), TQT_SLOT(activateFolder(KNFolder*))); + connect(fm, TQ_SIGNAL(folderAdded(KNFolder*)), TQ_SLOT(addPendingFolders())); + connect(fm, TQ_SIGNAL(folderRemoved(KNFolder*)), TQ_SLOT(removeFolder(KNFolder*))); + connect(fm, TQ_SIGNAL(folderActivated(KNFolder*)), TQ_SLOT(activateFolder(KNFolder*))); installEventFilter(this); } diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index b478f909..4a43a9d5 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -39,7 +39,7 @@ using TDERecentAddress::RecentAddresses; #include <tdetempfile.h> #include <kpgp.h> #include <kpgpblock.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kqcstringsplitter.h> #include <ksyntaxhighlighter.h> #include <tqcursor.h> @@ -78,7 +78,7 @@ TQPopupMenu *KNLineEdit::createPopupMenu() menu->insertSeparator(); menu->insertItem( i18n( "Edit Recent Addresses..." ), - this, TQT_SLOT( editRecentAddresses() ) ); + this, TQ_SLOT( editRecentAddresses() ) ); return menu; } @@ -183,9 +183,9 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & v_iew=new ComposerView(this); setCentralWidget(v_iew); - connect(v_iew->c_ancelEditorBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotCancelEditor())); - connect(v_iew->e_dit, TQT_SIGNAL(sigDragEnterEvent(TQDragEnterEvent *)), TQT_SLOT(slotDragEnterEvent(TQDragEnterEvent *))); - connect(v_iew->e_dit, TQT_SIGNAL(sigDropEvent(TQDropEvent *)), TQT_SLOT(slotDropEvent(TQDropEvent *))); + connect(v_iew->c_ancelEditorBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotCancelEditor())); + connect(v_iew->e_dit, TQ_SIGNAL(sigDragEnterEvent(TQDragEnterEvent *)), TQ_SLOT(slotDragEnterEvent(TQDragEnterEvent *))); + connect(v_iew->e_dit, TQ_SIGNAL(sigDropEvent(TQDropEvent *)), TQ_SLOT(slotDropEvent(TQDropEvent *))); //statusbar KStatusBar *sb=statusBar(); @@ -199,128 +199,128 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & sb->setItemAlignment (4,AlignCenter | AlignVCenter); sb->insertItem(TQString(), 5,0); // line sb->setItemAlignment (5,AlignCenter | AlignVCenter); - connect(v_iew->e_dit, TQT_SIGNAL(CursorPositionChanged()), TQT_SLOT(slotUpdateCursorPos())); - connect(v_iew->e_dit, TQT_SIGNAL(toggle_overwrite_signal()), TQT_SLOT(slotUpdateStatusBar())); + connect(v_iew->e_dit, TQ_SIGNAL(CursorPositionChanged()), TQ_SLOT(slotUpdateCursorPos())); + connect(v_iew->e_dit, TQ_SIGNAL(toggle_overwrite_signal()), TQ_SLOT(slotUpdateStatusBar())); //------------------------------- <Actions> -------------------------------------- //file menu - new TDEAction(i18n("&Send Now"),"mail-send", CTRL + Key_Return , TQT_TQOBJECT(this), - TQT_SLOT(slotSendNow()), actionCollection(), "send_now"); + new TDEAction(i18n("&Send Now"),"mail-send", CTRL + Key_Return , this, + TQ_SLOT(slotSendNow()), actionCollection(), "send_now"); - new TDEAction(i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSendLater()), actionCollection(), "send_later"); + new TDEAction(i18n("Send &Later"), "queue", 0, this, + TQ_SLOT(slotSendLater()), actionCollection(), "send_later"); - new TDEAction(i18n("Save as &Draft"),"document-save", 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotSaveAsDraft()), actionCollection(), "save_as_draft"); + new TDEAction(i18n("Save as &Draft"),"document-save", 0 , this, + TQ_SLOT(slotSaveAsDraft()), actionCollection(), "save_as_draft"); - new TDEAction(i18n("D&elete"),"edit-delete", 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotArtDelete()), actionCollection(), "art_delete"); + new TDEAction(i18n("D&elete"),"edit-delete", 0 , this, + TQ_SLOT(slotArtDelete()), actionCollection(), "art_delete"); - KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()),actionCollection()); + KStdAction::close(this, TQ_SLOT(close()),actionCollection()); //edit menu - KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection()); - KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actionCollection()); + KStdAction::undo(this, TQ_SLOT(slotUndo()), actionCollection()); + KStdAction::redo(this, TQ_SLOT(slotRedo()), actionCollection()); - KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection()); + KStdAction::cut(this, TQ_SLOT(slotCut()), actionCollection()); - KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection()); + KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection()); - KStdAction::pasteText(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), actionCollection()); + KStdAction::pasteText(this, TQ_SLOT(slotPaste()), actionCollection()); - new TDEAction(i18n("Paste as &Quotation"), 0, TQT_TQOBJECT(v_iew->e_dit), - TQT_SLOT(slotPasteAsQuotation()), actionCollection(), "paste_quoted"); + new TDEAction(i18n("Paste as &Quotation"), 0, v_iew->e_dit, + TQ_SLOT(slotPasteAsQuotation()), actionCollection(), "paste_quoted"); - KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection()); + KStdAction::selectAll(this, TQ_SLOT(slotSelectAll()), actionCollection()); - KStdAction::find(TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotFind()), actionCollection()); - KStdAction::findNext(TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotSearchAgain()), actionCollection()); + KStdAction::find(v_iew->e_dit, TQ_SLOT(slotFind()), actionCollection()); + KStdAction::findNext(v_iew->e_dit, TQ_SLOT(slotSearchAgain()), actionCollection()); - KStdAction::replace(TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotReplace()), actionCollection()); + KStdAction::replace(v_iew->e_dit, TQ_SLOT(slotReplace()), actionCollection()); //attach menu - new TDEAction(i18n("Append &Signature"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotAppendSig()), + new TDEAction(i18n("Append &Signature"), 0 , this, TQ_SLOT(slotAppendSig()), actionCollection(), "append_signature"); - new TDEAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()), + new TDEAction(i18n("&Insert File..."), 0, this, TQ_SLOT(slotInsertFile()), actionCollection(), "insert_file"); - new TDEAction(i18n("Insert File (in a &box)..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFileBoxed()), + new TDEAction(i18n("Insert File (in a &box)..."), 0, this, TQ_SLOT(slotInsertFileBoxed()), actionCollection(), "insert_file_boxed"); - new TDEAction(i18n("Attach &File..."), "attach", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()), + new TDEAction(i18n("Attach &File..."), "attach", 0, this, TQ_SLOT(slotAttachFile()), actionCollection(), "attach_file"); a_ctPGPsign = new TDEToggleAction(i18n("Sign Article with &PGP"), "signature", 0, actionCollection(), "sign_article"); - a_ctRemoveAttachment = new TDEAction(i18n("&Remove"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotRemoveAttachment()), actionCollection(), "remove_attachment"); + a_ctRemoveAttachment = new TDEAction(i18n("&Remove"), 0, this, + TQ_SLOT(slotRemoveAttachment()), actionCollection(), "remove_attachment"); - a_ctAttachmentProperties = new TDEAction(i18n("&Properties"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAttachmentProperties()), actionCollection(), "attachment_properties"); + a_ctAttachmentProperties = new TDEAction(i18n("&Properties"), 0, this, + TQ_SLOT(slotAttachmentProperties()), actionCollection(), "attachment_properties"); //options menu - a_ctDoPost = new TDEToggleAction(i18n("Send &News Article"), "document-new", 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotToggleDoPost()), actionCollection(), "send_news"); + a_ctDoPost = new TDEToggleAction(i18n("Send &News Article"), "document-new", 0 , this, + TQ_SLOT(slotToggleDoPost()), actionCollection(), "send_news"); - a_ctDoMail = new TDEToggleAction(i18n("Send E&mail"), "mail_generic" , 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotToggleDoMail()), actionCollection(), "send_mail"); + a_ctDoMail = new TDEToggleAction(i18n("Send E&mail"), "mail_generic" , 0 , this, + TQ_SLOT(slotToggleDoMail()), actionCollection(), "send_mail"); a_ctSetCharset = new TDESelectAction(i18n("Set &Charset"), 0, actionCollection(), "set_charset"); a_ctSetCharset->setItems(knGlobals.configManager()->postNewsTechnical()->composerCharsets()); a_ctSetCharset->setShortcutConfigurable(false); - connect(a_ctSetCharset, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotSetCharset(const TQString&))); + connect(a_ctSetCharset, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotSetCharset(const TQString&))); - a_ctSetCharsetKeyb = new TDEAction(i18n("Set Charset"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSetCharsetKeyboard()), actionCollection(), "set_charset_keyboard"); + a_ctSetCharsetKeyb = new TDEAction(i18n("Set Charset"), 0, this, + TQ_SLOT(slotSetCharsetKeyboard()), actionCollection(), "set_charset_keyboard"); - a_ctWordWrap = new TDEToggleAction(i18n("&Word Wrap"), 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotToggleWordWrap()), actionCollection(), "toggle_wordwrap"); + a_ctWordWrap = new TDEToggleAction(i18n("&Word Wrap"), 0 , this, + TQ_SLOT(slotToggleWordWrap()), actionCollection(), "toggle_wordwrap"); //tools menu - new TDEAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit), - TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); + new TDEAction(i18n("Add &Quote Characters"), 0, v_iew->e_dit, + TQ_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); - new TDEAction(i18n("&Remove Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit), - TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); + new TDEAction(i18n("&Remove Quote Characters"), 0, v_iew->e_dit, + TQ_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); - new TDEAction(i18n("Add &Box"), 0, TQT_TQOBJECT(v_iew->e_dit), - TQT_SLOT(slotAddBox()), actionCollection(), "tools_box"); + new TDEAction(i18n("Add &Box"), 0, v_iew->e_dit, + TQ_SLOT(slotAddBox()), actionCollection(), "tools_box"); - new TDEAction(i18n("Re&move Box"), 0, TQT_TQOBJECT(v_iew->e_dit), - TQT_SLOT(slotRemoveBox()), actionCollection(), "tools_unbox"); + new TDEAction(i18n("Re&move Box"), 0, v_iew->e_dit, + TQ_SLOT(slotRemoveBox()), actionCollection(), "tools_unbox"); - TDEAction *undoRewrap = new TDEAction(i18n("Get &Original Text (not re-wrapped)"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotUndoRewrap()), actionCollection(), "tools_undoRewrap"); + TDEAction *undoRewrap = new TDEAction(i18n("Get &Original Text (not re-wrapped)"), 0, this, + TQ_SLOT(slotUndoRewrap()), actionCollection(), "tools_undoRewrap"); undoRewrap->setEnabled(!u_nwraped.isNull()); - TDEAction *rot13 = new TDEAction(i18n("S&cramble (Rot 13)"), "encrypted", 0, TQT_TQOBJECT(v_iew->e_dit), - TQT_SLOT(slotRot13()), actionCollection(), "tools_rot13"); + TDEAction *rot13 = new TDEAction(i18n("S&cramble (Rot 13)"), "encrypted", 0, v_iew->e_dit, + TQ_SLOT(slotRot13()), actionCollection(), "tools_rot13"); rot13->setEnabled(false); - connect(v_iew->e_dit, TQT_SIGNAL(copyAvailable(bool)), rot13, TQT_SLOT(setEnabled(bool))); + connect(v_iew->e_dit, TQ_SIGNAL(copyAvailable(bool)), rot13, TQ_SLOT(setEnabled(bool))); - a_ctExternalEditor = new TDEAction(i18n("Start &External Editor"), "system-run", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotExternalEditor()), actionCollection(), "external_editor"); + a_ctExternalEditor = new TDEAction(i18n("Start &External Editor"), "system-run", 0, this, + TQ_SLOT(slotExternalEditor()), actionCollection(), "external_editor"); - a_ctSpellCheck = KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection()); + a_ctSpellCheck = KStdAction::spelling (this, TQ_SLOT(slotSpellcheck()), actionCollection()); //settings menu createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfKeys()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotConfKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbar()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(knGlobals.top), TQT_SLOT(slotSettings()), actionCollection()); + KStdAction::preferences(knGlobals.top, TQ_SLOT(slotSettings()), actionCollection()); a_ccel=new TDEAccel(this); a_ctSetCharsetKeyb->plugAccel(a_ccel); @@ -420,7 +420,7 @@ int KNComposer::listOfResultOfCheckWord( const TQStringList & lst , const TQStri { TDEAction * act = new TDEAction( *it ); - connect( act, TQT_SIGNAL(activated()), v_iew->e_dit, TQT_SLOT(slotCorrectWord()) ); + connect( act, TQ_SIGNAL(activated()), v_iew->e_dit, TQ_SLOT(slotCorrectWord()) ); m_listAction.append( act ); } } @@ -1302,7 +1302,7 @@ void KNComposer::slotExternalEditor() if(!filenameAdded) // no %f in the editor command (*e_xternalEditor) << e_ditorTempfile->name(); - connect(e_xternalEditor, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotEditorFinished(TDEProcess *))); + connect(e_xternalEditor, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotEditorFinished(TDEProcess *))); if(!e_xternalEditor->start()) { KMessageBox::error(this, i18n("Unable to start external editor.\nPlease check your configuration in the settings dialog.")); delete e_xternalEditor; @@ -1327,17 +1327,17 @@ void KNComposer::slotSpellcheck() a_ctExternalEditor->setEnabled(false); a_ctSpellCheck->setEnabled(false); - s_pellChecker = new KSpell(TQT_TQWIDGET(this), i18n("Spellcheck"), TQT_TQOBJECT(this), TQT_SLOT(slotSpellStarted(KSpell *))); + s_pellChecker = new KSpell(this, i18n("Spellcheck"), this, TQ_SLOT(slotSpellStarted(KSpell *))); TQStringList l = KSpellingHighlighter::personalWords(); for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) { s_pellChecker->addPersonal( *it ); } - connect(s_pellChecker, TQT_SIGNAL(death()), this, TQT_SLOT(slotSpellFinished())); - connect(s_pellChecker, TQT_SIGNAL(done(const TQString&)), this, TQT_SLOT(slotSpellDone(const TQString&))); - connect(s_pellChecker, TQT_SIGNAL(misspelling (const TQString &, const TQStringList &, unsigned int)), - this, TQT_SLOT(slotMisspelling (const TQString &, const TQStringList &, unsigned int))); - connect(s_pellChecker, TQT_SIGNAL(corrected (const TQString &, const TQString &, unsigned int)), - this, TQT_SLOT(slotCorrected (const TQString &, const TQString &, unsigned int))); + connect(s_pellChecker, TQ_SIGNAL(death()), this, TQ_SLOT(slotSpellFinished())); + connect(s_pellChecker, TQ_SIGNAL(done(const TQString&)), this, TQ_SLOT(slotSpellDone(const TQString&))); + connect(s_pellChecker, TQ_SIGNAL(misspelling (const TQString &, const TQStringList &, unsigned int)), + this, TQ_SLOT(slotMisspelling (const TQString &, const TQStringList &, unsigned int))); + connect(s_pellChecker, TQ_SIGNAL(corrected (const TQString &, const TQString &, unsigned int)), + this, TQ_SLOT(slotCorrected (const TQString &, const TQString &, unsigned int))); } @@ -1401,7 +1401,7 @@ void KNComposer::slotConfToolbar() conf->setGroup("composerWindow_options"); saveMainWindowSettings(conf); KEditToolbar dlg(guiFactory(),this); - connect(&dlg,TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg,TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } @@ -1508,10 +1508,10 @@ void KNComposer::slotGroupsBtnClicked() KNGroupSelectDialog *dlg=new KNGroupSelectDialog(this, nntp, v_iew->g_roups->text().remove(TQRegExp("\\s"))); - connect(dlg, TQT_SIGNAL(loadList(KNNntpAccount*)), - knGlobals.groupManager(), TQT_SLOT(slotLoadGroupList(KNNntpAccount*))); - connect(knGlobals.groupManager(), TQT_SIGNAL(newListReady(KNGroupListData*)), - dlg, TQT_SLOT(slotReceiveList(KNGroupListData*))); + connect(dlg, TQ_SIGNAL(loadList(KNNntpAccount*)), + knGlobals.groupManager(), TQ_SLOT(slotLoadGroupList(KNNntpAccount*))); + connect(knGlobals.groupManager(), TQ_SIGNAL(newListReady(KNGroupListData*)), + dlg, TQ_SLOT(slotReceiveList(KNGroupListData*))); if(dlg->exec()) v_iew->g_roups->setText(dlg->selectedGroups()); @@ -1744,7 +1744,7 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) hdrL->addWidget(l_to, 0,0); hdrL->addWidget(t_o, 0,1); hdrL->addWidget(t_oBtn, 0,2); - connect(t_oBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotToBtnClicked())); + connect(t_oBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotToBtnClicked())); //Newsgroups g_roups=new KNLineEdit(this, false, hdrFrame); @@ -1755,9 +1755,9 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) hdrL->addWidget(l_groups, 1,0); hdrL->addWidget(g_roups, 1,1); hdrL->addWidget(g_roupsBtn, 1,2); - connect(g_roups, TQT_SIGNAL(textChanged(const TQString&)), - parent(), TQT_SLOT(slotGroupsChanged(const TQString&))); - connect(g_roupsBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotGroupsBtnClicked())); + connect(g_roups, TQ_SIGNAL(textChanged(const TQString&)), + parent(), TQ_SLOT(slotGroupsChanged(const TQString&))); + connect(g_roupsBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotGroupsBtnClicked())); //Followup-To f_up2=new KComboBox(true, hdrFrame); @@ -1772,8 +1772,8 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) TQLabel *l=new TQLabel(s_ubject, i18n("S&ubject:"), hdrFrame); hdrL->addWidget(l, 3,0); hdrL->addMultiCellWidget(s_ubject, 3,3, 1,2); - connect(s_ubject, TQT_SIGNAL(textChanged(const TQString&)), - parent(), TQT_SLOT(slotSubjectChanged(const TQString&))); + connect(s_ubject, TQ_SIGNAL(textChanged(const TQString&)), + parent(), TQ_SLOT(slotSubjectChanged(const TQString&))); //Editor e_dit=new Editor(this, composer, main); @@ -1781,10 +1781,10 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) TDEConfig *config = knGlobals.config(); TDEConfigGroupSaver saver(config, "VISUAL_APPEARANCE"); - TQColor defaultColor1( kapp->palette().active().text()); // defaults from kmreaderwin.cpp - TQColor defaultColor2( kapp->palette().active().text() ); - TQColor defaultColor3( kapp->palette().active().text() ); - TQColor defaultForeground( kapp->palette().active().text() ); + TQColor defaultColor1( tdeApp->palette().active().text()); // defaults from kmreaderwin.cpp + TQColor defaultColor2( tdeApp->palette().active().text() ); + TQColor defaultColor3( tdeApp->palette().active().text() ); + TQColor defaultForeground( tdeApp->palette().active().text() ); TQColor col1 = config->readColorEntry( "ForegroundColor", &defaultForeground ); TQColor col2 = config->readColorEntry( "quote3Color", &defaultColor3 ); TQColor col3 = config->readColorEntry( "quote2Color", &defaultColor2 ); @@ -1793,8 +1793,8 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) mSpellChecker = new KDictSpellingHighlighter(e_dit, /*active*/ true, /*autoEnabled*/ true, /*spellColor*/ config->readColorEntry("NewMessage", &c), /*colorQuoting*/ true, col1, col2, col3, col4); - connect( mSpellChecker, TQT_SIGNAL(newSuggestions(const TQString&, const TQStringList&, unsigned int)), e_dit, - TQT_SLOT(slotAddSuggestion(const TQString&, const TQStringList&, unsigned int)) ); + connect( mSpellChecker, TQ_SIGNAL(newSuggestions(const TQString&, const TQStringList&, unsigned int)), e_dit, + TQ_SLOT(slotAddSuggestion(const TQString&, const TQStringList&, unsigned int)) ); TQVBoxLayout *notL=new TQVBoxLayout(e_dit); notL->addStretch(1); @@ -1906,33 +1906,33 @@ void KNComposer::ComposerView::showAttachmentView() topL->addMultiCellWidget(a_ttView, 0,2, 0,0); //connections - connect(a_ttView, TQT_SIGNAL(currentChanged(TQListViewItem*)), - parent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*))); - connect(a_ttView, TQT_SIGNAL(clicked ( TQListViewItem * )), - parent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*))); - - connect(a_ttView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - parent(), TQT_SLOT(slotAttachmentPopup(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(a_ttView, TQT_SIGNAL(delPressed(TQListViewItem*)), - parent(), TQT_SLOT(slotAttachmentRemove(TQListViewItem*))); - connect(a_ttView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - parent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*))); - connect(a_ttView, TQT_SIGNAL(returnPressed(TQListViewItem*)), - parent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*))); + connect(a_ttView, TQ_SIGNAL(currentChanged(TQListViewItem*)), + parent(), TQ_SLOT(slotAttachmentSelected(TQListViewItem*))); + connect(a_ttView, TQ_SIGNAL(clicked ( TQListViewItem * )), + parent(), TQ_SLOT(slotAttachmentSelected(TQListViewItem*))); + + connect(a_ttView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + parent(), TQ_SLOT(slotAttachmentPopup(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(a_ttView, TQ_SIGNAL(delPressed(TQListViewItem*)), + parent(), TQ_SLOT(slotAttachmentRemove(TQListViewItem*))); + connect(a_ttView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + parent(), TQ_SLOT(slotAttachmentEdit(TQListViewItem*))); + connect(a_ttView, TQ_SIGNAL(returnPressed(TQListViewItem*)), + parent(), TQ_SLOT(slotAttachmentEdit(TQListViewItem*))); //buttons a_ttAddBtn=new TQPushButton(i18n("A&dd..."),a_ttWidget); - connect(a_ttAddBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotAttachFile())); + connect(a_ttAddBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotAttachFile())); topL->addWidget(a_ttAddBtn, 0,1); a_ttRemoveBtn=new TQPushButton(i18n("&Remove"), a_ttWidget); a_ttRemoveBtn->setEnabled(false); - connect(a_ttRemoveBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotRemoveAttachment())); + connect(a_ttRemoveBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotRemoveAttachment())); topL->addWidget(a_ttRemoveBtn, 1,1); a_ttEditBtn=new TQPushButton(i18n("&Properties"), a_ttWidget); a_ttEditBtn->setEnabled(false); - connect(a_ttEditBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotAttachmentProperties())); + connect(a_ttEditBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotAttachmentProperties())); topL->addWidget(a_ttEditBtn, 2,1, TQt::AlignTop); topL->setRowStretch(2,1); @@ -2398,15 +2398,15 @@ void KNComposer::Editor::contentsContextMenuEvent( TQContextMenuEvent */*e*/ ) } else { - spell = new KSpell(this, i18n("Spellcheck"), TQT_TQOBJECT(this), TQT_SLOT(slotSpellStarted(KSpell *))); + spell = new KSpell(this, i18n("Spellcheck"), this, TQ_SLOT(slotSpellStarted(KSpell *))); TQStringList l = KSpellingHighlighter::personalWords(); for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) { spell->addPersonal( *it ); } - connect(spell, TQT_SIGNAL(death()), this, TQT_SLOT(slotSpellFinished())); - connect(spell, TQT_SIGNAL(done(const TQString&)), this, TQT_SLOT(slotSpellDone(const TQString&))); - connect(spell, TQT_SIGNAL(misspelling (const TQString &, const TQStringList &, unsigned int)), - this, TQT_SLOT(slotMisspelling (const TQString &, const TQStringList &, unsigned int))); + connect(spell, TQ_SIGNAL(death()), this, TQ_SLOT(slotSpellFinished())); + connect(spell, TQ_SIGNAL(done(const TQString&)), this, TQ_SLOT(slotSpellDone(const TQString&))); + connect(spell, TQ_SIGNAL(misspelling (const TQString &, const TQStringList &, unsigned int)), + this, TQ_SLOT(slotMisspelling (const TQString &, const TQStringList &, unsigned int))); } } @@ -2600,8 +2600,8 @@ KNComposer::AttachmentPropertiesDlg::AttachmentPropertiesDlg(KNAttachment *a, TQ topL->addWidget(mimeGB); //connections - connect(m_imeType, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotMimeTypeTextChanged(const TQString&))); + connect(m_imeType, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotMimeTypeTextChanged(const TQString&))); //finish GUI setFixedHeight(sizeHint().height()); diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp index 7c0ef435..f92b0e0d 100644 --- a/knode/knconfig.cpp +++ b/knode/knconfig.cpp @@ -18,16 +18,16 @@ #include <tqtextcodec.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <tdeapplication.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <kiconloader.h> #include <kiconeffect.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <email.h> @@ -138,8 +138,8 @@ TQString KNConfig::Identity::getSignature() for ( TQStringList::Iterator it = command.begin(); it != command.end(); ++it ) process << (*it); - connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(slotReceiveStdout(TDEProcess *, char *, int))); - connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(slotReceiveStderr(TDEProcess *, char *, int))); + connect(&process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(slotReceiveStdout(TDEProcess *, char *, int))); + connect(&process, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(slotReceiveStderr(TDEProcess *, char *, int))); if (!process.start(TDEProcess::Block,TDEProcess::AllOutput)) KMessageBox::error(knGlobals.topWidget, i18n("Cannot run the signature generator.")); @@ -452,7 +452,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const switch(i) { case background: - return kapp->palette().active().base(); + return tdeApp->palette().active().base(); case alternateBackground: return TDEGlobalSettings::alternateBackgroundColor(); @@ -466,13 +466,13 @@ TQColor KNConfig::Appearance::defaultColor(int i) const case normalText: case unreadThread: - return kapp->palette().active().text(); + return tdeApp->palette().active().text(); case url: return TDEGlobalSettings::linkColor(); case readThread: - return kapp->palette().disabled().text(); + return tdeApp->palette().disabled().text(); case unreadArticle: return TQColor( 183, 154, 11 ); @@ -492,7 +492,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const return TQColor( 0xFF, 0x40, 0x40 ); } - return kapp->palette().disabled().text(); + return tdeApp->palette().disabled().text(); } @@ -700,7 +700,7 @@ KNConfig::DisplayedHeaders::DisplayedHeaders() TQString fname( locate("data","knode/headers.rc") ); if (!fname.isNull()) { - KSimpleConfig headerConf(fname,true); + TDESimpleConfig headerConf(fname,true); TQStringList headers = headerConf.groupList(); headers.remove("<default>"); headers.sort(); @@ -749,7 +749,7 @@ void KNConfig::DisplayedHeaders::save() KNHelper::displayInternalFileError(); return; } - KSimpleConfig headerConf(dir+"headers.rc"); + TDESimpleConfig headerConf(dir+"headers.rc"); TQStringList oldHeaders = headerConf.groupList(); TQStringList::Iterator oldIt=oldHeaders.begin(); diff --git a/knode/knconfig.h b/knode/knconfig.h index f3dff7cd..d340112e 100644 --- a/knode/knconfig.h +++ b/knode/knconfig.h @@ -63,7 +63,7 @@ class Base { }; -class KDE_EXPORT Identity : public TQObject, public Base { +class TDE_EXPORT Identity : public TQObject, public Base { TQ_OBJECT @@ -134,7 +134,7 @@ TQ_OBJECT }; -class KDE_EXPORT Appearance : public Base { +class TDE_EXPORT Appearance : public Base { #define COL_CNT 16 #define FNT_CNT 5 @@ -208,7 +208,7 @@ class KDE_EXPORT Appearance : public Base { }; -class KDE_EXPORT ReadNewsGeneral : public Base { +class TDE_EXPORT ReadNewsGeneral : public Base { friend class ReadNewsGeneralWidget; @@ -266,7 +266,7 @@ class KDE_EXPORT ReadNewsGeneral : public Base { }; -class KDE_EXPORT ReadNewsNavigation : public Base { +class TDE_EXPORT ReadNewsNavigation : public Base { friend class ReadNewsNavigationWidget; @@ -294,7 +294,7 @@ class KDE_EXPORT ReadNewsNavigation : public Base { }; -class KDE_EXPORT ReadNewsViewer : public Base { +class TDE_EXPORT ReadNewsViewer : public Base { friend class ReadNewsViewerWidget; @@ -337,7 +337,7 @@ class KDE_EXPORT ReadNewsViewer : public Base { }; -class KDE_EXPORT DisplayedHeaders : public Base +class TDE_EXPORT DisplayedHeaders : public Base { public: DisplayedHeaders(); @@ -359,7 +359,7 @@ class KDE_EXPORT DisplayedHeaders : public Base }; -class KDE_EXPORT Scoring : public Base { +class TDE_EXPORT Scoring : public Base { friend class ScoringWidget; @@ -379,7 +379,7 @@ class KDE_EXPORT Scoring : public Base { }; -class KDE_EXPORT XHeader { +class TDE_EXPORT XHeader { public: XHeader() {} @@ -401,7 +401,7 @@ class KDE_EXPORT XHeader { typedef TQValueList<XHeader> XHeaders; -class KDE_EXPORT PostNewsTechnical : public Base { +class TDE_EXPORT PostNewsTechnical : public Base { friend class PostNewsTechnicalWidget; friend class SmtpAccountWidget; @@ -481,7 +481,7 @@ class PostNewsComposer : public Base { //BEGIN: Cleanup configuration ----------------------------------------------- -class KDE_EXPORT Cleanup : public Base { +class TDE_EXPORT Cleanup : public Base { friend class CleanupWidget; friend class GroupCleanupWidget; diff --git a/knode/knconfigmanager.cpp b/knode/knconfigmanager.cpp index a07a9c5e..f7d26506 100644 --- a/knode/knconfigmanager.cpp +++ b/knode/knconfigmanager.cpp @@ -67,7 +67,7 @@ void KNConfigManager::configure() { if(!d_ialog) { d_ialog=new KNConfigDialog(knGlobals.topWidget, "Preferences_Dlg"); - connect(d_ialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotDialogDone())); + connect(d_ialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotDialogDone())); d_ialog->show(); } else @@ -113,7 +113,7 @@ KNConfigDialog::KNConfigDialog(TQWidget *p, const char *n) setHelp("anc-setting-your-identity"); - connect(this, TQT_SIGNAL(configCommitted()), this, TQT_SLOT(slotConfigCommitted())); + connect(this, TQ_SIGNAL(configCommitted()), this, TQ_SLOT(slotConfigCommitted())); } diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp index d9f21878..2d5d8a58 100644 --- a/knode/knconfigpages.cpp +++ b/knode/knconfigpages.cpp @@ -23,7 +23,7 @@ #include "knconfigpages.h" #include "knconfigwidgets.h" -#include <kdemacros.h> +#include <tdemacros.h> // // common config page with tabs (code mostly taken from kmail) @@ -38,7 +38,7 @@ KNConfig::BasePageWithTabs::BasePageWithTabs( TQWidget * parent, const char * na void KNConfig::BasePageWithTabs::addTab( TDECModule* tab, const TQString & title ) { mTabWidget->addTab( tab, title ); - connect( tab, TQT_SIGNAL(changed( bool )), this, TQT_SIGNAL(changed( bool )) ); + connect( tab, TQ_SIGNAL(changed( bool )), this, TQ_SIGNAL(changed( bool )) ); } void KNConfig::BasePageWithTabs::load() { @@ -72,7 +72,7 @@ void KNConfig::BasePageWithTabs::defaults() { // extern "C" { - KDE_EXPORT TDECModule *create_knode_config_identity( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_knode_config_identity( TQWidget *parent, const char * ) { KNConfig::IdentityWidget *page = new KNConfig::IdentityWidget( knGlobals.configManager()->identity(), diff --git a/knode/knconfigpages.h b/knode/knconfigpages.h index 80d3a6cf..ade88885 100644 --- a/knode/knconfigpages.h +++ b/knode/knconfigpages.h @@ -29,7 +29,7 @@ namespace KNConfig { * It simply forwards load and save operations to all tabs. * Code mostly taken from kmail. */ -class KDE_EXPORT BasePageWithTabs : public TDECModule { +class TDE_EXPORT BasePageWithTabs : public TDECModule { TQ_OBJECT public: @@ -60,7 +60,7 @@ class AccountsPage : public BasePageWithTabs { // read news page -class KDE_EXPORT ReadNewsPage : public BasePageWithTabs { +class TDE_EXPORT ReadNewsPage : public BasePageWithTabs { TQ_OBJECT @@ -69,7 +69,7 @@ class KDE_EXPORT ReadNewsPage : public BasePageWithTabs { }; // post news page -class KDE_EXPORT PostNewsPage : public BasePageWithTabs { +class TDE_EXPORT PostNewsPage : public BasePageWithTabs { TQ_OBJECT diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index ea2d77a2..27c81824 100644 --- a/knode/knconfigwidgets.cpp +++ b/knode/knconfigwidgets.cpp @@ -66,7 +66,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * "<p>Ex: <b>John Stuart Masterson III</b>.</p></qt>"); TQWhatsThis::add( n_ame, msg ); TQWhatsThis::add( l, msg ); - connect( n_ame, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) ); + connect( n_ame, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) ); o_rga=new KLineEdit(this); l=new TQLabel(o_rga, i18n("Organi&zation:"), this); @@ -76,7 +76,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * "<p>Ex: <b>KNode, Inc</b>.</p></qt>" ); TQWhatsThis::add( o_rga, msg ); TQWhatsThis::add( l, msg ); - connect( o_rga, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) ); + connect( o_rga, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) ); e_mail=new KLineEdit(this); l=new TQLabel(e_mail, i18n("Email a&ddress:"), this); @@ -86,7 +86,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * "reading your articles</p><p>Ex: <b>nospam@please.com</b>.</qt>" ); TQWhatsThis::add( l, msg ); TQWhatsThis::add( e_mail, msg ); - connect( e_mail, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) ); + connect( e_mail, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) ); r_eplyTo=new KLineEdit(this); l=new TQLabel(r_eplyTo, i18n("&Reply-to address:"), this); @@ -97,13 +97,13 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * "email address.</p><p>Ex: <b>john@example.com</b>.</p></qt>" ); TQWhatsThis::add( l, msg ); TQWhatsThis::add( r_eplyTo, msg ); - connect( r_eplyTo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) ); + connect( r_eplyTo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) ); m_ailCopiesTo=new KLineEdit(this); l=new TQLabel(m_ailCopiesTo, i18n("&Mail-copies-to:"), this); topL->addWidget(l, 4,0); topL->addMultiCellWidget(m_ailCopiesTo, 4,4, 1,2); - connect( m_ailCopiesTo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) ); + connect( m_ailCopiesTo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) ); s_igningKey = new Kpgp::SecretKeyRequester(this); s_igningKey->dialogButton()->setText(i18n("Chan&ge...")); @@ -117,11 +117,11 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * "used to sign your articles.</p></qt>"); TQWhatsThis::add( l, msg ); TQWhatsThis::add( s_igningKey, msg ); - connect( s_igningKey, TQT_SIGNAL(changed()), TQT_SLOT(changed()) ); + connect( s_igningKey, TQ_SIGNAL(changed()), TQ_SLOT(changed()) ); b_uttonGroup = new TQButtonGroup(this); - connect( b_uttonGroup, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(slotSignatureType(int)) ); + connect( b_uttonGroup, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(slotSignatureType(int)) ); b_uttonGroup->setExclusive(true); b_uttonGroup->hide(); @@ -143,12 +143,12 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * TQWhatsThis::add( s_ig, msg ); c_hooseBtn = new TQPushButton( i18n("Choo&se..."), this); - connect(c_hooseBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSignatureChoose())); + connect(c_hooseBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSignatureChoose())); topL->addWidget(c_hooseBtn, 7, 2 ); e_ditBtn = new TQPushButton( i18n("&Edit File"), this); - connect(e_ditBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSignatureEdit())); + connect(e_ditBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSignatureEdit())); topL->addWidget(e_ditBtn, 8, 2); s_igGenerator = new TQCheckBox(i18n("&The file is a program"), this); @@ -156,7 +156,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * msg = i18n( "<qt><p>Mark this option if the signature will be generated by a program</p>" "<p>Ex: <b>/home/robt/gensig.sh</b>.</p></qt>" ); TQWhatsThis::add( s_igGenerator, msg ); - connect( s_igGenerator, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); + connect( s_igGenerator, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) ); s_igEdit = new TQRadioButton( i18n("Specify signature &below"), this); b_uttonGroup->insert(s_igEdit, 1); @@ -165,13 +165,13 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * s_igEditor = new TQTextEdit(this); s_igEditor->setTextFormat(TQt::PlainText); topL->addMultiCellWidget(s_igEditor, 10, 10, 0, 2); - connect( s_igEditor, TQT_SIGNAL(textChanged()), TQT_SLOT(changed()) ); + connect( s_igEditor, TQ_SIGNAL(textChanged()), TQ_SLOT(changed()) ); topL->setColStretch(1,1); topL->setRowStretch(7,1); topL->setResizeMode(TQLayout::Minimum); - connect(s_ig,TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(textFileNameChanged(const TQString &))); + connect(s_ig,TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(textFileNameChanged(const TQString &))); load(); } @@ -289,8 +289,8 @@ KNConfig::NntpAccountListWidget::NntpAccountListWidget(TQWidget *p, const char * // account listbox l_box=new KNDialogListBox(false, this); - connect(l_box, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotItemSelected(int))); - connect(l_box, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect(l_box, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotItemSelected(int))); + connect(l_box, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); topL->addMultiCellWidget(l_box, 0,4, 0,0); // info box @@ -302,19 +302,19 @@ KNConfig::NntpAccountListWidget::NntpAccountListWidget(TQWidget *p, const char * // buttons a_ddBtn=new TQPushButton(i18n("&Add..."), this); - connect(a_ddBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddBtnClicked())); + connect(a_ddBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddBtnClicked())); topL->addWidget(a_ddBtn, 0,1); e_ditBtn=new TQPushButton(i18n("modify something","&Edit..."), this); - connect(e_ditBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditBtnClicked())); + connect(e_ditBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditBtnClicked())); topL->addWidget(e_ditBtn, 1,1); d_elBtn=new TQPushButton(i18n("&Delete"), this); - connect(d_elBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelBtnClicked())); + connect(d_elBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelBtnClicked())); topL->addWidget(d_elBtn, 2,1); s_ubBtn=new TQPushButton(i18n("&Subscribe..."), this); - connect(s_ubBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSubBtnClicked())); + connect(s_ubBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSubBtnClicked())); topL->addWidget(s_ubBtn, 3,1); topL->setRowStretch(4,1); // stretch the server listbox @@ -323,9 +323,9 @@ KNConfig::NntpAccountListWidget::NntpAccountListWidget(TQWidget *p, const char * // the settings dialog is non-modal, so we have to react to changes // made outside of the dialog - connect(a_ccManager, TQT_SIGNAL(accountAdded(KNNntpAccount*)), this, TQT_SLOT(slotAddItem(KNNntpAccount*))); - connect(a_ccManager, TQT_SIGNAL(accountRemoved(KNNntpAccount*)), this, TQT_SLOT(slotRemoveItem(KNNntpAccount*))); - connect(a_ccManager, TQT_SIGNAL(accountModified(KNNntpAccount*)), this, TQT_SLOT(slotUpdateItem(KNNntpAccount*))); + connect(a_ccManager, TQ_SIGNAL(accountAdded(KNNntpAccount*)), this, TQ_SLOT(slotAddItem(KNNntpAccount*))); + connect(a_ccManager, TQ_SIGNAL(accountRemoved(KNNntpAccount*)), this, TQ_SLOT(slotRemoveItem(KNNntpAccount*))); + connect(a_ccManager, TQ_SIGNAL(accountModified(KNNntpAccount*)), this, TQ_SLOT(slotUpdateItem(KNNntpAccount*))); slotSelectionChanged(); // disable Delete & Edit initially } @@ -510,7 +510,7 @@ KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidge topL->addMultiCellWidget(u_seDiskCache, 6,6, 0,3);*/ a_uth=new TQCheckBox(i18n("Server requires &authentication"), page); - connect(a_uth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotAuthChecked(bool))); + connect(a_uth, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotAuthChecked(bool))); topL->addMultiCellWidget(a_uth, 6,6, 0,3); u_ser=new KLineEdit(page); @@ -531,7 +531,7 @@ KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidge topL->addMultiCellWidget(p_ass, 8,8, 1,2); i_nterval=new TQCheckBox(i18n("Enable &interval news checking"), page); - connect(i_nterval, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotIntervalChecked(bool))); + connect(i_nterval, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotIntervalChecked(bool))); topL->addMultiCellWidget(i_nterval, 9,9, 0,3); c_heckInterval=new KIntSpinBox(1,10000,1,1,10,page); @@ -559,7 +559,7 @@ KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidge cleanupLayout->addWidget( mCleanupWidget ); cleanupLayout->addStretch( 1 ); - connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordChanged()) ); + connect( knGlobals.accountManager(), TQ_SIGNAL(passwordsChanged()), TQ_SLOT(slotPasswordChanged()) ); KNHelper::restoreWindowSize("accNewsPropDLG", this, sizeHint()); @@ -633,7 +633,7 @@ KNConfig::SmtpAccountWidget::SmtpAccountWidget( TQWidget *p, const char *n ) : SmtpAccountWidgetBase( p, n ) { mAccount = knGlobals.accountManager()->smtp(); - connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordChanged()) ); + connect( knGlobals.accountManager(), TQ_SIGNAL(passwordsChanged()), TQ_SLOT(slotPasswordChanged()) ); load(); } @@ -821,29 +821,29 @@ KNConfig::AppearanceWidget::AppearanceWidget( TQWidget *p, const char *n ) : //color-list c_List = new KNDialogListBox(false, this); topL->addMultiCellWidget(c_List,1,3,0,0); - connect(c_List, TQT_SIGNAL(selected(TQListBoxItem*)),TQT_SLOT(slotColItemSelected(TQListBoxItem*))); - connect(c_List, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotColSelectionChanged())); + connect(c_List, TQ_SIGNAL(selected(TQListBoxItem*)),TQ_SLOT(slotColItemSelected(TQListBoxItem*))); + connect(c_List, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotColSelectionChanged())); c_olorCB = new TQCheckBox(i18n("&Use custom colors"),this); topL->addWidget(c_olorCB,0,0); - connect(c_olorCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotColCheckBoxToggled(bool))); + connect(c_olorCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotColCheckBoxToggled(bool))); c_olChngBtn=new TQPushButton(i18n("Cha&nge..."), this); - connect(c_olChngBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotColChangeBtnClicked())); + connect(c_olChngBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotColChangeBtnClicked())); topL->addWidget(c_olChngBtn,1,1); //font-list f_List = new KNDialogListBox(false, this); topL->addMultiCellWidget(f_List,5,7,0,0); - connect(f_List, TQT_SIGNAL(selected(TQListBoxItem*)),TQT_SLOT(slotFontItemSelected(TQListBoxItem*))); - connect(f_List, TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotFontSelectionChanged())); + connect(f_List, TQ_SIGNAL(selected(TQListBoxItem*)),TQ_SLOT(slotFontItemSelected(TQListBoxItem*))); + connect(f_List, TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotFontSelectionChanged())); f_ontCB = new TQCheckBox(i18n("Use custom &fonts"),this); topL->addWidget(f_ontCB,4,0); - connect(f_ontCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotFontCheckBoxToggled(bool))); + connect(f_ontCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotFontCheckBoxToggled(bool))); f_ntChngBtn=new TQPushButton(i18n("Chang&e..."), this); - connect(f_ntChngBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFontChangeBtnClicked())); + connect(f_ntChngBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFontChangeBtnClicked())); topL->addWidget(f_ntChngBtn,5,1); load(); @@ -1005,7 +1005,7 @@ KNConfig::ReadNewsGeneralWidget::ReadNewsGeneralWidget( ReadNewsGeneral *d, TQWi l1=new TQLabel(m_axFetch, i18n("&Maximum number of articles to fetch:"), hgb); m_arkCB=new TQCheckBox(i18n("Mar&k article as read after:"), hgb); m_arkSecs=new KIntSpinBox(0, 9999, 1, 0, 10, hgb); - connect(m_arkCB, TQT_SIGNAL(toggled(bool)), m_arkSecs, TQT_SLOT(setEnabled(bool))); + connect(m_arkCB, TQ_SIGNAL(toggled(bool)), m_arkSecs, TQ_SLOT(setEnabled(bool))); m_arkSecs->setSuffix(i18n(" sec")); m_arkCrossCB=new TQCheckBox(i18n("Mark c&rossposted articles as read"), hgb); @@ -1059,19 +1059,19 @@ KNConfig::ReadNewsGeneralWidget::ReadNewsGeneralWidget( ReadNewsGeneral *d, TQWi topL->setResizeMode(TQLayout::Minimum); - connect(a_utoCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(m_axFetch, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(m_arkCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(m_arkSecs, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(m_arkCrossCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(s_martScrollingCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(e_xpThrCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(d_efaultExpandCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(l_inesCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(s_coreCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(u_nreadCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(c_ollCacheSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(a_rtCacheSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(a_utoCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(m_axFetch, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(m_arkCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(m_arkSecs, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(m_arkCrossCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(s_martScrollingCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(e_xpThrCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(d_efaultExpandCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(l_inesCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(s_coreCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(u_nreadCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(c_ollCacheSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(a_rtCacheSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); load(); } @@ -1138,7 +1138,7 @@ KNConfig::ReadNewsNavigationWidget::ReadNewsNavigationWidget( ReadNewsNavigation m_arkAllReadGoNextCB=new TQCheckBox(i18n("&Switch to the next group"), gb); gbL->addWidget(m_arkAllReadGoNextCB); - connect(m_arkAllReadGoNextCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(m_arkAllReadGoNextCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); // ==== Mark Thread as Read ================================================= @@ -1152,8 +1152,8 @@ KNConfig::ReadNewsNavigationWidget::ReadNewsNavigationWidget( ReadNewsNavigation m_arkThreadReadGoNextCB=new TQCheckBox(i18n("Go &to the next unread thread"), gb); gbL->addWidget(m_arkThreadReadGoNextCB); - connect(m_arkThreadReadCloseThreadCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(m_arkThreadReadGoNextCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(m_arkThreadReadCloseThreadCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(m_arkThreadReadGoNextCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); // ==== Ignore Thread ======================================================= @@ -1167,8 +1167,8 @@ KNConfig::ReadNewsNavigationWidget::ReadNewsNavigationWidget( ReadNewsNavigation i_gnoreThreadGoNextCB=new TQCheckBox(i18n("Go to the next &unread thread"), gb); gbL->addWidget(i_gnoreThreadGoNextCB); - connect(i_gnoreThreadCloseThreadCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(i_gnoreThreadGoNextCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(i_gnoreThreadCloseThreadCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(i_gnoreThreadGoNextCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); topL->addStretch(1); topL->setResizeMode(TQLayout::Minimum); @@ -1253,14 +1253,14 @@ KNConfig::ReadNewsViewerWidget::ReadNewsViewerWidget( ReadNewsViewer *d, TQWidge topL->setResizeMode(TQLayout::Minimum); - connect(r_ewrapCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(r_emoveTrailingCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(s_igCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(q_uoteCharacters, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); - connect(o_penAttCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(a_ltAttCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect( mShowRefBar, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); - connect( mAlwaysShowHTML, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); + connect(r_ewrapCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(r_emoveTrailingCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(s_igCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(q_uoteCharacters, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); + connect(o_penAttCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(a_ltAttCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect( mShowRefBar, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) ); + connect( mAlwaysShowHTML, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) ); load(); } @@ -1311,29 +1311,29 @@ KNConfig::DisplayedHeadersWidget::DisplayedHeadersWidget( DisplayedHeaders *d, T //listbox l_box=new KNDialogListBox(false, this); - connect(l_box, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotItemSelected(int))); - connect(l_box, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect(l_box, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotItemSelected(int))); + connect(l_box, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); topL->addMultiCellWidget(l_box, 0,6, 0,0); // buttons a_ddBtn=new TQPushButton(i18n("&Add..."), this); - connect(a_ddBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddBtnClicked())); + connect(a_ddBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddBtnClicked())); topL->addWidget(a_ddBtn, 0,1); d_elBtn=new TQPushButton(i18n("&Delete"), this); - connect(d_elBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelBtnClicked())); + connect(d_elBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelBtnClicked())); topL->addWidget(d_elBtn, 1,1); e_ditBtn=new TQPushButton(i18n("modify something","&Edit..."), this); - connect(e_ditBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditBtnClicked())); + connect(e_ditBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditBtnClicked())); topL->addWidget(e_ditBtn, 2,1); u_pBtn=new TQPushButton(i18n("&Up"), this); - connect(u_pBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpBtnClicked())); + connect(u_pBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpBtnClicked())); topL->addWidget(u_pBtn, 4,1); d_ownBtn=new TQPushButton(i18n("Do&wn"), this); - connect(d_ownBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownBtnClicked())); + connect(d_ownBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDownBtnClicked())); topL->addWidget(d_ownBtn, 5,1); topL->addRowSpacing(3,20); // separate up/down buttons @@ -1499,7 +1499,7 @@ KNConfig::DisplayedHeaderConfDialog::DisplayedHeaderConfDialog(KNDisplayedHeader h_drC=new KComboBox(true, nameW); h_drC->lineEdit()->setMaxLength(64); - connect(h_drC, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int))); + connect(h_drC, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int))); nameL->addWidget(new TQLabel(h_drC, i18n("H&eader:"),nameW),0,0); nameL->addWidget(h_drC,0,1); @@ -1551,7 +1551,7 @@ KNConfig::DisplayedHeaderConfDialog::DisplayedHeaderConfDialog(KNDisplayedHeader setFixedHeight(sizeHint().height()); KNHelper::restoreWindowSize("accReadHdrPropDLG", this, sizeHint()); - connect(n_ameE, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotNameChanged(const TQString&))); + connect(n_ameE, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotNameChanged(const TQString&))); setHelp("anc-knode-headers"); slotNameChanged( n_ameE->text() ); @@ -1610,13 +1610,13 @@ KNConfig::ScoringWidget::ScoringWidget( Scoring *d, TQWidget *p, const char *n ) TQLabel *l=new TQLabel(i_gnored, i18n("Default score for &ignored threads:"), this); topL->addWidget(l, 2, 0); topL->addWidget(i_gnored, 2, 1); - connect(i_gnored, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(i_gnored, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); w_atched=new KIntSpinBox(-100000, 100000, 1, 0, 10, this); l=new TQLabel(w_atched, i18n("Default score for &watched threads:"), this); topL->addWidget(l, 3, 0); topL->addWidget(w_atched, 3, 1); - connect(w_atched, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(w_atched, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); topL->setColStretch(0, 1); @@ -1658,24 +1658,24 @@ KNConfig::FilterListWidget::FilterListWidget( TQWidget *p, const char *n ) : f_lb=new KNDialogListBox(false, this); topL->addWidget(new TQLabel(f_lb, i18n("&Filters:"),this),0,0); - connect(f_lb, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChangedFilter())); - connect(f_lb, TQT_SIGNAL(selected(int)), TQT_SLOT(slotItemSelectedFilter(int))); + connect(f_lb, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChangedFilter())); + connect(f_lb, TQ_SIGNAL(selected(int)), TQ_SLOT(slotItemSelectedFilter(int))); topL->addMultiCellWidget(f_lb,1,5,0,0); a_ddBtn=new TQPushButton(i18n("&Add..."), this); - connect(a_ddBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddBtnClicked())); + connect(a_ddBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddBtnClicked())); topL->addWidget(a_ddBtn,1,1); e_ditBtn=new TQPushButton(i18n("modify something","&Edit..."), this); - connect(e_ditBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditBtnClicked())); + connect(e_ditBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditBtnClicked())); topL->addWidget(e_ditBtn,2,1); c_opyBtn=new TQPushButton(i18n("Co&py..."), this); - connect(c_opyBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCopyBtnClicked())); + connect(c_opyBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCopyBtnClicked())); topL->addWidget(c_opyBtn,3,1); d_elBtn=new TQPushButton(i18n("&Delete"), this); - connect(d_elBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelBtnClicked())); + connect(d_elBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelBtnClicked())); topL->addWidget(d_elBtn,4,1); // == Menu ==================================================== @@ -1683,23 +1683,23 @@ KNConfig::FilterListWidget::FilterListWidget( TQWidget *p, const char *n ) : m_lb=new KNDialogListBox(false, this); topL->addWidget(new TQLabel(m_lb, i18n("&Menu:"),this),6,0); - connect(m_lb, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChangedMenu())); + connect(m_lb, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChangedMenu())); topL->addMultiCellWidget(m_lb,7,11,0,0); u_pBtn=new TQPushButton(i18n("&Up"), this); - connect(u_pBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpBtnClicked())); + connect(u_pBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpBtnClicked())); topL->addWidget(u_pBtn,7,1); d_ownBtn=new TQPushButton(i18n("Do&wn"), this); - connect(d_ownBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownBtnClicked())); + connect(d_ownBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDownBtnClicked())); topL->addWidget(d_ownBtn,8,1); s_epAddBtn=new TQPushButton(i18n("Add\n&Separator"), this); - connect(s_epAddBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSepAddBtnClicked())); + connect(s_epAddBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSepAddBtnClicked())); topL->addWidget(s_epAddBtn,9,1); s_epRemBtn=new TQPushButton(i18n("&Remove\nSeparator"), this); - connect(s_epRemBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSepRemBtnClicked())); + connect(s_epRemBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSepRemBtnClicked())); topL->addWidget(s_epRemBtn,10,1); topL->setRowStretch(5,1); @@ -1946,21 +1946,21 @@ KNConfig::PostNewsTechnicalWidget::PostNewsTechnicalWidget( PostNewsTechnical *d c_harset->insertStringList(d->composerCharsets()); ggbL->addWidget(new TQLabel(c_harset, i18n("Cha&rset:"), ggb), 1,0); ggbL->addWidget(c_harset, 1,1); - connect(c_harset, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(c_harset, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); e_ncoding=new TQComboBox(ggb); e_ncoding->insertItem(i18n("Allow 8-bit")); e_ncoding->insertItem(i18n("7-bit (Quoted-Printable)")); ggbL->addWidget(new TQLabel(e_ncoding, i18n("Enco&ding:"), ggb), 2,0); ggbL->addWidget(e_ncoding, 2,1); - connect(e_ncoding, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(e_ncoding, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); u_seOwnCSCB=new TQCheckBox(i18n("Use o&wn default charset when replying"), ggb); ggbL->addMultiCellWidget(u_seOwnCSCB, 3,3, 0,1); - connect(u_seOwnCSCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(u_seOwnCSCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); g_enMIdCB=new TQCheckBox(i18n("&Generate message-id"), ggb); - connect(g_enMIdCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotGenMIdCBToggled(bool))); + connect(g_enMIdCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotGenMIdCBToggled(bool))); ggbL->addMultiCellWidget(g_enMIdCB, 4,4, 0,1); h_ost=new KLineEdit(ggb); h_ost->setEnabled(false); @@ -1969,7 +1969,7 @@ KNConfig::PostNewsTechnicalWidget::PostNewsTechnicalWidget( PostNewsTechnical *d ggbL->addWidget(h_ostL, 5,0); ggbL->addWidget(h_ost, 5,1); ggbL->setColStretch(1,1); - connect(h_ost, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); + connect(h_ost, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); // ==== X-Headers ============================================================= @@ -1980,20 +1980,20 @@ KNConfig::PostNewsTechnicalWidget::PostNewsTechnicalWidget( PostNewsTechnical *d xgbL->addRowSpacing(0, fontMetrics().lineSpacing()-4); l_box=new KNDialogListBox(false, xgb); - connect(l_box, TQT_SIGNAL(selected(int)), TQT_SLOT(slotItemSelected(int))); - connect(l_box, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(l_box, TQ_SIGNAL(selected(int)), TQ_SLOT(slotItemSelected(int))); + connect(l_box, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); xgbL->addMultiCellWidget(l_box, 1,4, 0,0); a_ddBtn=new TQPushButton(i18n("&Add..."), xgb); - connect(a_ddBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddBtnClicked())); + connect(a_ddBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddBtnClicked())); xgbL->addWidget(a_ddBtn, 1,1); d_elBtn=new TQPushButton(i18n("Dele&te"), xgb); - connect(d_elBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelBtnClicked())); + connect(d_elBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelBtnClicked())); xgbL->addWidget(d_elBtn, 2,1); e_ditBtn=new TQPushButton(i18n("modify something","&Edit..."), xgb); - connect(e_ditBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditBtnClicked())); + connect(e_ditBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditBtnClicked())); xgbL->addWidget(e_ditBtn, 3,1); TQLabel *placeHolders = new TQLabel(i18n("<qt>Placeholders for replies: <b>%NAME</b>=sender's name, <b>%EMAIL</b>=sender's address</qt>"), xgb); @@ -2001,7 +2001,7 @@ KNConfig::PostNewsTechnicalWidget::PostNewsTechnicalWidget( PostNewsTechnical *d i_ncUaCB=new TQCheckBox(i18n("Do not add the \"&User-Agent\" identification header"), xgb); xgbL->addMultiCellWidget(i_ncUaCB, 6,6, 0,1); - connect(i_ncUaCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(i_ncUaCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); xgbL->setRowStretch(4,1); xgbL->setColStretch(0,1); @@ -2183,13 +2183,13 @@ KNConfig::PostNewsComposerWidget::PostNewsComposerWidget( PostNewsComposer *d, T generalL->addWidget(w_ordWrapCB,1,0); m_axLen=new KIntSpinBox(20, 200, 1, 20, 10, generalB); generalL->addWidget(m_axLen,1,2); - connect(w_ordWrapCB, TQT_SIGNAL(toggled(bool)), m_axLen, TQT_SLOT(setEnabled(bool))); - connect(w_ordWrapCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(m_axLen, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(w_ordWrapCB, TQ_SIGNAL(toggled(bool)), m_axLen, TQ_SLOT(setEnabled(bool))); + connect(w_ordWrapCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(m_axLen, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); o_wnSigCB=new TQCheckBox(i18n("Appe&nd signature automatically"), generalB); generalL->addMultiCellWidget(o_wnSigCB,2,2,0,1); - connect(o_wnSigCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(o_wnSigCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); generalL->setColStretch(1,1); @@ -2205,19 +2205,19 @@ KNConfig::PostNewsComposerWidget::PostNewsComposerWidget( PostNewsComposer *d, T replyL->addMultiCellWidget(new TQLabel(i_ntro,i18n("&Introduction phrase:"), replyB),1,1,0,1); replyL->addMultiCellWidget(i_ntro, 2,2,0,1); replyL->addMultiCellWidget(new TQLabel(i18n("<qt>Placeholders: <b>%NAME</b>=sender's name, <b>%EMAIL</b>=sender's address,<br><b>%DATE</b>=date, <b>%MSID</b>=message-id, <b>%GROUP</b>=group name, <b>%L</b>=line break</qt>"), replyB),3,3,0,1); - connect(i_ntro, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); + connect(i_ntro, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); r_ewrapCB=new TQCheckBox(i18n("Rewrap quoted te&xt automatically"), replyB); replyL->addMultiCellWidget(r_ewrapCB, 4,4,0,1); - connect(r_ewrapCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(r_ewrapCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); a_uthSigCB=new TQCheckBox(i18n("Include the a&uthor's signature"), replyB); replyL->addMultiCellWidget(a_uthSigCB, 5,5,0,1); - connect(a_uthSigCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(a_uthSigCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); c_ursorOnTopCB=new TQCheckBox(i18n("Put the cursor &below the introduction phrase"), replyB); replyL->addMultiCellWidget(c_ursorOnTopCB, 6,6,0,1); - connect(c_ursorOnTopCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(c_ursorOnTopCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); replyL->setColStretch(1,1); @@ -2233,15 +2233,15 @@ KNConfig::PostNewsComposerWidget::PostNewsComposerWidget( PostNewsComposer *d, T editorL->addWidget(new TQLabel(e_ditor, i18n("Specify edi&tor:"), editorB),1,0); editorL->addWidget(e_ditor,1,1); TQPushButton *btn = new TQPushButton(i18n("Choo&se..."),editorB); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotChooseEditor())); - connect(e_ditor, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotChooseEditor())); + connect(e_ditor, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); editorL->addWidget(btn,1,2); editorL->addMultiCellWidget(new TQLabel(i18n("%f will be replaced with the filename to edit."), editorB),2,2,0,2); e_xternCB=new TQCheckBox(i18n("Start exte&rnal editor automatically"), editorB); editorL->addMultiCellWidget(e_xternCB, 3,3,0,2); - connect(e_xternCB, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); + connect(e_xternCB, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); editorL->setColStretch(1,1); @@ -2310,7 +2310,7 @@ KNConfig::PostNewsSpellingWidget::PostNewsSpellingWidget( TQWidget *p, const cha c_onf = new KSpellConfig( this, "spell", 0, false ); topL->addWidget(c_onf); - connect(c_onf, TQT_SIGNAL(configChanged()), TQT_SLOT(changed())); + connect(c_onf, TQ_SIGNAL(configChanged()), TQ_SLOT(changed())); topL->addStretch(1); } @@ -2335,7 +2335,7 @@ KNConfig::PrivacyWidget::PrivacyWidget(TQWidget *p, const char *n) : TQBoxLayout *topLayout = new TQVBoxLayout(this, 5); c_onf = new Kpgp::Config(this,"knode pgp config",false); topLayout->addWidget(c_onf); - connect(c_onf, TQT_SIGNAL(changed()), TQT_SLOT(changed())); + connect(c_onf, TQ_SIGNAL(changed()), TQ_SLOT(changed())); topLayout->addStretch(1); @@ -2367,7 +2367,7 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren if (!mData->isGlobal()) { mDefault = new TQCheckBox( i18n("&Use global cleanup configuration"), this ); - connect( mDefault, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDefaultToggled(bool)) ); + connect( mDefault, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDefaultToggled(bool)) ); top->addWidget( mDefault ); } @@ -2382,38 +2382,38 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren mExpEnabled = new TQCheckBox( i18n("&Expire old articles automatically"), mExpGroup ); grid->addMultiCellWidget( mExpEnabled, 1, 1, 0, 1 ); - connect( mExpEnabled, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()) ); + connect( mExpEnabled, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()) ); mExpDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup ); TQLabel *label = new TQLabel( mExpDays, i18n("&Purge groups every:"), mExpGroup ); grid->addWidget( label, 2, 0 ); grid->addWidget( mExpDays, 2, 1, TQt::AlignRight ); - connect( mExpDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) ); - connect( mExpDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expDaysChanged(int)) ); - connect( mExpEnabled, TQT_SIGNAL(toggled(bool)), label, TQT_SLOT(setEnabled(bool)) ); - connect( mExpEnabled, TQT_SIGNAL(toggled(bool)), mExpDays, TQT_SLOT(setEnabled(bool)) ); + connect( mExpDays, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()) ); + connect( mExpDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(expDaysChanged(int)) ); + connect( mExpEnabled, TQ_SIGNAL(toggled(bool)), label, TQ_SLOT(setEnabled(bool)) ); + connect( mExpEnabled, TQ_SIGNAL(toggled(bool)), mExpDays, TQ_SLOT(setEnabled(bool)) ); mExpReadDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup ); label = new TQLabel( mExpReadDays, i18n("&Keep read articles:"), mExpGroup ); grid->addWidget( label, 3, 0 ); grid->addWidget( mExpReadDays, 3, 1, TQt::AlignRight ); - connect( mExpReadDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) ); - connect( mExpReadDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expReadDaysChanged(int)) ); + connect( mExpReadDays, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()) ); + connect( mExpReadDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(expReadDaysChanged(int)) ); mExpUnreadDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup ); label = new TQLabel( mExpUnreadDays, i18n("Keep u&nread articles:"), mExpGroup ); grid->addWidget( label, 4, 0 ); grid->addWidget( mExpUnreadDays, 4, 1, TQt::AlignRight ); - connect( mExpUnreadDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) ); - connect( mExpUnreadDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expUnreadDaysChanged(int)) ); + connect( mExpUnreadDays, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()) ); + connect( mExpUnreadDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(expUnreadDaysChanged(int)) ); mExpUnavailable = new TQCheckBox( i18n("&Remove articles that are not available on the server"), mExpGroup ); grid->addMultiCellWidget( mExpUnavailable, 5, 5, 0, 1 ); - connect( mExpUnavailable, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()) ); + connect( mExpUnavailable, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()) ); mPreserveThreads = new TQCheckBox( i18n("Preser&ve threads"), mExpGroup ); grid->addMultiCellWidget( mPreserveThreads, 6, 6, 0, 1 ); - connect( mPreserveThreads, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()) ); + connect( mPreserveThreads, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()) ); grid->setColStretch(1,1); } @@ -2476,7 +2476,7 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) : mGroupCleanup = new GroupCleanupWidget( d_ata, this ); topL->addWidget( mGroupCleanup ); - connect( mGroupCleanup, TQT_SIGNAL(changed()), TQT_SLOT(changed()) ); + connect( mGroupCleanup, TQ_SIGNAL(changed()), TQ_SLOT(changed()) ); // === folders ========================================================= @@ -2491,15 +2491,15 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) : foldersL->setRowSpacing( 0, KDialog::spacingHint() ); f_olderCB=new TQCheckBox(i18n("Co&mpact folders automatically"), foldersB); - connect(f_olderCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotFolderCBtoggled(bool))); + connect(f_olderCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotFolderCBtoggled(bool))); foldersL->addMultiCellWidget(f_olderCB,1,1,0,1); f_olderDays=new KIntSpinBox(0, 99999, 1, 0, 10, foldersB); f_olderDaysL=new TQLabel(f_olderDays,i18n("P&urge folders every:"), foldersB); foldersL->addWidget(f_olderDaysL,2,0); foldersL->addWidget(f_olderDays,2,1,TQt::AlignRight); - connect(f_olderDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(f_olderDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotFolderDaysChanged(int))); + connect(f_olderDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(f_olderDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotFolderDaysChanged(int))); foldersL->setColStretch(1,1); diff --git a/knode/knconfigwidgets.h b/knode/knconfigwidgets.h index 85c2ecd7..66978aca 100644 --- a/knode/knconfigwidgets.h +++ b/knode/knconfigwidgets.h @@ -63,7 +63,7 @@ namespace KNConfig { namespace KNConfig { -class KDE_EXPORT IdentityWidget : public TDECModule { +class TDE_EXPORT IdentityWidget : public TDECModule { TQ_OBJECT @@ -105,7 +105,7 @@ class KDE_EXPORT IdentityWidget : public TDECModule { }; -class KDE_EXPORT NntpAccountListWidget : public TDECModule { +class TDE_EXPORT NntpAccountListWidget : public TDECModule { TQ_OBJECT @@ -153,7 +153,7 @@ class KDE_EXPORT NntpAccountListWidget : public TDECModule { }; -class KDE_EXPORT NntpAccountConfDialog : public KDialogBase { +class TDE_EXPORT NntpAccountConfDialog : public KDialogBase { TQ_OBJECT @@ -195,7 +195,7 @@ class KDE_EXPORT NntpAccountConfDialog : public KDialogBase { }; -class KDE_EXPORT SmtpAccountWidget : public SmtpAccountWidgetBase { +class TDE_EXPORT SmtpAccountWidget : public SmtpAccountWidgetBase { TQ_OBJECT @@ -217,7 +217,7 @@ TQ_OBJECT }; -class KDE_EXPORT AppearanceWidget : public TDECModule { +class TDE_EXPORT AppearanceWidget : public TDECModule { TQ_OBJECT @@ -233,7 +233,7 @@ class KDE_EXPORT AppearanceWidget : public TDECModule { //=================================================================================== // code taken from KMail, Copyright (C) 2000 Espen Sand, espen@kde.org - class KDE_EXPORT ColorListItem : public TQListBoxText { + class TDE_EXPORT ColorListItem : public TQListBoxText { public: ColorListItem( const TQString &text, const TQColor &color=TQt::black ); @@ -252,7 +252,7 @@ class KDE_EXPORT AppearanceWidget : public TDECModule { //=================================================================================== - class KDE_EXPORT FontListItem : public TQListBoxText { + class TDE_EXPORT FontListItem : public TQListBoxText { public: FontListItem( const TQString &name, const TQFont & ); @@ -296,7 +296,7 @@ class KDE_EXPORT AppearanceWidget : public TDECModule { }; -class KDE_EXPORT ReadNewsGeneralWidget : public TDECModule { +class TDE_EXPORT ReadNewsGeneralWidget : public TDECModule { public: ReadNewsGeneralWidget(ReadNewsGeneral *d, TQWidget *p=0, const char *n=0); @@ -325,7 +325,7 @@ class KDE_EXPORT ReadNewsGeneralWidget : public TDECModule { }; -class KDE_EXPORT ReadNewsNavigationWidget : public TDECModule { +class TDE_EXPORT ReadNewsNavigationWidget : public TDECModule { public: ReadNewsNavigationWidget(ReadNewsNavigation *d, TQWidget *p=0, const char *n=0); @@ -346,7 +346,7 @@ class KDE_EXPORT ReadNewsNavigationWidget : public TDECModule { }; -class KDE_EXPORT ReadNewsViewerWidget : public TDECModule { +class TDE_EXPORT ReadNewsViewerWidget : public TDECModule { TQ_OBJECT @@ -373,7 +373,7 @@ class KDE_EXPORT ReadNewsViewerWidget : public TDECModule { }; -class KDE_EXPORT DisplayedHeadersWidget : public TDECModule { +class TDE_EXPORT DisplayedHeadersWidget : public TDECModule { TQ_OBJECT @@ -420,7 +420,7 @@ class KDE_EXPORT DisplayedHeadersWidget : public TDECModule { }; -class KDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase { +class TDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase { TQ_OBJECT @@ -445,7 +445,7 @@ class KDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase { }; -class KDE_EXPORT ScoringWidget : public TDECModule { +class TDE_EXPORT ScoringWidget : public TDECModule { TQ_OBJECT @@ -466,7 +466,7 @@ class KDE_EXPORT ScoringWidget : public TDECModule { }; -class KDE_EXPORT FilterListWidget : public TDECModule { +class TDE_EXPORT FilterListWidget : public TDECModule { TQ_OBJECT @@ -532,7 +532,7 @@ class KDE_EXPORT FilterListWidget : public TDECModule { }; -class KDE_EXPORT PostNewsTechnicalWidget : public TDECModule { +class TDE_EXPORT PostNewsTechnicalWidget : public TDECModule { TQ_OBJECT @@ -570,7 +570,7 @@ class KDE_EXPORT PostNewsTechnicalWidget : public TDECModule { }; -class KDE_EXPORT XHeaderConfDialog : public KDialogBase { +class TDE_EXPORT XHeaderConfDialog : public KDialogBase { public: XHeaderConfDialog(const TQString &h=TQString(), TQWidget *p=0, const char *n=0); @@ -586,7 +586,7 @@ class KDE_EXPORT XHeaderConfDialog : public KDialogBase { }; -class KDE_EXPORT PostNewsComposerWidget : public TDECModule { +class TDE_EXPORT PostNewsComposerWidget : public TDECModule { TQ_OBJECT @@ -617,7 +617,7 @@ class KDE_EXPORT PostNewsComposerWidget : public TDECModule { }; -class KDE_EXPORT PostNewsSpellingWidget : public TDECModule { +class TDE_EXPORT PostNewsSpellingWidget : public TDECModule { public: PostNewsSpellingWidget(TQWidget *p=0, const char *n=0); @@ -632,7 +632,7 @@ class KDE_EXPORT PostNewsSpellingWidget : public TDECModule { -class KDE_EXPORT PrivacyWidget : public TDECModule { +class TDE_EXPORT PrivacyWidget : public TDECModule { TQ_OBJECT @@ -652,7 +652,7 @@ class KDE_EXPORT PrivacyWidget : public TDECModule { //BEGIN: Cleanup configuration ----------------------------------------------- /** Configuration widget for group expireration */ -class KDE_EXPORT GroupCleanupWidget : public TQWidget { +class TDE_EXPORT GroupCleanupWidget : public TQWidget { TQ_OBJECT @@ -681,7 +681,7 @@ class KDE_EXPORT GroupCleanupWidget : public TQWidget { /** Global cleanup configuration widget */ -class KDE_EXPORT CleanupWidget : public TDECModule { +class TDE_EXPORT CleanupWidget : public TDECModule { TQ_OBJECT diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp index 20a63ffa..dce0df7a 100644 --- a/knode/knconvert.cpp +++ b/knode/knconvert.cpp @@ -21,9 +21,9 @@ #include <tdefiledialog.h> #include <kseparator.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <klineedit.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeapplication.h> #include <kpushbutton.h> @@ -47,7 +47,7 @@ bool KNConvert::needToConvert(const TQString &oldVersion) KNConvert::KNConvert(const TQString &version) : TQDialog(0,0,true), l_ogList(0), c_onversionDone(false), v_ersion(version) { - setCaption(kapp->makeStdCaption(i18n("Conversion"))); + setCaption(tdeApp->makeStdCaption(i18n("Conversion"))); TQVBoxLayout *topL=new TQVBoxLayout(this, 5,5); s_tack=new TQWidgetStack(this); topL->addWidget(s_tack, 1); @@ -61,8 +61,8 @@ KNConvert::KNConvert(const TQString &version) c_ancelBtn=new KPushButton(KStdGuiItem::cancel(), this); btnL->addWidget(c_ancelBtn); - connect(s_tartBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStart())); - connect(c_ancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(s_tartBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStart())); + connect(c_ancelBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); w_1=new TQWidget(s_tack); s_tack->addWidget(w_1, 1); @@ -78,7 +78,7 @@ will be created before the conversion starts.").arg(KNODE_VERSION), w_1); c_reateBkup=new TQCheckBox(i18n("Create backup of old data"), w_1); w1L->addMultiCellWidget(c_reateBkup, 2,2, 0,2); - connect(c_reateBkup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCreateBkupToggled(bool))); + connect(c_reateBkup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotCreateBkupToggled(bool))); b_ackupPathLabel=new TQLabel(i18n("Save backup in:"), w_1); w1L->addWidget(b_ackupPathLabel, 3,0); @@ -87,7 +87,7 @@ will be created before the conversion starts.").arg(KNODE_VERSION), w_1); w1L->addWidget(b_ackupPath, 3,1); b_rowseBtn= new TQPushButton(i18n("Browse..."), w_1); - connect(b_rowseBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBrowse())); + connect(b_rowseBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBrowse())); w1L->addWidget(b_rowseBtn, 3,2); w1L->setColStretch(1,1); w1L->addRowSpacing(1,15); @@ -177,7 +177,7 @@ void KNConvert::slotStart() *t_ar << "tar"; *t_ar << "-cz" << dataDir << "-f" << b_ackupPath->text(); - connect(t_ar, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotTarExited(TDEProcess*))); + connect(t_ar, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotTarExited(TDEProcess*))); if(!t_ar->start()) { delete t_ar; t_ar = 0; diff --git a/knode/knconvert.h b/knode/knconvert.h index 56d2f13b..323a67c8 100644 --- a/knode/knconvert.h +++ b/knode/knconvert.h @@ -21,7 +21,7 @@ #include <tqglobal.h> #include <tqvaluelist.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQListBox; class TQLabel; @@ -32,7 +32,7 @@ class KLineEdit; class TDEProcess; -class KDE_EXPORT KNConvert : public TQDialog { +class TDE_EXPORT KNConvert : public TQDialog { TQ_OBJECT diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp index 6a0e972a..b8471e6b 100644 --- a/knode/knfilterdialog.cpp +++ b/knode/knfilterdialog.cpp @@ -78,7 +78,7 @@ KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *parent, const char KNHelper::restoreWindowSize("filterDLG", this, sizeHint()); setHelp("anc-using-filters"); - connect( fname, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotTextChanged( const TQString & ))); + connect( fname, TQ_SIGNAL( textChanged ( const TQString & )), this, TQ_SLOT( slotTextChanged( const TQString & ))); slotTextChanged( fname->text() ); } diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp index eee045c2..b5394e28 100644 --- a/knode/knfiltermanager.cpp +++ b/knode/knfiltermanager.cpp @@ -17,8 +17,8 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include "utilities.h" #include "knglobals.h" @@ -34,7 +34,7 @@ KNFilterSelectAction::KNFilterSelectAction( const TQString& text, const TQString : TDEActionMenu(text,pix,parent,name), currentItem(-42) { popupMenu()->setCheckable(true); - connect(popupMenu(),TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotMenuActivated(int))); + connect(popupMenu(),TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotMenuActivated(int))); setDelayed(false); } @@ -107,7 +107,7 @@ void KNFilterManager::loadFilters() TQString fname(locate("data","knode/filters/filters.rc") ); if (!fname.isNull()) { - KSimpleConfig conf(fname,true); + TDESimpleConfig conf(fname,true); TQValueList<int> activeFilters = conf.readIntListEntry("Active"); menuOrder = conf.readIntListEntry("Menu"); @@ -135,7 +135,7 @@ void KNFilterManager::saveFilterLists() KNHelper::displayInternalFileError(); return; } - KSimpleConfig conf(dir+"filters.rc"); + TDESimpleConfig conf(dir+"filters.rc"); TQValueList<int> activeFilters; for ( TQValueList<KNArticleFilter*>::Iterator it = mFilterList.begin(); it != mFilterList.end(); ++it ) activeFilters << (*it)->id(); @@ -383,10 +383,10 @@ void KNFilterManager::setMenuAction(KNFilterSelectAction *a, TDEAction *keybA) { if(a) { a_ctFilter = a; - connect(a_ctFilter, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuActivated(int))); + connect(a_ctFilter, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int))); } if(keybA) - connect(keybA, TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowFilterChooser())); + connect(keybA, TQ_SIGNAL(activated()), this, TQ_SLOT(slotShowFilterChooser())); updateMenu(); } diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp index ee4449fa..d2e90fa4 100644 --- a/knode/knfolder.cpp +++ b/knode/knfolder.cpp @@ -14,8 +14,8 @@ #include <tqfileinfo.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdelocale.h> @@ -111,7 +111,7 @@ bool KNFolder::readInfo(const TQString &infoPath) i_nfoPath=infoPath; - KSimpleConfig info(i_nfoPath); + TDESimpleConfig info(i_nfoPath); if (!isRootFolder() && !isStandardFolder()) { n_ame=info.readEntry("name"); i_d=info.readNumEntry("id", -1); @@ -143,7 +143,7 @@ bool KNFolder::readInfo() void KNFolder::saveInfo() { if(!i_nfoPath.isEmpty()) { - KSimpleConfig info(i_nfoPath); + TDESimpleConfig info(i_nfoPath); if (!isRootFolder() && !isStandardFolder()) { info.writeEntry("name", n_ame); info.writeEntry("id", i_d); diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp index 2b6d1cc1..f4f4a22a 100644 --- a/knode/knfoldermanager.cpp +++ b/knode/knfoldermanager.cpp @@ -16,7 +16,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "knglobals.h" diff --git a/knode/knglobals.h b/knode/knglobals.h index c2eca4b8..91dd6838 100644 --- a/knode/knglobals.h +++ b/knode/knglobals.h @@ -20,7 +20,7 @@ #include <tdeconfig.h> #include "resource.h" -#include <kdemacros.h> +#include <tdemacros.h> class TDEInstance; class KNConfigManager; @@ -49,7 +49,7 @@ namespace KNode { via KNodeApp. Now they can be accessed directly, this removes many header dependencies. (knode.h isn't include everywhere) */ -class KDE_EXPORT KNGlobals { +class TDE_EXPORT KNGlobals { public: KNGlobals(); ~KNGlobals(); @@ -93,6 +93,6 @@ private: }; -extern KNGlobals knGlobals KDE_EXPORT; +extern KNGlobals knGlobals TDE_EXPORT; #endif diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp index 95de1a5b..e5f8f2d3 100644 --- a/knode/kngroup.cpp +++ b/knode/kngroup.cpp @@ -13,7 +13,7 @@ */ -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> #include <kdebug.h> @@ -77,7 +77,7 @@ void KNGroup::updateListItem() bool KNGroup::readInfo(const TQString &confPath) { - KSimpleConfig info(confPath); + TDESimpleConfig info(confPath); g_roupname = info.readEntry("groupname"); d_escription = info.readEntry("description"); @@ -122,7 +122,7 @@ void KNGroup::saveInfo() TQString dir(path()); if (!dir.isNull()) { - KSimpleConfig info(dir+g_roupname+".grpinfo"); + TDESimpleConfig info(dir+g_roupname+".grpinfo"); info.writeEntry("groupname", g_roupname); info.writeEntry("description", d_escription); diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp index bafa065c..865dbd20 100644 --- a/knode/kngroupbrowser.cpp +++ b/knode/kngroupbrowser.cpp @@ -87,8 +87,8 @@ KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntp groupView->addColumn(i18n("Description")); groupView->setTreeStepSize(15); - connect(groupView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this, TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); + connect(groupView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(slotItemDoubleClicked(TQListViewItem*))); //layout TQGridLayout *topL=new TQGridLayout(page,3,1,0,5); @@ -119,22 +119,22 @@ KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntp arrL->addWidget(arrowBtn2, AlignCenter); //connect - connect(filterEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotFilterTextChanged(const TQString&))); - connect(groupView, TQT_SIGNAL(expanded(TQListViewItem*)), - TQT_SLOT(slotItemExpand(TQListViewItem*))); + connect(filterEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotFilterTextChanged(const TQString&))); + connect(groupView, TQ_SIGNAL(expanded(TQListViewItem*)), + TQ_SLOT(slotItemExpand(TQListViewItem*))); - connect(refilterTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotRefilter())); - connect(noTreeCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotTreeCBToggled())); - connect(subCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotSubCBToggled())); - connect(newCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewCBToggled())); + connect(refilterTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotRefilter())); + connect(noTreeCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotTreeCBToggled())); + connect(subCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotSubCBToggled())); + connect(newCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewCBToggled())); enableButton(User1,false); enableButton(User2,false); filterEdit->setFocus(); - TQTimer::singleShot(2, this, TQT_SLOT(slotLoadList())); + TQTimer::singleShot(2, this, TQ_SLOT(slotLoadList())); } @@ -301,7 +301,7 @@ void KNGroupBrowser::slotItemExpand(TQListViewItem *it) { groupView->ensureVisible(groupView->contentsX(), y+h/2, 0, h/2); delayedCenter = y+h/2; - TQTimer::singleShot(300, this, TQT_SLOT(slotCenterDelayed())); + TQTimer::singleShot(300, this, TQ_SLOT(slotCenterDelayed())); } } diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp index 19bbad34..0fe1e7db 100644 --- a/knode/kngroupdialog.cpp +++ b/knode/kngroupdialog.cpp @@ -51,17 +51,17 @@ KNGroupDialog::KNGroupDialog(TQWidget *parent, KNNntpAccount *a) : dir1=right; dir2=left; - connect(groupView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(groupView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); - connect(subView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(unsubView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - - connect(arrowBtn1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn1())); - connect(arrowBtn2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn2())); + connect(groupView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(groupView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); + connect(subView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(unsubView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + + connect(arrowBtn1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn1())); + connect(arrowBtn2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn2())); KNHelper::restoreWindowSize("groupDlg", this, TQSize(662,393)); // optimized for 800x600 @@ -293,7 +293,7 @@ void KNGroupDialog::slotUser2() TQLabel *l = new TQLabel(TDEGlobal::locale()->formatDate(lastDate, false),btnGrp); topL->addWidget(l, 1, 1, TQt::AlignLeft); - connect(takeLast, TQT_SIGNAL(toggled(bool)), l, TQT_SLOT(setEnabled(bool))); + connect(takeLast, TQ_SIGNAL(toggled(bool)), l, TQ_SLOT(setEnabled(bool))); TQRadioButton *takeCustom = new TQRadioButton( i18n("Created since this date:"), btnGrp ); topL->addMultiCellWidget(takeCustom, 2, 2, 0, 1); @@ -302,7 +302,7 @@ void KNGroupDialog::slotUser2() dateSel->setMinimumSize(dateSel->sizeHint()); topL->addWidget(dateSel, 3, 1, TQt::AlignLeft); - connect(takeCustom, TQT_SIGNAL(toggled(bool)), dateSel, TQT_SLOT(setEnabled(bool))); + connect(takeCustom, TQ_SIGNAL(toggled(bool)), dateSel, TQ_SLOT(setEnabled(bool))); takeLast->setChecked(true); dateSel->setEnabled(false); diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp index d2d21762..e4c7aed6 100644 --- a/knode/kngroupmanager.cpp +++ b/knode/kngroupmanager.cpp @@ -418,10 +418,10 @@ void KNGroupManager::showGroupDialog(KNNntpAccount *a, TQWidget *parent) { KNGroupDialog* gDialog=new KNGroupDialog((parent!=0)? parent:knGlobals.topWidget, a); - connect(gDialog, TQT_SIGNAL(loadList(KNNntpAccount*)), this, TQT_SLOT(slotLoadGroupList(KNNntpAccount*))); - connect(gDialog, TQT_SIGNAL(fetchList(KNNntpAccount*)), this, TQT_SLOT(slotFetchGroupList(KNNntpAccount*))); - connect(gDialog, TQT_SIGNAL(checkNew(KNNntpAccount*,TQDate)), this, TQT_SLOT(slotCheckForNewGroups(KNNntpAccount*,TQDate))); - connect(this, TQT_SIGNAL(newListReady(KNGroupListData*)), gDialog, TQT_SLOT(slotReceiveList(KNGroupListData*))); + connect(gDialog, TQ_SIGNAL(loadList(KNNntpAccount*)), this, TQ_SLOT(slotLoadGroupList(KNNntpAccount*))); + connect(gDialog, TQ_SIGNAL(fetchList(KNNntpAccount*)), this, TQ_SLOT(slotFetchGroupList(KNNntpAccount*))); + connect(gDialog, TQ_SIGNAL(checkNew(KNNntpAccount*,TQDate)), this, TQ_SLOT(slotCheckForNewGroups(KNNntpAccount*,TQDate))); + connect(this, TQ_SIGNAL(newListReady(KNGroupListData*)), gDialog, TQ_SLOT(slotReceiveList(KNGroupListData*))); if(gDialog->exec()) { KNGroup *g=0; diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp index a6a90578..5a7f5200 100644 --- a/knode/kngrouppropdlg.cpp +++ b/knode/kngrouppropdlg.cpp @@ -62,7 +62,7 @@ KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *nam c_harset->insertStringList(knGlobals.configManager()->postNewsTechnical()->composerCharsets()); c_harset->setCurrentItem(knGlobals.configManager()->postNewsTechnical()->indexForCharset(g_rp->defaultCharset())); c_harset->setEnabled(g_rp->useCharset()); - connect(u_seCharset, TQT_SIGNAL(toggled(bool)), c_harset, TQT_SLOT(setEnabled(bool))); + connect(u_seCharset, TQ_SIGNAL(toggled(bool)), c_harset, TQ_SLOT(setEnabled(bool))); grpL->addWidget(c_harset, 2,2); grpL->setColStretch(1,1); diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp index 07f118c8..10374d6d 100644 --- a/knode/kngroupselectdialog.cpp +++ b/knode/kngroupselectdialog.cpp @@ -44,14 +44,14 @@ KNGroupSelectDialog::KNGroupSelectDialog(TQWidget *parent, KNNntpAccount *a, con new GroupItem(selView, info); } - connect(selView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(groupView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(groupView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); - connect(arrowBtn1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn1())); - connect(arrowBtn2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn2())); + connect(selView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(groupView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(groupView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); + connect(arrowBtn1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn1())); + connect(arrowBtn2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn2())); KNHelper::restoreWindowSize("groupSelDlg", this, TQSize(659,364)); // optimized for 800x600 } diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp index 7d4ac912..74d98a85 100644 --- a/knode/knjobdata.cpp +++ b/knode/knjobdata.cpp @@ -105,10 +105,10 @@ void KNJobData::setJob( TDEIO::Job *job ) { mJob = job; if ( job ) { - connect( job, TQT_SIGNAL( percent(TDEIO::Job*, unsigned long) ), - TQT_SLOT( slotJobPercent(TDEIO::Job*, unsigned long) ) ); - connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ), - TQT_SLOT( slotJobInfoMessage(TDEIO::Job*, const TQString&) ) ); + connect( job, TQ_SIGNAL( percent(TDEIO::Job*, unsigned long) ), + TQ_SLOT( slotJobPercent(TDEIO::Job*, unsigned long) ) ); + connect( job, TQ_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ), + TQ_SLOT( slotJobInfoMessage(TDEIO::Job*, const TQString&) ) ); } } diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp index 948ce37e..473807ed 100644 --- a/knode/knmainwidget.cpp +++ b/knode/knmainwidget.cpp @@ -93,7 +93,7 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa //article view a_rtDock = createDockWidget("article_viewer", SmallIcon("contents"), 0, - kapp->makeStdCaption(i18n("Article Viewer")), i18n("Article Viewer")); + tdeApp->makeStdCaption(i18n("Article Viewer")), i18n("Article Viewer")); if (!detachable) { a_rtDock->setEnableDocking(KDockWidget::DockFullSite); } @@ -106,13 +106,13 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa //setView(a_rtDock); setMainDockWidget(a_rtDock); - connect(a_rtDock, TQT_SIGNAL(iMBeingClosed()), TQT_SLOT(slotArticleDockHidden())); - connect(a_rtDock, TQT_SIGNAL(hasUndocked()), TQT_SLOT(slotArticleDockHidden())); - connect( mArticleViewer, TQT_SIGNAL(focusChangeRequest(TQWidget*)), TQT_SLOT(slotDockWidgetFocusChangeRequest(TQWidget*)) ); + connect(a_rtDock, TQ_SIGNAL(iMBeingClosed()), TQ_SLOT(slotArticleDockHidden())); + connect(a_rtDock, TQ_SIGNAL(hasUndocked()), TQ_SLOT(slotArticleDockHidden())); + connect( mArticleViewer, TQ_SIGNAL(focusChangeRequest(TQWidget*)), TQ_SLOT(slotDockWidgetFocusChangeRequest(TQWidget*)) ); //collection view c_olDock = createDockWidget("group_view", UserIcon("group"), 0, - kapp->makeStdCaption(i18n("Group View")), i18n("Group View")); + tdeApp->makeStdCaption(i18n("Group View")), i18n("Group View")); if (!detachable) { c_olDock->setEnableDocking(KDockWidget::DockFullSite); } @@ -123,26 +123,26 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa c_olDock->setWidget(c_olView); c_olDock->manualDock(a_rtDock, KDockWidget::DockLeft, 3000); - connect(c_olDock, TQT_SIGNAL(iMBeingClosed()), TQT_SLOT(slotGroupDockHidden())); - connect(c_olDock, TQT_SIGNAL(hasUndocked()), TQT_SLOT(slotGroupDockHidden())); - connect(c_olView, TQT_SIGNAL(focusChangeRequest(TQWidget *)), TQT_SLOT(slotDockWidgetFocusChangeRequest(TQWidget *))); - connect(c_olView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotCollectionSelected(TQListViewItem*))); - connect(c_olView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotCollectionRMB(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(c_olView, TQT_SIGNAL(folderDrop(TQDropEvent*, KNCollectionViewItem*)), - TQT_SLOT(slotCollectionViewDrop(TQDropEvent*, KNCollectionViewItem*))); - connect(c_olView, TQT_SIGNAL(itemRenamed(TQListViewItem*)), - TQT_SLOT(slotCollectionRenamed(TQListViewItem*))); - - accel->connectItem( accel->insertItem(Key_Up), mArticleViewer, TQT_SLOT(scrollUp()) ); - accel->connectItem( accel->insertItem(Key_Down), mArticleViewer, TQT_SLOT(scrollDown()) ); - accel->connectItem( accel->insertItem(Key_Prior), mArticleViewer, TQT_SLOT(scrollPrior()) ); - accel->connectItem( accel->insertItem(Key_Next), mArticleViewer, TQT_SLOT(scrollNext()) ); + connect(c_olDock, TQ_SIGNAL(iMBeingClosed()), TQ_SLOT(slotGroupDockHidden())); + connect(c_olDock, TQ_SIGNAL(hasUndocked()), TQ_SLOT(slotGroupDockHidden())); + connect(c_olView, TQ_SIGNAL(focusChangeRequest(TQWidget *)), TQ_SLOT(slotDockWidgetFocusChangeRequest(TQWidget *))); + connect(c_olView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotCollectionSelected(TQListViewItem*))); + connect(c_olView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQ_SLOT(slotCollectionRMB(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(c_olView, TQ_SIGNAL(folderDrop(TQDropEvent*, KNCollectionViewItem*)), + TQ_SLOT(slotCollectionViewDrop(TQDropEvent*, KNCollectionViewItem*))); + connect(c_olView, TQ_SIGNAL(itemRenamed(TQListViewItem*)), + TQ_SLOT(slotCollectionRenamed(TQListViewItem*))); + + accel->connectItem( accel->insertItem(Key_Up), mArticleViewer, TQ_SLOT(scrollUp()) ); + accel->connectItem( accel->insertItem(Key_Down), mArticleViewer, TQ_SLOT(scrollDown()) ); + accel->connectItem( accel->insertItem(Key_Prior), mArticleViewer, TQ_SLOT(scrollPrior()) ); + accel->connectItem( accel->insertItem(Key_Next), mArticleViewer, TQ_SLOT(scrollNext()) ); //header view h_drDock = createDockWidget("header_view", SmallIcon("text_block"), 0, - kapp->makeStdCaption(i18n("Header View")), i18n("Header View")); + tdeApp->makeStdCaption(i18n("Header View")), i18n("Header View")); if (!detachable) { h_drDock->setEnableDocking(KDockWidget::DockFullSite); } @@ -171,25 +171,25 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa s_earchLineEdit = new TDEListViewSearchLine(q_uicksearch, h_drView, "TDEListViewSearchLine"); q_uicksearch->setStretchableWidget(s_earchLineEdit); lbl->setBuddy(s_earchLineEdit); - connect( resetQuickSearch, TQT_SIGNAL( activated() ), s_earchLineEdit, TQT_SLOT( clear() )); + connect( resetQuickSearch, TQ_SIGNAL( activated() ), s_earchLineEdit, TQ_SLOT( clear() )); vlay->addWidget(q_uicksearch); vlay->addWidget(h_drView); - connect(h_drDock, TQT_SIGNAL(iMBeingClosed()), TQT_SLOT(slotHeaderDockHidden())); - connect(h_drDock, TQT_SIGNAL(hasUndocked()), TQT_SLOT(slotHeaderDockHidden())); - connect(h_drView, TQT_SIGNAL(focusChangeRequest(TQWidget *)), - TQT_SLOT(slotDockWidgetFocusChangeRequest(TQWidget *))); - connect(h_drView, TQT_SIGNAL(itemSelected(TQListViewItem*)), - TQT_SLOT(slotArticleSelected(TQListViewItem*))); - connect(h_drView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotArticleSelectionChanged())); - connect(h_drView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotArticleRMB(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(h_drView, TQT_SIGNAL(doubleClick(TQListViewItem *)), - TQT_SLOT(slotOpenArticle(TQListViewItem *))); - connect(h_drView, TQT_SIGNAL(sortingChanged(int)), - TQT_SLOT(slotHdrViewSortingChanged(int))); + connect(h_drDock, TQ_SIGNAL(iMBeingClosed()), TQ_SLOT(slotHeaderDockHidden())); + connect(h_drDock, TQ_SIGNAL(hasUndocked()), TQ_SLOT(slotHeaderDockHidden())); + connect(h_drView, TQ_SIGNAL(focusChangeRequest(TQWidget *)), + TQ_SLOT(slotDockWidgetFocusChangeRequest(TQWidget *))); + connect(h_drView, TQ_SIGNAL(itemSelected(TQListViewItem*)), + TQ_SLOT(slotArticleSelected(TQListViewItem*))); + connect(h_drView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotArticleSelectionChanged())); + connect(h_drView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQ_SLOT(slotArticleRMB(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(h_drView, TQ_SIGNAL(doubleClick(TQListViewItem *)), + TQ_SLOT(slotOpenArticle(TQListViewItem *))); + connect(h_drView, TQ_SIGNAL(sortingChanged(int)), + TQ_SLOT(slotHdrViewSortingChanged(int))); //actions initActions(); @@ -200,7 +200,7 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa //Network n_etAccess = knGlobals.netAccess(); - connect(n_etAccess, TQT_SIGNAL(netActive(bool)), this, TQT_SLOT(slotNetworkActive(bool))); + connect(n_etAccess, TQ_SIGNAL(netActive(bool)), this, TQ_SLOT(slotNetworkActive(bool))); //Filter Manager f_ilManager = knGlobals.filterManager(); @@ -225,8 +225,8 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa // Score Manager s_coreManager = knGlobals.scoringManager(); - //connect(s_coreManager, TQT_SIGNAL(changedRules()), TQT_SLOT(slotReScore())); - connect(s_coreManager, TQT_SIGNAL(finishedEditing()), TQT_SLOT(slotReScore())); + //connect(s_coreManager, TQ_SIGNAL(changedRules()), TQ_SLOT(slotReScore())); + connect(s_coreManager, TQ_SIGNAL(finishedEditing()), TQ_SLOT(slotReScore())); // Memory Manager m_emManager = knGlobals.memoryManager(); @@ -419,7 +419,7 @@ void KNMainWidget::secureProcessEvents() naccel->setEnabled(false); installEventFilter(this); - kapp->processEvents(); + tdeApp->processEvents(); b_lockui = false; if ( mbar ) @@ -550,114 +550,114 @@ void KNMainWidget::initActions() //navigation a_ctNavNextArt = new TDEAction( KGuiItem(i18n("&Next Article"), "go-next", - i18n("Go to next article")), "N;Right", TQT_TQOBJECT(h_drView), - TQT_SLOT(nextArticle()), actionCollection(), "go_nextArticle" ); + i18n("Go to next article")), "N;Right", h_drView, + TQ_SLOT(nextArticle()), actionCollection(), "go_nextArticle" ); a_ctNavPrevArt = new TDEAction( KGuiItem(i18n("&Previous Article"), "go-previous", - i18n("Go to previous article")), "P;Left" , TQT_TQOBJECT(h_drView), - TQT_SLOT(prevArticle()), actionCollection(), "go_prevArticle" ); - a_ctNavNextUnreadArt = new TDEAction(i18n("Next Unread &Article"), "1rightarrow", ALT+SHIFT+Key_Space , TQT_TQOBJECT(this), - TQT_SLOT(slotNavNextUnreadArt()), actionCollection(), "go_nextUnreadArticle"); - a_ctNavNextUnreadThread = new TDEAction(i18n("Next Unread &Thread"),"2rightarrow", SHIFT+Key_Space , TQT_TQOBJECT(this), - TQT_SLOT(slotNavNextUnreadThread()), actionCollection(), "go_nextUnreadThread"); - a_ctNavNextGroup = new TDEAction(i18n("Ne&xt Group"), "go-down", Key_Plus , TQT_TQOBJECT(c_olView), - TQT_SLOT(nextGroup()), actionCollection(), "go_nextGroup"); - a_ctNavPrevGroup = new TDEAction(i18n("Pre&vious Group"), "go-up", Key_Minus , TQT_TQOBJECT(c_olView), - TQT_SLOT(prevGroup()), actionCollection(), "go_prevGroup"); - a_ctNavReadThrough = new TDEAction(i18n("Read &Through Articles"), Key_Space , TQT_TQOBJECT(this), - TQT_SLOT(slotNavReadThrough()), actionCollection(), "go_readThrough"); + i18n("Go to previous article")), "P;Left" , h_drView, + TQ_SLOT(prevArticle()), actionCollection(), "go_prevArticle" ); + a_ctNavNextUnreadArt = new TDEAction(i18n("Next Unread &Article"), "1rightarrow", ALT+SHIFT+Key_Space , this, + TQ_SLOT(slotNavNextUnreadArt()), actionCollection(), "go_nextUnreadArticle"); + a_ctNavNextUnreadThread = new TDEAction(i18n("Next Unread &Thread"),"2rightarrow", SHIFT+Key_Space , this, + TQ_SLOT(slotNavNextUnreadThread()), actionCollection(), "go_nextUnreadThread"); + a_ctNavNextGroup = new TDEAction(i18n("Ne&xt Group"), "go-down", Key_Plus , c_olView, + TQ_SLOT(nextGroup()), actionCollection(), "go_nextGroup"); + a_ctNavPrevGroup = new TDEAction(i18n("Pre&vious Group"), "go-up", Key_Minus , c_olView, + TQ_SLOT(prevGroup()), actionCollection(), "go_prevGroup"); + a_ctNavReadThrough = new TDEAction(i18n("Read &Through Articles"), Key_Space , this, + TQ_SLOT(slotNavReadThrough()), actionCollection(), "go_readThrough"); a_ctNavReadThrough->plugAccel(a_ccel); TQAccel *accel = new TQAccel( this ); - new TDEAction( i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(c_olView), - TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder" ); + new TDEAction( i18n("Focus on Next Folder"), CTRL+Key_Right, c_olView, + TQ_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder" ); accel->connectItem(accel->insertItem(CTRL+Key_Right), - c_olView, TQT_SLOT(incCurrentFolder())); - new TDEAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(c_olView), - TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder" ); + c_olView, TQ_SLOT(incCurrentFolder())); + new TDEAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, c_olView, + TQ_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder" ); accel->connectItem(accel->insertItem(CTRL+Key_Left), - c_olView, TQT_SLOT(decCurrentFolder())); - new TDEAction( i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(c_olView), - TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder" ); + c_olView, TQ_SLOT(decCurrentFolder())); + new TDEAction( i18n("Select Folder with Focus"), CTRL+Key_Space, c_olView, + TQ_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder" ); accel->connectItem(accel->insertItem(CTRL+Key_Space), - c_olView, TQT_SLOT(selectCurrentFolder())); + c_olView, TQ_SLOT(selectCurrentFolder())); - new TDEAction( i18n("Focus on Next Article"), ALT+Key_Right, TQT_TQOBJECT(h_drView), - TQT_SLOT(incCurrentArticle()), actionCollection(), "inc_current_article" ); + new TDEAction( i18n("Focus on Next Article"), ALT+Key_Right, h_drView, + TQ_SLOT(incCurrentArticle()), actionCollection(), "inc_current_article" ); accel->connectItem( accel->insertItem(ALT+Key_Right), - TQT_TQOBJECT(h_drView), TQT_SLOT(incCurrentArticle()) ); - new TDEAction( i18n("Focus on Previous Article"), ALT+Key_Left, TQT_TQOBJECT(h_drView), - TQT_SLOT(decCurrentArticle()), actionCollection(), "dec_current_article" ); + h_drView, TQ_SLOT(incCurrentArticle()) ); + new TDEAction( i18n("Focus on Previous Article"), ALT+Key_Left, h_drView, + TQ_SLOT(decCurrentArticle()), actionCollection(), "dec_current_article" ); accel->connectItem( accel->insertItem(ALT+Key_Left), - TQT_TQOBJECT(h_drView), TQT_SLOT(decCurrentArticle()) ); - new TDEAction( i18n("Select Article with Focus"), ALT+Key_Space, TQT_TQOBJECT(h_drView), - TQT_SLOT(selectCurrentArticle()), actionCollection(), "select_current_article" ); + h_drView, TQ_SLOT(decCurrentArticle()) ); + new TDEAction( i18n("Select Article with Focus"), ALT+Key_Space, h_drView, + TQ_SLOT(selectCurrentArticle()), actionCollection(), "select_current_article" ); accel->connectItem( accel->insertItem(ALT+Key_Space), - TQT_TQOBJECT(h_drView), TQT_SLOT(selectCurrentArticle()) ); + h_drView, TQ_SLOT(selectCurrentArticle()) ); //collection-view - accounts - a_ctAccProperties = new TDEAction(i18n("Account &Properties"), "configure", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAccProperties()), actionCollection(), "account_properties"); - a_ctAccRename = new TDEAction(i18n("&Rename Account"), "text", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAccRename()), actionCollection(), "account_rename"); - a_ctAccSubscribe = new TDEAction(i18n("&Subscribe to Newsgroups..."), "news_subscribe", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAccSubscribe()), actionCollection(), "account_subscribe"); - a_ctAccExpireAll = new TDEAction(i18n("&Expire All Groups"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAccExpireAll()), actionCollection(), "account_expire_all"); - a_ctAccGetNewHdrs = new TDEAction(i18n("&Get New Articles in All Groups"), "mail_get", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAccGetNewHdrs()), actionCollection(), "account_dnlHeaders"); - a_ctAccGetNewHdrsAll = new TDEAction(i18n("&Get New Articles in All Accounts"), "mail_get_all", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAccGetNewHdrsAll()), actionCollection(), "account_dnlAllHeaders"); - a_ctAccDelete = new TDEAction(i18n("&Delete Account"), "edit-delete", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAccDelete()), actionCollection(), "account_delete"); - a_ctAccPostNewArticle = new TDEAction(i18n("&Post to Newsgroup..."), "mail-message-new", CTRL+Key_N, TQT_TQOBJECT(this), - TQT_SLOT(slotAccPostNewArticle()), actionCollection(), "article_postNew"); + a_ctAccProperties = new TDEAction(i18n("Account &Properties"), "configure", 0, this, + TQ_SLOT(slotAccProperties()), actionCollection(), "account_properties"); + a_ctAccRename = new TDEAction(i18n("&Rename Account"), "text", 0, this, + TQ_SLOT(slotAccRename()), actionCollection(), "account_rename"); + a_ctAccSubscribe = new TDEAction(i18n("&Subscribe to Newsgroups..."), "news_subscribe", 0, this, + TQ_SLOT(slotAccSubscribe()), actionCollection(), "account_subscribe"); + a_ctAccExpireAll = new TDEAction(i18n("&Expire All Groups"), 0, this, + TQ_SLOT(slotAccExpireAll()), actionCollection(), "account_expire_all"); + a_ctAccGetNewHdrs = new TDEAction(i18n("&Get New Articles in All Groups"), "mail_get", 0, this, + TQ_SLOT(slotAccGetNewHdrs()), actionCollection(), "account_dnlHeaders"); + a_ctAccGetNewHdrsAll = new TDEAction(i18n("&Get New Articles in All Accounts"), "mail_get_all", 0, this, + TQ_SLOT(slotAccGetNewHdrsAll()), actionCollection(), "account_dnlAllHeaders"); + a_ctAccDelete = new TDEAction(i18n("&Delete Account"), "edit-delete", 0, this, + TQ_SLOT(slotAccDelete()), actionCollection(), "account_delete"); + a_ctAccPostNewArticle = new TDEAction(i18n("&Post to Newsgroup..."), "mail-message-new", CTRL+Key_N, this, + TQ_SLOT(slotAccPostNewArticle()), actionCollection(), "article_postNew"); //collection-view - groups - a_ctGrpProperties = new TDEAction(i18n("Group &Properties"), "configure", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpProperties()), actionCollection(), "group_properties"); - a_ctGrpRename = new TDEAction(i18n("Rename &Group"), "text", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpRename()), actionCollection(), "group_rename"); - a_ctGrpGetNewHdrs = new TDEAction(i18n("&Get New Articles"), "mail_get" , 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpGetNewHdrs()), actionCollection(), "group_dnlHeaders"); - a_ctGrpExpire = new TDEAction(i18n("E&xpire Group"), "wizard", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpExpire()), actionCollection(), "group_expire"); - a_ctGrpReorganize = new TDEAction(i18n("Re&organize Group"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpReorganize()), actionCollection(), "group_reorg"); - a_ctGrpUnsubscribe = new TDEAction(i18n("&Unsubscribe From Group"), "news_unsubscribe", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpUnsubscribe()), actionCollection(), "group_unsubscribe"); - a_ctGrpSetAllRead = new TDEAction(i18n("Mark All as &Read"), "goto", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpSetAllRead()), actionCollection(), "group_allRead"); - a_ctGrpSetAllUnread = new TDEAction(i18n("Mark All as U&nread"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpSetAllUnread()), actionCollection(), "group_allUnread"); - a_ctGrpSetUnread = new TDEAction(i18n("Mark Last as Unr&ead..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpSetUnread()), actionCollection(), "group_unread"); + a_ctGrpProperties = new TDEAction(i18n("Group &Properties"), "configure", 0, this, + TQ_SLOT(slotGrpProperties()), actionCollection(), "group_properties"); + a_ctGrpRename = new TDEAction(i18n("Rename &Group"), "text", 0, this, + TQ_SLOT(slotGrpRename()), actionCollection(), "group_rename"); + a_ctGrpGetNewHdrs = new TDEAction(i18n("&Get New Articles"), "mail_get" , 0, this, + TQ_SLOT(slotGrpGetNewHdrs()), actionCollection(), "group_dnlHeaders"); + a_ctGrpExpire = new TDEAction(i18n("E&xpire Group"), "wizard", 0, this, + TQ_SLOT(slotGrpExpire()), actionCollection(), "group_expire"); + a_ctGrpReorganize = new TDEAction(i18n("Re&organize Group"), 0, this, + TQ_SLOT(slotGrpReorganize()), actionCollection(), "group_reorg"); + a_ctGrpUnsubscribe = new TDEAction(i18n("&Unsubscribe From Group"), "news_unsubscribe", 0, this, + TQ_SLOT(slotGrpUnsubscribe()), actionCollection(), "group_unsubscribe"); + a_ctGrpSetAllRead = new TDEAction(i18n("Mark All as &Read"), "goto", 0, this, + TQ_SLOT(slotGrpSetAllRead()), actionCollection(), "group_allRead"); + a_ctGrpSetAllUnread = new TDEAction(i18n("Mark All as U&nread"), 0, this, + TQ_SLOT(slotGrpSetAllUnread()), actionCollection(), "group_allUnread"); + a_ctGrpSetUnread = new TDEAction(i18n("Mark Last as Unr&ead..."), 0, this, + TQ_SLOT(slotGrpSetUnread()), actionCollection(), "group_unread"); (void) new TDEAction( i18n("&Configure KNode..."), - "configure", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSettings()), actionCollection(), + "configure", 0, this, + TQ_SLOT(slotSettings()), actionCollection(), "knode_configure_knode" ); //collection-view - folder - a_ctFolNew = new TDEAction(i18n("&New Folder"), "folder-new", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolNew()), actionCollection(), "folder-new"); - a_ctFolNewChild = new TDEAction(i18n("New &Subfolder"), "folder-new", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolNewChild()), actionCollection(), "folder_newChild"); - a_ctFolDelete = new TDEAction(i18n("&Delete Folder"), "edit-delete", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolDelete()), actionCollection(), "folder_delete"); - a_ctFolRename = new TDEAction(i18n("&Rename Folder"), "text", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolRename()), actionCollection(), "folder_rename"); - a_ctFolCompact = new TDEAction(i18n("C&ompact Folder"), "wizard", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolCompact()), actionCollection(), "folder_compact"); - a_ctFolCompactAll = new TDEAction(i18n("Co&mpact All Folders"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolCompactAll()), actionCollection(), "folder_compact_all"); - a_ctFolEmpty = new TDEAction(i18n("&Empty Folder"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolEmpty()), actionCollection(), "folder_empty"); - a_ctFolMboxImport = new TDEAction(i18n("&Import MBox Folder..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolMBoxImport()), actionCollection(), "folder_MboxImport"); - a_ctFolMboxExport = new TDEAction(i18n("E&xport as MBox Folder..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolMBoxExport()), actionCollection(), "folder_MboxExport"); + a_ctFolNew = new TDEAction(i18n("&New Folder"), "folder-new", 0, this, + TQ_SLOT(slotFolNew()), actionCollection(), "folder-new"); + a_ctFolNewChild = new TDEAction(i18n("New &Subfolder"), "folder-new", 0, this, + TQ_SLOT(slotFolNewChild()), actionCollection(), "folder_newChild"); + a_ctFolDelete = new TDEAction(i18n("&Delete Folder"), "edit-delete", 0, this, + TQ_SLOT(slotFolDelete()), actionCollection(), "folder_delete"); + a_ctFolRename = new TDEAction(i18n("&Rename Folder"), "text", 0, this, + TQ_SLOT(slotFolRename()), actionCollection(), "folder_rename"); + a_ctFolCompact = new TDEAction(i18n("C&ompact Folder"), "wizard", 0, this, + TQ_SLOT(slotFolCompact()), actionCollection(), "folder_compact"); + a_ctFolCompactAll = new TDEAction(i18n("Co&mpact All Folders"), 0, this, + TQ_SLOT(slotFolCompactAll()), actionCollection(), "folder_compact_all"); + a_ctFolEmpty = new TDEAction(i18n("&Empty Folder"), 0, this, + TQ_SLOT(slotFolEmpty()), actionCollection(), "folder_empty"); + a_ctFolMboxImport = new TDEAction(i18n("&Import MBox Folder..."), 0, this, + TQ_SLOT(slotFolMBoxImport()), actionCollection(), "folder_MboxImport"); + a_ctFolMboxExport = new TDEAction(i18n("E&xport as MBox Folder..."), 0, this, + TQ_SLOT(slotFolMBoxExport()), actionCollection(), "folder_MboxExport"); //header-view - list-handling a_ctArtSortHeaders = new TDESelectAction(i18n("S&ort"), 0, actionCollection(), "view_Sort"); @@ -669,96 +669,96 @@ void KNMainWidget::initActions() items += i18n("By &Date"); a_ctArtSortHeaders->setItems(items); a_ctArtSortHeaders->setShortcutConfigurable(false); - connect(a_ctArtSortHeaders, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotArtSortHeaders(int))); - a_ctArtSortHeadersKeyb = new TDEAction(i18n("Sort"), TQString(), Key_F7 , TQT_TQOBJECT(this), - TQT_SLOT(slotArtSortHeadersKeyb()), actionCollection(), "view_Sort_Keyb"); + connect(a_ctArtSortHeaders, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotArtSortHeaders(int))); + a_ctArtSortHeadersKeyb = new TDEAction(i18n("Sort"), TQString(), Key_F7 , this, + TQ_SLOT(slotArtSortHeadersKeyb()), actionCollection(), "view_Sort_Keyb"); a_ctArtSortHeadersKeyb->plugAccel(a_ccel); a_ctArtFilter = new KNFilterSelectAction(i18n("&Filter"), "filter", actionCollection(), "view_Filter"); a_ctArtFilter->setShortcutConfigurable(false); a_ctArtFilterKeyb = new TDEAction(i18n("Filter"), Key_F6, actionCollection(), "view_Filter_Keyb"); a_ctArtFilterKeyb->plugAccel(a_ccel); - a_ctArtSearch = new TDEAction(i18n("&Search Articles..."),"mail_find" , Key_F4 , TQT_TQOBJECT(this), - TQT_SLOT(slotArtSearch()), actionCollection(), "article_search"); - a_ctArtRefreshList = new TDEAction(i18n("&Refresh List"),"reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(this), - TQT_SLOT(slotArtRefreshList()), actionCollection(), "view_Refresh"); - a_ctArtCollapseAll = new TDEAction(i18n("&Collapse All Threads"), 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotArtCollapseAll()), actionCollection(), "view_CollapseAll"); - a_ctArtExpandAll = new TDEAction(i18n("E&xpand All Threads"), 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotArtExpandAll()), actionCollection(), "view_ExpandAll"); - a_ctArtToggleThread = new TDEAction(i18n("&Toggle Subthread"), Key_T, TQT_TQOBJECT(this), - TQT_SLOT(slotArtToggleThread()), actionCollection(), "thread_toggle"); - a_ctArtToggleShowThreads = new TDEToggleAction(i18n("Show T&hreads"), 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotArtToggleShowThreads()), actionCollection(), "view_showThreads"); + a_ctArtSearch = new TDEAction(i18n("&Search Articles..."),"mail_find" , Key_F4 , this, + TQ_SLOT(slotArtSearch()), actionCollection(), "article_search"); + a_ctArtRefreshList = new TDEAction(i18n("&Refresh List"),"reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), this, + TQ_SLOT(slotArtRefreshList()), actionCollection(), "view_Refresh"); + a_ctArtCollapseAll = new TDEAction(i18n("&Collapse All Threads"), 0 , this, + TQ_SLOT(slotArtCollapseAll()), actionCollection(), "view_CollapseAll"); + a_ctArtExpandAll = new TDEAction(i18n("E&xpand All Threads"), 0 , this, + TQ_SLOT(slotArtExpandAll()), actionCollection(), "view_ExpandAll"); + a_ctArtToggleThread = new TDEAction(i18n("&Toggle Subthread"), Key_T, this, + TQ_SLOT(slotArtToggleThread()), actionCollection(), "thread_toggle"); + a_ctArtToggleShowThreads = new TDEToggleAction(i18n("Show T&hreads"), 0 , this, + TQ_SLOT(slotArtToggleShowThreads()), actionCollection(), "view_showThreads"); a_ctArtToggleShowThreads->setCheckedState(i18n("Hide T&hreads")); a_ctArtToggleShowThreads->setChecked(c_fgManager->readNewsGeneral()->showThreads()); //header-view - remote articles - a_ctArtSetArtRead = new TDEAction(i18n("Mark as &Read"), Key_D , TQT_TQOBJECT(this), - TQT_SLOT(slotArtSetArtRead()), actionCollection(), "article_read"); - a_ctArtSetArtUnread = new TDEAction(i18n("Mar&k as Unread"), Key_U , TQT_TQOBJECT(this), - TQT_SLOT(slotArtSetArtUnread()), actionCollection(), "article_unread"); - a_ctArtSetThreadRead = new TDEAction(i18n("Mark &Thread as Read"), CTRL+Key_D , TQT_TQOBJECT(this), - TQT_SLOT(slotArtSetThreadRead()), actionCollection(), "thread_read"); - a_ctArtSetThreadUnread = new TDEAction(i18n("Mark T&hread as Unread"), CTRL+Key_U , TQT_TQOBJECT(this), - TQT_SLOT(slotArtSetThreadUnread()), actionCollection(), "thread_unread"); - a_ctArtOpenNewWindow = new TDEAction(i18n("Open in Own &Window"), "window-new", Key_O , TQT_TQOBJECT(this), - TQT_SLOT(slotArtOpenNewWindow()), actionCollection(), "article_ownWindow"); + a_ctArtSetArtRead = new TDEAction(i18n("Mark as &Read"), Key_D , this, + TQ_SLOT(slotArtSetArtRead()), actionCollection(), "article_read"); + a_ctArtSetArtUnread = new TDEAction(i18n("Mar&k as Unread"), Key_U , this, + TQ_SLOT(slotArtSetArtUnread()), actionCollection(), "article_unread"); + a_ctArtSetThreadRead = new TDEAction(i18n("Mark &Thread as Read"), CTRL+Key_D , this, + TQ_SLOT(slotArtSetThreadRead()), actionCollection(), "thread_read"); + a_ctArtSetThreadUnread = new TDEAction(i18n("Mark T&hread as Unread"), CTRL+Key_U , this, + TQ_SLOT(slotArtSetThreadUnread()), actionCollection(), "thread_unread"); + a_ctArtOpenNewWindow = new TDEAction(i18n("Open in Own &Window"), "window-new", Key_O , this, + TQ_SLOT(slotArtOpenNewWindow()), actionCollection(), "article_ownWindow"); // scoring - a_ctScoresEdit = new TDEAction(i18n("&Edit Scoring Rules..."), "edit", CTRL+Key_E, TQT_TQOBJECT(this), - TQT_SLOT(slotScoreEdit()), actionCollection(), "scoreedit"); - a_ctReScore = new TDEAction(i18n("Recalculate &Scores"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotReScore()),actionCollection(),"rescore"); - a_ctScoreLower = new TDEAction(i18n("&Lower Score for Author..."), CTRL+Key_L, TQT_TQOBJECT(this), - TQT_SLOT(slotScoreLower()), actionCollection(), "scorelower"); - a_ctScoreRaise = new TDEAction(i18n("&Raise Score for Author..."), CTRL+Key_I, TQT_TQOBJECT(this), - TQT_SLOT(slotScoreRaise()),actionCollection(),"scoreraise"); - a_ctArtToggleIgnored = new TDEAction(i18n("&Ignore Thread"), "go-bottom", Key_I , TQT_TQOBJECT(this), - TQT_SLOT(slotArtToggleIgnored()), actionCollection(), "thread_ignore"); - a_ctArtToggleWatched = new TDEAction(i18n("&Watch Thread"), "go-top", Key_W , TQT_TQOBJECT(this), - TQT_SLOT(slotArtToggleWatched()), actionCollection(), "thread_watch"); + a_ctScoresEdit = new TDEAction(i18n("&Edit Scoring Rules..."), "edit", CTRL+Key_E, this, + TQ_SLOT(slotScoreEdit()), actionCollection(), "scoreedit"); + a_ctReScore = new TDEAction(i18n("Recalculate &Scores"), 0, this, + TQ_SLOT(slotReScore()),actionCollection(),"rescore"); + a_ctScoreLower = new TDEAction(i18n("&Lower Score for Author..."), CTRL+Key_L, this, + TQ_SLOT(slotScoreLower()), actionCollection(), "scorelower"); + a_ctScoreRaise = new TDEAction(i18n("&Raise Score for Author..."), CTRL+Key_I, this, + TQ_SLOT(slotScoreRaise()),actionCollection(),"scoreraise"); + a_ctArtToggleIgnored = new TDEAction(i18n("&Ignore Thread"), "go-bottom", Key_I , this, + TQ_SLOT(slotArtToggleIgnored()), actionCollection(), "thread_ignore"); + a_ctArtToggleWatched = new TDEAction(i18n("&Watch Thread"), "go-top", Key_W , this, + TQ_SLOT(slotArtToggleWatched()), actionCollection(), "thread_watch"); //header-view local articles - a_ctArtSendOutbox = new TDEAction(i18n("Sen&d Pending Messages"), "mail-send", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotArtSendOutbox()), actionCollection(), "net_sendPending"); - a_ctArtDelete = new TDEAction(i18n("&Delete Article"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), - TQT_SLOT(slotArtDelete()), actionCollection(), "article_delete"); - a_ctArtSendNow = new TDEAction(i18n("Send &Now"),"mail-send", 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotArtSendNow()), actionCollection(), "article_sendNow"); - a_ctArtEdit = new TDEAction(i18n("edit article","&Edit Article..."), "edit", Key_E , TQT_TQOBJECT(this), - TQT_SLOT(slotArtEdit()), actionCollection(), "article_edit"); + a_ctArtSendOutbox = new TDEAction(i18n("Sen&d Pending Messages"), "mail-send", 0, this, + TQ_SLOT(slotArtSendOutbox()), actionCollection(), "net_sendPending"); + a_ctArtDelete = new TDEAction(i18n("&Delete Article"), "edit-delete", Key_Delete, this, + TQ_SLOT(slotArtDelete()), actionCollection(), "article_delete"); + a_ctArtSendNow = new TDEAction(i18n("Send &Now"),"mail-send", 0 , this, + TQ_SLOT(slotArtSendNow()), actionCollection(), "article_sendNow"); + a_ctArtEdit = new TDEAction(i18n("edit article","&Edit Article..."), "edit", Key_E , this, + TQ_SLOT(slotArtEdit()), actionCollection(), "article_edit"); //network - a_ctNetCancel = new TDEAction(i18n("Stop &Network"),"process-stop",0, TQT_TQOBJECT(this), - TQT_SLOT(slotNetCancel()), actionCollection(), "net_stop"); + a_ctNetCancel = new TDEAction(i18n("Stop &Network"),"process-stop",0, this, + TQ_SLOT(slotNetCancel()), actionCollection(), "net_stop"); a_ctNetCancel->setEnabled(false); - a_ctFetchArticleWithID = new TDEAction(i18n("&Fetch Article with ID..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFetchArticleWithID()), actionCollection(), "fetch_article_with_id"); + a_ctFetchArticleWithID = new TDEAction(i18n("&Fetch Article with ID..."), 0, this, + TQ_SLOT(slotFetchArticleWithID()), actionCollection(), "fetch_article_with_id"); a_ctFetchArticleWithID->setEnabled(false); - a_ctToggleGroupView = new TDEToggleAction(i18n("Show &Group View"), CTRL+Key_G, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleGroupView()), actionCollection(), "settings_show_groupView"); + a_ctToggleGroupView = new TDEToggleAction(i18n("Show &Group View"), CTRL+Key_G, this, + TQ_SLOT(slotToggleGroupView()), actionCollection(), "settings_show_groupView"); a_ctToggleGroupView->setCheckedState(i18n("Hide &Group View")); - a_ctToggleHeaderView = new TDEToggleAction(i18n("Show &Header View"), CTRL+Key_H, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleHeaderView()), actionCollection(), "settings_show_headerView"); + a_ctToggleHeaderView = new TDEToggleAction(i18n("Show &Header View"), CTRL+Key_H, this, + TQ_SLOT(slotToggleHeaderView()), actionCollection(), "settings_show_headerView"); a_ctToggleHeaderView->setCheckedState(i18n("Hide &Header View")); - a_ctToggleArticleViewer = new TDEToggleAction(i18n("Show &Article Viewer"), CTRL+Key_J, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleArticleViewer()), actionCollection(), "settings_show_articleViewer"); + a_ctToggleArticleViewer = new TDEToggleAction(i18n("Show &Article Viewer"), CTRL+Key_J, this, + TQ_SLOT(slotToggleArticleViewer()), actionCollection(), "settings_show_articleViewer"); a_ctToggleArticleViewer->setCheckedState(i18n("Hide &Article Viewer")); - a_ctToggleQuickSearch = new TDEToggleAction(i18n("Show Quick Search"), TQString(), TQT_TQOBJECT(this), - TQT_SLOT(slotToggleQuickSearch()), actionCollection(), "settings_show_quickSearch"); + a_ctToggleQuickSearch = new TDEToggleAction(i18n("Show Quick Search"), TQString(), this, + TQ_SLOT(slotToggleQuickSearch()), actionCollection(), "settings_show_quickSearch"); a_ctToggleQuickSearch->setCheckedState(i18n("Hide Quick Search")); - a_ctSwitchToGroupView = new TDEAction(i18n("Switch to Group View"), Key_G , TQT_TQOBJECT(this), - TQT_SLOT(slotSwitchToGroupView()), actionCollection(), "switch_to_group_view"); + a_ctSwitchToGroupView = new TDEAction(i18n("Switch to Group View"), Key_G , this, + TQ_SLOT(slotSwitchToGroupView()), actionCollection(), "switch_to_group_view"); a_ctSwitchToGroupView->plugAccel(a_ccel); - a_ctSwitchToHeaderView = new TDEAction(i18n("Switch to Header View"), Key_H , TQT_TQOBJECT(this), - TQT_SLOT(slotSwitchToHeaderView()), actionCollection(), "switch_to_header_view"); + a_ctSwitchToHeaderView = new TDEAction(i18n("Switch to Header View"), Key_H , this, + TQ_SLOT(slotSwitchToHeaderView()), actionCollection(), "switch_to_header_view"); a_ctSwitchToHeaderView->plugAccel(a_ccel); - a_ctSwitchToArticleViewer = new TDEAction(i18n("Switch to Article Viewer"), Key_J , TQT_TQOBJECT(this), - TQT_SLOT(slotSwitchToArticleViewer()), actionCollection(), "switch_to_article_viewer"); + a_ctSwitchToArticleViewer = new TDEAction(i18n("Switch to Article Viewer"), Key_J , this, + TQ_SLOT(slotSwitchToArticleViewer()), actionCollection(), "switch_to_article_viewer"); a_ctSwitchToArticleViewer->plugAccel(a_ccel); } @@ -2054,7 +2054,7 @@ FetchArticleIdDlg::FetchArticleIdDlg(TQWidget *parent, const char */*name*/ ) edit->setFocus(); enableButtonOK( false ); setButtonOK( i18n("&Fetch") ); - connect( edit, TQT_SIGNAL(textChanged( const TQString & )), this, TQT_SLOT(slotTextChanged(const TQString & ))); + connect( edit, TQ_SIGNAL(textChanged( const TQString & )), this, TQ_SLOT(slotTextChanged(const TQString & ))); KNHelper::restoreWindowSize("fetchArticleWithID", this, TQSize(325,66)); } diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h index 7dabe226..5c1e469a 100644 --- a/knode/knmainwidget.h +++ b/knode/knmainwidget.h @@ -21,7 +21,7 @@ #include "resource.h" #include <tqglobal.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQListViewItem; @@ -60,7 +60,7 @@ class KNLocalArticle; class KNRemoteArticle; class TDEActionCollection; -class KDE_EXPORT KNMainWidget : public KDockArea, virtual public KNodeIface +class TDE_EXPORT KNMainWidget : public KDockArea, virtual public KNodeIface { TQ_OBJECT diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp index 57488f71..475a48e3 100644 --- a/knode/knnetaccess.cpp +++ b/knode/knnetaccess.cpp @@ -42,16 +42,16 @@ KNNetAccess::KNNetAccess(TQObject *parent, const char *name ) { if ( pipe(nntpInPipe) == -1 || pipe(nntpOutPipe) == -1 ) { KMessageBox::error(knGlobals.topWidget, i18n("Internal error:\nFailed to open pipes for internal communication.")); - kapp->exit(1); + tdeApp->exit(1); } if ( fcntl( nntpInPipe[0], F_SETFL, O_NONBLOCK ) == -1 || fcntl( nntpOutPipe[0], F_SETFL, O_NONBLOCK ) == -1 ) { KMessageBox::error(knGlobals.topWidget, i18n("Internal error:\nFailed to open pipes for internal communication.")); - kapp->exit(1); + tdeApp->exit(1); } nntpNotifier=new TQSocketNotifier(nntpInPipe[0], TQSocketNotifier::Read); - connect(nntpNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotThreadSignal(int))); + connect(nntpNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotThreadSignal(int))); // initialize the KSocks stuff in the main thread, otherwise we get // strange effects on FreeBSD @@ -60,14 +60,14 @@ KNNetAccess::KNNetAccess(TQObject *parent, const char *name ) nntpClient=new KNNntpClient(nntpOutPipe[0],nntpInPipe[1],nntp_Mutex); nntpClient->start(); - connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordsChanged()) ); + connect( knGlobals.accountManager(), TQ_SIGNAL(passwordsChanged()), TQ_SLOT(slotPasswordsChanged()) ); } KNNetAccess::~KNNetAccess() { - disconnect(nntpNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotThreadSignal(int))); + disconnect(nntpNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotThreadSignal(int))); nntpClient->terminateClient(); triggerAsyncThread(nntpOutPipe[1]); @@ -95,7 +95,7 @@ void KNNetAccess::addJob(KNJobData *job) } job->createProgressItem(); - connect( job->progressItem(), TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotCancelJob(KPIM::ProgressItem*)) ); + connect( job->progressItem(), TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQ_SLOT(slotCancelJob(KPIM::ProgressItem*)) ); emit netActive( true ); // put jobs which are waiting for the wallet into an extra queue @@ -275,8 +275,8 @@ void KNNetAccess::startJobSmtp() destination.setPass( account->pass() ); } TDEIO::Job* job = TDEIO::storedPut( art->encodedContent(true), destination, -1, false, false, false ); - connect( job, TQT_SIGNAL( result(TDEIO::Job*) ), - TQT_SLOT( slotJobResult(TDEIO::Job*) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job*) ), + TQ_SLOT( slotJobResult(TDEIO::Job*) ) ); if ( account->encryption() == KNServerInfo::TLS ) job->addMetaData( "tls", "on" ); else @@ -312,7 +312,7 @@ void KNNetAccess::threadDoneNntp() bool keep=false; if (KDialog::Accepted == TDEIO::PasswordDialog::getNameAndPassword(user, pass, &keep, i18n("You need to supply a username and a\npassword to access this server"), false, - kapp->makeStdCaption(i18n("Authentication Failed")),info->server(),i18n("Server:"))) { + tdeApp->makeStdCaption(i18n("Authentication Failed")),info->server(),i18n("Server:"))) { info->setNeedsLogon(true); info->setUser(user); info->setPass(pass); diff --git a/knode/knnntpaccount.cpp b/knode/knnntpaccount.cpp index ba1657c0..77ee6ef3 100644 --- a/knode/knnntpaccount.cpp +++ b/knode/knnntpaccount.cpp @@ -12,8 +12,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "utilities.h" @@ -46,7 +46,7 @@ void KNNntpAccountIntervalChecking::installTimer() if(!t_imer) { t_imer = new TQTimer(); - connect(t_imer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotCheckNews())); + connect(t_imer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotCheckNews())); } else { @@ -92,7 +92,7 @@ KNNntpAccount::~KNNntpAccount() // tries to read information, returns false if it fails to do so bool KNNntpAccount::readInfo(const TQString &confPath) { - KSimpleConfig conf(confPath); + TDESimpleConfig conf(confPath); n_ame = conf.readEntry("name"); //u_nsentCount = conf.readNumEntry("unsentCnt", 0); @@ -130,7 +130,7 @@ void KNNntpAccount::saveInfo() if (dir.isNull()) return; - KSimpleConfig conf(dir+"info"); + TDESimpleConfig conf(dir+"info"); conf.writeEntry("name", n_ame); //conf.writeEntry("unsentCnt", u_nsentCount); @@ -167,7 +167,7 @@ void KNNntpAccount::saveInfo() TQString dir(path()); if (dir.isNull()) return; - KSimpleConfig conf(dir+"info"); + TDESimpleConfig conf(dir+"info"); conf.writeEntry("unsentCnt", u_nsentCount); }*/ diff --git a/knode/knode.cpp b/knode/knode.cpp index 175d1845..2bad1511 100644 --- a/knode/knode.cpp +++ b/knode/knode.cpp @@ -46,17 +46,17 @@ KNMainWindow::KNMainWindow( TQWidget* pWidget ) setStandardToolBarMenuEnabled(true); //config stuff - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfKeys()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(closeAllWindows()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbar()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotConfKeys()), actionCollection()); m_mainWidget = new KNMainWidget( this, true, this, 0 ); - connect( m_mainWidget, TQT_SIGNAL(signalCaptionChangeRequest(const TQString&)), - TQT_SLOT( setCaption(const TQString&)) ); + connect( m_mainWidget, TQ_SIGNAL(signalCaptionChangeRequest(const TQString&)), + TQ_SLOT( setCaption(const TQString&)) ); setCentralWidget( m_mainWidget ); setupStatusBar(); - connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL(statusMsg(const TQString&)), - this, TQT_SLOT(slotShowStatusMsg(const TQString& )) ); + connect( KPIM::BroadcastStatus::instance(), TQ_SIGNAL(statusMsg(const TQString&)), + this, TQ_SLOT(slotShowStatusMsg(const TQString& )) ); createGUI( "knodeui.rc" ); knGlobals.instance = 0; @@ -77,7 +77,7 @@ void KNMainWindow::slotConfToolbar() { saveMainWindowSettings(knGlobals.config(),"mainWindow_options"); KEditToolbar dlg(actionCollection(), "knodeui.rc"); - connect(&dlg,TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg,TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp index 028a267d..e4b856a2 100644 --- a/knode/knode_part.cpp +++ b/knode/knode_part.cpp @@ -53,16 +53,16 @@ KNodePart::KNodePart(TQWidget *parentWidget, const char *widgetName, mParentWidget( parentWidget ) { kdDebug(5003) << "KNodePart()" << endl; - kdDebug(5003) << " InstanceName: " << kapp->instanceName() << endl; + kdDebug(5003) << " InstanceName: " << tdeApp->instanceName() << endl; setInstance( KNodeFactory::instance() ); kdDebug(5003) << "KNodePart()..." << endl; - kdDebug(5003) << " InstanceName: " << kapp->instanceName() << endl; + kdDebug(5003) << " InstanceName: " << tdeApp->instanceName() << endl; TDEGlobal::locale()->insertCatalogue("libtdepim"); TDEGlobal::locale()->insertCatalogue("libkpgp"); - kapp->dcopClient()->suspend(); // Don't handle DCOP requests yet + tdeApp->dcopClient()->suspend(); // Don't handle DCOP requests yet TDEGlobal::iconLoader()->addAppDir("knode"); knGlobals.instance = KNodeFactory::instance(); @@ -76,7 +76,7 @@ KNodePart::KNodePart(TQWidget *parentWidget, const char *widgetName, topLayout->addWidget(mainWidget); mainWidget->setFocusPolicy(TQWidget::ClickFocus); - kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests. + tdeApp->dcopClient()->resume(); // Ok. We are ready for DCOP requests. new KParts::SideBarExtension( mainWidget->collectionView(), this, diff --git a/knode/knrangefilter.cpp b/knode/knrangefilter.cpp index f5aa5593..7eb36a55 100644 --- a/knode/knrangefilter.cpp +++ b/knode/knrangefilter.cpp @@ -19,7 +19,7 @@ #include <tqcheckbox.h> #include <tqcombobox.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <knuminput.h> #include "knrangefilter.h" @@ -70,7 +70,7 @@ bool KNRangeFilter::matchesOp(int v1, Op o, int v2) -void KNRangeFilter::load(KSimpleConfig *conf) +void KNRangeFilter::load(TDESimpleConfig *conf) { enabled=conf->readBoolEntry("enabled", false); val1=conf->readNumEntry("val1",0); @@ -81,7 +81,7 @@ void KNRangeFilter::load(KSimpleConfig *conf) -void KNRangeFilter::save(KSimpleConfig *conf) +void KNRangeFilter::save(TDESimpleConfig *conf) { conf->writeEntry("enabled", enabled); conf->writeEntry("val1", val1); @@ -134,9 +134,9 @@ KNRangeFilterWidget::KNRangeFilterWidget(const TQString& value, int min, int max topL->setColStretch(1,1); topL->setColStretch(5,1); - connect(op1, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOp1Changed(int))); - connect(op2, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOp2Changed(int))); - connect(enabled, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnabled(bool))); + connect(op1, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOp1Changed(int))); + connect(op2, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOp2Changed(int))); + connect(enabled, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnabled(bool))); slotEnabled(false); } diff --git a/knode/knrangefilter.h b/knode/knrangefilter.h index f5c429f3..d9185cd8 100644 --- a/knode/knrangefilter.h +++ b/knode/knrangefilter.h @@ -24,7 +24,7 @@ class KIntSpinBox; class TQComboBox; class TQCheckBox; -class KSimpleConfig; +class TDESimpleConfig; class KNRangeFilter { @@ -41,8 +41,8 @@ class KNRangeFilter { enabled=nr.enabled; return (*this); } - void load(KSimpleConfig *conf); - void save(KSimpleConfig *conf); + void load(TDESimpleConfig *conf); + void save(TDESimpleConfig *conf); bool doFilter(int a); diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp index b38e0650..bd19398a 100644 --- a/knode/knsearchdialog.cpp +++ b/knode/knsearchdialog.cpp @@ -32,7 +32,7 @@ KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *parent) : TQDialog(parent) { - setCaption(kapp->makeStdCaption( i18n("Search for Articles") )); + setCaption(tdeApp->makeStdCaption( i18n("Search for Articles") )); setIcon(SmallIcon("knode")); TQGroupBox *bg=new TQGroupBox(this); @@ -60,9 +60,9 @@ KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *parent) topL->addLayout(filterL, 1); topL->addWidget(bg); - connect(startBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartClicked())); - connect(newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewClicked())); - connect(closeBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCloseClicked())); + connect(startBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStartClicked())); + connect(newBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewClicked())); + connect(closeBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCloseClicked())); f_ilter=new KNArticleFilter(); f_ilter->setLoaded(true); diff --git a/knode/knsourceviewwindow.cpp b/knode/knsourceviewwindow.cpp index 71af3c18..c639c116 100644 --- a/knode/knsourceviewwindow.cpp +++ b/knode/knsourceviewwindow.cpp @@ -27,12 +27,12 @@ KNSourceViewWindow::KNSourceViewWindow( const TQString &text ) { setWFlags(WType_TopLevel | WDestructiveClose); TQAccel *accel = new TQAccel( this, "browser close-accel" ); - accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQT_SLOT( close() )); + accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQ_SLOT( close() )); KNConfig::Appearance *app=knGlobals.configManager()->appearance(); setTextFormat( PlainText ); - setCaption(kapp->makeStdCaption(i18n("Article Source"))); + setCaption(tdeApp->makeStdCaption(i18n("Article Source"))); setPaper( TQBrush(app->backgroundColor()) ); setFont( app->articleFixedFont() ); setColor( app->textColor() ); diff --git a/knode/knstatusfilter.cpp b/knode/knstatusfilter.cpp index ec098d9c..56572208 100644 --- a/knode/knstatusfilter.cpp +++ b/knode/knstatusfilter.cpp @@ -17,7 +17,7 @@ #include <tqlayout.h> #include <tqcheckbox.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include "knarticle.h" #include "knstatusfilter.h" @@ -36,7 +36,7 @@ KNStatusFilter::~KNStatusFilter() -void KNStatusFilter::load(KSimpleConfig *conf) +void KNStatusFilter::load(TDESimpleConfig *conf) { data.setBit(EN_R, conf->readBoolEntry("EN_R", false)); data.setBit(DAT_R, conf->readBoolEntry("DAT_R", false)); @@ -54,7 +54,7 @@ void KNStatusFilter::load(KSimpleConfig *conf) -void KNStatusFilter::save(KSimpleConfig *conf) +void KNStatusFilter::save(TDESimpleConfig *conf) { conf->writeEntry("EN_R", data.at(EN_R)); conf->writeEntry("DAT_R", data.at(DAT_R)); @@ -116,7 +116,7 @@ KNStatusFilterWidget::KNStatusFilterWidget(TQWidget *parent) : topL->setColStretch(2,1); topL->setRowStretch(4,1); - connect(this, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotEnabled(int))); + connect(this, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotEnabled(int))); } diff --git a/knode/knstatusfilter.h b/knode/knstatusfilter.h index 39ad9d91..8a851998 100644 --- a/knode/knstatusfilter.h +++ b/knode/knstatusfilter.h @@ -22,7 +22,7 @@ #include <tqbitarray.h> class TQCheckBox; -class KSimpleConfig; +class TDESimpleConfig; class KNRemoteArticle; @@ -37,8 +37,8 @@ class KNStatusFilter { KNStatusFilter& operator=(const KNStatusFilter &sf) { for(int i=0; i<8; i++) data.setBit(i, sf.data.at(i)); return (*this); } - void load(KSimpleConfig *conf); - void save(KSimpleConfig *conf); + void load(TDESimpleConfig *conf); + void save(TDESimpleConfig *conf); bool doFilter(KNRemoteArticle *a); diff --git a/knode/knstringfilter.cpp b/knode/knstringfilter.cpp index 20c62f1d..68ca0b80 100644 --- a/knode/knstringfilter.cpp +++ b/knode/knstringfilter.cpp @@ -17,7 +17,7 @@ #include <tqcheckbox.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <klineedit.h> #include "kngroup.h" @@ -75,7 +75,7 @@ void KNStringFilter::expand(KNGroup *g) -void KNStringFilter::load(KSimpleConfig *conf) +void KNStringFilter::load(TDESimpleConfig *conf) { con=conf->readBoolEntry("contains", true); data=conf->readEntry("Data"); @@ -84,7 +84,7 @@ void KNStringFilter::load(KSimpleConfig *conf) -void KNStringFilter::save(KSimpleConfig *conf) +void KNStringFilter::save(TDESimpleConfig *conf) { conf->writeEntry("contains", con); conf->writeEntry("Data", data); diff --git a/knode/knstringfilter.h b/knode/knstringfilter.h index 64df0340..4c2d0754 100644 --- a/knode/knstringfilter.h +++ b/knode/knstringfilter.h @@ -23,7 +23,7 @@ class TQCheckBox; class TQComboBox; class KLineEdit; -class KSimpleConfig; +class TDESimpleConfig; class KNGroup; @@ -40,8 +40,8 @@ class KNStringFilter { /** replace placeholders */ void expand(KNGroup *g); - void load(KSimpleConfig *conf); - void save(KSimpleConfig *conf); + void load(TDESimpleConfig *conf); + void save(TDESimpleConfig *conf); bool doFilter(const TQString &s); diff --git a/knode/knwidgets.cpp b/knode/knwidgets.cpp index b4c9a160..3e1d8dec 100644 --- a/knode/knwidgets.cpp +++ b/knode/knwidgets.cpp @@ -110,7 +110,7 @@ void KNDialogListBox::keyPressEvent(TQKeyEvent *e) KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *focusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name ) : KDockWidgetHeaderDrag(parent, dock, name), f_ocus(false) { - connect(focusWidget, TQT_SIGNAL(focusChanged(TQFocusEvent*)), TQT_SLOT(slotFocusChanged(TQFocusEvent*))); + connect(focusWidget, TQ_SIGNAL(focusChanged(TQFocusEvent*)), TQ_SLOT(slotFocusChanged(TQFocusEvent*))); } diff --git a/knode/main.cpp b/knode/main.cpp index ab833dd7..6a7fc259 100644 --- a/knode/main.cpp +++ b/knode/main.cpp @@ -31,7 +31,7 @@ int main(int argc, char* argv[]) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( knode_options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); if (!KNApplication::start()) return 0; diff --git a/knode/smtpaccountwidget_base.ui b/knode/smtpaccountwidget_base.ui index e0afff0a..8913c509 100644 --- a/knode/smtpaccountwidget_base.ui +++ b/knode/smtpaccountwidget_base.ui @@ -210,10 +210,10 @@ <slot>changed()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">useExternalMailerToggled(bool)</slot> <slot access="protected">loginToggled(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">tdecmodule.h</include> diff --git a/knotes/knote.cpp b/knotes/knote.cpp index 32cd586f..e0ac842a 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -44,10 +44,10 @@ #include <kcolordrag.h> #include <kiconeffect.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <kfind.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kinputdialog.h> #include <kmdcodec.h> #include <tdeglobalsettings.h> @@ -105,47 +105,47 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * // create the menu items for the note - not the editor... // rename, mail, print, save as, insert date, alarm, close, delete, new note new TDEAction( i18n("New"), "document-new", 0, - TQT_TQOBJECT(this),TQT_SLOT(slotRequestNewNote()) , actionCollection(), "new_note" ); + this,TQ_SLOT(slotRequestNewNote()) , actionCollection(), "new_note" ); new TDEAction( i18n("Rename..."), "text", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotRename()), actionCollection(), "rename_note" ); + this, TQ_SLOT(slotRename()), actionCollection(), "rename_note" ); m_readOnly = new TDEToggleAction( i18n("Lock"), "system-lock-screen" , 0, - TQT_TQOBJECT(this), TQT_SLOT(slotUpdateReadOnly()), actionCollection(), "lock_note" ); + this, TQ_SLOT(slotUpdateReadOnly()), actionCollection(), "lock_note" ); m_readOnly->setCheckedState( KGuiItem( i18n("Unlock"), "unlock" ) ); new TDEAction( i18n("Hide"), "window-close" , Key_Escape, - TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection(), "hide_note" ); + this, TQ_SLOT(slotClose()), actionCollection(), "hide_note" ); new TDEAction( i18n("Delete"), "knotes_delete", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotKill()), actionCollection(), "delete_note" ); + this, TQ_SLOT(slotKill()), actionCollection(), "delete_note" ); new TDEAction( i18n("Insert Date"), "knotes_date", 0 , - TQT_TQOBJECT(this), TQT_SLOT(slotInsDate()), actionCollection(), "insert_date" ); + this, TQ_SLOT(slotInsDate()), actionCollection(), "insert_date" ); new TDEAction( i18n("Set Alarm..."), "knotes_alarm", 0 , - TQT_TQOBJECT(this), TQT_SLOT(slotSetAlarm()), actionCollection(), "set_alarm" ); + this, TQ_SLOT(slotSetAlarm()), actionCollection(), "set_alarm" ); new TDEAction( i18n("Send..."), "network", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSend()), actionCollection(), "send_note" ); + this, TQ_SLOT(slotSend()), actionCollection(), "send_note" ); new TDEAction( i18n("Mail..."), "mail-send", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection(), "mail_note" ); + this, TQ_SLOT(slotMail()), actionCollection(), "mail_note" ); new TDEAction( i18n("Save As..."), "document-save-as", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection(), "save_note" ); - KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection(), "print_note" ); + this, TQ_SLOT(slotSaveAs()), actionCollection(), "save_note" ); + KStdAction::print( this, TQ_SLOT(slotPrint()), actionCollection(), "print_note" ); new TDEAction( i18n("Preferences..."), "configure", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection(), "configure_note" ); + this, TQ_SLOT(slotPreferences()), actionCollection(), "configure_note" ); m_keepAbove = new TDEToggleAction( i18n("Keep Above Others"), "go-up", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_above" ); + this, TQ_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_above" ); m_keepAbove->setExclusiveGroup( "keepAB" ); m_keepBelow = new TDEToggleAction( i18n("Keep Below Others"), "go-down", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_below" ); + this, TQ_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_below" ); m_keepBelow->setExclusiveGroup( "keepAB" ); m_toDesktop = new TDEListAction( i18n("To Desktop"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotPopupActionToDesktop(int)), actionCollection(), "to_desktop" ); - connect( m_toDesktop->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateDesktopActions()) ); + this, TQ_SLOT(slotPopupActionToDesktop(int)), actionCollection(), "to_desktop" ); + connect( m_toDesktop->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotUpdateDesktopActions()) ); // invisible action to walk through the notes to make this configurable new TDEAction( i18n("Walk Through Notes"), 0, SHIFT+Key_BackTab, - TQT_TQOBJECT(this), TQT_SIGNAL(sigShowNextNote()), actionCollection(), "walk_notes" ); + this, TQ_SIGNAL(sigShowNextNote()), actionCollection(), "walk_notes" ); // create the note header, button and label... m_label = new TQLabel( this ); @@ -155,17 +155,17 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * setName( m_journal->summary() ); // don't worry, no signals are connected at this stage yet m_button = new KNoteButton( "knotes_close", this ); - connect( m_button, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotClose()) ); + connect( m_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose()) ); // create the note editor m_editor = new KNoteEdit( actionCollection(), this ); m_editor->setNote( this ); m_editor->installEventFilter( this ); // receive events (for modified) m_editor->viewport()->installEventFilter( this ); - connect( m_editor, TQT_SIGNAL(contentsMoving( int, int )), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateViewport( int, int ))); + connect( m_editor, TQ_SIGNAL(contentsMoving( int, int )), this, TQ_SLOT(slotUpdateViewport( int, int ))); KXMLGUIBuilder builder( this ); - KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) ); + KXMLGUIFactory factory( &builder, this ); factory.addClient( this ); m_menu = dynamic_cast<TDEPopupMenu*>(factory.container( "note_context", this )); @@ -292,7 +292,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * // let KWin do the placement if the position is illegal--at least 10 pixels // of a note need to be visible const TQPoint& position = m_config->position(); - TQRect desk = kapp->desktop()->rect(); + TQRect desk = tdeApp->desktop()->rect(); desk.addCoords( 10, 10, -10, -10 ); if ( desk.intersects( TQRect( position, TQSize( width, height ) ) ) ) move( position ); // do before calling show() to avoid flicker @@ -360,8 +360,8 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * // HACK: update the icon color - again after showing the note, to make kicker aware of the new colors TDEIconEffect effect; - TQPixmap icon = effect.apply( kapp->icon(), TDEIconEffect::Colorize, 1, m_config->bgColor(), false ); - TQPixmap miniIcon = effect.apply( kapp->miniIcon(), TDEIconEffect::Colorize, 1, m_config->bgColor(), false ); + TQPixmap icon = effect.apply( tdeApp->icon(), TDEIconEffect::Colorize, 1, m_config->bgColor(), false ); + TQPixmap miniIcon = effect.apply( tdeApp->miniIcon(), TDEIconEffect::Colorize, 1, m_config->bgColor(), false ); KWin::setIcons( winId(), icon, miniIcon ); } @@ -576,8 +576,8 @@ void KNote::setColor( const TQColor& fg, const TQColor& bg ) // update the icon color TDEIconEffect effect; - TQPixmap icon = effect.apply( kapp->icon(), TDEIconEffect::Colorize, 1, bg, false ); - TQPixmap miniIcon = effect.apply( kapp->miniIcon(), TDEIconEffect::Colorize, 1, bg, false ); + TQPixmap icon = effect.apply( tdeApp->icon(), TDEIconEffect::Colorize, 1, bg, false ); + TQPixmap miniIcon = effect.apply( tdeApp->miniIcon(), TDEIconEffect::Colorize, 1, bg, false ); KWin::setIcons( winId(), icon, miniIcon ); // set the color for the selection used to highlight the find stuff @@ -600,9 +600,9 @@ void KNote::find( const TQString& pattern, long options ) delete m_find; m_find = new KFind( pattern, options, this ); - connect( m_find, TQT_SIGNAL(highlight( const TQString &, int, int )), - TQT_TQOBJECT(this), TQT_SLOT(slotHighlight( const TQString &, int, int )) ); - connect( m_find, TQT_SIGNAL(findNext()), TQT_TQOBJECT(this), TQT_SLOT(slotFindNext()) ); + connect( m_find, TQ_SIGNAL(highlight( const TQString &, int, int )), + this, TQ_SLOT(slotHighlight( const TQString &, int, int )) ); + connect( m_find, TQ_SIGNAL(findNext()), this, TQ_SLOT(slotFindNext()) ); m_find->setData( plainText() ); slotFindNext(); @@ -816,8 +816,8 @@ void KNote::slotPreferences() // create a new preferences dialog... KNoteConfigDlg *dialog = new KNoteConfigDlg( m_config, name(), this, noteId().utf8() ); - connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotApplyConfig()) ); - connect( this, TQT_SIGNAL(sigNameChanged()), dialog, TQT_SLOT(slotUpdateCaption()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplyConfig()) ); + connect( this, TQ_SIGNAL(sigNameChanged()), dialog, TQ_SLOT(slotUpdateCaption()) ); dialog->show(); } @@ -1285,7 +1285,7 @@ void KNote::resizeEvent( TQResizeEvent *qre ) void KNote::closeEvent( TQCloseEvent *event ) { - if(kapp->sessionSaving()) + if(tdeApp->sessionSaving()) return; event->ignore(); //We don't want to close (and delete the widget). Just hide it slotClose(); diff --git a/knotes/knotealarmdlg.cpp b/knotes/knotealarmdlg.cpp index 0a3236a2..5e43a86a 100644 --- a/knotes/knotealarmdlg.cpp +++ b/knotes/knotealarmdlg.cpp @@ -72,7 +72,7 @@ KNoteAlarmDlg::KNoteAlarmDlg( const TQString& caption, TQWidget *parent, const c label_in->setEnabled( false ); // TODO in->hide(); //show it and enable it when feature will implement - connect( m_buttons, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotButtonChanged( int )) ); + connect( m_buttons, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotButtonChanged( int )) ); } diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp index 60f7a539..2f16a378 100644 --- a/knotes/knoteconfigdlg.cpp +++ b/knotes/knoteconfigdlg.cpp @@ -47,7 +47,7 @@ KNoteConfigDlg::KNoteConfigDlg( KNoteConfig *config, const TQString& title, config ? Default|Ok|Apply|Cancel : Default|Ok|Cancel, Ok ) { setCaption( title ); - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() ); setIconListAllVisible( true ); enableButtonSeparator( true ); diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp index 1316bc3a..4ef1274d 100644 --- a/knotes/knoteedit.cpp +++ b/knotes/knoteedit.cpp @@ -45,27 +45,27 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char setLinkUnderline( true ); setCheckSpellingEnabled(false); // create the actions for the RMB menu - undo = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT(undo()), actions ); - redo = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT(redo()), actions ); + undo = KStdAction::undo( this, TQ_SLOT(undo()), actions ); + redo = KStdAction::redo( this, TQ_SLOT(redo()), actions ); undo->setEnabled( isUndoAvailable() ); redo->setEnabled( isRedoAvailable() ); - m_cut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(cut()), actions ); - m_copy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copy()), actions ); - m_paste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(paste()), actions ); + m_cut = KStdAction::cut( this, TQ_SLOT(cut()), actions ); + m_copy = KStdAction::copy( this, TQ_SLOT(copy()), actions ); + m_paste = KStdAction::paste( this, TQ_SLOT(paste()), actions ); m_cut->setEnabled( false ); m_copy->setEnabled( false ); m_paste->setEnabled( true ); - connect( this, TQT_SIGNAL(undoAvailable(bool)), TQT_TQOBJECT(this), TQT_SLOT(setEnabledUndo(bool)) ); - connect( this, TQT_SIGNAL(redoAvailable(bool)), TQT_TQOBJECT(this), TQT_SLOT(setEnabledRedo(bool)) ); + connect( this, TQ_SIGNAL(undoAvailable(bool)), this, TQ_SLOT(setEnabledUndo(bool)) ); + connect( this, TQ_SIGNAL(redoAvailable(bool)), this, TQ_SLOT(setEnabledRedo(bool)) ); - connect( this, TQT_SIGNAL(copyAvailable(bool)), TQT_TQOBJECT(this), TQT_SLOT( slotCutEnabled( bool ) ) ); - connect( this, TQT_SIGNAL(copyAvailable(bool)), m_copy, TQT_SLOT(setEnabled(bool)) ); + connect( this, TQ_SIGNAL(copyAvailable(bool)), this, TQ_SLOT( slotCutEnabled( bool ) ) ); + connect( this, TQ_SIGNAL(copyAvailable(bool)), m_copy, TQ_SLOT(setEnabled(bool)) ); - new TDEAction( KStdGuiItem::clear(), 0, TQT_TQOBJECT(this), TQT_SLOT(clear()), actions, "edit_clear" ); - KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT(selectAll()), actions ); + new TDEAction( KStdGuiItem::clear(), 0, this, TQ_SLOT(clear()), actions, "edit_clear" ); + KStdAction::selectAll( this, TQ_SLOT(selectAll()), actions ); // create the actions modifying the text format m_textBold = new TDEToggleAction( i18n("Bold"), "format-text-bold", CTRL + Key_B, 0, 0, @@ -77,23 +77,23 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char m_textStrikeOut = new TDEToggleAction( i18n("Strike Out"), "format-text-strikethrough", CTRL + Key_S, 0, 0, actions, "format_strikeout" ); - connect( m_textBold, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setBold(bool)) ); - connect( m_textItalic, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setItalic(bool)) ); - connect( m_textUnderline, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setUnderline(bool)) ); - connect( m_textStrikeOut, TQT_SIGNAL(toggled(bool)), TQT_SLOT(textStrikeOut(bool)) ); + connect( m_textBold, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setBold(bool)) ); + connect( m_textItalic, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setItalic(bool)) ); + connect( m_textUnderline, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setUnderline(bool)) ); + connect( m_textStrikeOut, TQ_SIGNAL(toggled(bool)), TQ_SLOT(textStrikeOut(bool)) ); m_textAlignLeft = new TDEToggleAction( i18n("Align Left"), "format-text-direction-ltr", ALT + Key_L, - TQT_TQOBJECT(this), TQT_SLOT(textAlignLeft()), + this, TQ_SLOT(textAlignLeft()), actions, "format_alignleft" ); m_textAlignLeft->setChecked( true ); // just a dummy, will be updated later m_textAlignCenter = new TDEToggleAction( i18n("Align Center"), "text_center", ALT + Key_C, - TQT_TQOBJECT(this), TQT_SLOT(textAlignCenter()), + this, TQ_SLOT(textAlignCenter()), actions, "format_aligncenter" ); m_textAlignRight = new TDEToggleAction( i18n("Align Right"), "format-text-direction-rtl", ALT + Key_R, - TQT_TQOBJECT(this), TQT_SLOT(textAlignRight()), + this, TQ_SLOT(textAlignRight()), actions, "format_alignright" ); m_textAlignBlock = new TDEToggleAction( i18n("Align Block"), "text_block", ALT + Key_B, - TQT_TQOBJECT(this), TQT_SLOT(textAlignBlock()), + this, TQ_SLOT(textAlignBlock()), actions, "format_alignblock" ); m_textAlignLeft->setExclusiveGroup( "align" ); @@ -102,16 +102,16 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char m_textAlignBlock->setExclusiveGroup( "align" ); m_textList = new TDEToggleAction( i18n("List"), "enum_list", 0, - TQT_TQOBJECT(this), TQT_SLOT(textList()), + this, TQ_SLOT(textList()), actions, "format_list" ); m_textList->setExclusiveGroup( "style" ); m_textSuper = new TDEToggleAction( i18n("Superscript"), "text_super", 0, - TQT_TQOBJECT(this), TQT_SLOT(textSuperScript()), + this, TQ_SLOT(textSuperScript()), actions, "format_super" ); m_textSub = new TDEToggleAction( i18n("Subscript"), "text_sub", 0, - TQT_TQOBJECT(this), TQT_SLOT(textSubScript()), + this, TQ_SLOT(textSubScript()), actions, "format_sub" ); m_textSuper->setExclusiveGroup( "valign" ); @@ -120,38 +120,38 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char // There is no easy possibility to implement text indenting with TQTextEdit // // m_textIncreaseIndent = new TDEAction( i18n("Increase Indent"), "format_increaseindent", 0, -// TQT_TQOBJECT(this), TQT_SLOT(textIncreaseIndent()), +// this, TQ_SLOT(textIncreaseIndent()), // actions, "format_increaseindent" ); // // m_textDecreaseIndent = new TDEAction( i18n("Decrease Indent"), "format_decreaseindent", 0, -// TQT_TQOBJECT(this), TQT_SLOT(textDecreaseIndent()), +// this, TQ_SLOT(textDecreaseIndent()), // actions, "format_decreaseindent" ); TQPixmap pix( ICON_SIZE, ICON_SIZE ); pix.fill( black ); // just a dummy, gets updated before widget is shown - m_textColor = new TDEAction( i18n("Text Color..."), pix, 0, TQT_TQOBJECT(this), - TQT_SLOT(textColor()), actions, "format_color" ); + m_textColor = new TDEAction( i18n("Text Color..."), pix, 0, this, + TQ_SLOT(textColor()), actions, "format_color" ); m_textFont = new TDEFontAction( i18n("Text Font"), "text", KKey(), actions, "format_font" ); - connect( m_textFont, TQT_SIGNAL(activated( const TQString & )), - TQT_TQOBJECT(this), TQT_SLOT(setFamily( const TQString & )) ); + connect( m_textFont, TQ_SIGNAL(activated( const TQString & )), + this, TQ_SLOT(setFamily( const TQString & )) ); m_textSize = new TDEFontSizeAction( i18n("Text Size"), KKey(), actions, "format_size" ); - connect( m_textSize, TQT_SIGNAL(fontSizeChanged( int )), - TQT_TQOBJECT(this), TQT_SLOT(setPointSize( int )) ); + connect( m_textSize, TQ_SIGNAL(fontSizeChanged( int )), + this, TQ_SLOT(setPointSize( int )) ); // TQTextEdit connections - connect( this, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect( this, TQT_SIGNAL(currentFontChanged( const TQFont & )), - TQT_TQOBJECT(this), TQT_SLOT(fontChanged( const TQFont & )) ); - connect( this, TQT_SIGNAL(currentColorChanged( const TQColor & )), - TQT_TQOBJECT(this), TQT_SLOT(colorChanged( const TQColor & )) ); - connect( this, TQT_SIGNAL(currentAlignmentChanged( int )), - TQT_TQOBJECT(this), TQT_SLOT(alignmentChanged( int )) ); - connect( this, TQT_SIGNAL(currentVerticalAlignmentChanged( VerticalAlignment )), - TQT_TQOBJECT(this), TQT_SLOT(verticalAlignmentChanged( VerticalAlignment )) ); + connect( this, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect( this, TQ_SIGNAL(currentFontChanged( const TQFont & )), + this, TQ_SLOT(fontChanged( const TQFont & )) ); + connect( this, TQ_SIGNAL(currentColorChanged( const TQColor & )), + this, TQ_SLOT(colorChanged( const TQColor & )) ); + connect( this, TQ_SIGNAL(currentAlignmentChanged( int )), + this, TQ_SLOT(alignmentChanged( int )) ); + connect( this, TQ_SIGNAL(currentVerticalAlignmentChanged( VerticalAlignment )), + this, TQ_SLOT(verticalAlignmentChanged( VerticalAlignment )) ); } KNoteEdit::~KNoteEdit() @@ -541,13 +541,13 @@ TQPopupMenu *KNoteEdit::createPopupMenu( const TQPoint &pos ) menu->insertSeparator(); id = menu->insertItem( SmallIconSet( "tools-check-spelling" ), i18n( "Check Spelling..." ), - TQT_TQOBJECT(this), TQT_SLOT( checkSpelling() ) ); + this, TQ_SLOT( checkSpelling() ) ); if( text().isEmpty() ) menu->setItemEnabled( id, false ); menu->insertSeparator(); - id=menu->insertItem(i18n("Allow Tabulations"),this,TQT_SLOT(slotAllowTab())); + id=menu->insertItem(i18n("Allow Tabulations"),this,TQ_SLOT(slotAllowTab())); menu->setItemChecked(id, !tabChangesFocus()); } diff --git a/knotes/knotehostdlg.cpp b/knotes/knotehostdlg.cpp index 9d8fff97..c840dae4 100644 --- a/knotes/knotehostdlg.cpp +++ b/knotes/knotehostdlg.cpp @@ -38,8 +38,8 @@ #include <kdebug.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include <kcombobox.h> #include "knotehostdlg.h" @@ -60,8 +60,8 @@ KNoteHostDlg::KNoteHostDlg( const TQString &caption, TQWidget *parent, const cha m_hostCombo->setHistoryItems( KNotesGlobalConfig::knownHosts(), true ); m_hostCombo->setFocus(); //m_hostCombo->completionObject()->setItems( KNotesGlobalConfig::hostCompletions() ); - connect( m_hostCombo->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), - this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); + connect( m_hostCombo->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & ) ), + this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); slotTextChanged( m_hostCombo->lineEdit()->text() ); } diff --git a/knotes/knotesalarm.cpp b/knotes/knotesalarm.cpp index c2d1bd1c..99f05cd9 100644 --- a/knotes/knotesalarm.cpp +++ b/knotes/knotesalarm.cpp @@ -49,7 +49,7 @@ KNotesAlarm::KNotesAlarm( KNotesResourceManager *manager, TQObject *parent, cons { // TODO: fix timezone stuff? - connect( &m_checkTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAlarms()) ); + connect( &m_checkTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAlarms()) ); m_checkTimer.start( 1000 * KNotesGlobalConfig::self()->checkInterval() ); // interval in seconds } diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index beaa3c22..aa322df3 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -29,14 +29,14 @@ #include <ksystemtray.h> #include <tdelocale.h> #include <kiconeffect.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdepopupmenu.h> #include <khelpmenu.h> #include <kfind.h> #include <kfinddialog.h> #include <kkeydialog.h> -#include <kglobalaccel.h> -#include <ksimpleconfig.h> +#include <tdeglobalaccel.h> +#include <tdesimpleconfig.h> #include <twin.h> #include <kbufferedsocket.h> #include <kserversocket.h> @@ -65,7 +65,7 @@ public: { m_keyChooser = new KKeyChooser( globals, this ); setMainWidget( m_keyChooser ); - connect( this, TQT_SIGNAL(defaultClicked()), m_keyChooser, TQT_SLOT(allDefault()) ); + connect( this, TQ_SIGNAL(defaultClicked()), m_keyChooser, TQ_SLOT(allDefault()) ); } void insert( TDEActionCollection *actions ) @@ -96,7 +96,7 @@ KNotesApp::KNotesApp() : DCOPObject("KNotesIface"), TQLabel( 0, 0, WType_TopLevel ), m_alarm( 0 ), m_listener( 0 ), m_find( 0 ), m_findPos( 0 ) { - connect( kapp, TQT_SIGNAL(lastWindowClosed()), kapp, TQT_SLOT(quit()) ); + connect( tdeApp, TQ_SIGNAL(lastWindowClosed()), tdeApp, TQ_SLOT(quit()) ); m_noteList.setAutoDelete( true ); m_noteActions.setAutoDelete( true ); @@ -112,25 +112,25 @@ KNotesApp::KNotesApp() // create the GUI... new TDEAction( i18n("New Note"), "document-new", 0, - TQT_TQOBJECT(this), TQT_SLOT(newNote()), actionCollection(), "new_note" ); + this, TQ_SLOT(newNote()), actionCollection(), "new_note" ); new TDEAction( i18n("New Note From Clipboard"), "edit-paste", 0, - TQT_TQOBJECT(this), TQT_SLOT(newNoteFromClipboard()), actionCollection(), "new_note_clipboard" ); + this, TQ_SLOT(newNoteFromClipboard()), actionCollection(), "new_note_clipboard" ); new TDEAction( i18n("Show All Notes"), "knotes", 0, - TQT_TQOBJECT(this), TQT_SLOT(showAllNotes()), actionCollection(), "show_all_notes" ); + this, TQ_SLOT(showAllNotes()), actionCollection(), "show_all_notes" ); new TDEAction( i18n("Hide All Notes"), "window-close", 0, - TQT_TQOBJECT(this), TQT_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" ); - new KHelpMenu( this, kapp->aboutData(), false, actionCollection() ); + this, TQ_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" ); + new KHelpMenu( this, tdeApp->aboutData(), false, actionCollection() ); - m_findAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotOpenFindDialog()), actionCollection() ); - KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection() ); - KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotConfigureAccels()), actionCollection() ); + m_findAction = KStdAction::find( this, TQ_SLOT(slotOpenFindDialog()), actionCollection() ); + KStdAction::preferences( this, TQ_SLOT(slotPreferences()), actionCollection() ); + KStdAction::keyBindings( this, TQ_SLOT(slotConfigureAccels()), actionCollection() ); //FIXME: no shortcut removing!? - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection() )->setShortcut( 0 ); + KStdAction::quit( this, TQ_SLOT(slotQuit()), actionCollection() )->setShortcut( 0 ); setXMLFile( instance()->instanceName() + "appui.rc" ); m_guiBuilder = new KXMLGUIBuilder( this ); - m_guiFactory = new KXMLGUIFactory( m_guiBuilder, TQT_TQOBJECT(this) ); + m_guiFactory = new KXMLGUIFactory( m_guiBuilder, this ); m_guiFactory->addClient( this ); m_context_menu = static_cast<TDEPopupMenu*>(m_guiFactory->container( "knotes_context", this )); @@ -147,19 +147,19 @@ KNotesApp::KNotesApp() m_noteGUI.setContent( doc ); // create accels for global shortcuts - m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this), "global accel" ); + m_globalAccel = new TDEGlobalAccel( this, "global accel" ); m_globalAccel->insert( "global_new_note", i18n("New Note"), "", TDEShortcut(), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(newNote()), true, true ); + this, TQ_SLOT(newNote()), true, true ); m_globalAccel->insert( "global_new_note_clipboard", i18n("New Note From Clipboard"), "", TDEShortcut(), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(newNoteFromClipboard()), true, true ); + this, TQ_SLOT(newNoteFromClipboard()), true, true ); m_globalAccel->insert( "global_hide_all_notes", i18n("Hide All Notes"), "", TDEShortcut(), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(hideAllNotes()), true, true ); + this, TQ_SLOT(hideAllNotes()), true, true ); m_globalAccel->insert( "global_show_all_notes", i18n("Show All Notes"), "", TDEShortcut(), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(showAllNotes()), true, true ); + this, TQ_SLOT(showAllNotes()), true, true ); m_globalAccel->readSettings(); @@ -174,10 +174,10 @@ KNotesApp::KNotesApp() // create the resource manager m_manager = new KNotesResourceManager(); - connect( m_manager, TQT_SIGNAL(sigRegisteredNote( KCal::Journal * )), - this, TQT_SLOT(createNote( KCal::Journal * )) ); - connect( m_manager, TQT_SIGNAL(sigDeregisteredNote( KCal::Journal * )), - this, TQT_SLOT(killNote( KCal::Journal * )) ); + connect( m_manager, TQ_SIGNAL(sigRegisteredNote( KCal::Journal * )), + this, TQ_SLOT(createNote( KCal::Journal * )) ); + connect( m_manager, TQ_SIGNAL(sigDeregisteredNote( KCal::Journal * )), + this, TQ_SLOT(killNote( KCal::Journal * )) ); // read the notes m_manager->load(); @@ -196,15 +196,15 @@ KNotesApp::KNotesApp() // set up the alarm reminder - do it after loading the notes because this // is used as a check if updateNoteActions has to be called for a new note - m_alarm = new KNotesAlarm( m_manager, TQT_TQOBJECT(this) ); + m_alarm = new KNotesAlarm( m_manager, this ); // create the socket and possibly start listening for connections m_listener = new TDEServerSocket(); m_listener->setResolutionEnabled( true ); - connect( m_listener, TQT_SIGNAL(readyAccept()), TQT_SLOT(acceptConnection()) ); + connect( m_listener, TQ_SIGNAL(readyAccept()), TQ_SLOT(acceptConnection()) ); updateNetworkListener(); - if ( m_noteList.count() == 0 && !kapp->isRestored() ) + if ( m_noteList.count() == 0 && !tdeApp->isRestored() ) newNote(); updateNoteActions(); @@ -575,8 +575,8 @@ void KNotesApp::slotPreferences() // create a new preferences dialog... KNoteConfigDlg *dialog = new KNoteConfigDlg( 0, i18n("Settings"), this, "KNotes Settings" ); - connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateNetworkListener()) ); - connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateStyle()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateNetworkListener()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateStyle()) ); dialog->show(); } @@ -629,7 +629,7 @@ void KNotesApp::slotQuit() (*it)->saveData(false); saveConfigs(); - kapp->quit(); + tdeApp->quit(); } @@ -657,14 +657,14 @@ void KNotesApp::createNote( KCal::Journal *journal ) KNote *newNote = new KNote( m_noteGUI, journal, 0, journal->uid().utf8() ); m_noteList.insert( newNote->noteId(), newNote ); - connect( newNote, TQT_SIGNAL(sigRequestNewNote()), TQT_SLOT(newNote()) ); - connect( newNote, TQT_SIGNAL(sigShowNextNote()), TQT_SLOT(slotWalkThroughNotes()) ); - connect( newNote, TQT_SIGNAL(sigKillNote( KCal::Journal* )), - TQT_SLOT(slotNoteKilled( KCal::Journal* )) ); - connect( newNote, TQT_SIGNAL(sigNameChanged()), TQT_SLOT(updateNoteActions()) ); - connect( newNote, TQT_SIGNAL(sigDataChanged(const TQString &)), TQT_SLOT(saveNotes(const TQString &)) ); - connect( newNote, TQT_SIGNAL(sigColorChanged()), TQT_SLOT(updateNoteActions()) ); - connect( newNote, TQT_SIGNAL(sigFindFinished()), TQT_SLOT(slotFindNext()) ); + connect( newNote, TQ_SIGNAL(sigRequestNewNote()), TQ_SLOT(newNote()) ); + connect( newNote, TQ_SIGNAL(sigShowNextNote()), TQ_SLOT(slotWalkThroughNotes()) ); + connect( newNote, TQ_SIGNAL(sigKillNote( KCal::Journal* )), + TQ_SLOT(slotNoteKilled( KCal::Journal* )) ); + connect( newNote, TQ_SIGNAL(sigNameChanged()), TQ_SLOT(updateNoteActions()) ); + connect( newNote, TQ_SIGNAL(sigDataChanged(const TQString &)), TQ_SLOT(saveNotes(const TQString &)) ); + connect( newNote, TQ_SIGNAL(sigColorChanged()), TQ_SLOT(updateNoteActions()) ); + connect( newNote, TQ_SIGNAL(sigFindFinished()), TQ_SLOT(slotFindNext()) ); // don't call this during startup for each and every loaded note if ( m_alarm ) @@ -693,8 +693,8 @@ void KNotesApp::acceptConnection() if ( s ) { KNotesNetworkReceiver *recv = new KNotesNetworkReceiver( s ); - connect( recv, TQT_SIGNAL(sigNoteReceived( const TQString &, const TQString & )), - TQT_TQOBJECT(this), TQT_SLOT(newNote( const TQString &, const TQString & )) ); + connect( recv, TQ_SIGNAL(sigNoteReceived( const TQString &, const TQString & )), + this, TQ_SLOT(newNote( const TQString &, const TQString & )) ); } } @@ -725,11 +725,11 @@ void KNotesApp::updateNoteActions() for ( TQDictIterator<KNote> it( m_noteList ); it.current(); ++it ) { TDEAction *action = new TDEAction( it.current()->name().replace("&", "&&"), - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowNote()), + TDEShortcut(), this, TQ_SLOT(slotShowNote()), (TQObject *)0, it.current()->noteId().utf8() ); TDEIconEffect effect; - TQPixmap icon = effect.apply( kapp->miniIcon(), TDEIconEffect::Colorize, 1, + TQPixmap icon = effect.apply( tdeApp->miniIcon(), TDEIconEffect::Colorize, 1, it.current()->paletteBackgroundColor(), false ); action->setIconSet( icon ); m_noteActions.append( action ); diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp index fb832a5b..ebe3f3ae 100644 --- a/knotes/knoteslegacy.cpp +++ b/knotes/knoteslegacy.cpp @@ -29,8 +29,8 @@ #include <tdeapplication.h> #include <tdeglobal.h> #include <kurl.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include <tdeio/netaccess.h> #include <unistd.h> @@ -52,7 +52,7 @@ void KNotesLegacy::cleanUp() // remove old (KDE 1.x) local config file if it still exists TQString configfile = TDEGlobal::dirs()->saveLocation( "config" ) + "knotesrc"; if ( TQFile::exists( configfile ) ) { - KSimpleConfig *test = new KSimpleConfig( configfile ); + TDESimpleConfig *test = new TDESimpleConfig( configfile ); test->setGroup( "General" ); double version = test->readDoubleNumEntry( "version", 1.0 ); delete test; @@ -76,7 +76,7 @@ bool KNotesLegacy::convert( CalendarLocal *calendar ) for ( TQStringList::ConstIterator note = notes.constBegin(); note != notes.constEnd(); ++note ) { TQString file = noteDir.absFilePath( *note ); - KSimpleConfig* test = new KSimpleConfig( file ); + TDESimpleConfig* test = new TDESimpleConfig( file ); test->setGroup( "General" ); double version = test->readDoubleNumEntry( "version", 1.0 ); diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp index 48bb791f..d1ae1237 100644 --- a/knotes/knotesnetrecv.cpp +++ b/knotes/knotesnetrecv.cpp @@ -70,15 +70,15 @@ KNotesNetworkReceiver::KNotesNetworkReceiver( TDEBufferedSocket *s ) .arg( date ); // Setup the communications - connect( m_sock, TQT_SIGNAL(readyRead()), TQT_SLOT(slotDataAvailable()) ); - connect( m_sock, TQT_SIGNAL(closed()), TQT_SLOT(slotConnectionClosed()) ); - connect( m_sock, TQT_SIGNAL(gotError( int )), TQT_SLOT(slotError( int )) ); + connect( m_sock, TQ_SIGNAL(readyRead()), TQ_SLOT(slotDataAvailable()) ); + connect( m_sock, TQ_SIGNAL(closed()), TQ_SLOT(slotConnectionClosed()) ); + connect( m_sock, TQ_SIGNAL(gotError( int )), TQ_SLOT(slotError( int )) ); m_sock->enableRead( true ); // Setup the timer m_timer = new TQTimer( this, "m_timer" ); - connect( m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotReceptionTimeout()) ); + connect( m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotReceptionTimeout()) ); m_timer->start( MAXTIME, true ); } diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp index 187d606b..55dc75c3 100644 --- a/knotes/knotesnetsend.cpp +++ b/knotes/knotesnetsend.cpp @@ -48,11 +48,11 @@ KNotesNetworkSender::KNotesNetworkSender( const TQString& hostname, int port ) // TQObject:: prefix needed, otherwise the KStreamSocket::connect() // mehtod is called!!! - TQObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(connected( const KResolverEntry& )), - TQT_SLOT(slotConnected( const KResolverEntry& )) ); - TQObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(gotError( int )), TQT_SLOT(slotError( int )) ); - TQObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(closed()), TQT_SLOT(slotClosed()) ); - TQObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(readyWrite()), TQT_SLOT(slotReadyWrite()) ); + TQObject::connect( this, TQ_SIGNAL(connected( const KResolverEntry& )), + TQ_SLOT(slotConnected( const KResolverEntry& )) ); + TQObject::connect( this, TQ_SIGNAL(gotError( int )), TQ_SLOT(slotError( int )) ); + TQObject::connect( this, TQ_SIGNAL(closed()), TQ_SLOT(slotClosed()) ); + TQObject::connect( this, TQ_SIGNAL(readyWrite()), TQ_SLOT(slotReadyWrite()) ); } void KNotesNetworkSender::setSenderId( const TQString& sender ) diff --git a/knotes/main.cpp b/knotes/main.cpp index e809a8f7..5f045a38 100644 --- a/knotes/main.cpp +++ b/knotes/main.cpp @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *******************************************************************/ -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <tdelocale.h> @@ -48,7 +48,7 @@ void remove_sm_from_client_leader() TQWidget w; KXErrorHandler handler; // ignore X errors status = XGetWindowProperty( tqt_xdisplay(), w.winId(), atoms[ 0 ], 0, 10000, - FALSE, XA_WINDOW, &type, &format, + false, XA_WINDOW, &type, &format, &nitems, &extra, &data ); if (status == Success && !handler.error( false )) @@ -64,7 +64,7 @@ void remove_sm_from_client_leader() Application::Application() - : KUniqueApplication(), mMainWindow( 0 ) + : TDEUniqueApplication(), mMainWindow( 0 ) { } @@ -83,7 +83,7 @@ int Application::newInstance() else mMainWindow->newNote(); - return KUniqueApplication::newInstance(); + return TDEUniqueApplication::newInstance(); } int main( int argc, char* argv[] ) @@ -119,10 +119,10 @@ int main( int argc, char* argv[] ) TDECmdLineArgs::init( argc, argv, &aboutData ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); Application app; - app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); remove_sm_from_client_leader(); diff --git a/knotes/main.h b/knotes/main.h index 7e7af105..7a1f4d1c 100644 --- a/knotes/main.h +++ b/knotes/main.h @@ -21,12 +21,12 @@ #ifndef MAIN_H #define MAIN_H -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> class KNotesApp; -class Application : public KUniqueApplication +class Application : public TDEUniqueApplication { public: Application(); diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp index e5d4d6e5..5f797ef9 100644 --- a/knotes/resourcelocal.cpp +++ b/knotes/resourcelocal.cpp @@ -33,7 +33,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <libkcal/icalformat.h> diff --git a/knotes/resourcenotes.h b/knotes/resourcenotes.h index 9ea668a0..8ac01f49 100644 --- a/knotes/resourcenotes.h +++ b/knotes/resourcenotes.h @@ -34,7 +34,7 @@ #define RESOURCENOTES_H #include <tderesources/resource.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <libkcal/alarm.h> class TDEConfig; @@ -52,7 +52,7 @@ namespace KCal { * \warning This code is still under heavy development. Don't expect source or * binary compatibility in future versions. */ -class KDE_EXPORT ResourceNotes : public KRES::Resource +class TDE_EXPORT ResourceNotes : public KRES::Resource { public: ResourceNotes( const TDEConfig * ); diff --git a/kode/automakefile.h b/kode/automakefile.h index 1a593732..d29322a7 100644 --- a/kode/automakefile.h +++ b/kode/automakefile.h @@ -26,14 +26,14 @@ #include <tqmap.h> #include <tqstringlist.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KODE { -class KDE_EXPORT AutoMakefile +class TDE_EXPORT AutoMakefile { public: - class KDE_EXPORT Target + class TDE_EXPORT Target { public: typedef TQValueList<Target> List; diff --git a/kode/class.h b/kode/class.h index aab15d27..f63eb362 100644 --- a/kode/class.h +++ b/kode/class.h @@ -26,7 +26,7 @@ #include "membervariable.h" #include "typedef.h" -#include <kdemacros.h> +#include <tdemacros.h> #include <tqvaluelist.h> #include <tqstring.h> #include <tqstringlist.h> @@ -34,7 +34,7 @@ namespace KODE { -class KDE_EXPORT Class +class TDE_EXPORT Class { public: typedef TQValueList<Class> List; diff --git a/kode/code.h b/kode/code.h index 2b1da631..12bf31c4 100644 --- a/kode/code.h +++ b/kode/code.h @@ -26,10 +26,10 @@ #include <tqvaluelist.h> #include <tqstring.h> #include <tqstringlist.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KODE { -class KDE_EXPORT Code +class TDE_EXPORT Code { public: Code(); diff --git a/kode/enum.h b/kode/enum.h index d4566bba..0cae53e4 100644 --- a/kode/enum.h +++ b/kode/enum.h @@ -22,11 +22,11 @@ #define KODE_ENUM_H #include <tqstringlist.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KODE { -class KDE_EXPORT Enum +class TDE_EXPORT Enum { public: typedef TQValueList<Enum> List; diff --git a/kode/file.h b/kode/file.h index 7a899154..506b5745 100644 --- a/kode/file.h +++ b/kode/file.h @@ -28,11 +28,11 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KODE { -class KDE_EXPORT File +class TDE_EXPORT File { public: File(); diff --git a/kode/function.h b/kode/function.h index 6d928f4f..94c8b3f1 100644 --- a/kode/function.h +++ b/kode/function.h @@ -26,11 +26,11 @@ #include <tqvaluelist.h> #include <tqstring.h> #include <tqstringlist.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KODE { -class KDE_EXPORT Function +class TDE_EXPORT Function { public: typedef TQValueList<Function> List; diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp index d97570be..f1c82d05 100644 --- a/kode/kodemain.cpp +++ b/kode/kodemain.cpp @@ -34,10 +34,10 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include <ksavefile.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqfile.h> #include <tqtextstream.h> @@ -478,7 +478,7 @@ int create( TDECmdLineArgs *args ) c.addFunction( get ); - c.addInclude( "kinstance.h" ); + c.addInclude( "tdeinstance.h" ); c.addInclude( "kdebug.h" ); c.addInclude( "sys/types.h" ); c.addInclude( "unistd.h" ); @@ -591,7 +591,7 @@ int create( TDECmdLineArgs *args ) TQFile::remove( protocolFilename ); - KSimpleConfig protocolFile( protocolFilename ); + TDESimpleConfig protocolFile( protocolFilename ); protocolFile.setGroup( "Protocol" ); protocolFile.writeEntry( "exec", "tdeio_" + protocol ); diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp index 8ec676fb..41e7e0a9 100644 --- a/kode/kwsdl/converter.cpp +++ b/kode/kwsdl/converter.cpp @@ -689,9 +689,9 @@ void Converter::convertService( const Service &service ) KODE::MemberVariable transport( inputMessage.name() + "Transport", "Transport" ); ctorCode += transport.name() + " = new Transport( \"" + (*it).mLocation + "\" );"; - ctorCode += "connect( " + transport.name() + ", TQT_SIGNAL( result( const TQString& ) ),"; + ctorCode += "connect( " + transport.name() + ", TQ_SIGNAL( result( const TQString& ) ),"; ctorCode.indent(); - ctorCode += "this, TQT_SLOT( " + outputMessage.name() + "Slot( const TQString& ) ) );"; + ctorCode += "this, TQ_SLOT( " + outputMessage.name() + "Slot( const TQString& ) ) );"; ctorCode.unindent(); dtorCode += "delete " + transport.name() + ";"; @@ -946,8 +946,8 @@ void Converter::createTransportClass() queryCode += "job->addMetaData( \"UserAgent\", \"KWSDL\" );"; queryCode += "job->addMetaData( \"content-type\", \"Content-Type: text/xml; charset=utf-8\" );"; queryCode.newLine(); - queryCode += "connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );"; - queryCode += "connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );"; + queryCode += "connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );"; + queryCode += "connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );"; query.setBody( queryCode ); diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp index b0fb78b0..9a31b31a 100644 --- a/kode/kwsdl/kung/binaryinputfield.cpp +++ b/kode/kwsdl/kung/binaryinputfield.cpp @@ -107,8 +107,8 @@ BinaryWidget::BinaryWidget( TQWidget *parent ) mLayout->addWidget( mLoadButton, 0, 1 ); mLayout->addWidget( mSaveButton, 1, 1 ); - connect( mLoadButton, TQT_SIGNAL( clicked() ), TQT_SLOT( load() ) ); - connect( mSaveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( save() ) ); + connect( mLoadButton, TQ_SIGNAL( clicked() ), TQ_SLOT( load() ) ); + connect( mSaveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( save() ) ); } void BinaryWidget::setData( const TQByteArray &data ) diff --git a/kode/kwsdl/kung/boolinputfield.cpp b/kode/kwsdl/kung/boolinputfield.cpp index 88311266..12def657 100644 --- a/kode/kwsdl/kung/boolinputfield.cpp +++ b/kode/kwsdl/kung/boolinputfield.cpp @@ -65,8 +65,8 @@ TQWidget *BoolInputField::createWidget( TQWidget *parent ) mInputWidget->setChecked( mValue ); - connect( mInputWidget, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( inputChanged( bool ) ) ); + connect( mInputWidget, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( inputChanged( bool ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/dateinputfield.cpp b/kode/kwsdl/kung/dateinputfield.cpp index cb24670f..b7d6f8f0 100644 --- a/kode/kwsdl/kung/dateinputfield.cpp +++ b/kode/kwsdl/kung/dateinputfield.cpp @@ -65,8 +65,8 @@ TQWidget *DateInputField::createWidget( TQWidget *parent ) mInputWidget->setDate( mValue ); - connect( mInputWidget, TQT_SIGNAL( dateChanged( TQDate ) ), - this, TQT_SLOT( inputChanged( TQDate ) ) ); + connect( mInputWidget, TQ_SIGNAL( dateChanged( TQDate ) ), + this, TQ_SLOT( inputChanged( TQDate ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/dispatcher.cpp b/kode/kwsdl/kung/dispatcher.cpp index 5c65d0c4..7b2ad477 100644 --- a/kode/kwsdl/kung/dispatcher.cpp +++ b/kode/kwsdl/kung/dispatcher.cpp @@ -57,10 +57,10 @@ void Dispatcher::setWSDL( const KWSDL::WSDL &wsdl ) mConversationManager = new GeneralConversationManager( mWSDL ); mTransport = new Transport( mWSDL.service().ports().first().mLocation ); - connect( mTransport, TQT_SIGNAL( result( const TQString& ) ), - this, TQT_SLOT( result( const TQString& ) ) ); - connect( mTransport, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( error( const TQString& ) ) ); + connect( mTransport, TQ_SIGNAL( result( const TQString& ) ), + this, TQ_SLOT( result( const TQString& ) ) ); + connect( mTransport, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( error( const TQString& ) ) ); } void Dispatcher::run() @@ -140,14 +140,14 @@ void Dispatcher::result( const TQString &xml ) mLastMessage = mCurrentMessage; - TQTimer::singleShot( 0, this, TQT_SLOT( nextMessage() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( nextMessage() ) ); } void Dispatcher::error( const TQString &errorMsg ) { KMessageBox::error( 0, errorMsg ); - TQTimer::singleShot( 0, this, TQT_SLOT( nextMessage() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( nextMessage() ) ); } #include "dispatcher.moc" diff --git a/kode/kwsdl/kung/doubleinputfield.cpp b/kode/kwsdl/kung/doubleinputfield.cpp index 39f22774..1df00f03 100644 --- a/kode/kwsdl/kung/doubleinputfield.cpp +++ b/kode/kwsdl/kung/doubleinputfield.cpp @@ -78,8 +78,8 @@ TQWidget *DoubleInputField::createWidget( TQWidget *parent ) mInputWidget->setValue( mValue ); - connect( mInputWidget, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( inputChanged( double ) ) ); + connect( mInputWidget, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( inputChanged( double ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/enuminputfield.cpp b/kode/kwsdl/kung/enuminputfield.cpp index 30c11670..f49ab4be 100644 --- a/kode/kwsdl/kung/enuminputfield.cpp +++ b/kode/kwsdl/kung/enuminputfield.cpp @@ -70,8 +70,8 @@ TQWidget *EnumInputField::createWidget( TQWidget *parent ) mInputWidget->insertStringList( mEnums ); mInputWidget->setCurrentItem( mEnums.findIndex( mValue ) ); - connect( mInputWidget, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( inputChanged( int ) ) ); + connect( mInputWidget, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( inputChanged( int ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/integerinputfield.cpp b/kode/kwsdl/kung/integerinputfield.cpp index 76d48cd5..38c08222 100644 --- a/kode/kwsdl/kung/integerinputfield.cpp +++ b/kode/kwsdl/kung/integerinputfield.cpp @@ -116,8 +116,8 @@ TQWidget *IntegerInputField::createWidget( TQWidget *parent ) mInputWidget->setValue( mValue ); - connect( mInputWidget, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( inputChanged( int ) ) ); + connect( mInputWidget, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( inputChanged( int ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp index 539e3de2..147c83fd 100644 --- a/kode/kwsdl/kung/listinputfield.cpp +++ b/kode/kwsdl/kung/listinputfield.cpp @@ -105,9 +105,9 @@ ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQS mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); layout->addWidget( mRemoveButton, 2, 1 ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) ); update(); } diff --git a/kode/kwsdl/kung/main.cpp b/kode/kwsdl/kung/main.cpp index 2dadbe9d..3036eeae 100644 --- a/kode/kwsdl/kung/main.cpp +++ b/kode/kwsdl/kung/main.cpp @@ -58,7 +58,7 @@ int main( int argc, char **argv ) Loader loader; loader.setWSDLUrl( args->url( 0 ).path() ); - TQTimer::singleShot( 0, &loader, TQT_SLOT( run() ) ); + TQTimer::singleShot( 0, &loader, TQ_SLOT( run() ) ); return app.exec(); } diff --git a/kode/kwsdl/kung/stringinputfield.cpp b/kode/kwsdl/kung/stringinputfield.cpp index 9ea45029..ee90eeec 100644 --- a/kode/kwsdl/kung/stringinputfield.cpp +++ b/kode/kwsdl/kung/stringinputfield.cpp @@ -84,8 +84,8 @@ TQWidget *StringInputField::createWidget( TQWidget *parent ) mInputWidget->setText( mValue ); - connect( mInputWidget, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( inputChanged( const TQString& ) ) ); + connect( mInputWidget, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( inputChanged( const TQString& ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/timeinputfield.cpp b/kode/kwsdl/kung/timeinputfield.cpp index 38e1a264..024e2671 100644 --- a/kode/kwsdl/kung/timeinputfield.cpp +++ b/kode/kwsdl/kung/timeinputfield.cpp @@ -65,8 +65,8 @@ TQWidget *TimeInputField::createWidget( TQWidget *parent ) mInputWidget->setTime( mValue ); - connect( mInputWidget, TQT_SIGNAL( valueChanged( const TQTime& ) ), - this, TQT_SLOT( inputChanged( const TQTime& ) ) ); + connect( mInputWidget, TQ_SIGNAL( valueChanged( const TQTime& ) ), + this, TQ_SLOT( inputChanged( const TQTime& ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/transport.cpp b/kode/kwsdl/kung/transport.cpp index e9dabf3c..4961ad2f 100644 --- a/kode/kwsdl/kung/transport.cpp +++ b/kode/kwsdl/kung/transport.cpp @@ -45,8 +45,8 @@ void Transport::query( const TQString &xml ) job->addMetaData( "UserAgent", "KDE Kung" ); job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); } void Transport::slotData( TDEIO::Job*, const TQByteArray &data ) diff --git a/kode/kwsdl/main.cpp b/kode/kwsdl/main.cpp index 5ba4f533..900f6ee4 100644 --- a/kode/kwsdl/main.cpp +++ b/kode/kwsdl/main.cpp @@ -71,7 +71,7 @@ int main( int argc, char **argv ) if ( args->isSet( "namespace" ) ) compiler.setNameSpace( args->getOption( "namespace" ) ); - TQTimer::singleShot( 0, &compiler, TQT_SLOT( run() ) ); + TQTimer::singleShot( 0, &compiler, TQ_SLOT( run() ) ); return app.exec(); } diff --git a/kode/kwsdl/schema/fileprovider.cpp b/kode/kwsdl/schema/fileprovider.cpp index ed5606fd..8d435274 100644 --- a/kode/kwsdl/schema/fileprovider.cpp +++ b/kode/kwsdl/schema/fileprovider.cpp @@ -53,10 +53,10 @@ bool FileProvider::get( const TQString &url, TQString &target ) tqDebug( "Downloading external schema '%s'", url.latin1() ); TDEIO::TransferJob* job = TDEIO::get( KURL( url ), false, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); mBlocked = true; while ( mBlocked ) { diff --git a/kode/kwsdl/tests/google/googlesearch.cpp b/kode/kwsdl/tests/google/googlesearch.cpp index fcea9d75..aa282a06 100644 --- a/kode/kwsdl/tests/google/googlesearch.cpp +++ b/kode/kwsdl/tests/google/googlesearch.cpp @@ -29,12 +29,12 @@ GoogleSearch::GoogleSearch() : TQObject( 0, "" ) { - connect( &mService, TQT_SIGNAL( doGetCachedPageResponse( TQByteArray* ) ), - this, TQT_SLOT( cachedPageResult( TQByteArray* ) ) ); - connect( &mService, TQT_SIGNAL( doSpellingSuggestionResponse( TQString* ) ), - this, TQT_SLOT( spellingSuggestionResult( TQString* ) ) ); - connect( &mService, TQT_SIGNAL( doGoogleSearchResponse( GoogleSearchResult* ) ), - this, TQT_SLOT( googleSearchResult( GoogleSearchResult* ) ) ); + connect( &mService, TQ_SIGNAL( doGetCachedPageResponse( TQByteArray* ) ), + this, TQ_SLOT( cachedPageResult( TQByteArray* ) ) ); + connect( &mService, TQ_SIGNAL( doSpellingSuggestionResponse( TQString* ) ), + this, TQ_SLOT( spellingSuggestionResult( TQString* ) ) ); + connect( &mService, TQ_SIGNAL( doGoogleSearchResponse( GoogleSearchResult* ) ), + this, TQ_SLOT( googleSearchResult( GoogleSearchResult* ) ) ); mKey = ""; } diff --git a/kode/kwsdl/tests/google/googlesearchservice.cpp b/kode/kwsdl/tests/google/googlesearchservice.cpp index d2e7c97e..095fe115 100644 --- a/kode/kwsdl/tests/google/googlesearchservice.cpp +++ b/kode/kwsdl/tests/google/googlesearchservice.cpp @@ -183,14 +183,14 @@ void GoogleSearchService::doGoogleSearchResponseSlot( const TQString &xml ) GoogleSearchService::GoogleSearchService() { mDoGetCachedPageTransport = new Transport( "http://api.google.com/search/beta2" ); - connect( mDoGetCachedPageTransport, TQT_SIGNAL( result( const TQString& ) ), - this, TQT_SLOT( doGetCachedPageResponseSlot( const TQString& ) ) ); + connect( mDoGetCachedPageTransport, TQ_SIGNAL( result( const TQString& ) ), + this, TQ_SLOT( doGetCachedPageResponseSlot( const TQString& ) ) ); mDoSpellingSuggestionTransport = new Transport( "http://api.google.com/search/beta2" ); - connect( mDoSpellingSuggestionTransport, TQT_SIGNAL( result( const TQString& ) ), - this, TQT_SLOT( doSpellingSuggestionResponseSlot( const TQString& ) ) ); + connect( mDoSpellingSuggestionTransport, TQ_SIGNAL( result( const TQString& ) ), + this, TQ_SLOT( doSpellingSuggestionResponseSlot( const TQString& ) ) ); mDoGoogleSearchTransport = new Transport( "http://api.google.com/search/beta2" ); - connect( mDoGoogleSearchTransport, TQT_SIGNAL( result( const TQString& ) ), - this, TQT_SLOT( doGoogleSearchResponseSlot( const TQString& ) ) ); + connect( mDoGoogleSearchTransport, TQ_SIGNAL( result( const TQString& ) ), + this, TQ_SLOT( doGoogleSearchResponseSlot( const TQString& ) ) ); } GoogleSearchService::~GoogleSearchService() diff --git a/kode/kwsdl/tests/google/transport.cpp b/kode/kwsdl/tests/google/transport.cpp index 30b9645e..c7a390e8 100644 --- a/kode/kwsdl/tests/google/transport.cpp +++ b/kode/kwsdl/tests/google/transport.cpp @@ -48,8 +48,8 @@ void Transport::query( const TQString &xml ) job->addMetaData( "UserAgent", "KWSDL" ); job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); } void Transport::slotData( TDEIO::Job*, const TQByteArray &data ) diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp index 26eb2e22..497effbb 100644 --- a/kode/kxml_compiler/creator.cpp +++ b/kode/kxml_compiler/creator.cpp @@ -33,8 +33,8 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqtextstream.h> diff --git a/kode/kxml_compiler/creator.h b/kode/kxml_compiler/creator.h index 39cac4c6..7f51396f 100644 --- a/kode/kxml_compiler/creator.h +++ b/kode/kxml_compiler/creator.h @@ -35,8 +35,8 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqtextstream.h> diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp index 317515b6..66c0030d 100644 --- a/kode/kxml_compiler/kxml_compiler.cpp +++ b/kode/kxml_compiler/kxml_compiler.cpp @@ -33,8 +33,8 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqtextstream.h> diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp index 5fc72f97..7a91411b 100644 --- a/kode/kxml_compiler/parser.cpp +++ b/kode/kxml_compiler/parser.cpp @@ -32,8 +32,8 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqtextstream.h> diff --git a/kode/kxml_compiler/parser.h b/kode/kxml_compiler/parser.h index 9f0f21a1..4747e5b4 100644 --- a/kode/kxml_compiler/parser.h +++ b/kode/kxml_compiler/parser.h @@ -32,8 +32,8 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqtextstream.h> diff --git a/kode/license.h b/kode/license.h index e73be134..fca593e2 100644 --- a/kode/license.h +++ b/kode/license.h @@ -22,11 +22,11 @@ #define KODE_LICENSE_H #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KODE { -class KDE_EXPORT License +class TDE_EXPORT License { public: enum Type { GPL, LGPL }; diff --git a/kode/membervariable.h b/kode/membervariable.h index f75ab0f1..b8995ed7 100644 --- a/kode/membervariable.h +++ b/kode/membervariable.h @@ -25,11 +25,11 @@ #include <tqvaluelist.h> #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KODE { -class KDE_EXPORT MemberVariable : public Variable +class TDE_EXPORT MemberVariable : public Variable { public: typedef TQValueList<MemberVariable> List; diff --git a/kode/printer.h b/kode/printer.h index ceb0f7a9..a939c0be 100644 --- a/kode/printer.h +++ b/kode/printer.h @@ -26,14 +26,14 @@ #include "style.h" #include "automakefile.h" -#include <kdemacros.h> +#include <tdemacros.h> #include <tqvaluelist.h> #include <tqstring.h> #include <tqstringlist.h> namespace KODE { -class KDE_EXPORT Printer +class TDE_EXPORT Printer { public: Printer(); diff --git a/kode/statemachine.h b/kode/statemachine.h index a3490592..e1a8fa1f 100644 --- a/kode/statemachine.h +++ b/kode/statemachine.h @@ -25,11 +25,11 @@ #include <tqstring.h> #include <tqmap.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KODE { -class KDE_EXPORT StateMachine +class TDE_EXPORT StateMachine { public: StateMachine(); diff --git a/kode/style.h b/kode/style.h index 42b5fe18..fe469f33 100644 --- a/kode/style.h +++ b/kode/style.h @@ -27,11 +27,11 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KODE { -class KDE_EXPORT Style +class TDE_EXPORT Style { public: Style(); diff --git a/kode/typedef.h b/kode/typedef.h index a985c5fb..c922bfdb 100644 --- a/kode/typedef.h +++ b/kode/typedef.h @@ -22,11 +22,11 @@ #define KODE_TYPEDEF_H #include <tqvaluelist.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KODE { -class KDE_EXPORT Typedef +class TDE_EXPORT Typedef { public: typedef TQValueList<Typedef> List; diff --git a/kode/variable.h b/kode/variable.h index 252d7b40..6c52123f 100644 --- a/kode/variable.h +++ b/kode/variable.h @@ -24,11 +24,11 @@ #include <tqvaluelist.h> #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KODE { -class KDE_EXPORT Variable +class TDE_EXPORT Variable { public: typedef TQValueList<Variable> List; diff --git a/konsolekalendar/konsolekalendaradd.cpp b/konsolekalendar/konsolekalendaradd.cpp index 75828ed3..24a84d8c 100644 --- a/konsolekalendar/konsolekalendaradd.cpp +++ b/konsolekalendar/konsolekalendaradd.cpp @@ -37,7 +37,7 @@ #include <tqobject.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <libkcal/calendarlocal.h> diff --git a/konsolekalendar/konsolekalendarvariables.cpp b/konsolekalendar/konsolekalendarvariables.cpp index fddb77d9..c2630d04 100644 --- a/konsolekalendar/konsolekalendarvariables.cpp +++ b/konsolekalendar/konsolekalendarvariables.cpp @@ -34,7 +34,7 @@ #include <kdebug.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqdatetime.h> #include <tqstring.h> diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp index a68af033..ff281ab2 100644 --- a/konsolekalendar/main.cpp +++ b/konsolekalendar/main.cpp @@ -50,7 +50,7 @@ #include <tdelocale.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <libkcal/calformat.h> diff --git a/konsolekalendar/stdcalendar.cpp b/konsolekalendar/stdcalendar.cpp index 0c871b81..9225c032 100644 --- a/konsolekalendar/stdcalendar.cpp +++ b/konsolekalendar/stdcalendar.cpp @@ -27,7 +27,7 @@ #include <libtdepim/kpimprefs.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kurl.h> diff --git a/konsolekalendar/stdcalendar.h b/konsolekalendar/stdcalendar.h index b1f43472..555beb5b 100644 --- a/konsolekalendar/stdcalendar.h +++ b/konsolekalendar/stdcalendar.h @@ -27,7 +27,7 @@ namespace KCal { -class KDE_EXPORT StdCalendar : public KCal::CalendarResources +class TDE_EXPORT StdCalendar : public KCal::CalendarResources { public: StdCalendar(); diff --git a/kontact/DESIGN.dcopinteraction b/kontact/DESIGN.dcopinteraction index d51fd886..7eb4e412 100644 --- a/kontact/DESIGN.dcopinteraction +++ b/kontact/DESIGN.dcopinteraction @@ -20,12 +20,12 @@ Here are some code snippets that must go into the part (A) that wants to use "Fo * Constructor: m_foo_stub = 0L; - kapp->dcopClient()->setNotifications( true ); - connect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString&)), - this, SLOT( unregisteredFromDCOP( const QCString& )) ); + tdeApp->dcopClient()->setNotifications( true ); + connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const QCString&)), + this, TQ_SLOT( unregisteredFromDCOP( const QCString& )) ); * Destructor: - kapp->dcopClient()->setNotifications( false ); + tdeApp->dcopClient()->setNotifications( false ); delete m_foo_stub; [Note that setNotifications() is implemented with a refcount, this is the @@ -74,7 +74,7 @@ See e.g. tdepim/kaddressbook/kaddressbook.desktop Designing DCOP interfaces ========================= -Porting the kroupware Q_SIGNALS/Q_SLOTS to DCOP requires some changes. +Porting the kroupware signals/slots to DCOP requires some changes. For instance any non-const reference (such as those used for returning values to the caller) has to be changed. If there is more than one value to be returned, you need to diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index 5cc30c2c..859e76fa 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -43,7 +43,7 @@ Core::Core( TQWidget *parent, const char *name ) d = new Private; TQTimer* timer = new TQTimer( this ); mLastDate = TQDate::currentDate(); - connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkNewDay() ) ); + connect(timer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkNewDay() ) ); timer->start( 1000*60 ); } @@ -66,13 +66,13 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname ) KParts::ReadOnlyPart *part = KParts::ComponentFactory:: createPartInstanceFromLibrary<KParts::ReadOnlyPart> - ( libname, this, 0, TQT_TQOBJECT(this), "kontact", TQStringList(), &error ); + ( libname, this, 0, this, "kontact", TQStringList(), &error ); KParts::ReadOnlyPart *pimPart = dynamic_cast<KParts::ReadOnlyPart*>( part ); if ( pimPart ) { mParts.insert( libname, pimPart ); - TQObject::connect( pimPart, TQT_SIGNAL( destroyed( TQObject * ) ), - TQT_SLOT( slotPartDestroyed( TQObject * ) ) ); + TQObject::connect( pimPart, TQ_SIGNAL( destroyed( TQObject * ) ), + TQ_SLOT( slotPartDestroyed( TQObject * ) ) ); } else { // TODO move to KParts::ComponentFactory switch( error ) { diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h index 7317febc..cc71407c 100644 --- a/kontact/interfaces/core.h +++ b/kontact/interfaces/core.h @@ -24,7 +24,7 @@ #define KONTACT_CORE_H #include <tqdatetime.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tdeparts/mainwindow.h> #include <tdeparts/part.h> @@ -38,7 +38,7 @@ class Plugin; /** This class provides the interface to the Kontact core for the plugins. */ -class KDE_EXPORT Core : public KParts::MainWindow +class TDE_EXPORT Core : public KParts::MainWindow { TQ_OBJECT diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp index 3b63466c..b3ec8202 100644 --- a/kontact/interfaces/plugin.cpp +++ b/kontact/interfaces/plugin.cpp @@ -27,7 +27,7 @@ #include <tdeglobal.h> #include <tdeparts/componentfactory.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <krun.h> #include "core.h" @@ -147,7 +147,7 @@ KParts::ReadOnlyPart *Plugin::part() if ( !d->part ) { d->part = createPart(); if ( d->part ) { - connect( d->part, TQT_SIGNAL( destroyed() ), TQT_SLOT( partDestroyed() ) ); + connect( d->part, TQ_SIGNAL( destroyed() ), TQ_SLOT( partDestroyed() ) ); core()->partLoaded( this, d->part ); } } diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h index af7cbfa7..f2911ade 100644 --- a/kontact/interfaces/plugin.h +++ b/kontact/interfaces/plugin.h @@ -26,7 +26,7 @@ #include <tqobject.h> #include <kxmlguiclient.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tqptrlist.h> class TQStringList; @@ -55,7 +55,7 @@ class Summary; to get a plugin. It can insert an icon into the sidepane, add widgets to the widgetstack and add menu items via XMLGUI. */ -class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient +class TDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient { TQ_OBJECT diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h index 945395c8..cd97525a 100644 --- a/kontact/interfaces/summary.h +++ b/kontact/interfaces/summary.h @@ -23,7 +23,7 @@ #include <tqwidget.h> #include <tqpixmap.h> -#include <kdemacros.h> +#include <tdemacros.h> class KStatusBar; @@ -33,7 +33,7 @@ namespace Kontact /** Summary widget for display in the Summary View plugin. */ -class KDE_EXPORT Summary : public TQWidget +class TDE_EXPORT Summary : public TQWidget { TQ_OBJECT diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp index 98a5d45b..7fe8633e 100644 --- a/kontact/interfaces/uniqueapphandler.cpp +++ b/kontact/interfaces/uniqueapphandler.cpp @@ -28,7 +28,7 @@ #include <dcopclient.h> #include <kdebug.h> #include <tdelocale.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> /* Test plan for the various cases of interaction between standalone apps and kontact: @@ -78,10 +78,10 @@ using namespace Kontact; int UniqueAppHandler::newInstance() { - // This bit is duplicated from KUniqueApplication::newInstance() - if ( kapp->mainWidget() ) { - kapp->mainWidget()->show(); - KWin::forceActiveWindow( kapp->mainWidget()->winId() ); + // This bit is duplicated from TDEUniqueApplication::newInstance() + if ( tdeApp->mainWidget() ) { + tdeApp->mainWidget()->show(); + KWin::forceActiveWindow( tdeApp->mainWidget()->winId() ); TDEStartupInfo::appStarted(); } @@ -99,13 +99,13 @@ bool UniqueAppHandler::process( const TQCString &fun, const TQByteArray &data, TDECmdLineArgs::reset(); // forget options defined by other "applications" loadCommandLineOptions(); // implemented by plugin - // This bit is duplicated from KUniqueApplication::processDelayed() + // This bit is duplicated from TDEUniqueApplication::processDelayed() TQDataStream ds( data, IO_ReadOnly ); TDECmdLineArgs::loadAppArgs( ds ); if ( !ds.atEnd() ) { // backwards compatibility TQCString asn_id; ds >> asn_id; - kapp->setStartupId( asn_id ); + tdeApp->setStartupId( asn_id ); } TQDataStream _replyStream( replyData, IO_WriteOnly ); @@ -148,16 +148,16 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin : TQObject( plugin ), mFactory( factory ), mPlugin( plugin ) { // The app is running standalone if 1) that name is known to DCOP - mRunningStandalone = kapp->dcopClient()->isApplicationRegistered( plugin->name() ); + mRunningStandalone = tdeApp->dcopClient()->isApplicationRegistered( plugin->name() ); // and 2) it's not registered by kontact (e.g. in another plugin) - if ( mRunningStandalone && kapp->dcopClient()->findLocalClient( plugin->name() ) ) + if ( mRunningStandalone && tdeApp->dcopClient()->findLocalClient( plugin->name() ) ) mRunningStandalone = false; if ( mRunningStandalone ) { - kapp->dcopClient()->setNotifications( true ); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ), - this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + tdeApp->dcopClient()->setNotifications( true ); + connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ), + this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); } else { mFactory->createHandler( mPlugin ); } @@ -166,7 +166,7 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin UniqueAppWatcher::~UniqueAppWatcher() { if ( mRunningStandalone ) - kapp->dcopClient()->setNotifications( false ); + tdeApp->dcopClient()->setNotifications( false ); delete mFactory; } @@ -174,11 +174,11 @@ UniqueAppWatcher::~UniqueAppWatcher() void UniqueAppWatcher::unregisteredFromDCOP( const TQCString& appId ) { if ( appId == mPlugin->name() && mRunningStandalone ) { - disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ), - this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + disconnect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ), + this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); kdDebug(5601) << k_funcinfo << appId << endl; mFactory->createHandler( mPlugin ); - kapp->dcopClient()->setNotifications( false ); + tdeApp->dcopClient()->setNotifications( false ); mRunningStandalone = false; } } @@ -196,7 +196,7 @@ static TDECmdLineOptions options[] = void Kontact::UniqueAppHandler::loadKontactCommandLineOptions() { TDECmdLineArgs::addCmdLineOptions( options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); TDEApplication::addCmdLineOptions(); } diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h index bef34d47..81e0b72a 100644 --- a/kontact/interfaces/uniqueapphandler.h +++ b/kontact/interfaces/uniqueapphandler.h @@ -24,7 +24,7 @@ #include <dcopobject.h> #include <plugin.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace Kontact { @@ -36,7 +36,7 @@ namespace Kontact * By default this means simply bringing the main window to the front, * but newInstance can be reimplemented. */ -class KDE_EXPORT UniqueAppHandler : public DCOPObject +class TDE_EXPORT UniqueAppHandler : public DCOPObject { K_DCOP @@ -91,7 +91,7 @@ template <class T> class UniqueAppHandlerFactory : public UniqueAppHandlerFactor * Kontact takes over from there. * */ -class KDE_EXPORT UniqueAppWatcher : public TQObject +class TDE_EXPORT UniqueAppWatcher : public TQObject { TQ_OBJECT diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp index a7a7fa7a..17cd5862 100644 --- a/kontact/plugins/akregator/akregator_plugin.cpp +++ b/kontact/plugins/akregator/akregator_plugin.cpp @@ -49,11 +49,11 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_akregator, PluginFactory( "kontact_akregator" ) ) AkregatorPlugin::AkregatorPlugin( Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, TQT_TQOBJECT(core), "akregator" ), m_stub(0) + : Kontact::Plugin( core, core, "akregator" ), m_stub(0) { setInstance( PluginFactory::instance() ); - insertNewAction( new TDEAction( i18n( "New Feed..." ), "bookmark_add", CTRL+SHIFT+Key_F, this, TQT_SLOT( addFeed() ), actionCollection(), "feed_new" ) ); + insertNewAction( new TDEAction( i18n( "New Feed..." ), "bookmark_add", CTRL+SHIFT+Key_F, this, TQ_SLOT( addFeed() ), actionCollection(), "feed_new" ) ); m_uniqueAppWatcher = new Kontact::UniqueAppWatcher( new Kontact::UniqueAppHandlerFactory<Akregator::UniqueAppHandler>(), this ); @@ -89,7 +89,7 @@ MyBasePart* AkregatorPlugin::createPart() { MyBasePart* p = loadPart(); - connect(p, TQT_SIGNAL(showPart()), this, TQT_SLOT(showPart())); + connect(p, TQ_SIGNAL(showPart()), this, TQ_SLOT(showPart())); m_stub = new Akregator::AkregatorPartIface_stub( dcopClient(), "akregator", "AkregatorIface" ); m_stub->openStandardFeedList(); diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp index d6db8112..8cdef758 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp @@ -52,20 +52,20 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kaddressbookplugin, KAddressbookPluginFactory( "kontact_kaddressbookplugin" ) ) KAddressbookPlugin::KAddressbookPlugin( Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, TQT_TQOBJECT(core), "kaddressbook" ), + : Kontact::Plugin( core, core, "kaddressbook" ), mStub( 0 ) { setInstance( KAddressbookPluginFactory::instance() ); insertNewAction( new TDEAction( i18n( "New Contact..." ), "identity", - CTRL+SHIFT+Key_C, this, TQT_SLOT( slotNewContact() ), actionCollection(), + CTRL+SHIFT+Key_C, this, TQ_SLOT( slotNewContact() ), actionCollection(), "new_contact" ) ); insertNewAction( new TDEAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this, - TQT_SLOT( slotNewDistributionList() ), actionCollection(), "new_distributionlist" ) ); + TQ_SLOT( slotNewDistributionList() ), actionCollection(), "new_distributionlist" ) ); insertSyncAction( new TDEAction( i18n( "Synchronize Contacts" ), "reload", - 0, this, TQT_SLOT( slotSyncContacts() ), actionCollection(), + 0, this, TQ_SLOT( slotSyncContacts() ), actionCollection(), "kaddressbook_sync" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( new Kontact::UniqueAppHandlerFactory<KABUniqueAppHandler>(), this ); diff --git a/kontact/plugins/karm/karm_plugin.cpp b/kontact/plugins/karm/karm_plugin.cpp index 8db54bc9..a84dd63b 100644 --- a/kontact/plugins/karm/karm_plugin.cpp +++ b/kontact/plugins/karm/karm_plugin.cpp @@ -37,12 +37,12 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_karm, KarmPluginFactory( "kontact_karm" ) ) KarmPlugin::KarmPlugin( Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, TQT_TQOBJECT(core), "KArm" ) + : Kontact::Plugin( core, core, "KArm" ) { setInstance( KarmPluginFactory::instance() ); (void)dcopClient(); insertNewAction( new TDEAction( i18n( "New Task" ), "karm", - CTRL+SHIFT+Key_W, this, TQT_SLOT( newTask() ), actionCollection(), + CTRL+SHIFT+Key_W, this, TQ_SLOT( newTask() ), actionCollection(), "new_task" ) ); } diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index e2f9126f..7b2d92b2 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -37,11 +37,11 @@ #include "kcmkmailsummary.h" -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { - KDE_EXPORT TDECModule *create_kmailsummary( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmailsummary( TQWidget *parent, const char * ) { return new KCMKMailSummary( parent, "kcmkmailsummary" ); } @@ -52,8 +52,8 @@ KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name ) { initGUI(); - connect( mFolderView, TQT_SIGNAL( clicked( TQListViewItem* ) ), TQT_SLOT( modified() ) ); - connect( mFullPath, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); + connect( mFolderView, TQ_SIGNAL( clicked( TQListViewItem* ) ), TQ_SLOT( modified() ) ); + connect( mFullPath, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) ); TDEAcceleratorManager::manage( this ); diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index 09c2fd05..8d9c670a 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -29,7 +29,7 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <tdeparts/componentfactory.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <dcopclient.h> #include <tdetempfile.h> @@ -56,17 +56,17 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kmailplugin, KMailPluginFactory( "kontact_kmailplugin" ) ) KMailPlugin::KMailPlugin(Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, TQT_TQOBJECT(core), "kmail" ), + : Kontact::Plugin( core, core, "kmail" ), mStub( 0 ) { setInstance( KMailPluginFactory::instance() ); insertNewAction( new TDEAction( i18n( "New Message..." ), "mail-message-new", - CTRL+SHIFT+Key_M, this, TQT_SLOT( slotNewMail() ), actionCollection(), + CTRL+SHIFT+Key_M, this, TQ_SLOT( slotNewMail() ), actionCollection(), "new_mail" ) ); insertSyncAction( new TDEAction( i18n( "Synchronize Mail" ), "reload", - 0, this, TQT_SLOT( slotSyncFolders() ), actionCollection(), + 0, this, TQ_SLOT( slotSyncFolders() ), actionCollection(), "sync_mail" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( @@ -203,7 +203,7 @@ int KMailUniqueAppHandler::newInstance() } bool KMailPlugin::queryClose() const { - KMailIface_stub stub( kapp->dcopClient(), "kmail", "KMailIface" ); + KMailIface_stub stub( tdeApp->dcopClient(), "kmail", "KMailIface" ); bool canClose=stub.canQueryClose(); return canClose; } diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp index 924938a0..31e22992 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/kontact/plugins/kmail/summarywidget.cpp @@ -133,8 +133,8 @@ void SummaryWidget::updateFolderList( const TQStringList& folders ) urlLabel->installEventFilter( this ); urlLabel->setAlignment( AlignLeft ); urlLabel->show(); - connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - TQT_SLOT( selectFolder( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + TQ_SLOT( selectFolder( const TQString& ) ) ); mLayout->addWidget( urlLabel, counter, 0 ); mLabels.append( urlLabel ); @@ -163,7 +163,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders ) bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { - KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); + KURLLabel* label = static_cast<KURLLabel*>( obj ); if ( e->type() == TQEvent::Enter ) emit message( i18n( "Open Folder: \"%1\"" ).arg( label->text() ) ); if ( e->type() == TQEvent::Leave ) diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp index 758572bb..8a6fb54f 100644 --- a/kontact/plugins/knode/knode_plugin.cpp +++ b/kontact/plugins/knode/knode_plugin.cpp @@ -45,12 +45,12 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_knodeplugin, KNodePlugin::KNodePlugin( Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, TQT_TQOBJECT(core), "knode" ), mStub(0) + : Kontact::Plugin( core, core, "knode" ), mStub(0) { setInstance( KNodePluginFactory::instance() ); insertNewAction( new TDEAction( i18n( "New Article..." ), "mail-message-new", CTRL+SHIFT+Key_A, - this, TQT_SLOT( slotPostArticle() ), actionCollection(), "post_article" ) ); + this, TQ_SLOT( slotPostArticle() ), actionCollection(), "post_article" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( new Kontact::UniqueAppHandlerFactory<KNodeUniqueAppHandler>(), this ); diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index 20e8d6c9..7ec3df6c 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -50,13 +50,13 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name ) setInstance( new TDEInstance( "knotes" ) ); // create the actions - new TDEAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQT_SLOT( newNote() ), + new TDEAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQ_SLOT( newNote() ), actionCollection(), "file_new" ); - new TDEAction( i18n( "Rename..." ), "text", this, TQT_SLOT( renameNote() ), + new TDEAction( i18n( "Rename..." ), "text", this, TQ_SLOT( renameNote() ), actionCollection(), "edit_rename" ); - new TDEAction( i18n( "Delete" ), "edit-delete", Key_Delete, this, TQT_SLOT( killSelectedNotes() ), + new TDEAction( i18n( "Delete" ), "edit-delete", Key_Delete, this, TQ_SLOT( killSelectedNotes() ), actionCollection(), "edit_delete" ); - new TDEAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQT_SLOT( printSelectedNotes() ), + new TDEAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQ_SLOT( printSelectedNotes() ), actionCollection(), "print_note" ); // TODO icons: s/editdelete/knotes_delete/ or the other way round in knotes @@ -68,20 +68,20 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name ) mNotesView->setAutoArrange( true ); mNotesView->setSorting( true ); - connect( mNotesView, TQT_SIGNAL( executed( TQIconViewItem* ) ), - this, TQT_SLOT( editNote( TQIconViewItem* ) ) ); - connect( mNotesView, TQT_SIGNAL( returnPressed( TQIconViewItem* ) ), - this, TQT_SLOT( editNote( TQIconViewItem* ) ) ); - connect( mNotesView, TQT_SIGNAL( itemRenamed( TQIconViewItem* ) ), - this, TQT_SLOT( renamedNote( TQIconViewItem* ) ) ); - connect( mNotesView, TQT_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ), - this, TQT_SLOT( popupRMB( TQIconViewItem*, const TQPoint& ) ) ); - connect( mNotesView, TQT_SIGNAL( onItem( TQIconViewItem* ) ), - this, TQT_SLOT( slotOnItem( TQIconViewItem* ) ) ); - connect( mNotesView, TQT_SIGNAL( onViewport() ), - this, TQT_SLOT( slotOnViewport() ) ); - connect( mNotesView, TQT_SIGNAL( currentChanged( TQIconViewItem* ) ), - this, TQT_SLOT( slotOnCurrentChanged( TQIconViewItem* ) ) ); + connect( mNotesView, TQ_SIGNAL( executed( TQIconViewItem* ) ), + this, TQ_SLOT( editNote( TQIconViewItem* ) ) ); + connect( mNotesView, TQ_SIGNAL( returnPressed( TQIconViewItem* ) ), + this, TQ_SLOT( editNote( TQIconViewItem* ) ) ); + connect( mNotesView, TQ_SIGNAL( itemRenamed( TQIconViewItem* ) ), + this, TQ_SLOT( renamedNote( TQIconViewItem* ) ) ); + connect( mNotesView, TQ_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ), + this, TQ_SLOT( popupRMB( TQIconViewItem*, const TQPoint& ) ) ); + connect( mNotesView, TQ_SIGNAL( onItem( TQIconViewItem* ) ), + this, TQ_SLOT( slotOnItem( TQIconViewItem* ) ) ); + connect( mNotesView, TQ_SIGNAL( onViewport() ), + this, TQ_SLOT( slotOnViewport() ) ); + connect( mNotesView, TQ_SIGNAL( currentChanged( TQIconViewItem* ) ), + this, TQ_SLOT( slotOnCurrentChanged( TQIconViewItem* ) ) ); slotOnCurrentChanged( 0 ); @@ -91,10 +91,10 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name ) setXMLFile( "knotes_part.rc" ); // connect the resource manager - connect( mManager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ), - this, TQT_SLOT( createNote( KCal::Journal* ) ) ); - connect( mManager, TQT_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ), - this, TQT_SLOT( killNote( KCal::Journal* ) ) ); + connect( mManager, TQ_SIGNAL( sigRegisteredNote( KCal::Journal* ) ), + this, TQ_SLOT( createNote( KCal::Journal* ) ) ); + connect( mManager, TQ_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ), + this, TQ_SLOT( killNote( KCal::Journal* ) ) ); // read the notes mManager->load(); diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h index 0d6cd46c..735f492e 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -144,7 +144,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient mNoteEdit->setFocus(); KXMLGUIBuilder builder( page ); - KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) ); + KXMLGUIFactory factory( &builder, this ); factory.addClient( this ); mTool = static_cast<TDEToolBar *>(factory.container( "note_tool", this )); diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp index bec6fb5c..1b66eea1 100644 --- a/kontact/plugins/knotes/knotes_plugin.cpp +++ b/kontact/plugins/knotes/knotes_plugin.cpp @@ -39,15 +39,15 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_knotesplugin, KNotesPlugin::KNotesPlugin( Kontact::Core *core, const char *, const TQStringList & ) - : Kontact::Plugin( core, TQT_TQOBJECT(core), "knotes" ), + : Kontact::Plugin( core, core, "knotes" ), mAboutData( 0 ) { setInstance( KNotesPluginFactory::instance() ); insertNewAction( new TDEAction( i18n( "New Note..." ), "knotes", CTRL+SHIFT+Key_N, - this, TQT_SLOT( slotNewNote() ), actionCollection(), "new_note" ) ); + this, TQ_SLOT( slotNewNote() ), actionCollection(), "new_note" ) ); insertSyncAction( new TDEAction( i18n( "Synchronize Notes" ), "reload", 0, - this, TQT_SLOT( slotSyncNotes() ), actionCollection(), "knotes_sync" ) ); + this, TQ_SLOT( slotSyncNotes() ), actionCollection(), "knotes_sync" ) ); } KNotesPlugin::~KNotesPlugin() diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp index 97bd771f..fe39868a 100644 --- a/kontact/plugins/knotes/knotetip.cpp +++ b/kontact/plugins/knotes/knotetip.cpp @@ -75,7 +75,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item ) mNoteIVI = item; if ( !mNoteIVI ) { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); if ( isVisible() ) { setFilter( false ); hide(); @@ -104,7 +104,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item ) resize( w, TQMIN( h, desk.height() / 2 - 20 ) ); hide(); - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); setFilter( true ); startTimer( 600 ); // delay showing the tooltip for 0.7 sec } @@ -121,7 +121,7 @@ void KNoteTip::resizeEvent( TQResizeEvent *ev ) void KNoteTip::timerEvent( TQTimerEvent * ) { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); if ( !isVisible() ) { startTimer( 15000 ); // show the tooltip for 15 sec @@ -144,7 +144,7 @@ bool KNoteTip::eventFilter( TQObject *, TQEvent *e ) case TQEvent::FocusIn: case TQEvent::FocusOut: case TQEvent::Wheel: - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); setFilter( false ); hide(); default: @@ -184,11 +184,11 @@ void KNoteTip::setFilter( bool enable ) return; if ( enable ) { - kapp->installEventFilter( this ); + tdeApp->installEventFilter( this ); TQApplication::setGlobalMouseTracking( true ); } else { TQApplication::setGlobalMouseTracking( false ); - kapp->removeEventFilter( this ); + tdeApp->removeEventFilter( this ); } mFilter = enable; diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp index ca0f6ae5..d7269fac 100644 --- a/kontact/plugins/knotes/summarywidget.cpp +++ b/kontact/plugins/knotes/summarywidget.cpp @@ -34,7 +34,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <kurllabel.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knotes/resourcenotes.h> #include <knotes/resourcemanager.h> @@ -61,10 +61,10 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin, mCalendar = new KCal::CalendarLocal( TQString::fromLatin1("UTC") ); KNotesResourceManager *manager = new KNotesResourceManager(); - TQObject::connect( manager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ), - this, TQT_SLOT( addNote( KCal::Journal* ) ) ); - TQObject::connect( manager, TQT_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ), - this, TQT_SLOT( removeNote( KCal::Journal* ) ) ); + TQObject::connect( manager, TQ_SIGNAL( sigRegisteredNote( KCal::Journal* ) ), + this, TQ_SLOT( addNote( KCal::Journal* ) ) ); + TQObject::connect( manager, TQ_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ), + this, TQ_SLOT( removeNote( KCal::Journal* ) ) ); manager->load(); @@ -111,8 +111,8 @@ void KNotesSummaryWidget::updateView() TQToolTip::add( urlLabel, (*it)->description().left( 80 ) ); } - connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SLOT( urlClicked( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SLOT( urlClicked( const TQString& ) ) ); counter++; } @@ -138,7 +138,7 @@ void KNotesSummaryWidget::urlClicked( const TQString &/*uid*/ ) bool KNotesSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { - KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); + KURLLabel* label = static_cast<KURLLabel*>( obj ); if ( e->type() == TQEvent::Enter ) emit message( i18n( "Read Note: \"%1\"" ).arg( label->text() ) ); if ( e->type() == TQEvent::Leave ) diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp index ac3b7735..a028d937 100644 --- a/kontact/plugins/korganizer/journalplugin.cpp +++ b/kontact/plugins/korganizer/journalplugin.cpp @@ -43,17 +43,17 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_journalplugin, JournalPluginFactory( "kontact_journalplugin" ) ) JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ), + : Kontact::Plugin( core, core, "korganizer" ), mIface( 0 ) { setInstance( JournalPluginFactory::instance() ); instance()->iconLoader()->addAppDir("tdepim"); insertNewAction( new TDEAction( i18n( "New Journal..." ), "newjournal", - CTRL+SHIFT+Key_J, this, TQT_SLOT( slotNewJournal() ), actionCollection(), + CTRL+SHIFT+Key_J, this, TQ_SLOT( slotNewJournal() ), actionCollection(), "new_journal" ) ); insertSyncAction( new TDEAction( i18n( "Synchronize Journal" ), "reload", - 0, this, TQT_SLOT( slotSyncJournal() ), actionCollection(), + 0, this, TQ_SLOT( slotSyncJournal() ), actionCollection(), "journal_sync" ) ); diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index eda11019..41efc83e 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -37,11 +37,11 @@ #include "kcmkorgsummary.h" -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { - KDE_EXPORT TDECModule *create_korgsummary( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_korgsummary( TQWidget *parent, const char * ) { return new KCMKOrgSummary( parent, "kcmkorgsummary" ); } @@ -54,11 +54,11 @@ KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name ) customDaysChanged( 1 ); - connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) ); - connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) ); - connect( mTodoGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) ); - connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) ); - connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( customDaysChanged( int ) ) ); + connect( mCalendarGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) ); + connect( mCalendarGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( buttonClicked( int ) ) ); + connect( mTodoGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) ); + connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) ); + connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( customDaysChanged( int ) ) ); TDEAcceleratorManager::manage( this ); diff --git a/kontact/plugins/korganizer/korg_uniqueapp.cpp b/kontact/plugins/korganizer/korg_uniqueapp.cpp index c8360583..69ab8dc2 100644 --- a/kontact/plugins/korganizer/korg_uniqueapp.cpp +++ b/kontact/plugins/korganizer/korg_uniqueapp.cpp @@ -41,10 +41,10 @@ int KOrganizerUniqueAppHandler::newInstance() korganizer.send( "handleCommandLine" ); // Bring korganizer's plugin to front - // This bit is duplicated from KUniqueApplication::newInstance() - if ( kapp->mainWidget() ) { - kapp->mainWidget()->show(); - KWin::forceActiveWindow( kapp->mainWidget()->winId() ); + // This bit is duplicated from TDEUniqueApplication::newInstance() + if ( tdeApp->mainWidget() ) { + tdeApp->mainWidget()->show(); + KWin::forceActiveWindow( tdeApp->mainWidget()->winId() ); TDEStartupInfo::appStarted(); } diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index b25016aa..69cdd757 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -35,7 +35,7 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <dcopclient.h> @@ -57,7 +57,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_korganizerplugin, KOrganizerPluginFactory( "kontact_korganizerplugin" ) ) KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ), + : Kontact::Plugin( core, core, "korganizer" ), mIface( 0 ) { @@ -65,11 +65,11 @@ KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQS instance()->iconLoader()->addAppDir("tdepim"); insertNewAction( new TDEAction( i18n( "New Event..." ), "newappointment", - CTRL+SHIFT+Key_E, this, TQT_SLOT( slotNewEvent() ), actionCollection(), + CTRL+SHIFT+Key_E, this, TQ_SLOT( slotNewEvent() ), actionCollection(), "new_event" ) ); insertSyncAction( new TDEAction( i18n( "Synchronize Calendar" ), "reload", - 0, this, TQT_SLOT( slotSyncEvents() ), actionCollection(), + 0, this, TQ_SLOT( slotSyncEvents() ), actionCollection(), "korganizer_sync" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( @@ -238,7 +238,7 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event ) } bool KOrganizerPlugin::queryClose() const { - KOrganizerIface_stub stub( kapp->dcopClient(), "korganizer", "KOrganizerIface" ); + KOrganizerIface_stub stub( tdeApp->dcopClient(), "korganizer", "KOrganizerIface" ); bool canClose=stub.canQueryClose(); return (!canClose); } diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index 93b2c2dd..8400b83e 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -32,7 +32,7 @@ #include <tdelocale.h> #include <tdeparts/part.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurllabel.h> #include <libkcal/event.h> #include <libkcal/resourcecalendar.h> @@ -66,9 +66,9 @@ SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent, mCalendar = KOrg::StdCalendar::self(); - connect( mCalendar, TQT_SIGNAL( calendarChanged() ), TQT_SLOT( updateView() ) ); - connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ), - TQT_SLOT( updateView() ) ); + connect( mCalendar, TQ_SIGNAL( calendarChanged() ), TQ_SLOT( updateView() ) ); + connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ), + TQ_SLOT( updateView() ) ); updateView(); } @@ -202,10 +202,10 @@ void SummaryWidget::updateView() mLayout->addWidget( urlLabel, counter, 2 ); mLabels.append( urlLabel ); - connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SLOT( viewEvent( const TQString& ) ) ); - connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), - this, TQT_SLOT( popupMenu( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SLOT( viewEvent( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ), + this, TQ_SLOT( popupMenu( const TQString& ) ) ); TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, ev, dt, true ) ); if ( !tipText.isEmpty() ) { @@ -286,7 +286,7 @@ void SummaryWidget::popupMenu( const TQString &uid ) bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { - KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); + KURLLabel* label = static_cast<KURLLabel*>( obj ); if ( e->type() == TQEvent::Enter ) emit message( i18n( "Edit Appointment: \"%1\"" ).arg( label->text() ) ); if ( e->type() == TQEvent::Leave ) diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index 885c835a..bcb2c566 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -55,18 +55,18 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_todoplugin, TodoPluginFactory( "kontact_todoplugin" ) ) TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ), + : Kontact::Plugin( core, core, "korganizer" ), mIface( 0 ) { setInstance( TodoPluginFactory::instance() ); instance()->iconLoader()->addAppDir("tdepim"); insertNewAction( new TDEAction( i18n( "New To-do..." ), "newtodo", - CTRL+SHIFT+Key_T, this, TQT_SLOT( slotNewTodo() ), actionCollection(), + CTRL+SHIFT+Key_T, this, TQ_SLOT( slotNewTodo() ), actionCollection(), "new_todo" ) ); insertSyncAction( new TDEAction( i18n( "Synchronize To-do List" ), "reload", - 0, this, TQT_SLOT( slotSyncTodos() ), actionCollection(), + 0, this, TQ_SLOT( slotSyncTodos() ), actionCollection(), "todo_sync" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 255ee2ef..2fb9bf95 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -32,7 +32,7 @@ #include <tdelocale.h> #include <tdeparts/part.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurllabel.h> #include <libkcal/resourcecalendar.h> #include <libkcal/resourcelocal.h> @@ -68,9 +68,9 @@ TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin, mCalendar = KOrg::StdCalendar::self(); - connect( mCalendar, TQT_SIGNAL( calendarChanged() ), TQT_SLOT( updateView() ) ); - connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ), - TQT_SLOT( updateView() ) ); + connect( mCalendar, TQ_SIGNAL( calendarChanged() ), TQ_SLOT( updateView() ) ); + connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ), + TQ_SLOT( updateView() ) ); updateView(); } @@ -163,10 +163,10 @@ void TodoSummaryWidget::updateView() mLayout->addWidget( urlLabel, counter, 2 ); mLabels.append( urlLabel ); - connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SLOT( viewTodo( const TQString& ) ) ); - connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), - this, TQT_SLOT( popupMenu( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SLOT( viewTodo( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ), + this, TQ_SLOT( popupMenu( const TQString& ) ) ); TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, currentDate, true ) ); if ( !tipText.isEmpty() ) { @@ -211,7 +211,7 @@ void TodoSummaryWidget::removeTodo( const TQString &uid ) void TodoSummaryWidget::completeTodo( const TQString &uid ) { KCal::Todo *todo = mCalendar->todo( uid ); - IncidenceChanger *changer = new IncidenceChanger( mCalendar, TQT_TQOBJECT(this) ); + IncidenceChanger *changer = new IncidenceChanger( mCalendar, this ); if ( !todo->isReadOnly() && changer->beginChange( todo, 0, TQString() ) ) { KCal::Todo *oldTodo = todo->clone(); todo->setCompleted( TQDateTime::currentDateTime() ); @@ -251,7 +251,7 @@ void TodoSummaryWidget::popupMenu( const TQString &uid ) bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { - KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); + KURLLabel* label = static_cast<KURLLabel*>( obj ); if ( e->type() == TQEvent::Enter ) emit message( i18n( "Edit To-do: \"%1\"" ).arg( label->text() ) ); if ( e->type() == TQEvent::Leave ) diff --git a/kontact/plugins/kpilot/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp index 81053917..9239db85 100644 --- a/kontact/plugins/kpilot/kpilot_plugin.cpp +++ b/kontact/plugins/kpilot/kpilot_plugin.cpp @@ -35,7 +35,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kpilotplugin, KPilotPluginFactory( "kontact_kpilotplugin" ) ) KPilotPlugin::KPilotPlugin( Kontact::Core *core, const char *name, const TQStringList& ) - : Kontact::Plugin( core, TQT_TQOBJECT(core), "kpilot" ), mAboutData( 0 ) + : Kontact::Plugin( core, core, "kpilot" ), mAboutData( 0 ) { setInstance( KPilotPluginFactory::instance() ); // TODO: Make sure kpilotDaemon is running! diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp index 9ab256d2..6a15dc09 100644 --- a/kontact/plugins/kpilot/summarywidget.cpp +++ b/kontact/plugins/kpilot/summarywidget.cpp @@ -71,8 +71,8 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) mLayout->addWidget( mSyncTimeLabel, row, 1 ); mShowSyncLogLabel = new KURLLabel( "", i18n( "[View Sync Log]" ), this ); mLayout->addWidget( mShowSyncLogLabel, row, 3 ); - connect( mShowSyncLogLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SLOT( showSyncLog( const TQString& ) ) ); + connect( mShowSyncLogLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SLOT( showSyncLog( const TQString& ) ) ); // User row++; @@ -110,16 +110,16 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) mLayout->addMultiCellWidget( mNoConnectionLabel, row, row, 1, 2 ); mNoConnectionStartLabel = new KURLLabel( "", i18n( "[Start KPilot]" ), this ); mLayout->addWidget( mNoConnectionStartLabel, row, 3 ); - connect( mNoConnectionStartLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SLOT( startKPilot() ) ); + connect( mNoConnectionStartLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SLOT( startKPilot() ) ); - if ( !kapp->dcopClient()->isApplicationRegistered( "kpilotDaemon" ) ) { + if ( !tdeApp->dcopClient()->isApplicationRegistered( "kpilotDaemon" ) ) { startKPilot(); } connectDCOPSignal( 0, 0, "kpilotDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)", "receiveDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)", false ); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString & ) ), TQT_SLOT( slotAppRemoved( const TQCString& ) ) ); + connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString & ) ), TQ_SLOT( slotAppRemoved( const TQCString& ) ) ); } SummaryWidget::~SummaryWidget() diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 2eee85ea..84aaca95 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -45,11 +45,11 @@ #include "newsfeeds.h" -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { - KDE_EXPORT TDECModule *create_kontactknt( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kontactknt( TQWidget *parent, const char * ) { return new KCMKontactKNT( parent, "kcmkontactknt" ); } @@ -80,10 +80,10 @@ NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWi mTitle->setText( title ); mURL->setText( url ); mTitle->setFocus(); - connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); + connect( mTitle, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mURL, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); modified(); } @@ -133,18 +133,18 @@ KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name ) { initGUI(); - connect( mAllNews, TQT_SIGNAL( currentChanged( TQListViewItem* ) ), - this, TQT_SLOT( allCurrentChanged( TQListViewItem* ) ) ); - connect( mSelectedNews, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( selectedChanged( TQListViewItem* ) ) ); + connect( mAllNews, TQ_SIGNAL( currentChanged( TQListViewItem* ) ), + this, TQ_SLOT( allCurrentChanged( TQListViewItem* ) ) ); + connect( mSelectedNews, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( selectedChanged( TQListViewItem* ) ) ); - connect( mUpdateInterval, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) ); - connect( mArticleCount, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) ); + connect( mUpdateInterval, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) ); + connect( mArticleCount, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) ); - connect( mAddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addNews() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeNews() ) ); - connect( mNewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( newFeed() ) ); - connect( mDeleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteFeed() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addNews() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeNews() ) ); + connect( mNewButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( newFeed() ) ); + connect( mDeleteButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteFeed() ) ); TDEAcceleratorManager::manage( this ); @@ -392,7 +392,7 @@ bool KCMKontactKNT::dcopActive() const TQString error; TQCString appID; bool isGood = true; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if ( !client->isApplicationRegistered( "rssservice" ) ) { if ( TDEApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) ) isGood = false; diff --git a/kontact/plugins/newsticker/newsticker_plugin.cpp b/kontact/plugins/newsticker/newsticker_plugin.cpp index 04d46883..62d27fc8 100644 --- a/kontact/plugins/newsticker/newsticker_plugin.cpp +++ b/kontact/plugins/newsticker/newsticker_plugin.cpp @@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_newstickerplugin, NewsTickerPluginFactory( "kontact_newstickerplugin" ) ) NewsTickerPlugin::NewsTickerPlugin( Kontact::Core *core, const char *name, const TQStringList& ) - : Kontact::Plugin( core, TQT_TQOBJECT(core), name ) + : Kontact::Plugin( core, core, name ) { setInstance( NewsTickerPluginFactory::instance() ); } diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp index f385b269..e209d031 100644 --- a/kontact/plugins/newsticker/summarywidget.cpp +++ b/kontact/plugins/newsticker/summarywidget.cpp @@ -57,7 +57,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) TQCString appID; bool dcopAvailable = true; - if ( !kapp->dcopClient()->isApplicationRegistered( "rssservice" ) ) { + if ( !tdeApp->dcopClient()->isApplicationRegistered( "rssservice" ) ) { if ( TDEApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) ) { TQLabel *label = new TQLabel( i18n( "No rss dcop service available.\nYou need rssservice to use this plugin." ), this ); vlay->addWidget( label, TQt::AlignHCenter ); @@ -68,7 +68,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) mBaseWidget = new TQWidget( this, "baseWidget" ); vlay->addWidget( mBaseWidget ); - connect( &mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateDocuments() ) ); + connect( &mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateDocuments() ) ); readConfig(); @@ -223,10 +223,10 @@ void SummaryWidget::updateView() urlLabel->setMaximumSize( urlLabel->minimumSizeHint() ); mLabels.append( urlLabel ); - connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - kapp, TQT_SLOT( invokeBrowser( const TQString& ) ) ); - connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), - this, TQT_SLOT( rmbMenu( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + tdeApp, TQ_SLOT( invokeBrowser( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ), + this, TQ_SLOT( rmbMenu( const TQString& ) ) ); // header TQLabel *label = new TQLabel( hbox ); @@ -252,10 +252,10 @@ void SummaryWidget::updateView() mLabels.append( urlLabel ); mLayout->addWidget( urlLabel ); - connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - kapp, TQT_SLOT( invokeBrowser( const TQString& ) ) ); - connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), - this, TQT_SLOT( rmbMenu( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + tdeApp, TQ_SLOT( invokeBrowser( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ), + this, TQ_SLOT( rmbMenu( const TQString& ) ) ); numArticles++; @@ -300,13 +300,13 @@ void SummaryWidget::rmbMenu( const TQString& url ) menu.insertItem( i18n( "Copy URL to Clipboard" ) ); int id = menu.exec( TQCursor::pos() ); if ( id != -1 ) - kapp->clipboard()->setText( url, TQClipboard::Clipboard ); + tdeApp->clipboard()->setText( url, TQClipboard::Clipboard ); } bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { - KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); + KURLLabel* label = static_cast<KURLLabel*>( obj ); if ( e->type() == TQEvent::Enter ) emit message( label->url() ); if ( e->type() == TQEvent::Leave ) diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index c0512fae..3a97d2c1 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -39,11 +39,11 @@ #include "kcmsdsummary.h" -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { - KDE_EXPORT TDECModule *create_sdsummary( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_sdsummary( TQWidget *parent, const char * ) { return new KCMSDSummary( parent, "kcmsdsummary" ); } @@ -56,12 +56,12 @@ KCMSDSummary::KCMSDSummary( TQWidget *parent, const char *name ) customDaysChanged( 1 ); - connect( mDaysGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) ); - connect( mDaysGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) ); - connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) ); - connect( mContactGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) ); - connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) ); - connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( customDaysChanged( int ) ) ); + connect( mDaysGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) ); + connect( mDaysGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( buttonClicked( int ) ) ); + connect( mCalendarGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) ); + connect( mContactGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) ); + connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) ); + connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( customDaysChanged( int ) ) ); TDEAcceleratorManager::manage( this ); diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index e4f86278..083392ef 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -39,7 +39,7 @@ #include <tdelocale.h> #include <tdeparts/part.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurllabel.h> #include <libkcal/event.h> #include <libkcal/resourcecalendar.h> @@ -95,10 +95,10 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, // Setup the Addressbook TDEABC::StdAddressBook *ab = TDEABC::StdAddressBook::self( true ); - connect( ab, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - this, TQT_SLOT( updateView() ) ); - connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ), - this, TQT_SLOT( updateView() ) ); + connect( ab, TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + this, TQ_SLOT( updateView() ) ); + connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ), + this, TQ_SLOT( updateView() ) ); // Setup the Calendar mCalendar = new KCal::CalendarResources( KPimPrefs::timezone() ); @@ -128,10 +128,10 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, } mCalendar = KOrg::StdCalendar::self(); - connect( mCalendar, TQT_SIGNAL( calendarChanged() ), - this, TQT_SLOT( updateView() ) ); - connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ), - this, TQT_SLOT( updateView() ) ); + connect( mCalendar, TQ_SIGNAL( calendarChanged() ), + this, TQ_SLOT( updateView() ) ); + connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ), + this, TQ_SLOT( updateView() ) ); // Update Configuration configUpdated(); @@ -506,10 +506,10 @@ void SDSummaryWidget::updateView() mLayout->addWidget( urlLabel, counter, 4 ); mLabels.append( urlLabel ); - connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SLOT( mailContact( const TQString& ) ) ); - connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), - this, TQT_SLOT( popupMenu( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SLOT( mailContact( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ), + this, TQ_SLOT( popupMenu( const TQString& ) ) ); } else { label = new TQLabel( this ); label->setText( (*addrIt).summary ); @@ -558,7 +558,7 @@ void SDSummaryWidget::mailContact( const TQString &uid ) TDEABC::StdAddressBook *ab = TDEABC::StdAddressBook::self( true ); TQString email = ab->findByUid( uid ).fullEmail(); - kapp->invokeMailer( email, TQString() ); + tdeApp->invokeMailer( email, TQString() ); } void SDSummaryWidget::viewContact( const TQString &uid ) @@ -593,7 +593,7 @@ void SDSummaryWidget::popupMenu( const TQString &uid ) bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { - KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); + KURLLabel* label = static_cast<KURLLabel*>( obj ); if ( e->type() == TQEvent::Enter ) emit message( i18n( "Mail to:\"%1\"" ).arg( label->text() ) ); if ( e->type() == TQEvent::Leave ) diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp index 58c830c8..a1893aef 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.cpp +++ b/kontact/plugins/specialdates/specialdates_plugin.cpp @@ -38,7 +38,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_specialdatesplugin, SpecialdatesPluginFactory( "kontact_specialdatesplugin" ) ) SpecialdatesPlugin::SpecialdatesPlugin( Kontact::Core *core, const char *name, const TQStringList& ) - : Kontact::Plugin( core, TQT_TQOBJECT(core), name ), + : Kontact::Plugin( core, core, name ), mAboutData( 0 ) { setInstance( SpecialdatesPluginFactory::instance() ); diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index 65bd13e5..0ceb1ec4 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -39,11 +39,11 @@ #include "kcmkontactsummary.h" -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { - KDE_EXPORT TDECModule *create_kontactsummary( TQWidget *parent, const char * ) { + TDE_EXPORT TDECModule *create_kontactsummary( TQWidget *parent, const char * ) { return new KCMKontactSummary( parent, "kcmkontactsummary" ); } } @@ -103,8 +103,8 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name ) layout->setStretchFactor( mPluginView, 1 ); - connect( mPluginView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - this, TQT_SLOT( itemClicked( TQListViewItem* ) ) ); + connect( mPluginView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + this, TQ_SLOT( itemClicked( TQListViewItem* ) ) ); load(); TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kontactsummary" ), diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index ddb43d71..fec7f36c 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -37,7 +37,7 @@ #include <tdemessagebox.h> #include <kservice.h> #include <ktrader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqscrollview.h> #include <tdeglobal.h> #include <tdelocale.h> @@ -77,25 +77,25 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*, initGUI( core ); - connect( kapp, TQT_SIGNAL( tdedisplayPaletteChanged() ), TQT_SLOT( slotAdjustPalette() ) ); + connect( tdeApp, TQ_SIGNAL( tdedisplayPaletteChanged() ), TQ_SLOT( slotAdjustPalette() ) ); slotAdjustPalette(); setDate( TQDate::currentDate() ); - connect( mCore, TQT_SIGNAL( dayChanged( const TQDate& ) ), - TQT_SLOT( setDate( const TQDate& ) ) ); + connect( mCore, TQ_SIGNAL( dayChanged( const TQDate& ) ), + TQ_SLOT( setDate( const TQDate& ) ) ); KParts::InfoExtension *info = new KParts::InfoExtension( this, "Summary" ); - connect( this, TQT_SIGNAL( textChanged( const TQString& ) ), - info, TQT_SIGNAL( textChanged( const TQString& ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString& ) ), + info, TQ_SIGNAL( textChanged( const TQString& ) ) ); mConfigAction = new TDEAction( i18n( "&Configure Summary View..." ), "configure", 0, this, - TQT_SLOT( slotConfigure() ), actionCollection(), + TQ_SLOT( slotConfigure() ), actionCollection(), "summaryview_configure" ); setXMLFile( "kontactsummary_part.rc" ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotTextChanged() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotTextChanged() ) ); } SummaryViewPart::~SummaryViewPart() @@ -142,8 +142,8 @@ void SummaryViewPart::updateWidgets() mSummaries.clear(); mFrame = new DropWidget( mMainWidget ); - connect( mFrame, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ), - this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) ); + connect( mFrame, TQ_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ), + this, TQ_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) ); mMainLayout->insertWidget( 2, mFrame ); @@ -176,10 +176,10 @@ void SummaryViewPart::updateWidgets() if ( summary->summaryHeight() > 0 ) { mSummaries.insert( plugin->identifier(), summary ); - connect( summary, TQT_SIGNAL( message( const TQString& ) ), - BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) ); - connect( summary, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ), - this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) ); + connect( summary, TQ_SIGNAL( message( const TQString& ) ), + BroadcastStatus::instance(), TQ_SLOT( setStatusMsg( const TQString& ) ) ); + connect( summary, TQ_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ), + this, TQ_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) ); if ( !mLeftColumnSummaries.contains( plugin->identifier() ) && !mRightColumnSummaries.contains( plugin->identifier() ) ) { @@ -311,7 +311,7 @@ void SummaryViewPart::slotTextChanged() void SummaryViewPart::slotAdjustPalette() { - mMainWidget->setPaletteBackgroundColor( kapp->palette().active().base() ); + mMainWidget->setPaletteBackgroundColor( tdeApp->palette().active().base() ); } void SummaryViewPart::setDate( const TQDate& newDate ) @@ -327,8 +327,8 @@ void SummaryViewPart::slotConfigure() TQStringList modules = configModules(); modules.prepend( "kcmkontactsummary.desktop" ); - connect( &dlg, TQT_SIGNAL( configCommitted() ), - this, TQT_SLOT( updateWidgets() ) ); + connect( &dlg, TQ_SIGNAL( configCommitted() ), + this, TQ_SLOT( updateWidgets() ) ); TQStringList::ConstIterator strIt; for ( strIt = modules.begin(); strIt != modules.end(); ++strIt ) @@ -384,8 +384,8 @@ void SummaryViewPart::initGUI( Kontact::Core *core ) mFrame = new DropWidget( mMainWidget ); mMainLayout->insertWidget( 2, mFrame ); - connect( mFrame, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ), - this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) ); + connect( mFrame, TQ_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ), + this, TQ_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) ); updateWidgets(); } diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp index 81e46a8e..711c2b39 100644 --- a/kontact/plugins/summary/summaryview_plugin.cpp +++ b/kontact/plugins/summary/summaryview_plugin.cpp @@ -34,7 +34,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_summaryplugin, SummaryViewFactory( "kontact_summaryplugin" ) ) SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringList& ) - : Kontact::Plugin( core, TQT_TQOBJECT(core), name), + : Kontact::Plugin( core, core, name), mAboutData( 0 ), mPart( 0 ) { setInstance( SummaryViewFactory::instance() ); @@ -42,8 +42,8 @@ SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringL mSyncAction = new TDESelectAction( i18n( "Synchronize All" ), "reload", 0, 0, 0, actionCollection(), "kontact_summary_sync" ); - connect( mSyncAction, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( syncAccount( const TQString& ) ) ); - connect( mSyncAction->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fillSyncActionSubEntries() ) ); + connect( mSyncAction, TQ_SIGNAL( activated( const TQString& ) ), this, TQ_SLOT( syncAccount( const TQString& ) ) ); + connect( mSyncAction->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fillSyncActionSubEntries() ) ); insertSyncAction( mSyncAction ); fillSyncActionSubEntries(); diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp index 2e712ae8..0752a836 100644 --- a/kontact/plugins/test/test_part.cpp +++ b/kontact/plugins/test/test_part.cpp @@ -48,19 +48,19 @@ TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget m_edit = new TQTextEdit; setWidget(m_edit); setXMLFile("testpartui.rc"); - new TDEAction( "new contact (test)", 0, this, TQT_SLOT( newContact() ), actionCollection(), "test_deleteevent" ); + new TDEAction( "new contact (test)", 0, this, TQ_SLOT( newContact() ), actionCollection(), "test_deleteevent" ); m_kab_stub = 0L; new KParts::SideBarExtension(new TQComboBox(this), this, "sbe"); - kapp->dcopClient()->setNotifications( true ); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString&)), - this, TQT_SLOT( unregisteredFromDCOP( const TQCString& )) ); + tdeApp->dcopClient()->setNotifications( true ); + connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString&)), + this, TQ_SLOT( unregisteredFromDCOP( const TQCString& )) ); } TestPart::~TestPart() { - kapp->dcopClient()->setNotifications( false ); + tdeApp->dcopClient()->setNotifications( false ); delete m_kab_stub; } @@ -92,7 +92,7 @@ bool TestPart::connectToAddressBook() } // TODO document the required named for the dcop interfaces e.g. "CalendarIface". TQCString dcopObjectId = "KAddressBookIface"; - m_kab_stub = new KAddressBookIface_stub(kapp->dcopClient(), dcopService, dcopObjectId); + m_kab_stub = new KAddressBookIface_stub(tdeApp->dcopClient(), dcopService, dcopObjectId); } return m_kab_stub != 0L; } diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp index 631d91cb..e98cd4f2 100644 --- a/kontact/plugins/test/test_plugin.cpp +++ b/kontact/plugins/test/test_plugin.cpp @@ -35,11 +35,11 @@ typedef KGenericFactory< TestPlugin, Kontact::Core > TestPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkptestplugin, TestPluginFactory( "kptestplugin" ) ) TestPlugin::TestPlugin(Kontact::Core *_core, const char *name, const TQStringList &) - : Kontact::Plugin(_core, TQT_TQOBJECT(_core), name) + : Kontact::Plugin(_core, _core, name) { setInstance(TestPluginFactory::instance()); - insertNewAction(new TDEAction("Test", 0, this, TQT_SLOT(slotTestMenu()), actionCollection(), "edit_test")); + insertNewAction(new TDEAction("Test", 0, this, TQ_SLOT(slotTestMenu()), actionCollection(), "edit_test")); setXMLFile("kptestplugin.rc"); } diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index 37fbe74d..fb28ab33 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -33,7 +33,7 @@ #include <tdeglobalsettings.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kurllabel.h> #include "summarywidget.h" @@ -52,7 +52,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) TQString error; TQCString appID; bool serviceAvailable = true; - if ( !kapp->dcopClient()->isApplicationRegistered( "KWeatherService" ) ) { + if ( !tdeApp->dcopClient()->isApplicationRegistered( "KWeatherService" ) ) { if ( TDEApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) ) { TQLabel *label = new TQLabel( i18n( "No weather dcop service available;\nyou need KWeather to use this plugin." ), this ); mLayout->addWidget( label, TQt::AlignHCenter | AlignVCenter ); @@ -69,7 +69,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) if ( reply.isValid() ) { mStations = reply; - connect( &mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( timeout() ) ); + connect( &mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( timeout() ) ); mTimer.start( 0 ); } else { kdDebug(5602) << "ERROR: dcop reply not valid..." << endl; @@ -117,8 +117,8 @@ void SummaryWidget::updateView() urlLabel->setAlignment( AlignTop ); layout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 ); mLabels.append( urlLabel ); - connect ( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SLOT( showReport( const TQString& ) ) ); + connect ( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SLOT( showReport( const TQString& ) ) ); TQLabel* label = new TQLabel( this ); label->setText( TQString( "%1 (%2)" ).arg( (*it).name() ).arg( (*it).temperature() ) ); @@ -210,8 +210,8 @@ void SummaryWidget::updateSummary( bool ) void SummaryWidget::showReport( const TQString &stationID ) { mProc = new TDEProcess; - TQApplication::connect( mProc, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( reportFinished( TDEProcess* ) ) ); + TQApplication::connect( mProc, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( reportFinished( TDEProcess* ) ) ); *mProc << "kweatherreport"; *mProc << stationID; diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp index 93a97bfc..506b16fd 100644 --- a/kontact/plugins/weather/weather_plugin.cpp +++ b/kontact/plugins/weather/weather_plugin.cpp @@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_weatherplugin, WeatherPluginFactory( "kontact_weatherplugin" ) ) WeatherPlugin::WeatherPlugin( Kontact::Core *core, const char *name, const TQStringList& ) - : Kontact::Plugin( core, TQT_TQOBJECT(core), name ), mAboutData( 0 ) + : Kontact::Plugin( core, core, name ), mAboutData( 0 ) { setInstance( WeatherPluginFactory::instance() ); } diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index e3560ed7..f9a261a9 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -267,16 +267,16 @@ Navigator::Navigator( IconSidePane *parent, const char *name ) setFocusPolicy( TQWidget::NoFocus ); - connect( this, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ), - TQT_SLOT( slotExecuted( TQListBoxItem* ) ) ); - connect( this, TQT_SIGNAL( rightButtonPressed( TQListBoxItem*, const TQPoint& ) ), - TQT_SLOT( slotShowRMBMenu( TQListBoxItem*, const TQPoint& ) ) ); - connect( this, TQT_SIGNAL( onItem( TQListBoxItem * ) ), - TQT_SLOT( slotMouseOn( TQListBoxItem * ) ) ); - connect( this, TQT_SIGNAL( onViewport() ), TQT_SLOT( slotMouseOff() ) ); + connect( this, TQ_SIGNAL( selectionChanged( TQListBoxItem* ) ), + TQ_SLOT( slotExecuted( TQListBoxItem* ) ) ); + connect( this, TQ_SIGNAL( rightButtonPressed( TQListBoxItem*, const TQPoint& ) ), + TQ_SLOT( slotShowRMBMenu( TQListBoxItem*, const TQPoint& ) ) ); + connect( this, TQ_SIGNAL( onItem( TQListBoxItem * ) ), + TQ_SLOT( slotMouseOn( TQListBoxItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), TQ_SLOT( slotMouseOff() ) ); - mMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( shortCutSelected( int ) ) ); + mMapper = new TQSignalMapper( this ); + connect( mMapper, TQ_SIGNAL( mapped( int ) ), TQ_SLOT( shortCutSelected( int ) ) ); TQToolTip::remove( this ); if ( !mShowText ) @@ -295,7 +295,7 @@ void Navigator::highlightItem( EntryItem * item ) setPaintActiveItem( mHighlightItem, true ); - TQTimer::singleShot( 2000, this, TQT_SLOT( slotStopHighlight() ) ); + TQTimer::singleShot( 2000, this, TQ_SLOT( slotStopHighlight() ) ); } void Navigator::slotStopHighlight() @@ -539,8 +539,8 @@ IconSidePane::IconSidePane( Core *core, TQWidget *parent, const char *name ) : SidePaneBase( core, parent, name ) { mNavigator = new Navigator( this ); - connect( mNavigator, TQT_SIGNAL( pluginActivated( Kontact::Plugin* ) ), - TQT_SIGNAL( pluginSelected( Kontact::Plugin* ) ) ); + connect( mNavigator, TQ_SIGNAL( pluginActivated( Kontact::Plugin* ) ), + TQ_SIGNAL( pluginSelected( Kontact::Plugin* ) ) ); setAcceptDrops( true ); } diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index 4e6e4407..0d2426a0 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -38,11 +38,11 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { - KDE_EXPORT TDECModule *create_kontactconfig( TQWidget *parent, const char * ) { + TDE_EXPORT TDECModule *create_kontactconfig( TQWidget *parent, const char * ) { return new KcmKontact( parent, "kcmkontact" ); } } @@ -81,8 +81,8 @@ KcmKontact::KcmKontact( TQWidget *parent, const char *name ) pluginStartupLayout->addWidget( selection->comboBox() ); selection->comboBox()->setEnabled( false ); - connect( forceStartupPlugin->checkBox(), TQT_SIGNAL( toggled( bool ) ), - selection->comboBox(), TQT_SLOT( setEnabled( bool ) ) ); + connect( forceStartupPlugin->checkBox(), TQ_SIGNAL( toggled( bool ) ), + selection->comboBox(), TQ_SLOT( setEnabled( bool ) ) ); load(); } @@ -104,7 +104,7 @@ PluginSelection::PluginSelection( TDEConfigSkeleton::ItemString *item, TQWidget { mItem = item; mPluginCombo = new TQComboBox( parent ); - connect( mPluginCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) ); + connect( mPluginCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( changed() ) ); } PluginSelection::~PluginSelection() diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index 576eb48c..1602a300 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -28,9 +28,9 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdestartupinfo.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <twin.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktrader.h> #include "plugin.h" @@ -49,7 +49,7 @@ static const char description[] = static const char version[] = "1.2.9"; -class KontactApp : public KUniqueApplication { +class KontactApp : public TDEUniqueApplication { public: KontactApp() : mMainWindow( 0 ), mSessionRestored( false ) { @@ -139,7 +139,7 @@ int KontactApp::newInstance() // Handle startup notification and window activation // (The first time it will do nothing except note that it was called) - return KUniqueApplication::newInstance(); + return TDEUniqueApplication::newInstance(); } int main( int argc, char **argv ) diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index 43d7ca54..27af94f5 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -52,7 +52,7 @@ #include <ksettings/dialog.h> #include <ksettings/dispatcher.h> #include <tdeshortcut.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstatusbar.h> #include <kstdaction.h> #include <ktip.h> @@ -96,7 +96,7 @@ class SettingsDialogWrapper : public KSettings::Dialog void fixButtonLabel( TQWidget *widget ) { TQObject *object = widget->child( "KJanusWidget::buttonBelowList" ); - TQPushButton *button = static_cast<TQPushButton*>( TQT_TQWIDGET(object) ); + TQPushButton *button = static_cast<TQPushButton*>( object ); if ( button ) button->setText( i18n( "Select Components ..." ) ); } @@ -120,8 +120,8 @@ void MainWindow::initGUI() setupActions(); setHelpMenuEnabled( false ); KHelpMenu *helpMenu = new KHelpMenu( this, 0, true, actionCollection() ); - connect( helpMenu, TQT_SIGNAL( showAboutApplication() ), - TQT_SLOT( showAboutDialog() ) ); + connect( helpMenu, TQ_SIGNAL( showAboutApplication() ), + TQ_SLOT( showAboutDialog() ) ); TDETrader::OfferList offers = TDETrader::self()->query( TQString::fromLatin1( "Kontact/Plugin" ), @@ -133,7 +133,7 @@ void MainWindow::initGUI() (*it)->load(); TDEAction *action = new TDEAction( (*it)->name(), (*it)->icon(), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(slotActionTriggered()), + this, TQ_SLOT(slotActionTriggered()), actionCollection(), (*it)->pluginName().latin1() ); action->setName( (*it)->pluginName().latin1() ); action->setWhatsThis( i18n( "Switch to plugin %1" ).arg( (*it)->name() ) ); @@ -144,8 +144,8 @@ void MainWindow::initGUI() } } - KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( configureShortcuts() ), actionCollection() ); - KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( configureToolbars() ), actionCollection() ); + KStdAction::keyBindings( this, TQ_SLOT( configureShortcuts() ), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT( configureToolbars() ), actionCollection() ); setXMLFile( "kontactui.rc" ); setStandardToolBarMenuEnabled( true ); @@ -157,10 +157,10 @@ void MainWindow::initGUI() resize( 700, 520 ); // initial size to prevent a scrollbar in sidepane setAutoSaveSettings(); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileLoaded( const TQString& ) ), - this, TQT_SLOT( slotLoadProfile( const TQString& ) ) ); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( saveToProfileRequested( const TQString& ) ), - this, TQT_SLOT( slotSaveToProfile( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileLoaded( const TQString& ) ), + this, TQ_SLOT( slotLoadProfile( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( saveToProfileRequested( const TQString& ) ), + this, TQ_SLOT( slotSaveToProfile( const TQString& ) ) ); } @@ -168,15 +168,15 @@ void MainWindow::initObject() { // prepare the part manager mPartManager = new KParts::PartManager( this ); - connect( mPartManager, TQT_SIGNAL( activePartChanged( KParts::Part* ) ), - this, TQT_SLOT( slotActivePartChanged( KParts::Part* ) ) ); + connect( mPartManager, TQ_SIGNAL( activePartChanged( KParts::Part* ) ), + this, TQ_SLOT( slotActivePartChanged( KParts::Part* ) ) ); if ( mSidePane ) { mSidePane->updatePlugins(); } - KSettings::Dispatcher::self()->registerInstance( instance(), TQT_TQOBJECT(this), - TQT_SLOT( updateConfig() ) ); + KSettings::Dispatcher::self()->registerInstance( instance(), this, + TQ_SLOT( updateConfig() ) ); loadSettings(); @@ -187,18 +187,18 @@ void MainWindow::initObject() // done initializing slotShowStatusMsg( TQString() ); - connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ), - this, TQT_SLOT( slotShowStatusMsg( const TQString& ) ) ); + connect( KPIM::BroadcastStatus::instance(), TQ_SIGNAL( statusMsg( const TQString& ) ), + this, TQ_SLOT( slotShowStatusMsg( const TQString& ) ) ); // launch commandline specified module if any activatePluginModule(); - if ( Prefs::lastVersionSeen() == kapp->aboutData()->version() ) { + if ( Prefs::lastVersionSeen() == tdeApp->aboutData()->version() ) { selectPlugin( mCurrentPlugin ); } paintAboutScreen( introductionString() ); - Prefs::setLastVersionSeen( kapp->aboutData()->version() ); + Prefs::setLastVersionSeen( tdeApp->aboutData()->version() ); } MainWindow::~MainWindow() @@ -251,8 +251,8 @@ void MainWindow::initWidgets() sizes << 0; mSplitter->setSizes(sizes); - connect( mSidePane, TQT_SIGNAL( pluginSelected( Kontact::Plugin * ) ), - TQT_SLOT( selectPlugin( Kontact::Plugin * ) ) ); + connect( mSidePane, TQ_SIGNAL( pluginSelected( Kontact::Plugin * ) ), + TQ_SLOT( selectPlugin( Kontact::Plugin * ) ) ); TQVBox *vBox; if ( mSplitter ) { @@ -291,7 +291,7 @@ void MainWindow::paintAboutScreen( const TQString& msg ) TQString location = locate( "data", "kontact/about/main.html" ); TQString content = KPIM::kFileToString( location ); content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); - if ( kapp->reverseLayout() ) + if ( tdeApp->reverseLayout() ) content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else content = content.arg( "" ); @@ -323,19 +323,19 @@ void MainWindow::initAboutScreen() mIntroPart->view()->setLineWidth( 0 ); connect( mIntroPart->browserExtension(), - TQT_SIGNAL( openURLRequest( const KURL&, const KParts::URLArgs& ) ), - TQT_SLOT( slotOpenUrl( const KURL& ) ) ); + TQ_SIGNAL( openURLRequest( const KURL&, const KParts::URLArgs& ) ), + TQ_SLOT( slotOpenUrl( const KURL& ) ) ); connect( mIntroPart->browserExtension(), - TQT_SIGNAL( createNewWindow( const KURL&, const KParts::URLArgs& ) ), - TQT_SLOT( slotOpenUrl( const KURL& ) ) ); + TQ_SIGNAL( createNewWindow( const KURL&, const KParts::URLArgs& ) ), + TQ_SLOT( slotOpenUrl( const KURL& ) ) ); } void MainWindow::setupActions() { - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( slotQuit() ), actionCollection() ); mNewActions = new TDEToolBarPopupAction( KGuiItem( i18n( "New" ), "" ), - TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewClicked() ), + TDEStdAccel::shortcut(TDEStdAccel::New), this, TQ_SLOT( slotNewClicked() ), actionCollection(), "action_new" ); TDEConfig* const cfg = Prefs::self()->config(); @@ -344,18 +344,18 @@ void MainWindow::setupActions() if ( mSyncActionsEnabled ) { mSyncActions = new TDEToolBarPopupAction( KGuiItem( i18n( "Synchronize" ) ), - TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT( slotSyncClicked() ), + TDEStdAccel::shortcut(TDEStdAccel::Reload), this, TQ_SLOT( slotSyncClicked() ), actionCollection(), "action_sync" ); } - new TDEAction( i18n( "Configure Kontact..." ), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPreferences() ), + new TDEAction( i18n( "Configure Kontact..." ), "configure", 0, this, TQ_SLOT( slotPreferences() ), actionCollection(), "settings_configure_kontact" ); - new TDEAction( i18n( "Configure &Profiles..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureProfiles() ), + new TDEAction( i18n( "Configure &Profiles..." ), 0, this, TQ_SLOT( slotConfigureProfiles() ), actionCollection(), "settings_configure_kontact_profiles" ); - new TDEAction( i18n( "&Kontact Introduction" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowIntroduction() ), + new TDEAction( i18n( "&Kontact Introduction" ), 0, this, TQ_SLOT( slotShowIntroduction() ), actionCollection(), "help_introduction" ); - new TDEAction( i18n( "&Tip of the Day" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), + new TDEAction( i18n( "&Tip of the Day" ), 0, this, TQ_SLOT( slotShowTip() ), actionCollection(), "help_tipofday" ); KWidgetAction* spacerAction = new KWidgetAction( new TQWidget( this ), "SpacerAction", "", 0, 0, actionCollection(), "navigator_spacer_item" ); @@ -543,7 +543,7 @@ void MainWindow::loadPlugins() kdDebug(5600) << "Loading Plugin: " << (*it)->name() << endl; Kontact::Plugin *plugin = KParts::ComponentFactory::createInstanceFromService<Kontact::Plugin>( - (*it)->service(), TQT_TQOBJECT(this) ); + (*it)->service(), this ); if ( !plugin ) continue; @@ -763,7 +763,7 @@ void MainWindow::slotSyncClicked() TDEToolBar* Kontact::MainWindow::findToolBar(const char* name) { // like TDEMainWindow::toolBar, but which doesn't create the toolbar if not found - return static_cast<TDEToolBar *>(TQT_TQWIDGET(child(name, "TDEToolBar"))); + return static_cast<TDEToolBar *>(child(name, "TDEToolBar")); } void MainWindow::slotActionTriggered() @@ -802,7 +802,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) } // store old focus widget - TQWidget *focusWidget = kapp->focusWidget(); + TQWidget *focusWidget = tdeApp->focusWidget(); if ( mCurrentPlugin && focusWidget ) { // save the focus widget only when it belongs to the activated part TQWidget *parent = focusWidget->parentWidget(); @@ -977,8 +977,8 @@ void MainWindow::slotPreferences() } dlg = new SettingsDialogWrapper( KSettings::Dialog::Configurable, this ); dlg->addPluginInfos( filteredPlugins ); - connect( dlg, TQT_SIGNAL( pluginSelectionChanged() ), - TQT_SLOT( pluginsChanged() ) ); + connect( dlg, TQ_SIGNAL( pluginSelectionChanged() ), + TQ_SLOT( pluginsChanged() ) ); } dlg->show(); @@ -1053,8 +1053,8 @@ void MainWindow::configureToolbars() saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); KEditToolbar edit( factory() ); - connect( &edit, TQT_SIGNAL( newToolbarConfig() ), - this, TQT_SLOT( slotNewToolbarConfig() ) ); + connect( &edit, TQ_SIGNAL( newToolbarConfig() ), + this, TQ_SLOT( slotNewToolbarConfig() ) ); edit.exec(); } @@ -1084,7 +1084,7 @@ void MainWindow::slotOpenUrl( const KURL &url ) if ( !url.query().isEmpty() ) { app = url.query().mid( 1 ); } - kapp->invokeHelp( TQString(), app ); + tdeApp->invokeHelp( TQString(), app ); } } else { new KRun( url, this ); @@ -1133,8 +1133,8 @@ void MainWindow::saveProperties( TDEConfig *config ) bool MainWindow::queryClose() { - //if ( kapp->sessionSaving() || mReallyClose ) - if ( kapp->sessionSaving() ) + //if ( tdeApp->sessionSaving() || mReallyClose ) + if ( tdeApp->sessionSaving() ) return true; bool localClose = true; @@ -1178,7 +1178,7 @@ TQString MainWindow::introductionString() "<td><a href=\"%1\">%1</a><br><span id=\"subtext\"><nobr>%1</td></tr>" "</table>" "<p style=\"margin-bottom: 0px\"> <a href=\"%1\">Skip this introduction</a></p>" ) - .arg( kapp->aboutData()->version() ) + .arg( tdeApp->aboutData()->version() ) .arg( i18n( "Kontact handles your e-mail, addressbook, calendar, to-do list and more." ) ) .arg( "exec:/help?kontact" ) .arg( iconSize ) diff --git a/kontact/src/prefs.kcfgc b/kontact/src/prefs.kcfgc index 03eb7af7..3b94b5b7 100644 --- a/kontact/src/prefs.kcfgc +++ b/kontact/src/prefs.kcfgc @@ -6,7 +6,7 @@ Singleton=true Mutators=true #Inherits=KPimPrefs #IncludeFiles=libtdepim/kpimprefs.h -Visibility=KDE_EXPORT +Visibility=TDE_EXPORT MemberVariables=public GlobalEnums=true ItemAccessors=true diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp index e85d90c5..0c9c2a49 100644 --- a/kontact/src/profiledialog.cpp +++ b/kontact/src/profiledialog.cpp @@ -53,10 +53,10 @@ Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialo m_list->setRenameable( NameColumn, true ); m_list->setRenameable( DescriptionColumn, true ); - connect( m_list, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( listSelectionChanged() ) ); - connect( m_list, TQT_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), - this, TQT_SLOT( listItemRenamed( TQListViewItem*, const TQString&, int ) ) ); + connect( m_list, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( listSelectionChanged() ) ); + connect( m_list, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), + this, TQ_SLOT( listItemRenamed( TQListViewItem*, const TQString&, int ) ) ); horizontalLayout->addWidget( m_list ); TQVBoxLayout* buttonLayout = new TQVBoxLayout( horizontalLayout ); @@ -64,49 +64,49 @@ Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialo m_newProfileButton = new TQPushButton( mainWidget ); m_newProfileButton->setText( i18n("New Profile") ); - connect( m_newProfileButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( addNewProfile() ) ); + connect( m_newProfileButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( addNewProfile() ) ); buttonLayout->addWidget( m_newProfileButton ); m_deleteProfileButton = new TQPushButton( mainWidget ); m_deleteProfileButton->setText( i18n("Delete Profile") ); m_deleteProfileButton->setEnabled( false ); - connect( m_deleteProfileButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( deleteSelectedProfile() ) ); + connect( m_deleteProfileButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( deleteSelectedProfile() ) ); buttonLayout->addWidget( m_deleteProfileButton ); m_saveProfileButton = new TQPushButton( mainWidget ); m_saveProfileButton->setText( i18n("Save Profile") ); m_saveProfileButton->setEnabled( false ); - connect( m_saveProfileButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( saveToSelectedProfile() ) ); + connect( m_saveProfileButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( saveToSelectedProfile() ) ); buttonLayout->addWidget( m_saveProfileButton ); buttonLayout->addStretch(); m_importProfileButton = new TQPushButton( mainWidget ); m_importProfileButton->setText( i18n("Import Profile") ); - connect( m_importProfileButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( importProfile() ) ); + connect( m_importProfileButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( importProfile() ) ); buttonLayout->addWidget( m_importProfileButton ); m_exportProfileButton = new TQPushButton( mainWidget ); m_exportProfileButton->setText( i18n("Export Profile") ); m_exportProfileButton->setEnabled( false ); - connect( m_exportProfileButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( exportSelectedProfile() ) ); + connect( m_exportProfileButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( exportSelectedProfile() ) ); buttonLayout->addWidget( m_exportProfileButton ); setMainWidget( mainWidget ); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileAdded( const TQString& ) ), - this, TQT_SLOT( profileAdded( const TQString& ) ) ); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileRemoved( const TQString& ) ), - this, TQT_SLOT( profileRemoved( const TQString& ) ) ); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileLoaded( const TQString& ) ), - this, TQT_SLOT( profileLoaded( const TQString& ) ) ); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileUpdated( const TQString& ) ), - this, TQT_SLOT( profileUpdated( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileAdded( const TQString& ) ), + this, TQ_SLOT( profileAdded( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileRemoved( const TQString& ) ), + this, TQ_SLOT( profileRemoved( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileLoaded( const TQString& ) ), + this, TQ_SLOT( profileLoaded( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileUpdated( const TQString& ) ), + this, TQ_SLOT( profileUpdated( const TQString& ) ) ); const TQValueList<Kontact::Profile> profiles = Kontact::ProfileManager::self()->profiles(); for ( TQValueList<Kontact::Profile>::ConstIterator it = profiles.begin(), end = profiles.end(); it != end; ++it ) diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp index 0d87b9bf..80941e02 100644 --- a/kontact/src/profilemanager.cpp +++ b/kontact/src/profilemanager.cpp @@ -29,7 +29,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <kurl.h> diff --git a/korganizer/aboutdata.h b/korganizer/aboutdata.h index 9edf278a..a9ba16b3 100644 --- a/korganizer/aboutdata.h +++ b/korganizer/aboutdata.h @@ -25,11 +25,11 @@ #define KORG_ABOUTDATA_H #include <tdeaboutdata.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KOrg { -class KDE_EXPORT AboutData : public TDEAboutData +class TDE_EXPORT AboutData : public TDEAboutData { public: AboutData(); diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index 128ebd68..6e43d25d 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -37,7 +37,7 @@ #include "koagendaview.h" #include "multiagendaview.h" #include "kowindowlist.h" -#include "kprocess.h" +#include "tdeprocess.h" #include "konewstuff.h" #include "history.h" #include "kogroupware.h" @@ -61,7 +61,7 @@ #include <tdeio/netaccess.h> #include <kkeydialog.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktip.h> #include <tdetempfile.h> #include <kxmlguiclient.h> @@ -127,7 +127,7 @@ void ActionManager::init() mWindowList = new KOWindowList; // Show tip of the day, when the first calendar is shown. if ( !mIsPart ) - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( showTipOnStart() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( showTipOnStart() ) ); } // Note: We need this ActionManager to be fully constructed, and // parent() to have a valid reference to it before the following @@ -138,27 +138,27 @@ void ActionManager::init() // set up autoSaving stuff mAutoSaveTimer = new TQTimer( this ); - connect( mAutoSaveTimer,TQT_SIGNAL( timeout() ), TQT_SLOT( checkAutoSave() ) ); + connect( mAutoSaveTimer,TQ_SIGNAL( timeout() ), TQ_SLOT( checkAutoSave() ) ); if ( KOPrefs::instance()->mAutoSave && KOPrefs::instance()->mAutoSaveInterval > 0 ) { mAutoSaveTimer->start( 1000 * 60 * KOPrefs::instance()->mAutoSaveInterval ); } mAutoArchiveTimer = new TQTimer( this ); - connect( mAutoArchiveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotAutoArchive() ) ); + connect( mAutoArchiveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotAutoArchive() ) ); // First auto-archive should be in 5 minutes (like in kmail). if ( KOPrefs::instance()->mAutoArchive ) mAutoArchiveTimer->start( 5 * 60 * 1000, true ); // singleshot setTitle(); - connect( mCalendarView, TQT_SIGNAL( modifiedChanged( bool ) ), TQT_SLOT( setTitle() ) ); - connect( mCalendarView, TQT_SIGNAL( configChanged() ), TQT_SLOT( updateConfig() ) ); + connect( mCalendarView, TQ_SIGNAL( modifiedChanged( bool ) ), TQ_SLOT( setTitle() ) ); + connect( mCalendarView, TQ_SIGNAL( configChanged() ), TQ_SLOT( updateConfig() ) ); - connect( mCalendarView, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), - TQT_TQOBJECT(this), TQT_SLOT( processIncidenceSelection( Incidence *,const TQDate & ) ) ); - connect( mCalendarView, TQT_SIGNAL( exportHTML( HTMLExportSettings * ) ), - TQT_TQOBJECT(this), TQT_SLOT( exportHTML( HTMLExportSettings * ) ) ); + connect( mCalendarView, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), + this, TQ_SLOT( processIncidenceSelection( Incidence *,const TQDate & ) ) ); + connect( mCalendarView, TQ_SIGNAL( exportHTML( HTMLExportSettings * ) ), + this, TQ_SLOT( exportHTML( HTMLExportSettings * ) ) ); processIncidenceSelection( 0, TQDate() ); @@ -198,13 +198,13 @@ void ActionManager::createCalendarResources() mCalendarView->addExtension( &factory ); mResourceView = factory.resourceView(); - connect( mCalendarResources, TQT_SIGNAL( calendarChanged() ), - mCalendarView, TQT_SLOT( resourcesChanged() ) ); - connect( mCalendarResources, TQT_SIGNAL( signalErrorMessage( const TQString & ) ), - mCalendarView, TQT_SLOT( showErrorMessage( const TQString & ) ) ); + connect( mCalendarResources, TQ_SIGNAL( calendarChanged() ), + mCalendarView, TQ_SLOT( resourcesChanged() ) ); + connect( mCalendarResources, TQ_SIGNAL( signalErrorMessage( const TQString & ) ), + mCalendarView, TQ_SLOT( showErrorMessage( const TQString & ) ) ); - connect( mCalendarView, TQT_SIGNAL( configChanged() ), - TQT_SLOT( updateConfig() ) ); + connect( mCalendarView, TQ_SIGNAL( configChanged() ), + TQ_SLOT( updateConfig() ) ); initCalendar( mCalendarResources ); } @@ -227,58 +227,58 @@ void ActionManager::initActions() //~~~~~~~~~~~~~~~~~~~~~~~ LOADING / SAVING ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ if ( mIsPart ) { if ( mMainWindow->hasDocument() ) { - KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT(file_new()), mACollection, "korganizer_openNew" ); - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( file_open() ), mACollection, "korganizer_open" ); - mRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( file_open( const KURL& ) ), + KStdAction::openNew( this, TQ_SLOT(file_new()), mACollection, "korganizer_openNew" ); + KStdAction::open( this, TQ_SLOT( file_open() ), mACollection, "korganizer_open" ); + mRecent = KStdAction::openRecent( this, TQ_SLOT( file_open( const KURL& ) ), mACollection, "korganizer_openRecent" ); - KStdAction::revert( this,TQT_SLOT( file_revert() ), mACollection, "korganizer_revert" ); - KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( file_saveas() ), mACollection, + KStdAction::revert( this,TQ_SLOT( file_revert() ), mACollection, "korganizer_revert" ); + KStdAction::saveAs( this, TQ_SLOT( file_saveas() ), mACollection, "korganizer_saveAs" ); - KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( file_save() ), mACollection, "korganizer_save" ); + KStdAction::save( this, TQ_SLOT( file_save() ), mACollection, "korganizer_save" ); } - KStdAction::print( TQT_TQOBJECT(mCalendarView), TQT_SLOT( print() ), mACollection, "korganizer_print" ); + KStdAction::print( mCalendarView, TQ_SLOT( print() ), mACollection, "korganizer_print" ); } else { - KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( file_new() ), mACollection ); - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( file_open() ), mACollection ); - mRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( file_open( const KURL& ) ), + KStdAction::openNew( this, TQ_SLOT( file_new() ), mACollection ); + KStdAction::open( this, TQ_SLOT( file_open() ), mACollection ); + mRecent = KStdAction::openRecent( this, TQ_SLOT( file_open( const KURL& ) ), mACollection ); if ( mMainWindow->hasDocument() ) { - KStdAction::revert( this,TQT_SLOT( file_revert() ), mACollection ); - KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( file_save() ), mACollection ); - KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( file_saveas() ), mACollection ); + KStdAction::revert( this,TQ_SLOT( file_revert() ), mACollection ); + KStdAction::save( this, TQ_SLOT( file_save() ), mACollection ); + KStdAction::saveAs( this, TQ_SLOT( file_saveas() ), mACollection ); } - KStdAction::print( TQT_TQOBJECT(mCalendarView), TQT_SLOT( print() ), mACollection ); + KStdAction::print( mCalendarView, TQ_SLOT( print() ), mACollection ); } //~~~~~~~~~~~~~~~~~~~~~~~~ IMPORT / EXPORT ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - new TDEAction( i18n("Import &Event/Calendar (ICS-/VCS-File)..."), 0, TQT_TQOBJECT(this), TQT_SLOT( file_merge() ), + new TDEAction( i18n("Import &Event/Calendar (ICS-/VCS-File)..."), 0, this, TQ_SLOT( file_merge() ), mACollection, "import_icalendar" ); - new TDEAction( i18n("&Import From UNIX Ical tool (.calendar-File)"), 0, TQT_TQOBJECT(this), TQT_SLOT( file_icalimport() ), + new TDEAction( i18n("&Import From UNIX Ical tool (.calendar-File)"), 0, this, TQ_SLOT( file_icalimport() ), mACollection, "import_ical" ); new TDEAction( i18n("Get &Hot New Stuff..."), 0, this, - TQT_SLOT( downloadNewStuff() ), mACollection, + TQ_SLOT( downloadNewStuff() ), mACollection, "downloadnewstuff" ); new TDEAction( i18n("Export &Web Page..."), "webexport", 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportWeb() ), + mCalendarView, TQ_SLOT( exportWeb() ), mACollection, "export_web" ); new TDEAction( i18n("&iCalendar..."), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportICalendar() ), + mCalendarView, TQ_SLOT( exportICalendar() ), mACollection, "export_icalendar" ); new TDEAction( i18n("&vCalendar..."), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportVCalendar() ), + mCalendarView, TQ_SLOT( exportVCalendar() ), mACollection, "export_vcalendar" ); - new TDEAction( i18n("Upload &Hot New Stuff..."), 0, TQT_TQOBJECT(this), - TQT_SLOT( uploadNewStuff() ), mACollection, + new TDEAction( i18n("Upload &Hot New Stuff..."), 0, this, + TQ_SLOT( uploadNewStuff() ), mACollection, "uploadnewstuff" ); - new TDEAction( i18n("Archive O&ld Entries..."), 0, TQT_TQOBJECT(this), TQT_SLOT( file_archive() ), + new TDEAction( i18n("Archive O&ld Entries..."), 0, this, TQ_SLOT( file_archive() ), mACollection, "file_archive" ); new TDEAction( i18n("delete completed to-dos", "Pur&ge Completed To-dos"), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( purgeCompleted() ), mACollection, + mCalendarView, TQ_SLOT( purgeCompleted() ), mACollection, "purge_completed" ); @@ -289,45 +289,45 @@ void ActionManager::initActions() KOrg::History *h = mCalendarView->history(); if ( mIsPart ) { // edit menu - mCutAction = KStdAction::cut( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_cut() ), + mCutAction = KStdAction::cut( mCalendarView, TQ_SLOT( edit_cut() ), mACollection, "korganizer_cut" ); - mCopyAction = KStdAction::copy( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_copy() ), + mCopyAction = KStdAction::copy( mCalendarView, TQ_SLOT( edit_copy() ), mACollection, "korganizer_copy" ); - pasteAction = KStdAction::paste( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_paste() ), + pasteAction = KStdAction::paste( mCalendarView, TQ_SLOT( edit_paste() ), mACollection, "korganizer_paste" ); - mUndoAction = KStdAction::undo( h, TQT_SLOT( undo() ), + mUndoAction = KStdAction::undo( h, TQ_SLOT( undo() ), mACollection, "korganizer_undo" ); - mRedoAction = KStdAction::redo( h, TQT_SLOT( redo() ), + mRedoAction = KStdAction::redo( h, TQ_SLOT( redo() ), mACollection, "korganizer_redo" ); } else { - mCutAction = KStdAction::cut( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_cut() ), + mCutAction = KStdAction::cut( mCalendarView,TQ_SLOT( edit_cut() ), mACollection ); - mCopyAction = KStdAction::copy( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_copy() ), + mCopyAction = KStdAction::copy( mCalendarView,TQ_SLOT( edit_copy() ), mACollection ); - pasteAction = KStdAction::paste( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_paste() ), + pasteAction = KStdAction::paste( mCalendarView,TQ_SLOT( edit_paste() ), mACollection ); - mUndoAction = KStdAction::undo( TQT_TQOBJECT(h), TQT_SLOT( undo() ), mACollection ); - mRedoAction = KStdAction::redo( TQT_TQOBJECT(h), TQT_SLOT( redo() ), mACollection ); + mUndoAction = KStdAction::undo( h, TQ_SLOT( undo() ), mACollection ); + mRedoAction = KStdAction::redo( h, TQ_SLOT( redo() ), mACollection ); } mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( appointment_delete() ), + mCalendarView, TQ_SLOT( appointment_delete() ), mACollection, "edit_delete" ); if ( mIsPart ) { - KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ), + KStdAction::find( mCalendarView->dialogManager(), TQ_SLOT( showSearchDialog() ), mACollection, "korganizer_find" ); } else { - KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ), + KStdAction::find( mCalendarView->dialogManager(), TQ_SLOT( showSearchDialog() ), mACollection ); } pasteAction->setEnabled( false ); mUndoAction->setEnabled( false ); mRedoAction->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL( pasteEnabled( bool ) ), - pasteAction, TQT_SLOT( setEnabled( bool ) ) ); - connect( h, TQT_SIGNAL( undoAvailable( const TQString & ) ), - TQT_SLOT( updateUndoAction( const TQString & ) ) ); - connect( h, TQT_SIGNAL( redoAvailable( const TQString & ) ), - TQT_SLOT( updateRedoAction( const TQString & ) ) ); + connect( mCalendarView, TQ_SIGNAL( pasteEnabled( bool ) ), + pasteAction, TQ_SLOT( setEnabled( bool ) ) ); + connect( h, TQ_SIGNAL( undoAvailable( const TQString & ) ), + TQ_SLOT( updateUndoAction( const TQString & ) ) ); + connect( h, TQ_SIGNAL( redoAvailable( const TQString & ) ), + TQ_SLOT( updateRedoAction( const TQString & ) ) ); @@ -337,83 +337,83 @@ void ActionManager::initActions() //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ VIEWS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ new TDEAction( i18n("What's &Next"), KOGlobals::self()->smallIcon( "whatsnext" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showWhatsNextView() ), + mCalendarView->viewManager(), TQ_SLOT( showWhatsNextView() ), mACollection, "view_whatsnext" ); new TDEAction( i18n("&Day"), KOGlobals::self()->smallIcon( "1day" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showDayView() ), + mCalendarView->viewManager(), TQ_SLOT( showDayView() ), mACollection, "view_day" ); mNextXDays = new TDEAction( "", KOGlobals::self()->smallIcon( "xdays" ), 0, mCalendarView->viewManager(), - TQT_SLOT( showNextXView() ), + TQ_SLOT( showNextXView() ), mACollection, "view_nextx" ); mNextXDays->setText( i18n( "&Next Day", "Ne&xt %n Days", KOPrefs::instance()->mNextXDays ) ); new TDEAction( i18n("W&ork Week"), KOGlobals::self()->smallIcon( "5days" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showWorkWeekView() ), + mCalendarView->viewManager(), TQ_SLOT( showWorkWeekView() ), mACollection, "view_workweek" ); new TDEAction( i18n("&Week"), KOGlobals::self()->smallIcon( "7days" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showWeekView() ), + mCalendarView->viewManager(), TQ_SLOT( showWeekView() ), mACollection, "view_week" ); new TDEAction( i18n("&Month"), KOGlobals::self()->smallIcon( "month" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showMonthView() ), + mCalendarView->viewManager(), TQ_SLOT( showMonthView() ), mACollection, "view_month" ); new TDEAction( i18n("&List"), KOGlobals::self()->smallIcon( "list" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showListView() ), + mCalendarView->viewManager(), TQ_SLOT( showListView() ), mACollection, "view_list" ); new TDEAction( i18n("&To-do List"), KOGlobals::self()->smallIcon( "todo" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showTodoView() ), + mCalendarView->viewManager(), TQ_SLOT( showTodoView() ), mACollection, "view_todo" ); new TDEAction( i18n("&Journal"), KOGlobals::self()->smallIcon( "journal" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showJournalView() ), + mCalendarView->viewManager(), TQ_SLOT( showJournalView() ), mACollection, "view_journal" ); new TDEAction( i18n("&Timeline View"), KOGlobals::self()->smallIcon( "timeline" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showTimelineView() ), + mCalendarView->viewManager(), TQ_SLOT( showTimelineView() ), mACollection, "view_timeline" ); //~~~~~~~~~~~~~~~~~~~~~~~~~~~ FILTERS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ new TDEAction( i18n("&Refresh"), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( updateView() ), + mCalendarView, TQ_SLOT( updateView() ), mACollection, "update" ); // TODO: // new TDEAction( i18n("Hide &Completed To-dos"), 0, -// mCalendarView, TQT_SLOT( toggleHideCompleted() ), +// mCalendarView, TQ_SLOT( toggleHideCompleted() ), // mACollection, "hide_completed_todos" ); mFilterAction = new TDESelectAction( i18n("F&ilter"), 0, mACollection, "filter_select" ); mFilterAction->setEditable( false ); - connect( mFilterAction, TQT_SIGNAL( activated(int) ), - mCalendarView, TQT_SLOT( filterActivated( int ) ) ); - connect( mCalendarView, TQT_SIGNAL( newFilterListSignal( const TQStringList & ) ), - mFilterAction, TQT_SLOT( setItems( const TQStringList & ) ) ); - connect( mCalendarView, TQT_SIGNAL( selectFilterSignal( int ) ), - mFilterAction, TQT_SLOT( setCurrentItem( int ) ) ); - connect( mCalendarView, TQT_SIGNAL( filterChanged() ), - TQT_TQOBJECT(this), TQT_SLOT( setTitle() ) ); + connect( mFilterAction, TQ_SIGNAL( activated(int) ), + mCalendarView, TQ_SLOT( filterActivated( int ) ) ); + connect( mCalendarView, TQ_SIGNAL( newFilterListSignal( const TQStringList & ) ), + mFilterAction, TQ_SLOT( setItems( const TQStringList & ) ) ); + connect( mCalendarView, TQ_SIGNAL( selectFilterSignal( int ) ), + mFilterAction, TQ_SLOT( setCurrentItem( int ) ) ); + connect( mCalendarView, TQ_SIGNAL( filterChanged() ), + this, TQ_SLOT( setTitle() ) ); //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ZOOM ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // TODO: try to find / create better icons for the following 4 actions new TDEAction( i18n( "Zoom In Horizontally" ), "zoom-in", 0, - mCalendarView->viewManager(), TQT_SLOT( zoomInHorizontally() ), + mCalendarView->viewManager(), TQ_SLOT( zoomInHorizontally() ), mACollection, "zoom_in_horizontally" ); new TDEAction( i18n( "Zoom Out Horizontally" ), "zoom-out", 0, - mCalendarView->viewManager(), TQT_SLOT( zoomOutHorizontally() ), + mCalendarView->viewManager(), TQ_SLOT( zoomOutHorizontally() ), mACollection, "zoom_out_horizontally" ); new TDEAction( i18n( "Zoom In Vertically" ), "zoom-in", 0, - mCalendarView->viewManager(), TQT_SLOT( zoomInVertically() ), + mCalendarView->viewManager(), TQ_SLOT( zoomInVertically() ), mACollection, "zoom_in_vertically" ); new TDEAction( i18n( "Zoom Out Vertically" ), "zoom-out", 0, - mCalendarView->viewManager(), TQT_SLOT( zoomOutVertically() ), + mCalendarView->viewManager(), TQ_SLOT( zoomOutVertically() ), mACollection, "zoom_out_vertically" ); @@ -422,73 +422,73 @@ void ActionManager::initActions() //************************** Actions MENU ********************************* new TDEAction( i18n("Go to &Today"), "today", 0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( goToday() ), + mCalendarView,TQ_SLOT( goToday() ), mACollection, "go_today" ); bool isRTL = TQApplication::reverseLayout(); action = new TDEAction( i18n("Go &Backward"), isRTL ? "forward" : "back", 0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( goPrevious() ), + mCalendarView,TQ_SLOT( goPrevious() ), mACollection, "go_previous" ); // Changing the action text by setText makes the toolbar button disappear. // This has to be fixed first, before the connects below can be reenabled. /* - connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ), - action, TQT_SLOT( setText( const TQString & ) ) ); - connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( dumpText( const TQString & ) ) );*/ + connect( mCalendarView, TQ_SIGNAL( changeNavStringPrev( const TQString & ) ), + action, TQ_SLOT( setText( const TQString & ) ) ); + connect( mCalendarView, TQ_SIGNAL( changeNavStringPrev( const TQString & ) ), + this, TQ_SLOT( dumpText( const TQString & ) ) );*/ action = new TDEAction( i18n("Go &Forward"), isRTL ? "back" : "forward", 0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( goNext() ), + mCalendarView,TQ_SLOT( goNext() ), mACollection, "go_next" ); /* - connect( mCalendarView,TQT_SIGNAL( changeNavStringNext( const TQString & ) ), - action,TQT_SLOT( setText( const TQString & ) ) ); + connect( mCalendarView,TQ_SIGNAL( changeNavStringNext( const TQString & ) ), + action,TQ_SLOT( setText( const TQString & ) ) ); */ //************************** Actions MENU ********************************* new TDEAction( i18n("New E&vent..."), KOGlobals::self()->smallIcon( "newappointment" ), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT(newEvent()), + mCalendarView, TQ_SLOT(newEvent()), mACollection, "new_event" ); new TDEAction( i18n("New &To-do..."), KOGlobals::self()->smallIcon( "newtodo" ), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT(newTodo()), + mCalendarView, TQ_SLOT(newTodo()), mACollection, "new_todo" ); action = new TDEAction( i18n("New Su&b-to-do..."), 0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( newSubTodo() ), + mCalendarView,TQ_SLOT( newSubTodo() ), mACollection, "new_subtodo" ); action->setEnabled( false ); - connect( mCalendarView,TQT_SIGNAL( todoSelected( bool ) ), - action,TQT_SLOT( setEnabled( bool ) ) ); + connect( mCalendarView,TQ_SIGNAL( todoSelected( bool ) ), + action,TQ_SLOT( setEnabled( bool ) ) ); new TDEAction( i18n("New &Journal..."), KOGlobals::self()->smallIcon( "newjournal" ), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT(newJournal()), + mCalendarView, TQ_SLOT(newJournal()), mACollection, "new_journal" ); mShowIncidenceAction = new TDEAction( i18n("&Show"), 0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( showIncidence() ), + mCalendarView,TQ_SLOT( showIncidence() ), mACollection, "show_incidence" ); mEditIncidenceAction = new TDEAction( i18n("&Edit..."), 0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( editIncidence() ), + mCalendarView,TQ_SLOT( editIncidence() ), mACollection, "edit_incidence" ); mDeleteIncidenceAction = new TDEAction( i18n("&Delete"), Key_Delete, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( deleteIncidence()), + mCalendarView,TQ_SLOT( deleteIncidence()), mACollection, "delete_incidence" ); action = new TDEAction( i18n("&Make Sub-to-do Independent"), 0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( todo_unsub() ), + mCalendarView,TQ_SLOT( todo_unsub() ), mACollection, "unsub_todo" ); action->setEnabled( false ); - connect( mCalendarView,TQT_SIGNAL( subtodoSelected( bool ) ), - action,TQT_SLOT( setEnabled( bool ) ) ); + connect( mCalendarView,TQ_SIGNAL( subtodoSelected( bool ) ), + action,TQ_SLOT( setEnabled( bool ) ) ); // TODO: Add item to move the incidence to different resource // mAssignResourceAction = new TDEAction( i18n("Assign &Resource..."), 0, -// mCalendarView, TQT_SLOT( assignResource()), +// mCalendarView, TQ_SLOT( assignResource()), // mACollection, "assign_resource" ); // TODO: Add item to quickly toggle the reminder of a given incidence // mToggleAlarmAction = new TDEToggleAction( i18n("&Activate Reminder"), 0, -// mCalendarView, TQT_SLOT( toggleAlarm()), +// mCalendarView, TQ_SLOT( toggleAlarm()), // mACollection, "activate_alarm" ); @@ -496,65 +496,65 @@ void ActionManager::initActions() //************************** SCHEDULE MENU ******************************** mPublishEvent = new TDEAction( i18n("&Publish Item Information..."), "mail-send", 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( schedule_publish() ), + mCalendarView, TQ_SLOT( schedule_publish() ), mACollection, "schedule_publish" ); mPublishEvent->setEnabled( false ); mSendInvitation = new TDEAction( i18n( "Send &Invitation to Attendees" ), "mail_generic", 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_request()), + mCalendarView, TQ_SLOT(schedule_request()), mACollection, "schedule_request" ); mSendInvitation->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)), - mSendInvitation, TQT_SLOT(setEnabled(bool)) ); + connect( mCalendarView, TQ_SIGNAL(organizerEventsSelected(bool)), + mSendInvitation, TQ_SLOT(setEnabled(bool)) ); mRequestUpdate = new TDEAction( i18n( "Re&quest Update" ), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_refresh()), + mCalendarView, TQ_SLOT(schedule_refresh()), mACollection, "schedule_refresh" ); mRequestUpdate->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)), - mRequestUpdate, TQT_SLOT(setEnabled(bool)) ); + connect( mCalendarView, TQ_SIGNAL(groupEventsSelected(bool)), + mRequestUpdate, TQ_SLOT(setEnabled(bool)) ); mSendCancel = new TDEAction( i18n( "Send &Cancelation to Attendees" ), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_cancel()), + mCalendarView, TQ_SLOT(schedule_cancel()), mACollection, "schedule_cancel" ); mSendCancel->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)), - mSendCancel, TQT_SLOT(setEnabled(bool)) ); + connect( mCalendarView, TQ_SIGNAL(organizerEventsSelected(bool)), + mSendCancel, TQ_SLOT(setEnabled(bool)) ); mSendStatusUpdate = new TDEAction( i18n( "Send Status &Update" ), "mail-reply-sender", 0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT(schedule_reply()), + mCalendarView,TQ_SLOT(schedule_reply()), mACollection, "schedule_reply" ); mSendStatusUpdate->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)), - mSendStatusUpdate, TQT_SLOT(setEnabled(bool)) ); + connect( mCalendarView, TQ_SIGNAL(groupEventsSelected(bool)), + mSendStatusUpdate, TQ_SLOT(setEnabled(bool)) ); mRequestChange = new TDEAction( i18n( "counter proposal", "Request Chan&ge" ), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_counter()), + mCalendarView, TQ_SLOT(schedule_counter()), mACollection, "schedule_counter" ); mRequestChange->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)), - mRequestChange, TQT_SLOT(setEnabled(bool)) ); + connect( mCalendarView, TQ_SIGNAL(groupEventsSelected(bool)), + mRequestChange, TQ_SLOT(setEnabled(bool)) ); mForwardEvent = new TDEAction( i18n("&Send as iCalendar..."), "mail-forward", 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_forward()), + mCalendarView, TQ_SLOT(schedule_forward()), mACollection, "schedule_forward" ); mForwardEvent->setEnabled( false ); action = new TDEAction( i18n("&Mail Free Busy Information..."), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( mailFreeBusy() ), + mCalendarView, TQ_SLOT( mailFreeBusy() ), mACollection, "mail_freebusy" ); action->setEnabled( true ); action = new TDEAction( i18n("&Upload Free Busy Information"), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( uploadFreeBusy() ), + mCalendarView, TQ_SLOT( uploadFreeBusy() ), mACollection, "upload_freebusy" ); action->setEnabled( true ); if ( !mIsPart ) { action = new TDEAction( i18n("&Addressbook"),"contents",0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( openAddressbook() ), + mCalendarView,TQ_SLOT( openAddressbook() ), mACollection,"addressbook" ); } @@ -565,13 +565,13 @@ void ActionManager::initActions() //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ mDateNavigatorShowAction = new TDEToggleAction( i18n("Show Date Navigator"), 0, - TQT_TQOBJECT(this), TQT_SLOT( toggleDateNavigator() ), + this, TQ_SLOT( toggleDateNavigator() ), mACollection, "show_datenavigator" ); mTodoViewShowAction = new TDEToggleAction ( i18n("Show To-do View"), 0, - TQT_TQOBJECT(this), TQT_SLOT( toggleTodoView() ), + this, TQ_SLOT( toggleTodoView() ), mACollection, "show_todoview" ); mEventViewerShowAction = new TDEToggleAction ( i18n("Show Item Viewer"), 0, - TQT_TQOBJECT(this), TQT_SLOT( toggleEventViewer() ), + this, TQ_SLOT( toggleEventViewer() ), mACollection, "show_eventviewer" ); TDEConfig *config = KOGlobals::self()->config(); config->setGroup( "Settings" ); @@ -590,10 +590,10 @@ void ActionManager::initActions() if ( !mMainWindow->hasDocument() ) { mResourceViewShowAction = new TDEToggleAction ( i18n("Show Resource View"), 0, - TQT_TQOBJECT(this), TQT_SLOT( toggleResourceView() ), + this, TQ_SLOT( toggleResourceView() ), mACollection, "show_resourceview" ); mResourceButtonsAction = new TDEToggleAction( i18n("Show &Resource Buttons"), 0, - TQT_TQOBJECT(this), TQT_SLOT( toggleResourceButtons() ), + this, TQ_SLOT( toggleResourceButtons() ), mACollection, "show_resourcebuttons" ); mResourceViewShowAction->setChecked( config->readBoolEntry( "ResourceViewVisible", true ) ); @@ -608,38 +608,38 @@ void ActionManager::initActions() //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ new TDEAction( i18n("Configure &Date && Time..."), 0, - TQT_TQOBJECT(this), TQT_SLOT( configureDateTime() ), + this, TQ_SLOT( configureDateTime() ), mACollection, "conf_datetime" ); // TODO: Add an item to show the resource management dlg // new TDEAction( i18n("Manage &Resources..."), 0, -// TQT_TQOBJECT(this), TQT_SLOT( manageResources() ), +// this, TQ_SLOT( manageResources() ), // mACollection, "conf_resources" ); new TDEAction( i18n("Manage View &Filters..."), "configure", 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( editFilters() ), + mCalendarView, TQ_SLOT( editFilters() ), mACollection, "edit_filters" ); new TDEAction( i18n("Manage C&ategories..."), 0, - TQT_TQOBJECT(mCalendarView->dialogManager()), TQT_SLOT( showCategoryEditDialog() ), + mCalendarView->dialogManager(), TQ_SLOT( showCategoryEditDialog() ), mACollection, "edit_categories" ); if ( mIsPart ) { new TDEAction( i18n("&Configure Calendar..."), "configure", 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_options() ), + mCalendarView, TQ_SLOT( edit_options() ), mACollection, "korganizer_configure" ); - KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ), + KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ), mACollection, "korganizer_configure_shortcuts" ); } else { - KStdAction::preferences( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_options() ), + KStdAction::preferences( mCalendarView, TQ_SLOT( edit_options() ), mACollection ); - KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ), mACollection ); + KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ), mACollection ); } //**************************** HELP MENU ********************************** - KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( showTip() ), mACollection, + KStdAction::tipOfDay( this, TQ_SLOT( showTip() ), mACollection, "help_tipofday" ); // new TDEAction( i18n("Show Intro Page"), 0, -// mCalendarView,TQT_SLOT( showIntro() ), +// mCalendarView,TQ_SLOT( showIntro() ), // mACollection,"show_intro" ); @@ -1293,8 +1293,8 @@ void ActionManager::configureDateTime() TDEProcess *proc = new TDEProcess; *proc << "tdecmshell" << "language"; - connect( proc,TQT_SIGNAL( processExited( TDEProcess * ) ), - TQT_SLOT( configureDateTimeFinished( TDEProcess * ) ) ); + connect( proc,TQ_SIGNAL( processExited( TDEProcess * ) ), + TQ_SLOT( configureDateTimeFinished( TDEProcess * ) ) ); if ( !proc->start() ) { KMessageBox::sorry( dialogParent(), @@ -1935,8 +1935,8 @@ bool ActionManager::queryClose() // FIXME: Put main window into a state indicating final saving. mIsClosing = true; // FIXME: Close main window when save is finished -// connect( mCalendarResources, TQT_SIGNAL( calendarSaved() ), -// mMainWindow, TQT_SLOT( close() ) ); +// connect( mCalendarResources, TQ_SIGNAL( calendarSaved() ), +// mMainWindow, TQ_SLOT( close() ) ); } if ( mCalendarResources->isSaving() ) { kdDebug(5850) << "ActionManager::queryClose(): isSaving" << endl; @@ -2012,12 +2012,12 @@ void ActionManager::importCalendar( const KURL &url ) PreviewDialog *dialog; dialog = new PreviewDialog( url, mMainWindow->topLevelWidget() ); - connect( dialog, TQT_SIGNAL( dialogFinished( PreviewDialog * ) ), - TQT_SLOT( slotPreviewDialogFinished( PreviewDialog * ) ) ); - connect( dialog, TQT_SIGNAL( openURL( const KURL &, bool ) ), - TQT_SLOT( openURL( const KURL &, bool ) ) ); - connect( dialog, TQT_SIGNAL( addResource( const KURL & ) ), - TQT_SLOT( addResource( const KURL & ) ) ); + connect( dialog, TQ_SIGNAL( dialogFinished( PreviewDialog * ) ), + TQ_SLOT( slotPreviewDialogFinished( PreviewDialog * ) ) ); + connect( dialog, TQ_SIGNAL( openURL( const KURL &, bool ) ), + TQ_SLOT( openURL( const KURL &, bool ) ) ); + connect( dialog, TQ_SIGNAL( addResource( const KURL & ) ), + TQ_SLOT( addResource( const KURL & ) ) ); if ( dialog->loadCalendar() ) { dialog->show(); @@ -2046,7 +2046,7 @@ void ActionManager::slotAutoArchive() return; mAutoArchiveTimer->stop(); EventArchiver archiver; - connect( &archiver, TQT_SIGNAL( eventsDeleted() ), mCalendarView, TQT_SLOT( updateView() ) ); + connect( &archiver, TQ_SIGNAL( eventsDeleted() ), mCalendarView, TQ_SLOT( updateView() ) ); archiver.runAuto( mCalendarView->calendar(), mCalendarView, false /*no gui*/ ); // restart timer with the correct delay ( especially useful for the first time ) slotAutoArchivingSettingsModified(); diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h index d7b8c417..22a36abd 100644 --- a/korganizer/actionmanager.h +++ b/korganizer/actionmanager.h @@ -30,7 +30,7 @@ #include <tqobject.h> #include <kurl.h> #include <korganizer/part.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "kcalendariface.h" @@ -70,7 +70,7 @@ using namespace KCal; actions are in one location. It also provides DCOP interface[s]. */ -class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface +class TDE_EXPORT ActionManager : public TQObject, public KCalendarIface { TQ_OBJECT @@ -259,7 +259,7 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface void keyBindings(); /** - Using the TDEConfig associated with the kapp variable, read in the + Using the TDEConfig associated with the tdeApp variable, read in the settings from the config file. */ void readSettings(); diff --git a/korganizer/agendaview.cpp b/korganizer/agendaview.cpp index df141789..e0519ba4 100644 --- a/korganizer/agendaview.cpp +++ b/korganizer/agendaview.cpp @@ -27,9 +27,9 @@ AgendaView::AgendaView(Calendar * cal, TQWidget * parent, const char * name) : { KCal::CalendarResources *calres = dynamic_cast<KCal::CalendarResources*>( cal ); if ( calres ) { - connect( calres, TQT_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); - connect( calres, TQT_SIGNAL(signalResourceModified( ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); - connect( calres, TQT_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceModified( ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); } } diff --git a/korganizer/archivedialog.cpp b/korganizer/archivedialog.cpp index 989be261..7b8eae46 100644 --- a/korganizer/archivedialog.cpp +++ b/korganizer/archivedialog.cpp @@ -76,7 +76,7 @@ ArchiveDialog::ArchiveDialog(Calendar *cal,TQWidget *parent, const char *name) TQButtonGroup* radioBG = new TQButtonGroup( this ); radioBG->hide(); // just for the exclusive behavior - connect( radioBG, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotActionChanged() ) ); + connect( radioBG, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotActionChanged() ) ); TQHBoxLayout *dateLayout = new TQHBoxLayout(0); mArchiveOnceRB = new TQRadioButton(i18n("Archive now items older than:"),topFrame); @@ -147,10 +147,10 @@ ArchiveDialog::ArchiveDialog(Calendar *cal,TQWidget *parent, const char *name) i18n("Select this option to delete old events and to-dos without saving them. " "It is not possible to recover the events later.")); topLayout->addWidget(mDeleteCb); - connect(mDeleteCb, TQT_SIGNAL(toggled(bool)), mArchiveFile, TQT_SLOT(setDisabled(bool))); - connect(mDeleteCb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableUser1())); - connect(mArchiveFile->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(slotEnableUser1())); + connect(mDeleteCb, TQ_SIGNAL(toggled(bool)), mArchiveFile, TQ_SLOT(setDisabled(bool))); + connect(mDeleteCb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableUser1())); + connect(mArchiveFile->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(slotEnableUser1())); // Load settings from KOPrefs mExpiryTimeNumInput->setValue( KOPrefs::instance()->mExpiryTime ); @@ -194,7 +194,7 @@ void ArchiveDialog::slotActionChanged() void ArchiveDialog::slotUser1() { EventArchiver archiver; - connect( &archiver, TQT_SIGNAL( eventsDeleted() ), this, TQT_SLOT( slotEventsDeleted() ) ); + connect( &archiver, TQ_SIGNAL( eventsDeleted() ), this, TQ_SLOT( slotEventsDeleted() ) ); KOPrefs::instance()->mAutoArchive = mAutoArchiveRB->isChecked(); KOPrefs::instance()->mExpiryTime = mExpiryTimeNumInput->value(); diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 8e2e1b70..239f8522 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -84,7 +84,7 @@ #include <tdeglobal.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <tdemessagebox.h> #include <knotifyclient.h> @@ -131,8 +131,8 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) mExtensions.setAutoDelete( true ); - mDateNavigator = new DateNavigator( TQT_TQOBJECT(this) ); - mDateChecker = new DateChecker( TQT_TQOBJECT(this) ); + mDateNavigator = new DateNavigator( this ); + mDateChecker = new DateChecker( this ); TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -200,64 +200,64 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) #endif // Signals emited by mDateNavigator - connect( mDateNavigator, TQT_SIGNAL( datesSelected( const KCal::DateList &, const TQDate & ) ), - TQT_SLOT( showDates( const KCal::DateList &, const TQDate & ) ) ); + connect( mDateNavigator, TQ_SIGNAL( datesSelected( const KCal::DateList &, const TQDate & ) ), + TQ_SLOT( showDates( const KCal::DateList &, const TQDate & ) ) ); // Signals emited by mNavigatorBar - connect( mNavigatorBar, TQT_SIGNAL( prevYearClicked() ), - mDateNavigator, TQT_SLOT( selectPreviousYear() ) ); - connect( mNavigatorBar, TQT_SIGNAL( nextYearClicked() ), - mDateNavigator, TQT_SLOT( selectNextYear() ) ); - connect( mNavigatorBar, TQT_SIGNAL( prevMonthClicked() ), - mDateNavigator, TQT_SLOT( selectPreviousMonth() ) ); - connect( mNavigatorBar, TQT_SIGNAL( nextMonthClicked() ), - mDateNavigator, TQT_SLOT( selectNextMonth() ) ); - connect( mNavigatorBar, TQT_SIGNAL( monthSelected(int) ), - mDateNavigator, TQT_SLOT( selectMonth(int) ) ); - connect( mNavigatorBar, TQT_SIGNAL( yearSelected(int)), - mDateNavigator, TQT_SLOT(selectYear(int)) ); + connect( mNavigatorBar, TQ_SIGNAL( prevYearClicked() ), + mDateNavigator, TQ_SLOT( selectPreviousYear() ) ); + connect( mNavigatorBar, TQ_SIGNAL( nextYearClicked() ), + mDateNavigator, TQ_SLOT( selectNextYear() ) ); + connect( mNavigatorBar, TQ_SIGNAL( prevMonthClicked() ), + mDateNavigator, TQ_SLOT( selectPreviousMonth() ) ); + connect( mNavigatorBar, TQ_SIGNAL( nextMonthClicked() ), + mDateNavigator, TQ_SLOT( selectNextMonth() ) ); + connect( mNavigatorBar, TQ_SIGNAL( monthSelected(int) ), + mDateNavigator, TQ_SLOT( selectMonth(int) ) ); + connect( mNavigatorBar, TQ_SIGNAL( yearSelected(int)), + mDateNavigator, TQ_SLOT(selectYear(int)) ); // Signals emited by mDateNavigatorContainer - connect( mDateNavigatorContainer, TQT_SIGNAL( weekClicked( const TQDate & ) ), - this, TQT_SLOT( selectWeek( const TQDate & ) ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( prevMonthClicked(const TQDate &, const TQDate &, const TQDate &) ), - mDateNavigator, TQT_SLOT( selectPreviousMonth(const TQDate &, const TQDate &, const TQDate &) ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( nextMonthClicked(const TQDate &, const TQDate &, const TQDate &) ), - mDateNavigator, TQT_SLOT( selectNextMonth(const TQDate &, const TQDate &, const TQDate &) ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( prevYearClicked() ), - mDateNavigator, TQT_SLOT( selectPreviousYear() ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( nextYearClicked() ), - mDateNavigator, TQT_SLOT( selectNextYear() ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( monthSelected(int) ), - mDateNavigator, TQT_SLOT( selectMonth(int) ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL(yearSelected(int)), - mDateNavigator, TQT_SLOT(selectYear(int)) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( goPrevious() ), - mDateNavigator, TQT_SLOT( selectPrevious() ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( goNext() ), - mDateNavigator, TQT_SLOT( selectNext() ) ); - - connect( mDateNavigatorContainer, TQT_SIGNAL( datesSelected( const KCal::DateList & ) ), - mDateNavigator, TQT_SLOT( selectDates( const KCal::DateList & ) ) ); - - connect( mDateNavigatorContainer, TQT_SIGNAL(incidenceDropped(Incidence*, const TQDate&)), - TQT_SLOT( addIncidenceOn( Incidence *, const TQDate & ) ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL(incidenceDroppedMove(Incidence*,const TQDate&)), - TQT_SLOT( moveIncidenceTo( Incidence *, const TQDate & ) ) ); - - connect( mDateChecker, TQT_SIGNAL( dayPassed( const TQDate & ) ), - mTodoList, TQT_SLOT( dayPassed( const TQDate & ) ) ); - connect( mDateChecker, TQT_SIGNAL( dayPassed( const TQDate & ) ), - TQT_SIGNAL( dayPassed( const TQDate & ) ) ); - connect( mDateChecker, TQT_SIGNAL( dayPassed( const TQDate & ) ), - mDateNavigatorContainer, TQT_SLOT( updateToday() ) ); - - connect( this, TQT_SIGNAL( configChanged() ), - mDateNavigatorContainer, TQT_SLOT( updateConfig() ) ); - - connect( this, TQT_SIGNAL( incidenceSelected(Incidence *, const TQDate &) ), - mEventViewer, TQT_SLOT ( setIncidence (Incidence *, const TQDate &) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( weekClicked( const TQDate & ) ), + this, TQ_SLOT( selectWeek( const TQDate & ) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( prevMonthClicked(const TQDate &, const TQDate &, const TQDate &) ), + mDateNavigator, TQ_SLOT( selectPreviousMonth(const TQDate &, const TQDate &, const TQDate &) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( nextMonthClicked(const TQDate &, const TQDate &, const TQDate &) ), + mDateNavigator, TQ_SLOT( selectNextMonth(const TQDate &, const TQDate &, const TQDate &) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( prevYearClicked() ), + mDateNavigator, TQ_SLOT( selectPreviousYear() ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( nextYearClicked() ), + mDateNavigator, TQ_SLOT( selectNextYear() ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( monthSelected(int) ), + mDateNavigator, TQ_SLOT( selectMonth(int) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL(yearSelected(int)), + mDateNavigator, TQ_SLOT(selectYear(int)) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( goPrevious() ), + mDateNavigator, TQ_SLOT( selectPrevious() ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( goNext() ), + mDateNavigator, TQ_SLOT( selectNext() ) ); + + connect( mDateNavigatorContainer, TQ_SIGNAL( datesSelected( const KCal::DateList & ) ), + mDateNavigator, TQ_SLOT( selectDates( const KCal::DateList & ) ) ); + + connect( mDateNavigatorContainer, TQ_SIGNAL(incidenceDropped(Incidence*, const TQDate&)), + TQ_SLOT( addIncidenceOn( Incidence *, const TQDate & ) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL(incidenceDroppedMove(Incidence*,const TQDate&)), + TQ_SLOT( moveIncidenceTo( Incidence *, const TQDate & ) ) ); + + connect( mDateChecker, TQ_SIGNAL( dayPassed( const TQDate & ) ), + mTodoList, TQ_SLOT( dayPassed( const TQDate & ) ) ); + connect( mDateChecker, TQ_SIGNAL( dayPassed( const TQDate & ) ), + TQ_SIGNAL( dayPassed( const TQDate & ) ) ); + connect( mDateChecker, TQ_SIGNAL( dayPassed( const TQDate & ) ), + mDateNavigatorContainer, TQ_SLOT( updateToday() ) ); + + connect( this, TQ_SIGNAL( configChanged() ), + mDateNavigatorContainer, TQ_SLOT( updateConfig() ) ); + + connect( this, TQ_SIGNAL( incidenceSelected(Incidence *, const TQDate &) ), + mEventViewer, TQ_SLOT ( setIncidence (Incidence *, const TQDate &) ) ); //TODO: do a pretty Summary, TQString s; @@ -277,13 +277,13 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) KOGlobals::self()-> setHolidays( new KHolidays( KOPrefs::instance()->mHolidays ) ); - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - TQT_SLOT( checkClipboard() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + TQ_SLOT( checkClipboard() ) ); - connect( mTodoList, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), - TQT_SLOT( processTodoListSelection( Incidence *,const TQDate & ) ) ); - disconnect( mTodoList, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), - this, TQT_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) ); + connect( mTodoList, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), + TQ_SLOT( processTodoListSelection( Incidence *,const TQDate & ) ) ); + disconnect( mTodoList, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), + this, TQ_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) ); kdDebug(5850) << "CalendarView::CalendarView() done" << endl; } @@ -307,11 +307,11 @@ void CalendarView::setCalendar( Calendar *cal ) delete mHistory; mHistory = new History( mCalendar ); - connect( mHistory, TQT_SIGNAL( undone() ), TQT_SLOT( updateView() ) ); - connect( mHistory, TQT_SIGNAL( redone() ), TQT_SLOT( updateView() ) ); + connect( mHistory, TQ_SIGNAL( undone() ), TQ_SLOT( updateView() ) ); + connect( mHistory, TQ_SIGNAL( redone() ), TQ_SLOT( updateView() ) ); if ( mChanger ) delete mChanger; - setIncidenceChanger( new IncidenceChanger( mCalendar, TQT_TQOBJECT(this) ) ); + setIncidenceChanger( new IncidenceChanger( mCalendar, this ) ); mCalendar->registerObserver( this ); @@ -326,21 +326,21 @@ void CalendarView::setIncidenceChanger( IncidenceChangerBase *changer ) { mChanger = changer; emit newIncidenceChanger( mChanger ); - connect( mChanger, TQT_SIGNAL( incidenceAdded( Incidence* ) ), - this, TQT_SLOT( incidenceAdded( Incidence* ) ) ); - connect( mChanger, TQT_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ), - this, TQT_SLOT( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ) ); - connect( mChanger, TQT_SIGNAL( incidenceToBeDeleted( Incidence * ) ), - this, TQT_SLOT( incidenceToBeDeleted( Incidence * ) ) ); - connect( mChanger, TQT_SIGNAL( incidenceDeleted( Incidence * ) ), - this, TQT_SLOT( incidenceDeleted( Incidence * ) ) ); + connect( mChanger, TQ_SIGNAL( incidenceAdded( Incidence* ) ), + this, TQ_SLOT( incidenceAdded( Incidence* ) ) ); + connect( mChanger, TQ_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ), + this, TQ_SLOT( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ) ); + connect( mChanger, TQ_SIGNAL( incidenceToBeDeleted( Incidence * ) ), + this, TQ_SLOT( incidenceToBeDeleted( Incidence * ) ) ); + connect( mChanger, TQ_SIGNAL( incidenceDeleted( Incidence * ) ), + this, TQ_SLOT( incidenceDeleted( Incidence * ) ) ); - connect( mChanger, TQT_SIGNAL( schedule( Scheduler::Method, Incidence*) ), - this, TQT_SLOT( schedule( Scheduler::Method, Incidence*) ) ); + connect( mChanger, TQ_SIGNAL( schedule( Scheduler::Method, Incidence*) ), + this, TQ_SLOT( schedule( Scheduler::Method, Incidence*) ) ); - connect( this, TQT_SIGNAL( cancelAttendees( Incidence * ) ), - mChanger, TQT_SLOT( cancelAttendees( Incidence * ) ) ); + connect( this, TQ_SIGNAL( cancelAttendees( Incidence * ) ), + mChanger, TQ_SLOT( cancelAttendees( Incidence * ) ) ); } Calendar *CalendarView::calendar() @@ -1776,7 +1776,7 @@ void CalendarView::print() #ifndef KORG_NOPRINTER KOCoreHelper helper; CalPrinter printer( this, mCalendar, &helper ); - connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) ); + connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) ); KOrg::BaseView *currentView = mViewManager->currentView(); @@ -1802,8 +1802,8 @@ void CalendarView::exportWeb() // seem to load the config theirselves if ( settings ) settings->readConfig(); ExportWebDialog *dlg = new ExportWebDialog( settings, this ); - connect( dlg, TQT_SIGNAL( exportHTML( HTMLExportSettings* ) ), - this, TQT_SIGNAL( exportHTML( HTMLExportSettings* ) ) ); + connect( dlg, TQ_SIGNAL( exportHTML( HTMLExportSettings* ) ), + this, TQ_SIGNAL( exportHTML( HTMLExportSettings* ) ) ); dlg->show(); } @@ -2472,8 +2472,8 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force) void CalendarView::connectIncidenceEditor( KOIncidenceEditor *editor ) { - connect( this, TQT_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), - editor, TQT_SLOT( setIncidenceChanger( IncidenceChangerBase* ) ) ); + connect( this, TQ_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), + editor, TQ_SLOT( setIncidenceChanger( IncidenceChangerBase* ) ) ); editor->setIncidenceChanger( mChanger ); } diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 3d1d7623..91868296 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -31,7 +31,7 @@ #include <tdefile.h> #include <korganizer/koeventviewer.h> #include <libkcal/scheduler.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "koglobals.h" #include "interfaces/korganizer/calendarviewbase.h" @@ -78,7 +78,7 @@ class CalendarViewExtension : public TQWidget @short main calendar view widget @author Cornelius Schumacher */ -class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::Observer +class TDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::Observer { TQ_OBJECT @@ -378,7 +378,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar:: void checkClipboard(); /** - Using the TDEConfig associated with the kapp variable, read in the + Using the TDEConfig associated with the tdeApp variable, read in the settings from the config file. You have to call setCalendar before calling readSettings. diff --git a/korganizer/datechecker.cpp b/korganizer/datechecker.cpp index 2be3d060..ebe73465 100644 --- a/korganizer/datechecker.cpp +++ b/korganizer/datechecker.cpp @@ -55,8 +55,8 @@ void DateChecker::enableRollover( RolloverType r ) case FollowMonth: if ( !mUpdateTimer ) { mUpdateTimer = new TQTimer( this, "mUpdateTimer" ); - connect( mUpdateTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( possiblyPastMidnight() ) ); + connect( mUpdateTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( possiblyPastMidnight() ) ); } mUpdateTimer->start( 0, true ); mLastDayChecked = TQDate::currentDate(); diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index b2b8e8a0..3ff76fec 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -68,26 +68,26 @@ DateNavigatorContainer::~DateNavigatorContainer() void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v ) { - connect( v, TQT_SIGNAL( datesSelected( const KCal::DateList & ) ), - TQT_SIGNAL( datesSelected( const KCal::DateList & ) ) ); - connect( v, TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ), - TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) ); - connect( v, TQT_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ), - TQT_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) ); - connect( v, TQT_SIGNAL( weekClicked( const TQDate & ) ), - TQT_SIGNAL( weekClicked( const TQDate & ) ) ); - - connect( v, TQT_SIGNAL( goPrevious() ), TQT_SIGNAL( goPrevious() ) ); - connect( v, TQT_SIGNAL( goNext() ), TQT_SIGNAL( goNext() ) ); - - connect( v, TQT_SIGNAL( nextYearClicked() ), TQT_SIGNAL( nextYearClicked() ) ); - connect( v, TQT_SIGNAL( prevYearClicked() ), TQT_SIGNAL( prevYearClicked() ) ); - - connect( v, TQT_SIGNAL( prevMonthClicked() ), this, TQT_SLOT( goPrevMonth() ) ); - connect( v, TQT_SIGNAL( nextMonthClicked() ), this, TQT_SLOT( goNextMonth() ) ); - - connect( v, TQT_SIGNAL( monthSelected( int ) ), TQT_SIGNAL( monthSelected( int ) ) ); - connect( v, TQT_SIGNAL( yearSelected( int ) ), TQT_SIGNAL( yearSelected( int ) ) ); + connect( v, TQ_SIGNAL( datesSelected( const KCal::DateList & ) ), + TQ_SIGNAL( datesSelected( const KCal::DateList & ) ) ); + connect( v, TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ), + TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) ); + connect( v, TQ_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ), + TQ_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) ); + connect( v, TQ_SIGNAL( weekClicked( const TQDate & ) ), + TQ_SIGNAL( weekClicked( const TQDate & ) ) ); + + connect( v, TQ_SIGNAL( goPrevious() ), TQ_SIGNAL( goPrevious() ) ); + connect( v, TQ_SIGNAL( goNext() ), TQ_SIGNAL( goNext() ) ); + + connect( v, TQ_SIGNAL( nextYearClicked() ), TQ_SIGNAL( nextYearClicked() ) ); + connect( v, TQ_SIGNAL( prevYearClicked() ), TQ_SIGNAL( prevYearClicked() ) ); + + connect( v, TQ_SIGNAL( prevMonthClicked() ), this, TQ_SLOT( goPrevMonth() ) ); + connect( v, TQ_SIGNAL( nextMonthClicked() ), this, TQ_SLOT( goNextMonth() ) ); + + connect( v, TQ_SIGNAL( monthSelected( int ) ), TQ_SIGNAL( monthSelected( int ) ) ); + connect( v, TQ_SIGNAL( yearSelected( int ) ), TQ_SIGNAL( yearSelected( int ) ) ); } void DateNavigatorContainer::setCalendar( Calendar *cal ) @@ -211,7 +211,7 @@ void DateNavigatorContainer::resizeEvent( TQResizeEvent * ) kdDebug(5850) << " SIZEHINT: " << sizeHint() << endl; kdDebug(5850) << " MINIMUM SIZE: " << minimumSize() << endl; #endif - TQTimer::singleShot( 0, this, TQT_SLOT( resizeAllContents() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( resizeAllContents() ) ); } void DateNavigatorContainer::resizeAllContents() diff --git a/korganizer/docprefs.cpp b/korganizer/docprefs.cpp index 1ac91835..f89f9809 100644 --- a/korganizer/docprefs.cpp +++ b/korganizer/docprefs.cpp @@ -22,18 +22,18 @@ without including the source code for TQt in the source distribution. */ -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "docprefs.h" -KSimpleConfig *DocPrefs::mConfig = 0; +TDESimpleConfig *DocPrefs::mConfig = 0; DocPrefs::DocPrefs( const TQString &type ) { if ( !mConfig ) { - mConfig = new KSimpleConfig( locateLocal( "data", "korganizer/docprefs." + type + ".tdeconfig" ) ); + mConfig = new TDESimpleConfig( locateLocal( "data", "korganizer/docprefs." + type + ".tdeconfig" ) ); } } diff --git a/korganizer/docprefs.h b/korganizer/docprefs.h index 7e6597e4..36ccd82b 100644 --- a/korganizer/docprefs.h +++ b/korganizer/docprefs.h @@ -26,7 +26,7 @@ #include <tqstring.h> -class KSimpleConfig; +class TDESimpleConfig; class DocPrefs { @@ -41,7 +41,7 @@ class DocPrefs void writeEntry( const TQString &identifier, bool value ); private: - static KSimpleConfig *mConfig; + static TDESimpleConfig *mConfig; TQString mDocId; }; diff --git a/korganizer/exportwebdialog.cpp b/korganizer/exportwebdialog.cpp index 156ed702..8eb09d04 100644 --- a/korganizer/exportwebdialog.cpp +++ b/korganizer/exportwebdialog.cpp @@ -42,7 +42,7 @@ #include <klineedit.h> #include <kurl.h> #include <tdeio/job.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include "koglobals.h" #include <kurlrequester.h> @@ -81,8 +81,8 @@ ExportWebDialog::ExportWebDialog( HTMLExportSettings *settings, TQWidget *parent // setupFreeBusyPage(); // setupAdvancedPage(); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotOk() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), TQ_SLOT( reject() ) ); readConfig(); updateState(); @@ -149,9 +149,9 @@ void ExportWebDialog::setupGeneralPage() topLayout->addWidget( typeGroup ); // addWidBool( mSettings->weekViewItem(), typeGroup ); mMonthViewCheckBox = addWidBool( mSettings->monthViewItem(), typeGroup )->checkBox(); - connect( mMonthViewCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateState()) ); + connect( mMonthViewCheckBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateState()) ); mEventListCheckBox = addWidBool( mSettings->eventViewItem(), typeGroup )->checkBox(); - connect( mEventListCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateState()) ); + connect( mEventListCheckBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateState()) ); addWidBool( mSettings->todoViewItem(), typeGroup ); // addWidBool( mSettings->journalViewItem(), typeGroup ); // addWidBool( mSettings->freeBusyViewItem(), typeGroup ); @@ -162,8 +162,8 @@ void ExportWebDialog::setupGeneralPage() topLayout->addWidget(destGroup); KPrefsWidPath *pathWid = addWidPath( mSettings->outputFileItem(), destGroup, "text/html", KFile::File ); - connect( pathWid->urlRequester(), TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotTextChanged( const TQString & ) ) ); + connect( pathWid->urlRequester(), TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotTextChanged( const TQString & ) ) ); topLayout->addStretch( 1 ); } diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui index a44124b5..131b6536 100644 --- a/korganizer/filteredit_base.ui +++ b/korganizer/filteredit_base.ui @@ -297,9 +297,9 @@ Only to-dos which have least one attendee will be checked. If you are not in th <slot>setEnabled(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>updateFilter()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">knuminput.h</include> diff --git a/korganizer/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp index 74f5a48c..6a2ef703 100644 --- a/korganizer/filtereditdialog.cpp +++ b/korganizer/filtereditdialog.cpp @@ -53,11 +53,11 @@ FilterEditDialog::FilterEditDialog( TQPtrList<CalFilter> *filters, { setMainWidget( mFilterEdit = new FilterEdit(filters, this)); - connect(mFilterEdit, TQT_SIGNAL(dataConsistent(bool)), - TQT_SLOT(setDialogConsistent(bool))); + connect(mFilterEdit, TQ_SIGNAL(dataConsistent(bool)), + TQ_SLOT(setDialogConsistent(bool))); updateFilterList(); - connect( mFilterEdit, TQT_SIGNAL( editCategories() ), TQT_SIGNAL( editCategories() ) ); - connect( mFilterEdit, TQT_SIGNAL( filterChanged() ), TQT_SIGNAL( filterChanged() ) ); + connect( mFilterEdit, TQ_SIGNAL( editCategories() ), TQ_SIGNAL( editCategories() ) ); + connect( mFilterEdit, TQ_SIGNAL( filterChanged() ), TQ_SIGNAL( filterChanged() ) ); } FilterEditDialog::~FilterEditDialog() @@ -99,11 +99,11 @@ FilterEdit::FilterEdit(TQPtrList<CalFilter> *filters, TQWidget *parent) TQWhatsThis::add( mNewButton, i18n( "Press this button to define a new filter." ) ); TQWhatsThis::add( mDeleteButton, i18n( "Press this button to remove the currently active filter." ) ); - connect( mRulesList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(filterSelected()) ); - connect( mNewButton, TQT_SIGNAL( clicked() ), TQT_SLOT( bNewPressed() ) ); - connect( mDeleteButton, TQT_SIGNAL( clicked() ), TQT_SLOT( bDeletePressed() ) ); - connect( mNameLineEdit, TQT_SIGNAL( textChanged(const TQString &) ), TQT_SLOT( updateSelectedName(const TQString &) ) ); - connect( mCatEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editCategorySelection() ) ); + connect( mRulesList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(filterSelected()) ); + connect( mNewButton, TQ_SIGNAL( clicked() ), TQ_SLOT( bNewPressed() ) ); + connect( mDeleteButton, TQ_SIGNAL( clicked() ), TQ_SLOT( bDeletePressed() ) ); + connect( mNameLineEdit, TQ_SIGNAL( textChanged(const TQString &) ), TQ_SLOT( updateSelectedName(const TQString &) ) ); + connect( mCatEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editCategorySelection() ) ); } FilterEdit::~FilterEdit() { @@ -231,10 +231,10 @@ void FilterEdit::editCategorySelection() if ( !mCategorySelectDialog ) { mCategorySelectDialog = new KPIM::CategorySelectDialog( KOPrefs::instance(), this, "filterCatSelect" ); connect( mCategorySelectDialog, - TQT_SIGNAL( categoriesSelected( const TQStringList & ) ), - TQT_SLOT( updateCategorySelection( const TQStringList & ) ) ); - connect( mCategorySelectDialog, TQT_SIGNAL( editCategories() ), - TQT_SIGNAL( editCategories() ) ); + TQ_SIGNAL( categoriesSelected( const TQStringList & ) ), + TQ_SLOT( updateCategorySelection( const TQStringList & ) ) ); + connect( mCategorySelectDialog, TQ_SIGNAL( editCategories() ), + TQ_SIGNAL( editCategories() ) ); } mCategorySelectDialog->setSelected( current->categoryList() ); diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp index 9aa7ed82..4d9c027b 100644 --- a/korganizer/freebusymanager.cpp +++ b/korganizer/freebusymanager.cpp @@ -59,7 +59,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeabc/stdaddressbook.h> #include <tdeabc/addressee.h> @@ -82,10 +82,10 @@ FreeBusyDownloadJob::FreeBusyDownloadJob( const TQString &email, const KURL &url KOrg::MainWindow *korg = ActionManager::findInstance( KURL() ); job->setWindow( korg->topLevelWidget() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); TDEIO::Scheduler::scheduleJob( job ); } @@ -339,8 +339,8 @@ void FreeBusyManager::publishFreeBusy() KOrg::MainWindow *korg = ActionManager::findInstance( KURL() ); job->setWindow( korg->topLevelWidget() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotUploadFreeBusyResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotUploadFreeBusyResult( TDEIO::Job * ) ) ); } } @@ -406,15 +406,15 @@ bool FreeBusyManager::processRetrieveQueue() FreeBusyDownloadJob *job = new FreeBusyDownloadJob( email, sourceURL, this, "freebusy_download_job" ); - connect( job, TQT_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *, + connect( job, TQ_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *, const TQString & ) ), - TQT_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ) ); - connect( job, TQT_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *, + TQ_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ) ); + connect( job, TQ_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *, const TQString & ) ), - TQT_SLOT( processRetrieveQueue() ) ); + TQ_SLOT( processRetrieveQueue() ) ); - connect( job, TQT_SIGNAL( freeBusyDownloadError( const TQString& ) ), - this, TQT_SLOT( slotFreeBusyDownloadError( const TQString& ) ) ); + connect( job, TQ_SIGNAL( freeBusyDownloadError( const TQString& ) ), + this, TQ_SLOT( slotFreeBusyDownloadError( const TQString& ) ) ); return true; } diff --git a/korganizer/freebusyurldialog.cpp b/korganizer/freebusyurldialog.cpp index 519e103e..189021fc 100644 --- a/korganizer/freebusyurldialog.cpp +++ b/korganizer/freebusyurldialog.cpp @@ -30,7 +30,7 @@ #include <klineedit.h> #include <tdelocale.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h index ce3e2145..cc00b3b1 100644 --- a/korganizer/interfaces/korganizer/baseview.h +++ b/korganizer/interfaces/korganizer/baseview.h @@ -29,7 +29,7 @@ #include <tdelocale.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "korganizer/incidencechangerbase.h" #include "printplugin.h" @@ -56,7 +56,7 @@ namespace KOrg { @author Preston Brown, Cornelius Schumacher @see KOTodoView, KOEventView, KOListView, KOAgendaView, KOMonthView */ -class KDE_EXPORT BaseView : public TQWidget +class TDE_EXPORT BaseView : public TQWidget { TQ_OBJECT diff --git a/korganizer/interfaces/korganizer/part.h b/korganizer/interfaces/korganizer/part.h index 0e723048..cb0b6884 100644 --- a/korganizer/interfaces/korganizer/part.h +++ b/korganizer/interfaces/korganizer/part.h @@ -39,7 +39,7 @@ class Part : public KParts::Part typedef TQPtrList<Part> List; Part( MainWindow *parent, const char *name ) - : KParts::Part( parent?(TQT_TQOBJECT(parent->topLevelWidget())):0, name ), mMainWindow( parent ) {} + : KParts::Part( parent?(parent->topLevelWidget()):0, name ), mMainWindow( parent ) {} virtual ~Part() {} diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 0ceec954..08d57be5 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -75,8 +75,8 @@ JournalDateEntry::JournalDateEntry( Calendar *calendar, TQWidget *parent ) : mTitle = new JournalTitleLable( this ); mTitle->setMargin(2); mTitle->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - connect( mTitle, TQT_SIGNAL( linkClicked( const TQString & ) ), - this, TQT_SLOT( emitNewJournal() ) ); + connect( mTitle, TQ_SIGNAL( linkClicked( const TQString & ) ), + this, TQ_SLOT( emitNewJournal() ) ); } JournalDateEntry::~JournalDateEntry() @@ -120,16 +120,16 @@ void JournalDateEntry::addJournal( Journal *j ) entry->setIncidenceChanger( mChanger ); mEntries.insert( j, entry ); - connect( this, TQT_SIGNAL( setIncidenceChangerSignal( IncidenceChangerBase * ) ), - entry, TQT_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) ); - connect( this, TQT_SIGNAL( setDateSignal( const TQDate & ) ), - entry, TQT_SLOT( setDate( const TQDate & ) ) ); - connect( this, TQT_SIGNAL( flushEntries() ), - entry, TQT_SLOT( flushEntry() ) ); - connect( entry, TQT_SIGNAL( deleteIncidence( Incidence* ) ), - this, TQT_SIGNAL( deleteIncidence( Incidence* ) ) ); - connect( entry, TQT_SIGNAL( editIncidence( Incidence*, const TQDate& ) ), - this, TQT_SIGNAL( editIncidence( Incidence*, const TQDate& ) ) ); + connect( this, TQ_SIGNAL( setIncidenceChangerSignal( IncidenceChangerBase * ) ), + entry, TQ_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) ); + connect( this, TQ_SIGNAL( setDateSignal( const TQDate & ) ), + entry, TQ_SLOT( setDate( const TQDate & ) ) ); + connect( this, TQ_SIGNAL( flushEntries() ), + entry, TQ_SLOT( flushEntry() ) ); + connect( entry, TQ_SIGNAL( deleteIncidence( Incidence* ) ), + this, TQ_SIGNAL( deleteIncidence( Incidence* ) ) ); + connect( entry, TQ_SIGNAL( editIncidence( Incidence*, const TQDate& ) ), + this, TQ_SIGNAL( editIncidence( Incidence*, const TQDate& ) ) ); } Journal::List JournalDateEntry::journals() const @@ -203,8 +203,8 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : mLayout->addWidget( mTimeCheck, 0, 2 ); mTimeEdit = new KTimeEdit( this ); mLayout->addWidget( mTimeEdit, 0, 3 ); - connect( mTimeCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(timeCheckBoxToggled(bool)) ); + connect( mTimeCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(timeCheckBoxToggled(bool)) ); TQWhatsThis::add( mTimeCheck, i18n("Determines whether this journal entry has " "a time associated with it") ); TQWhatsThis::add( mTimeEdit, i18n( "Sets the time associated with this journal " @@ -217,7 +217,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : TQToolTip::add( mDeleteButton, i18n("Delete this journal entry") ); TQWhatsThis::add( mDeleteButton, i18n("Delete this journal entry") ); mLayout->addWidget( mDeleteButton, 0, 4 ); - connect( mDeleteButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(deleteItem()) ); + connect( mDeleteButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(deleteItem()) ); mEditButton = new TQToolButton( this, "editButton" ); mEditButton->setPixmap( KOGlobals::self()->smallIcon( "edit" ) ); @@ -225,7 +225,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : TQToolTip::add( mEditButton, i18n("Edit this journal entry") ); TQWhatsThis::add( mEditButton, i18n("Opens an editor dialog for this journal entry") ); mLayout->addWidget( mEditButton, 0, 5 ); - connect( mEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( editItem() ) ); + connect( mEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( editItem() ) ); #ifndef KORG_NOPRINTER mPrintButton = new TQToolButton( this, "printButton" ); @@ -234,15 +234,15 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : TQToolTip::add( mPrintButton, i18n("Print this journal entry") ); TQWhatsThis::add( mPrintButton, i18n("Opens the print dialog for this journal entry") ); mLayout->addWidget( mPrintButton, 0, 6 ); - connect( mPrintButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( printItem() ) ); + connect( mPrintButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( printItem() ) ); #endif mEditor = new KTextEdit(this); mLayout->addMultiCellWidget( mEditor, 1, 2, 0, 6 ); - connect( mTitleEdit, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(setDirty()) ); - connect( mTimeCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDirty()) ); - connect( mTimeEdit, TQT_SIGNAL(timeChanged(TQTime)), TQT_SLOT(setDirty()) ); - connect( mEditor, TQT_SIGNAL(textChanged()), TQT_SLOT(setDirty()) ); + connect( mTitleEdit, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(setDirty()) ); + connect( mTimeCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setDirty()) ); + connect( mTimeEdit, TQ_SIGNAL(timeChanged(TQTime)), TQ_SLOT(setDirty()) ); + connect( mEditor, TQ_SIGNAL(textChanged()), TQ_SLOT(setDirty()) ); mEditor->installEventFilter(this); @@ -283,7 +283,7 @@ void JournalEntry::printItem() if ( mJournal ) { KOCoreHelper helper; CalPrinter printer( this, 0, &helper ); - connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) ); + connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) ); Incidence::List selectedIncidences; selectedIncidences.append( mJournal ); diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 918b8958..94f74a66 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -53,12 +53,12 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name ) mNavigatorBar = new NavigatorBar( this ); topLayout->addMultiCellWidget( mNavigatorBar, 0, 0, 0, 7 ); - connect( mNavigatorBar, TQT_SIGNAL( prevYearClicked() ), TQT_SIGNAL( prevYearClicked() ) ); - connect( mNavigatorBar, TQT_SIGNAL( prevMonthClicked() ), TQT_SIGNAL( prevMonthClicked() ) ); - connect( mNavigatorBar, TQT_SIGNAL( nextMonthClicked() ), TQT_SIGNAL( nextMonthClicked() ) ); - connect( mNavigatorBar, TQT_SIGNAL( nextYearClicked() ), TQT_SIGNAL( nextYearClicked() ) ); - connect( mNavigatorBar, TQT_SIGNAL( monthSelected( int ) ), TQT_SIGNAL( monthSelected( int ) ) ); - connect( mNavigatorBar, TQT_SIGNAL( yearSelected( int ) ), TQT_SIGNAL( yearSelected( int ) ) ); + connect( mNavigatorBar, TQ_SIGNAL( prevYearClicked() ), TQ_SIGNAL( prevYearClicked() ) ); + connect( mNavigatorBar, TQ_SIGNAL( prevMonthClicked() ), TQ_SIGNAL( prevMonthClicked() ) ); + connect( mNavigatorBar, TQ_SIGNAL( nextMonthClicked() ), TQ_SIGNAL( nextMonthClicked() ) ); + connect( mNavigatorBar, TQ_SIGNAL( nextYearClicked() ), TQ_SIGNAL( nextYearClicked() ) ); + connect( mNavigatorBar, TQ_SIGNAL( monthSelected( int ) ), TQ_SIGNAL( monthSelected( int ) ) ); + connect( mNavigatorBar, TQ_SIGNAL( yearSelected( int ) ), TQ_SIGNAL( yearSelected( int ) ) ); int i; TQString generalFont = TDEGlobalSettings::generalFont().family(); @@ -84,13 +84,13 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name ) mDayMatrix = new KODayMatrix( this, "KDateNavigator::dayMatrix" ); - connect( mDayMatrix, TQT_SIGNAL( selected( const KCal::DateList & ) ), - TQT_SIGNAL( datesSelected( const KCal::DateList & ) ) ); + connect( mDayMatrix, TQ_SIGNAL( selected( const KCal::DateList & ) ), + TQ_SIGNAL( datesSelected( const KCal::DateList & ) ) ); - connect( mDayMatrix, TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ), - TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) ); - connect( mDayMatrix, TQT_SIGNAL( incidenceDroppedMove( Incidence * , const TQDate & ) ), - TQT_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) ); + connect( mDayMatrix, TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ), + TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) ); + connect( mDayMatrix, TQ_SIGNAL( incidenceDroppedMove( Incidence * , const TQDate & ) ), + TQ_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) ); topLayout->addMultiCellWidget( mDayMatrix, 2, 7, 1, 7 ); diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 1405f205..b7a0e1de 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -69,7 +69,7 @@ MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name ) setMargin(0); setBackgroundColor(TQt::red); minutes = new TQTimer(this); - connect(minutes, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateLocation())); + connect(minutes, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateLocation())); minutes->start(0, true); mTimeBox = new TQLabel(this); @@ -257,8 +257,8 @@ void KOAgenda::init() // effect. Has to be fixed. setFocusPolicy( TQWidget::WheelFocus ); - connect( &mScrollUpTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( scrollUp() ) ); - connect( &mScrollDownTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( scrollDown() ) ); + connect( &mScrollUpTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( scrollUp() ) ); + connect( &mScrollDownTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( scrollDown() ) ); mStartCell = TQPoint( 0, 0 ); mEndCell = TQPoint( 0, 0 ); @@ -305,8 +305,8 @@ void KOAgenda::init() calculateWorkingHours(); - connect( verticalScrollBar(), TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( checkScrollBoundaries( int ) ) ); + connect( verticalScrollBar(), TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( checkScrollBoundaries( int ) ) ); // Create the Marcus Bains line. if( mAllDayMode ) { @@ -423,7 +423,7 @@ bool KOAgenda::eventFilter_drag( TQObject *object, TQDropEvent *de ) #ifndef KORG_NODND TQPoint viewportPos; if ( object != viewport() && object != this ) { - viewportPos = TQT_TQWIDGET( object )->mapToParent( de->pos() ); + viewportPos = static_cast<TQWidget*>( object )->mapToParent( de->pos() ); } else { viewportPos = de->pos(); } @@ -1604,10 +1604,10 @@ KOAgendaItem *KOAgenda::insertItem( Incidence *incidence, const TQDate &qd, int mActionType = NOP; KOAgendaItem *agendaItem = new KOAgendaItem( mCalendar, incidence, qd, viewport(), itemPos, itemCount ); - connect( agendaItem, TQT_SIGNAL( removeAgendaItem( KOAgendaItem * ) ), - TQT_SLOT( removeAgendaItem( KOAgendaItem * ) ) ); - connect( agendaItem, TQT_SIGNAL( showAgendaItem( KOAgendaItem * ) ), - TQT_SLOT( showAgendaItem( KOAgendaItem * ) ) ); + connect( agendaItem, TQ_SIGNAL( removeAgendaItem( KOAgendaItem * ) ), + TQ_SLOT( removeAgendaItem( KOAgendaItem * ) ) ); + connect( agendaItem, TQ_SIGNAL( showAgendaItem( KOAgendaItem * ) ), + TQ_SLOT( showAgendaItem( KOAgendaItem * ) ) ); if ( YBottom <= YTop ) { kdDebug(5850) << "KOAgenda::insertItem(): Text: " << agendaItem->text() << " YSize<0" << endl; @@ -1649,10 +1649,10 @@ KOAgendaItem *KOAgenda::insertAllDayItem( Incidence *event, const TQDate &qd, mActionType = NOP; KOAgendaItem *agendaItem = new KOAgendaItem( mCalendar, event, qd, viewport(), 1, 1 ); - connect( agendaItem, TQT_SIGNAL( removeAgendaItem( KOAgendaItem* ) ), - TQT_SLOT( removeAgendaItem( KOAgendaItem* ) ) ); - connect( agendaItem, TQT_SIGNAL( showAgendaItem( KOAgendaItem* ) ), - TQT_SLOT( showAgendaItem( KOAgendaItem* ) ) ); + connect( agendaItem, TQ_SIGNAL( removeAgendaItem( KOAgendaItem* ) ), + TQ_SLOT( removeAgendaItem( KOAgendaItem* ) ) ); + connect( agendaItem, TQ_SIGNAL( showAgendaItem( KOAgendaItem* ) ), + TQ_SLOT( showAgendaItem( KOAgendaItem* ) ) ); agendaItem->setCellXY( XBegin, 0, 0 ); agendaItem->setCellXRight( XEnd ); @@ -1799,7 +1799,7 @@ bool KOAgenda::removeAgendaItem( KOAgendaItem *item ) } mItemsToDelete.append( thisItem ); - TQTimer::singleShot( 0, this, TQT_SLOT( deleteItemsToDelete() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteItemsToDelete() ) ); return taken; } @@ -1843,7 +1843,7 @@ void KOAgenda::resizeEvent ( TQResizeEvent *ev ) mGridSpacingY = mDesiredGridSpacingY; } calculateWorkingHours(); - TQTimer::singleShot( 0, this, TQT_SLOT( resizeAllContents() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( resizeAllContents() ) ); emit gridSpacingYChanged( mGridSpacingY * 4 ); TQScrollView::resizeEvent(ev); } diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 3e47ad63..7df989cb 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -41,7 +41,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tdelocale.h> #include <tdeconfig.h> @@ -315,7 +315,7 @@ KOAgendaView::KOAgendaView( Calendar *cal, mExpandButton->setPixmap( mNotExpandedPixmap ); mExpandButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - connect( mExpandButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( toggleExpand() ) ); + connect( mExpandButton, TQ_SIGNAL( clicked() ), TQ_SIGNAL( toggleExpand() ) ); } else { TQLabel *label = new TQLabel( i18n("All Day"), mDummyAllDayLeft ); label->setAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak ); @@ -373,27 +373,27 @@ KOAgendaView::KOAgendaView( Calendar *cal, updateTimeBarWidth(); // Scrolling - connect(mAgenda->verticalScrollBar(),TQT_SIGNAL(valueChanged(int)), - mTimeLabels, TQT_SLOT(positionChanged())); + connect(mAgenda->verticalScrollBar(),TQ_SIGNAL(valueChanged(int)), + mTimeLabels, TQ_SLOT(positionChanged())); connect( mAgenda, - TQT_SIGNAL( zoomView( const int, const TQPoint & ,const TQt::Orientation ) ), - TQT_SLOT( zoomView( const int, const TQPoint &, const TQt::Orientation ) ) ); + TQ_SIGNAL( zoomView( const int, const TQPoint & ,const TQt::Orientation ) ), + TQ_SLOT( zoomView( const int, const TQPoint &, const TQt::Orientation ) ) ); - connect(mTimeLabels->verticalScrollBar(),TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(setContentsPos(int))); + connect(mTimeLabels->verticalScrollBar(),TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(setContentsPos(int))); // Create Events, depends on type of agenda - connect( mAgenda, TQT_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)), - TQT_SLOT(newTimeSpanSelected(const TQPoint &, const TQPoint &))); - connect( mAllDayAgenda, TQT_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)), - TQT_SLOT(newTimeSpanSelectedAllDay(const TQPoint &, const TQPoint &))); + connect( mAgenda, TQ_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)), + TQ_SLOT(newTimeSpanSelected(const TQPoint &, const TQPoint &))); + connect( mAllDayAgenda, TQ_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)), + TQ_SLOT(newTimeSpanSelectedAllDay(const TQPoint &, const TQPoint &))); // event indicator update - connect( mAgenda, TQT_SIGNAL(lowerYChanged(int)), - TQT_SLOT(updateEventIndicatorTop(int))); - connect( mAgenda, TQT_SIGNAL(upperYChanged(int)), - TQT_SLOT(updateEventIndicatorBottom(int))); + connect( mAgenda, TQ_SIGNAL(lowerYChanged(int)), + TQ_SLOT(updateEventIndicatorTop(int))); + connect( mAgenda, TQ_SIGNAL(upperYChanged(int)), + TQ_SLOT(updateEventIndicatorBottom(int))); if ( !readOnly() ) { connectAgenda( mAgenda, mAgendaPopup, mAllDayAgenda ); @@ -417,53 +417,53 @@ KOAgendaView::~KOAgendaView() void KOAgendaView::connectAgenda( KOAgenda *agenda, TQPopupMenu *popup, KOAgenda *otherAgenda ) { - connect( agenda, TQT_SIGNAL(showIncidencePopupSignal(Calendar *,Incidence *,const TQDate &)), - popup, TQT_SLOT(showIncidencePopup(Calendar *,Incidence *,const TQDate &)) ); + connect( agenda, TQ_SIGNAL(showIncidencePopupSignal(Calendar *,Incidence *,const TQDate &)), + popup, TQ_SLOT(showIncidencePopup(Calendar *,Incidence *,const TQDate &)) ); - connect( agenda, TQT_SIGNAL(showNewEventPopupSignal()), - TQT_SLOT(showNewEventPopup()) ); + connect( agenda, TQ_SIGNAL(showNewEventPopupSignal()), + TQ_SLOT(showNewEventPopup()) ); // Create/Show/Edit/Delete Event - connect( agenda, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) ); + connect( agenda, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) ); - connect( agenda, TQT_SIGNAL(newStartSelectSignal()), - otherAgenda, TQT_SLOT(clearSelection()) ); - connect( agenda, TQT_SIGNAL(newStartSelectSignal()), - TQT_SIGNAL(timeSpanSelectionChanged()) ); + connect( agenda, TQ_SIGNAL(newStartSelectSignal()), + otherAgenda, TQ_SLOT(clearSelection()) ); + connect( agenda, TQ_SIGNAL(newStartSelectSignal()), + TQ_SIGNAL(timeSpanSelectionChanged()) ); - connect( agenda, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); - connect( agenda, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); - connect( agenda, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) ); + connect( agenda, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); + connect( agenda, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); + connect( agenda, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) ); - connect( agenda, TQT_SIGNAL(startMultiModify(const TQString &)), - TQT_SIGNAL(startMultiModify(const TQString &)) ); - connect( agenda, TQT_SIGNAL(endMultiModify()), - TQT_SIGNAL(endMultiModify()) ); + connect( agenda, TQ_SIGNAL(startMultiModify(const TQString &)), + TQ_SIGNAL(startMultiModify(const TQString &)) ); + connect( agenda, TQ_SIGNAL(endMultiModify()), + TQ_SIGNAL(endMultiModify()) ); - connect( agenda, TQT_SIGNAL(itemModified(KOAgendaItem *)), - TQT_SLOT(updateEventDates(KOAgendaItem *)) ); + connect( agenda, TQ_SIGNAL(itemModified(KOAgendaItem *)), + TQ_SLOT(updateEventDates(KOAgendaItem *)) ); - connect( agenda, TQT_SIGNAL(enableAgendaUpdate(bool)), - TQT_SLOT(enableAgendaUpdate(bool)) ); + connect( agenda, TQ_SIGNAL(enableAgendaUpdate(bool)), + TQ_SLOT(enableAgendaUpdate(bool)) ); // drag signals - connect( agenda, TQT_SIGNAL(startDragSignal(Incidence *)), - TQT_SLOT(startDrag(Incidence *)) ); + connect( agenda, TQ_SIGNAL(startDragSignal(Incidence *)), + TQ_SLOT(startDrag(Incidence *)) ); // synchronize selections - connect( agenda, TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), - otherAgenda, TQT_SLOT(deselectItem()) ); - connect( agenda, TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), - TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) ); + connect( agenda, TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), + otherAgenda, TQ_SLOT(deselectItem()) ); + connect( agenda, TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), + TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) ); // rescheduling of todos by d'n'd - connect( agenda, TQT_SIGNAL(droppedToDo(Todo *,const TQPoint &,bool)), - TQT_SLOT(slotTodoDropped(Todo *,const TQPoint &,bool)) ); + connect( agenda, TQ_SIGNAL(droppedToDo(Todo *,const TQPoint &,bool)), + TQ_SLOT(slotTodoDropped(Todo *,const TQPoint &,bool)) ); } @@ -682,7 +682,7 @@ void KOAgendaView::createDayLabels( bool force ) if ( !mIsSideBySide ) mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()); mDayLabels->show(); - TQTimer::singleShot( 0, this, TQT_SLOT( updateDayLabelSizes() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateDayLabelSizes() ) ); } void KOAgendaView::enableAgendaUpdate( bool enable ) @@ -1117,7 +1117,7 @@ void KOAgendaView::updateEventDates( KOAgendaItem *item ) if ( !result ) { mPendingChanges = true; - TQTimer::singleShot( 0, this, TQT_SLOT(updateView()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(updateView()) ); return; } @@ -1131,7 +1131,7 @@ void KOAgendaView::updateEventDates( KOAgendaItem *item ) // recreated. All others have to!!! if ( incidence->doesRecur() ) { mUpdateItem = incidence; - TQTimer::singleShot( 0, this, TQT_SLOT( doUpdateItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( doUpdateItem() ) ); } enableAgendaUpdate( true ); diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp index 8d6b6f61..14847258 100644 --- a/korganizer/koapp.cpp +++ b/korganizer/koapp.cpp @@ -54,7 +54,7 @@ using namespace std; -KOrganizerApp::KOrganizerApp() : KUniqueApplication() +KOrganizerApp::KOrganizerApp() : TDEUniqueApplication() { TQString prodId = "-//K Desktop Environment//NONSGML KOrganizer %1//EN"; CalFormat::setApplication( "KOrganizer", prodId.arg( korgVersion ) ); diff --git a/korganizer/koapp.h b/korganizer/koapp.h index 59ead1a0..cb1cd22b 100644 --- a/korganizer/koapp.h +++ b/korganizer/koapp.h @@ -25,9 +25,9 @@ #ifndef KORGANIZERAPP_H #define KORGANIZERAPP_H -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> -class KOrganizerApp : public KUniqueApplication +class KOrganizerApp : public TDEUniqueApplication { TQ_OBJECT diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp index 8d831e07..5c8ddc39 100644 --- a/korganizer/koattendeeeditor.cpp +++ b/korganizer/koattendeeeditor.cpp @@ -109,9 +109,9 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) mNameEdit->setClickMessage( i18n("Click to add a new attendee") ); attendeeLabel->setBuddy( mNameEdit ); mNameEdit->installEventFilter( this ); - connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( updateAttendee() ) ); - connect( mNameEdit, TQT_SIGNAL(returnPressed()), TQT_SLOT(expandAttendee()) ); + connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( updateAttendee() ) ); + connect( mNameEdit, TQ_SIGNAL(returnPressed()), TQ_SLOT(expandAttendee()) ); topLayout->addMultiCellWidget( mNameEdit, 0, 0, 1, 2 ); whatsThis = i18n("Edits the role of the attendee selected " @@ -125,8 +125,8 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) TQWhatsThis::add( mRoleCombo, whatsThis ); mRoleCombo->insertStringList( Attendee::roleList() ); attendeeRoleLabel->setBuddy( mRoleCombo ); - connect( mRoleCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( updateAttendee() ) ); + connect( mRoleCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( updateAttendee() ) ); topLayout->addWidget( mRoleCombo, 1, 1 ); mDelegateLabel = new TQLabel( parent ); @@ -151,8 +151,8 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) mStatusCombo->insertItem( KOGlobals::self()->smallIcon( "help" ), Attendee::statusName( Attendee::InProcess ) ); statusLabel->setBuddy( mStatusCombo ); - connect( mStatusCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( updateAttendee() ) ); + connect( mStatusCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( updateAttendee() ) ); topLayout->addWidget( mStatusCombo, 2, 1 ); topLayout->setColStretch( 2, 1 ); @@ -163,7 +163,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) "selected in the list above to request " "a response concerning attendance.") ); mRsvpButton->setText( i18n("Re&quest response") ); - connect( mRsvpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAttendee() ) ); + connect( mRsvpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateAttendee() ) ); topLayout->addWidget( mRsvpButton, 2, 2 ); TQWidget *buttonBox = new TQWidget( parent ); @@ -179,7 +179,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) "from your addressbook, click the 'Select Addressee' " "button instead.") ); buttonLayout->addWidget( mAddButton ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addNewAttendee() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addNewAttendee() ) ); mRemoveButton = new TQPushButton( i18n("&Remove"), buttonBox ); TQWhatsThis::add( mRemoveButton, @@ -193,7 +193,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) i18n("Opens your address book, allowing you to select " "new attendees from it.") ); buttonLayout->addWidget( mAddressBookButton ); - connect( mAddressBookButton, TQT_SIGNAL( clicked() ), TQT_SLOT( openAddressBook() ) ); + connect( mAddressBookButton, TQ_SIGNAL( clicked() ), TQ_SLOT( openAddressBook() ) ); topLayout->addMultiCellWidget( buttonBox, 0, 3, 3, 3 ); @@ -277,7 +277,7 @@ void KOAttendeeEditor::addNewAttendee() // We don't want the hint again mNameEdit->setClickMessage( "" ); mNameEdit->setFocus(); - TQTimer::singleShot( 0, mNameEdit, TQT_SLOT( selectAll() ) ); + TQTimer::singleShot( 0, mNameEdit, TQ_SLOT( selectAll() ) ); } void KOAttendeeEditor::readEvent(KCal::Incidence * incidence) diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp index 9bc2adbc..5ff8a0d4 100644 --- a/korganizer/kocore.cpp +++ b/korganizer/kocore.cpp @@ -36,7 +36,7 @@ #include <kdebug.h> #include <tdeconfig.h> #include <kxmlguifactory.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tqwidget.h> diff --git a/korganizer/kocore.h b/korganizer/kocore.h index f5dd7c97..e8efe099 100644 --- a/korganizer/kocore.h +++ b/korganizer/kocore.h @@ -29,12 +29,12 @@ #include <korganizer/part.h> #include <korganizer/printplugin.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <ktrader.h> namespace KPIM { class IdentityManager; } -class KDE_EXPORT KOCore +class TDE_EXPORT KOCore { public: ~KOCore(); diff --git a/korganizer/kocounterdialog.cpp b/korganizer/kocounterdialog.cpp index 5341e1d0..dc6a76ea 100644 --- a/korganizer/kocounterdialog.cpp +++ b/korganizer/kocounterdialog.cpp @@ -39,8 +39,8 @@ KOCounterDialog::KOCounterDialog( Calendar *calendar, TQWidget *parent, const ch mEventViewer = new KOEventViewer( calendar, this ); setMainWidget( mEventViewer ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotCancel() ) ); - connect( this, TQT_SIGNAL( user2Clicked() ), TQT_SLOT( slotOk( ) ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotCancel() ) ); + connect( this, TQ_SIGNAL( user2Clicked() ), TQ_SLOT( slotOk( ) ) ); // FIXME: Set a sensible size (based on the content?). setMinimumSize( 300, 200 ); diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index d78bb43e..0a575a77 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -125,9 +125,9 @@ void KODayMatrix::setCalendar( Calendar *cal ) mCalendar->registerObserver( this ); CalendarResources *calres = dynamic_cast<CalendarResources*>( cal ); if ( calres ) { - connect( calres, TQT_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); - connect( calres, TQT_SIGNAL(signalResourceModified( ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); - connect( calres, TQT_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceModified( ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); } setAcceptDrops( mCalendar ); diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index 20ed0259..17bb056c 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp @@ -93,8 +93,8 @@ KODialogManager::KODialogManager( CalendarView *mainView ) : // don't set any specific parent for the dialog, as its kept around and reused // in different cases where it should have different parents KWin::setMainWindow( mCategoryEditDialog, 0 ); - connect( mainView, TQT_SIGNAL( categoriesChanged() ), - mCategoryEditDialog, TQT_SLOT( reload() ) ); + connect( mainView, TQ_SIGNAL( categoriesChanged() ), + mCategoryEditDialog, TQ_SLOT( reload() ) ); KOGlobals::fitDialogToScreen( mCategoryEditDialog ); } @@ -123,20 +123,20 @@ void KODialogManager::showOptionsDialog() // mOptionsDialog = new TDEConfigureDialog( TDEConfigureDialog::Configurable ); // mOptionsDialog = new TDEConfigureDialog( mMainView ); connect( mOptionsDialog->dialog(), - TQT_SIGNAL( configCommitted( const TQCString & ) ), - mMainView, TQT_SLOT( updateConfig() ) ); + TQ_SIGNAL( configCommitted( const TQCString & ) ), + mMainView, TQ_SLOT( updateConfig() ) ); #else mOptionsDialog = new KCMultiDialog( mMainView, "KorganizerPreferences" ); - connect( mOptionsDialog, TQT_SIGNAL( configCommitted( const TQCString & ) ), - mMainView, TQT_SLOT( updateConfig( const TQCString& ) ) ); + connect( mOptionsDialog, TQ_SIGNAL( configCommitted( const TQCString & ) ), + mMainView, TQ_SLOT( updateConfig( const TQCString& ) ) ); #if 0 - connect( mOptionsDialog, TQT_SIGNAL( applyClicked() ), - mMainView, TQT_SLOT( updateConfig() ) ); - connect( mOptionsDialog, TQT_SIGNAL( okClicked() ), - mMainView, TQT_SLOT( updateConfig() ) ); + connect( mOptionsDialog, TQ_SIGNAL( applyClicked() ), + mMainView, TQ_SLOT( updateConfig() ) ); + connect( mOptionsDialog, TQ_SIGNAL( okClicked() ), + mMainView, TQ_SLOT( updateConfig() ) ); // @TODO Find a way to do this with KCMultiDialog - connect(mCategoryEditDialog,TQT_SIGNAL(categoryConfigChanged()), - mOptionsDialog,TQT_SLOT(updateCategories())); + connect(mCategoryEditDialog,TQ_SIGNAL(categoryConfigChanged()), + mOptionsDialog,TQ_SLOT(updateCategories())); #endif TQStringList modules; @@ -172,13 +172,13 @@ void KODialogManager::showSearchDialog() { if ( !mSearchDialog ) { mSearchDialog = new SearchDialog( mMainView->calendar(), mMainView ); - connect( mSearchDialog, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(showIncidence(Incidence *,const TQDate &)) ); - connect( mSearchDialog, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(editIncidence(Incidence *,const TQDate &)) ); - connect( mSearchDialog, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - mMainView, TQT_SLOT(deleteIncidence(Incidence *)) ); - connect( mMainView, TQT_SIGNAL(closingDown()),mSearchDialog,TQT_SLOT(reject()) ); + connect( mSearchDialog, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(showIncidence(Incidence *,const TQDate &)) ); + connect( mSearchDialog, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(editIncidence(Incidence *,const TQDate &)) ); + connect( mSearchDialog, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + mMainView, TQ_SLOT(deleteIncidence(Incidence *)) ); + connect( mMainView, TQ_SIGNAL(closingDown()),mSearchDialog,TQ_SLOT(reject()) ); } // make sure the widget is on top again mSearchDialog->show(); @@ -190,10 +190,10 @@ void KODialogManager::showArchiveDialog() #ifndef KORG_NOARCHIVE if (!mArchiveDialog) { mArchiveDialog = new ArchiveDialog(mMainView->calendar(),mMainView); - connect(mArchiveDialog,TQT_SIGNAL(eventsDeleted()), - mMainView,TQT_SLOT(updateView())); - connect(mArchiveDialog,TQT_SIGNAL(autoArchivingSettingsModified()), - mMainView,TQT_SLOT(slotAutoArchivingSettingsModified())); + connect(mArchiveDialog,TQ_SIGNAL(eventsDeleted()), + mMainView,TQ_SLOT(updateView())); + connect(mArchiveDialog,TQ_SIGNAL(autoArchivingSettingsModified()), + mMainView,TQ_SLOT(slotAutoArchivingSettingsModified())); } mArchiveDialog->show(); mArchiveDialog->raise(); @@ -207,12 +207,12 @@ void KODialogManager::showFilterEditDialog( TQPtrList<CalFilter> *filters ) { if ( !mFilterEditDialog ) { mFilterEditDialog = new FilterEditDialog( filters, mMainView ); - connect( mFilterEditDialog, TQT_SIGNAL( filterChanged() ), - mMainView, TQT_SLOT( updateFilter() ) ); - connect( mFilterEditDialog, TQT_SIGNAL( editCategories() ), - mCategoryEditDialog, TQT_SLOT( show() ) ); - connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ), - mFilterEditDialog, TQT_SLOT( updateCategoryConfig() ) ); + connect( mFilterEditDialog, TQ_SIGNAL( filterChanged() ), + mMainView, TQ_SLOT( updateFilter() ) ); + connect( mFilterEditDialog, TQ_SIGNAL( editCategories() ), + mCategoryEditDialog, TQ_SLOT( show() ) ); + connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ), + mFilterEditDialog, TQ_SLOT( updateCategoryConfig() ) ); } mFilterEditDialog->show(); mFilterEditDialog->raise(); @@ -241,29 +241,29 @@ void KODialogManager::connectTypeAhead( KOEventEditor *editor, { if ( editor && agenda ) { agenda->setTypeAheadReceiver( editor->typeAheadReceiver() ); - connect( editor, TQT_SIGNAL( focusReceivedSignal() ), - agenda, TQT_SLOT( finishTypeAhead() ) ); + connect( editor, TQ_SIGNAL( focusReceivedSignal() ), + agenda, TQ_SLOT( finishTypeAhead() ) ); } } void KODialogManager::connectEditor( KOIncidenceEditor*editor ) { - connect( editor, TQT_SIGNAL( deleteIncidenceSignal( Incidence * ) ), - mMainView, TQT_SLOT( deleteIncidence( Incidence * ) ) ); - - connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ), - editor, TQT_SIGNAL( updateCategoryConfig() ) ); - connect( editor, TQT_SIGNAL( editCategories() ), - mCategoryEditDialog, TQT_SLOT( show() ) ); - - connect( editor, TQT_SIGNAL( dialogClose( Incidence * ) ), - mMainView, TQT_SLOT( dialogClosing( Incidence * ) ) ); - connect( editor, TQT_SIGNAL( editCanceled( Incidence * ) ), - mMainView, TQT_SLOT( editCanceled( Incidence * ) ) ); - connect( mMainView, TQT_SIGNAL( closingDown() ), editor, TQT_SLOT( reject() ) ); - - connect( editor, TQT_SIGNAL( deleteAttendee( Incidence * ) ), - mMainView, TQT_SIGNAL( cancelAttendees( Incidence * ) ) ); + connect( editor, TQ_SIGNAL( deleteIncidenceSignal( Incidence * ) ), + mMainView, TQ_SLOT( deleteIncidence( Incidence * ) ) ); + + connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ), + editor, TQ_SIGNAL( updateCategoryConfig() ) ); + connect( editor, TQ_SIGNAL( editCategories() ), + mCategoryEditDialog, TQ_SLOT( show() ) ); + + connect( editor, TQ_SIGNAL( dialogClose( Incidence * ) ), + mMainView, TQ_SLOT( dialogClosing( Incidence * ) ) ); + connect( editor, TQ_SIGNAL( editCanceled( Incidence * ) ), + mMainView, TQ_SLOT( editCanceled( Incidence * ) ) ); + connect( mMainView, TQ_SIGNAL( closingDown() ), editor, TQ_SLOT( reject() ) ); + + connect( editor, TQ_SIGNAL( deleteAttendee( Incidence * ) ), + mMainView, TQ_SIGNAL( cancelAttendees( Incidence * ) ) ); } KOTodoEditor *KODialogManager::getTodoEditor() diff --git a/korganizer/koeditoralarms.cpp b/korganizer/koeditoralarms.cpp index 1415eef5..e7d1beb9 100644 --- a/korganizer/koeditoralarms.cpp +++ b/korganizer/koeditoralarms.cpp @@ -206,25 +206,25 @@ KOEditorAlarms::KOEditorAlarms( const TQCString &type, mWidget->mAlarmList->setResizeMode( TQListView::LastColumn ); mWidget->mAlarmList->setColumnWidthMode( 0, TQListView::Maximum ); mWidget->mAlarmList->setColumnWidthMode( 1, TQListView::Maximum ); - connect( mWidget->mAlarmList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - TQT_SLOT( selectionChanged( TQListViewItem * ) ) ); - connect( mWidget->mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ) ); - connect( mWidget->mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() ) ); - connect( mWidget->mDuplicateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDuplicate() ) ); - - connect( mWidget->mAlarmOffset, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mOffsetUnit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mBeforeAfter, TQT_SIGNAL( activated( int ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mRepeats, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mRepeatCount, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mRepeatInterval, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mAlarmType, TQT_SIGNAL(clicked(int)), TQT_SLOT( changed() ) ); - connect( mWidget->mDisplayText, TQT_SIGNAL( textChanged() ), TQT_SLOT( changed() ) ); - connect( mWidget->mSoundFile, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mApplication, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mAppArguments, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mEmailAddress, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mEmailText, TQT_SIGNAL( textChanged() ), TQT_SLOT( changed() ) ); + connect( mWidget->mAlarmList, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + TQ_SLOT( selectionChanged( TQListViewItem * ) ) ); + connect( mWidget->mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() ) ); + connect( mWidget->mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() ) ); + connect( mWidget->mDuplicateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDuplicate() ) ); + + connect( mWidget->mAlarmOffset, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mOffsetUnit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mBeforeAfter, TQ_SIGNAL( activated( int ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mRepeats, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mRepeatCount, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mRepeatInterval, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mAlarmType, TQ_SIGNAL(clicked(int)), TQ_SLOT( changed() ) ); + connect( mWidget->mDisplayText, TQ_SIGNAL( textChanged() ), TQ_SLOT( changed() ) ); + connect( mWidget->mSoundFile, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mApplication, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mAppArguments, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mEmailAddress, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mEmailText, TQ_SIGNAL( textChanged() ), TQ_SLOT( changed() ) ); init(); diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index 6f46ac5f..6bf22137 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -224,10 +224,10 @@ AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item, i18n( "Enter the path to the attachment file or use the " "file browser by pressing the adjacent button" ) ); grid->addMultiCellWidget( mURLRequester, 4, 4, 1, 2 ); - connect( mURLRequester, TQT_SIGNAL(urlSelected(const TQString &)), - TQT_SLOT(urlSelected(const TQString &)) ); - connect( mURLRequester, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( urlChanged( const TQString& ) ) ); + connect( mURLRequester, TQ_SIGNAL(urlSelected(const TQString &)), + TQ_SLOT(urlSelected(const TQString &)) ); + connect( mURLRequester, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( urlChanged( const TQString& ) ) ); urlChanged( item->uri() ); } else { uint size = item->attachment()->size(); @@ -324,8 +324,8 @@ AttachmentIconView::AttachmentIconView( KOEditorAttachments* parent ) setMaxItemWidth( TQMAX(maxItemWidth(), 250) ); setMinimumHeight( TQMAX(fontMetrics().height(), 16) + 12 ); - connect( this, TQT_SIGNAL( dropped ( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ), - this, TQT_SLOT( handleDrop( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ) ); + connect( this, TQ_SIGNAL( dropped ( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ), + this, TQ_SLOT( handleDrop( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ) ); } KURL AttachmentIconView::tempFileForAttachment( KCal::Attachment *attachment ) @@ -462,12 +462,12 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent, i18n("Displays a list of current items (files, mail, etc.) " "that have been associated with this event or to-do. ") ); topLayout->addWidget( mAttachments ); - connect( mAttachments, TQT_SIGNAL( doubleClicked( TQIconViewItem * ) ), - TQT_SLOT( showAttachment( TQIconViewItem * ) ) ); - connect( mAttachments, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(selectionChanged()) ); - connect( mAttachments, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)), - TQT_SLOT(contextMenu(TQIconViewItem*,const TQPoint&)) ); + connect( mAttachments, TQ_SIGNAL( doubleClicked( TQIconViewItem * ) ), + TQ_SLOT( showAttachment( TQIconViewItem * ) ) ); + connect( mAttachments, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(selectionChanged()) ); + connect( mAttachments, TQ_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)), + TQ_SLOT(contextMenu(TQIconViewItem*,const TQPoint&)) ); TQPushButton *addButton = new TQPushButton( this ); addButton->setIconSet( SmallIconSet( "add" ) ); @@ -477,7 +477,7 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent, "to add to this event or to-do as link or as " "inline data." ) ); topLayout->addWidget( addButton ); - connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()) ); + connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()) ); mRemoveBtn = new TQPushButton( this ); mRemoveBtn->setIconSet( SmallIconSet( "remove" ) ); @@ -486,33 +486,33 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent, i18n("Removes the attachment selected in the list above " "from this event or to-do.") ); topLayout->addWidget( mRemoveBtn ); - connect( mRemoveBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()) ); + connect( mRemoveBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()) ); mContextMenu = new TDEPopupMenu( this ); - TDEActionCollection* ac = new TDEActionCollection( TQT_TQWIDGET(this), TQT_TQOBJECT(this) ); + TDEActionCollection* ac = new TDEActionCollection( this, this ); - mOpenAction = new TDEAction( i18n("Open"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShow()), ac ); + mOpenAction = new TDEAction( i18n("Open"), 0, this, TQ_SLOT(slotShow()), ac ); mOpenAction->plug( mContextMenu ); - mSaveAsAction = new TDEAction( i18n( "Save As..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), ac ); + mSaveAsAction = new TDEAction( i18n( "Save As..." ), 0, this, TQ_SLOT(slotSaveAs()), ac ); mSaveAsAction->plug( mContextMenu ); mContextMenu->insertSeparator(); - mCopyAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac ); + mCopyAction = KStdAction::copy(this, TQ_SLOT(slotCopy()), ac ); mCopyAction->plug( mContextMenu ); - mCutAction = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), ac ); + mCutAction = KStdAction::cut(this, TQ_SLOT(slotCut()), ac ); mCutAction->plug( mContextMenu ); - TDEAction *action = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), ac ); + TDEAction *action = KStdAction::paste(this, TQ_SLOT(slotPaste()), ac ); action->plug( mContextMenu ); mContextMenu->insertSeparator(); - mDeleteAction = new TDEAction( i18n( "&Remove" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), ac ); + mDeleteAction = new TDEAction( i18n( "&Remove" ), 0, this, TQ_SLOT(slotRemove()), ac ); mDeleteAction->plug( mContextMenu ); mDeleteAction->setShortcut( Key_Delete ); mContextMenu->insertSeparator(); - mEditAction = new TDEAction( i18n( "&Properties..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEdit()), ac ); + mEditAction = new TDEAction( i18n( "&Properties..." ), 0, this, TQ_SLOT(slotEdit()), ac ); mEditAction->plug( mContextMenu ); selectionChanged(); @@ -562,7 +562,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source ) TQMap<TQString,TQString> metadata; if ( KURLDrag::decode( source, urls, metadata ) ) { probablyWeHaveUris = true; - labels = TQStringList::split( ':', metadata["labels"], FALSE ); + labels = TQStringList::split( ':', metadata["labels"], false ); for ( TQStringList::Iterator it = labels.begin(); it != labels.end(); ++it ) { *it = KURL::decode_string( (*it).latin1() ); } @@ -571,7 +571,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source ) } else if ( TQTextDrag::canDecode( source ) ) { TQString text; TQTextDrag::decode( source, text ); - TQStringList lst = TQStringList::split( '\n', text, FALSE ); + TQStringList lst = TQStringList::split( '\n', text, false ); for ( TQStringList::ConstIterator it = lst.constBegin(); it != lst.constEnd(); ++it ) { urls.append( *it ); labels.append( TQString() ); @@ -691,7 +691,7 @@ void KOEditorAttachments::slotEdit() AttachmentEditDialog *dialog = new AttachmentEditDialog( attitem, mAttachments ); dialog->mInline->setEnabled( false ); dialog->setModal( false ); - connect( dialog, TQT_SIGNAL(hidden()), dialog, TQT_SLOT(delayedDestruct()) ); + connect( dialog, TQ_SIGNAL(hidden()), dialog, TQ_SLOT(delayedDestruct()) ); dialog->show(); } } @@ -854,7 +854,7 @@ void KOEditorAttachments::readIncidence( KCal::Incidence *i ) addAttachment( (*it) ); } if ( mAttachments->count() > 0 ) { - TQTimer::singleShot( 0, mAttachments, TQT_SLOT(arrangeItemsInGrid()) ); + TQTimer::singleShot( 0, mAttachments, TQ_SLOT(arrangeItemsInGrid()) ); } } diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index 95d21176..9d570f16 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -208,17 +208,17 @@ KOEditorDetails::KOEditorDetails( int spacing, TQWidget *parent, mListView->setFixedHeight( 78 ); } - connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - TQT_SLOT( updateAttendeeInput() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + TQ_SLOT( updateAttendeeInput() ) ); #ifndef KORG_NODND - connect( mListView, TQT_SIGNAL( dropped( Attendee * ) ), - TQT_SLOT( slotInsertAttendee( Attendee * ) ) ); + connect( mListView, TQ_SIGNAL( dropped( Attendee * ) ), + TQ_SLOT( slotInsertAttendee( Attendee * ) ) ); #endif topLayout->addWidget( mListView ); initEditWidgets( this, topLayout ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeAttendee()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeAttendee()) ); updateAttendeeInput(); } diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp index 62d874dd..05db9b5d 100644 --- a/korganizer/koeditorfreebusy.cpp +++ b/korganizer/koeditorfreebusy.cpp @@ -263,15 +263,15 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, scaleCombo->insertItem( i18n( "Month" ) ); scaleCombo->insertItem( i18n( "Automatic" ) ); scaleCombo->setCurrentItem( 0 ); // start with "hour" - connect( scaleCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotScaleChanged( int ) ) ); + connect( scaleCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotScaleChanged( int ) ) ); controlLayout->addWidget( scaleCombo ); TQPushButton *button = new TQPushButton( i18n( "Center on Start" ), this ); TQWhatsThis::add( button, i18n("Centers the Gantt chart on the start time " "and day of this event.") ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCenterOnStart() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCenterOnStart() ) ); controlLayout->addWidget( button ); controlLayout->addStretch( 1 ); @@ -280,7 +280,7 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, TQWhatsThis::add( button, i18n("Moves the event to a date and time when all the " "attendees are free.") ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPickDate() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotPickDate() ) ); controlLayout->addWidget( button ); controlLayout->addStretch( 1 ); @@ -290,7 +290,7 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, i18n("Reloads Free/Busy data for all attendees from " "the corresponding servers.") ); controlLayout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( manualReload() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( manualReload() ) ); mGanttView = new KDGanttView( this, "mGanttView" ); TQWhatsThis::add( mGanttView, @@ -330,37 +330,37 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, mEventRectangle->setColor( TQt::magenta ); mGanttView->addIntervalBackgroundColor( mEventRectangle ); - connect( mGanttView, TQT_SIGNAL ( timeIntervalSelected( const TQDateTime &, + connect( mGanttView, TQ_SIGNAL ( timeIntervalSelected( const TQDateTime &, const TQDateTime & ) ), - mGanttView, TQT_SLOT( zoomToSelection( const TQDateTime &, + mGanttView, TQ_SLOT( zoomToSelection( const TQDateTime &, const TQDateTime & ) ) ); - connect( mGanttView, TQT_SIGNAL( lvItemDoubleClicked( KDGanttViewItem * ) ), - TQT_SLOT( editFreeBusyUrl( KDGanttViewItem * ) ) ); - connect( mGanttView, TQT_SIGNAL( intervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ), - this, TQT_SLOT( slotIntervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ) ); - - connect( mGanttView, TQT_SIGNAL(lvSelectionChanged(KDGanttViewItem*)), - this, TQT_SLOT(updateAttendeeInput()) ); - connect( mGanttView, TQT_SIGNAL(lvItemLeftClicked(KDGanttViewItem*)), - this, TQT_SLOT(showAttendeeStatusMenu()) ); - connect( mGanttView, TQT_SIGNAL(lvItemRightClicked(KDGanttViewItem*)), - this, TQT_SLOT(showAttendeeStatusMenu()) ); - connect( mGanttView, TQT_SIGNAL(lvMouseButtonClicked(int, KDGanttViewItem*, const TQPoint&, int)), - this, TQT_SLOT(listViewClicked(int, KDGanttViewItem*)) ); + connect( mGanttView, TQ_SIGNAL( lvItemDoubleClicked( KDGanttViewItem * ) ), + TQ_SLOT( editFreeBusyUrl( KDGanttViewItem * ) ) ); + connect( mGanttView, TQ_SIGNAL( intervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ), + this, TQ_SLOT( slotIntervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ) ); + + connect( mGanttView, TQ_SIGNAL(lvSelectionChanged(KDGanttViewItem*)), + this, TQ_SLOT(updateAttendeeInput()) ); + connect( mGanttView, TQ_SIGNAL(lvItemLeftClicked(KDGanttViewItem*)), + this, TQ_SLOT(showAttendeeStatusMenu()) ); + connect( mGanttView, TQ_SIGNAL(lvItemRightClicked(KDGanttViewItem*)), + this, TQ_SLOT(showAttendeeStatusMenu()) ); + connect( mGanttView, TQ_SIGNAL(lvMouseButtonClicked(int, KDGanttViewItem*, const TQPoint&, int)), + this, TQ_SLOT(listViewClicked(int, KDGanttViewItem*)) ); FreeBusyManager *m = KOGroupware::instance()->freeBusyManager(); - connect( m, TQT_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ), - TQT_SLOT( slotInsertFreeBusy( KCal::FreeBusy *, const TQString & ) ) ); + connect( m, TQ_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ), + TQ_SLOT( slotInsertFreeBusy( KCal::FreeBusy *, const TQString & ) ) ); - connect( &mReloadTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( autoReload() ) ); + connect( &mReloadTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( autoReload() ) ); initEditWidgets( this, topLayout ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), - TQT_SLOT(removeAttendee()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), + TQ_SLOT(removeAttendee()) ); slotOrganizerChanged( mOrganizerCombo->currentText() ); - connect( mOrganizerCombo, TQT_SIGNAL( activated(const TQString&) ), - this, TQT_SLOT( slotOrganizerChanged(const TQString&) ) ); + connect( mOrganizerCombo, TQ_SIGNAL( activated(const TQString&) ), + this, TQ_SLOT( slotOrganizerChanged(const TQString&) ) ); //suppress the buggy consequences of clicks on the time header widget mGanttView->timeHeaderWidget()->installEventFilter( this ); diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 304fea93..54504198 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp @@ -47,7 +47,7 @@ #include <tdemessagebox.h> #include <tdefiledialog.h> #include <ksqueezedtextlabel.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktextedit.h> #include <krestrictedline.h> @@ -114,8 +114,8 @@ void KOEditorGeneral::initHeader( TQWidget *parent,TQBoxLayout *topLayout) mSummaryEdit = new FocusLineEdit( parent ); TQWhatsThis::add( mSummaryEdit, whatsThis ); - connect( mSummaryEdit, TQT_SIGNAL( focusReceivedSignal() ), - TQT_SIGNAL( focusReceivedSignal() ) ); + connect( mSummaryEdit, TQ_SIGNAL( focusReceivedSignal() ), + TQ_SIGNAL( focusReceivedSignal() ) ); headerLayout->addWidget(mSummaryEdit,1,1); summaryLabel->setBuddy( mSummaryEdit ); @@ -152,7 +152,7 @@ void KOEditorGeneral::initHeader( TQWidget *parent,TQBoxLayout *topLayout) mCategoriesButton = new TQPushButton( parent ); mCategoriesButton->setText(i18n("Select...")); TQWhatsThis::add( mCategoriesButton, whatsThis ); - connect(mCategoriesButton,TQT_SIGNAL(clicked()),TQT_SLOT(selectCategories())); + connect(mCategoriesButton,TQ_SIGNAL(clicked()),TQ_SLOT(selectCategories())); thirdLineLayout->addWidget( mCategoriesButton ); } @@ -209,7 +209,7 @@ void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout ) i18n( "Push this button to create an advanced set of reminders " "for this event or to-do." ) ); TQToolTip::add( mAlarmAdvancedButton, i18n( "Set an advanced reminder" ) ); - connect( mAlarmAdvancedButton, TQT_SIGNAL(clicked()), TQT_SLOT(editAlarms()) ); + connect( mAlarmAdvancedButton, TQ_SIGNAL(clicked()), TQ_SLOT(editAlarms()) ); alarmLayout->addWidget( mAlarmAdvancedButton ); mSimpleAlarmBox = new TQHBox( parent ); @@ -247,17 +247,17 @@ void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout ) mAlarmTimeEdit->setEnabled( false ); mAlarmIncrCombo->setEnabled( false ); mAlarmInfoLabel->setEnabled( false ); - connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmAdvancedButton, TQT_SLOT(setEnabled(bool)) ); - connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmTimeEdit, TQT_SLOT(setEnabled(bool)) ); - connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmIncrCombo, TQT_SLOT(setEnabled(bool)) ); - connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmInfoLabel, TQT_SLOT(setEnabled(bool)) ); + connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmAdvancedButton, TQ_SLOT(setEnabled(bool)) ); + connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmTimeEdit, TQ_SLOT(setEnabled(bool)) ); + connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmIncrCombo, TQ_SLOT(setEnabled(bool)) ); + connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmInfoLabel, TQ_SLOT(setEnabled(bool)) ); } void KOEditorGeneral::initAttachments(TQWidget *parent,TQBoxLayout *topLayout) { mAttachments = new KOEditorAttachments( KDialog::spacingHint(), parent ); - connect( mAttachments, TQT_SIGNAL( openURL( const KURL & ) ) , - this, TQT_SIGNAL( openURL( const KURL & ) ) ); + connect( mAttachments, TQ_SIGNAL( openURL( const KURL & ) ) , + this, TQ_SIGNAL( openURL( const KURL & ) ) ); topLayout->addWidget( mAttachments, 1 ); } @@ -290,8 +290,8 @@ void KOEditorGeneral::selectCategories() KOGlobals::fitDialogToScreen( categoryDialog ); categoryDialog->setSelected( mCategories ); - connect(categoryDialog, TQT_SIGNAL(editCategories()), this, TQT_SIGNAL(openCategoryDialog())); - connect(this, TQT_SIGNAL(updateCategoryConfig()), categoryDialog, TQT_SLOT(updateCategoryConfig())); + connect(categoryDialog, TQ_SIGNAL(editCategories()), this, TQ_SIGNAL(openCategoryDialog())); + connect(this, TQ_SIGNAL(updateCategoryConfig()), categoryDialog, TQ_SLOT(updateCategoryConfig())); if ( categoryDialog->exec() ) { setCategories( categoryDialog->selectedCategories() ); @@ -573,7 +573,7 @@ void KOEditorGeneral::setDescription( const TQString &text ) TQObject *KOEditorGeneral::typeAheadReceiver() const { - return TQT_TQOBJECT(mSummaryEdit); + return mSummaryEdit; } void KOEditorGeneral::updateAttendeeSummary(int count) diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index a5835ae3..5f2ecae6 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -41,7 +41,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <tdefiledialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktextedit.h> #include <libkcal/event.h> @@ -60,10 +60,10 @@ KOEditorGeneralEvent::KOEditorGeneralEvent(TQObject* parent, const char* name) : KOEditorGeneral( parent, name) { - connect( this, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )), - TQT_SLOT( setDuration() ) ); - connect( this, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )), - TQT_SLOT( emitDateTimeStr() )); + connect( this, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )), + TQ_SLOT( setDuration() ) ); + connect( this, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )), + TQ_SLOT( emitDateTimeStr() )); } KOEditorGeneralEvent::~KOEditorGeneralEvent() @@ -130,22 +130,22 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout) mAlldayEventCheckbox = new TQCheckBox(i18n("All-&day"),timeBoxFrame); layoutTimeBox->addWidget( mAlldayEventCheckbox, 0, 3 ); - connect(mAlldayEventCheckbox, TQT_SIGNAL(toggled(bool)),TQT_SLOT(associateTime(bool))); + connect(mAlldayEventCheckbox, TQ_SIGNAL(toggled(bool)),TQ_SLOT(associateTime(bool))); mDurationLabel = new TQLabel( timeBoxFrame ); layoutTimeBox->addWidget( mDurationLabel, 1, 3 ); // time widgets are checked if they contain a valid time - connect(mStartTimeEdit, TQT_SIGNAL(timeChanged(TQTime)), - this, TQT_SLOT(startTimeChanged(TQTime))); - connect(mEndTimeEdit, TQT_SIGNAL(timeChanged(TQTime)), - this, TQT_SLOT(endTimeChanged(TQTime))); + connect(mStartTimeEdit, TQ_SIGNAL(timeChanged(TQTime)), + this, TQ_SLOT(startTimeChanged(TQTime))); + connect(mEndTimeEdit, TQ_SIGNAL(timeChanged(TQTime)), + this, TQ_SLOT(endTimeChanged(TQTime))); // date widgets are checked if they contain a valid date - connect(mStartDateEdit, TQT_SIGNAL(dateChanged(const TQDate&)), - this, TQT_SLOT(startDateChanged(const TQDate&))); - connect(mEndDateEdit, TQT_SIGNAL(dateChanged(const TQDate&)), - this, TQT_SLOT(endDateChanged(const TQDate&))); + connect(mStartDateEdit, TQ_SIGNAL(dateChanged(const TQDate&)), + this, TQ_SLOT(startDateChanged(const TQDate&))); + connect(mEndDateEdit, TQ_SIGNAL(dateChanged(const TQDate&)), + this, TQ_SLOT(endDateChanged(const TQDate&))); TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame ); layoutTimeBox->addWidget( label, 2, 0 ); @@ -154,7 +154,7 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout) mRecEditButton = new TQPushButton( timeBoxFrame ); mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) ); recLayout->addWidget( mRecEditButton ); - connect( mRecEditButton, TQT_SIGNAL(clicked()), TQT_SIGNAL(editRecurrence()) ); + connect( mRecEditButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(editRecurrence()) ); mRecEditLabel = new TQLabel( TQString(), timeBoxFrame ); recLayout->addWidget( mRecEditLabel ); recLayout->addStretch( 1 ); @@ -206,12 +206,12 @@ void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * la barLayout->addWidget( label ); barLayout->addStretch( 1 ); TQPushButton *button = new TQPushButton( i18n("Accept"), mInvitationBar ); - connect( button, TQT_SIGNAL(clicked()), TQT_SIGNAL(acceptInvitation()) ); - connect( button, TQT_SIGNAL(clicked()), mInvitationBar, TQT_SLOT(hide()) ); + connect( button, TQ_SIGNAL(clicked()), TQ_SIGNAL(acceptInvitation()) ); + connect( button, TQ_SIGNAL(clicked()), mInvitationBar, TQ_SLOT(hide()) ); barLayout->addWidget( button ); button = new TQPushButton( i18n("Decline"), mInvitationBar ); - connect( button, TQT_SIGNAL(clicked()), TQT_SIGNAL(declineInvitation()) ); - connect( button, TQT_SIGNAL(clicked()), mInvitationBar, TQT_SLOT(hide()) ); + connect( button, TQ_SIGNAL(clicked()), TQ_SIGNAL(declineInvitation()) ); + connect( button, TQ_SIGNAL(clicked()), mInvitationBar, TQ_SLOT(hide()) ); barLayout->addWidget( button ); mInvitationBar->hide(); diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp index 9b27c063..34191bed 100644 --- a/korganizer/koeditorgeneraljournal.cpp +++ b/korganizer/koeditorgeneraljournal.cpp @@ -47,7 +47,7 @@ KOEditorGeneralJournal::KOEditorGeneralJournal( TQWidget *parent, const char *name ) - : KOEditorGeneral( TQT_TQOBJECT(parent), name ) + : KOEditorGeneral( parent, name ) { setType( "Journal" ); } @@ -94,8 +94,8 @@ void KOEditorGeneralJournal::initDate( TQWidget *parent, TQBoxLayout *topLayout mTimeEdit = new KTimeEdit( parent ); dateLayout->addWidget( mTimeEdit ); - connect( mTimeCheckBox, TQT_SIGNAL(toggled(bool)), - mTimeEdit, TQT_SLOT(setEnabled(bool)) ); + connect( mTimeCheckBox, TQ_SIGNAL(toggled(bool)), + mTimeEdit, TQ_SLOT(setEnabled(bool)) ); dateLayout->addStretch(); setTime( TQTime( -1, -1, -1 ) ); diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index e46e450d..80a6456f 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp @@ -40,7 +40,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <ktextedit.h> @@ -113,46 +113,46 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout) mStartCheck = new TQCheckBox(i18n("Sta&rt:"),timeBoxFrame); TQWhatsThis::add( mStartCheck, whatsThis ); layoutTimeBox->addWidget(mStartCheck,0,0); - connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableStartEdit(bool))); - connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(startDateModified())); + connect(mStartCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(enableStartEdit(bool))); + connect(mStartCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(startDateModified())); mStartDateEdit = new KDateEdit(timeBoxFrame); TQWhatsThis::add( mStartDateEdit, whatsThis ); layoutTimeBox->addWidget(mStartDateEdit,0,1); - connect(mStartDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(startDateModified())); + connect(mStartDateEdit,TQ_SIGNAL(dateChanged(const TQDate&)),TQ_SLOT(startDateModified())); mStartTimeEdit = new KTimeEdit(timeBoxFrame); TQWhatsThis::add( mStartTimeEdit, i18n("Sets the start time for this to-do.") ); layoutTimeBox->addWidget(mStartTimeEdit,0,2); - connect(mStartTimeEdit,TQT_SIGNAL(timeChanged(TQTime)),TQT_SLOT(startDateModified())); + connect(mStartTimeEdit,TQ_SIGNAL(timeChanged(TQTime)),TQ_SLOT(startDateModified())); whatsThis = i18n("Sets the due date for this to-do."); mDueCheck = new TQCheckBox(i18n("&Due:"),timeBoxFrame); TQWhatsThis::add( mDueCheck, whatsThis ); layoutTimeBox->addWidget(mDueCheck,1,0); - connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableDueEdit(bool))); - connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SIGNAL(dueDateEditToggle(bool))); - connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged())); + connect(mDueCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(enableDueEdit(bool))); + connect(mDueCheck,TQ_SIGNAL(toggled(bool)),TQ_SIGNAL(dueDateEditToggle(bool))); + connect(mDueCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(dateChanged())); mDueDateEdit = new KDateEdit(timeBoxFrame); TQWhatsThis::add( mDueDateEdit, whatsThis ); layoutTimeBox->addWidget(mDueDateEdit,1,1); - connect(mDueDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(dateChanged())); + connect(mDueDateEdit,TQ_SIGNAL(dateChanged(const TQDate&)),TQ_SLOT(dateChanged())); mDueTimeEdit = new KTimeEdit(timeBoxFrame); TQWhatsThis::add( mDueTimeEdit, i18n("Sets the due time for this to-do.") ); layoutTimeBox->addWidget(mDueTimeEdit,1,2); - connect(mDueTimeEdit,TQT_SIGNAL(timeChanged( TQTime )),TQT_SLOT(dateChanged())); + connect(mDueTimeEdit,TQ_SIGNAL(timeChanged( TQTime )),TQ_SLOT(dateChanged())); mTimeButton = new TQCheckBox(i18n("Ti&me associated"),timeBoxFrame); TQWhatsThis::add( mTimeButton, i18n("Sets whether or not this to-do's start and due dates " "have times associated with them.") ); layoutTimeBox->addWidget( mTimeButton, 0, 3 ); - connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableTimeEdits(bool))); - connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged())); + connect(mTimeButton,TQ_SIGNAL(toggled(bool)),TQ_SLOT(enableTimeEdits(bool))); + connect(mTimeButton,TQ_SIGNAL(toggled(bool)),TQ_SLOT(dateChanged())); TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame ); layoutTimeBox->addWidget( label, 3, 0 ); @@ -161,7 +161,7 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout) mRecEditButton = new TQPushButton( timeBoxFrame ); mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) ); recLayout->addWidget( mRecEditButton ); - connect( mRecEditButton, TQT_SIGNAL(clicked()), TQT_SIGNAL(editRecurrence()) ); + connect( mRecEditButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(editRecurrence()) ); mRecEditLabel = new TQLabel( TQString(), timeBoxFrame ); recLayout->addWidget( mRecEditLabel ); recLayout->addStretch( 1 ); @@ -195,7 +195,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo TQWhatsThis::add( mCompletedToggle, i18n( "Click this checkbox to toggle the completed percentage of the to-do " "between 0% or 100%" ) ); - connect( mCompletedToggle, TQT_SIGNAL(clicked()), TQT_SLOT(completedChanged()) ); + connect( mCompletedToggle, TQ_SIGNAL(clicked()), TQ_SLOT(completedChanged()) ); completionLayout->addWidget( mCompletedToggle ); label->setBuddy( mCompletedToggle ); @@ -209,7 +209,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo TQString label = i18n( "Percent complete", "%1 %" ).arg( i ); mCompletedCombo->insertItem( label ); } - connect( mCompletedCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(completedChanged(int)) ); + connect( mCompletedCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(completedChanged(int)) ); completionLayout->addWidget( mCompletedCombo ); mCompletedLabel = new TQLabel( i18n( "completed on", "on" ), parent ); diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index ea73d2fb..5a5beae6 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -620,12 +620,12 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) : boxLayout->setRowStretch( 4, 1 ); boxLayout->setColStretch( 1, 3 ); - connect( addExceptionButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( addException() ) ); - connect( changeExceptionButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( changeException() ) ); - connect( deleteExceptionButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( deleteException() ) ); + connect( addExceptionButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( addException() ) ); + connect( changeExceptionButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( changeException() ) ); + connect( deleteExceptionButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( deleteException() ) ); } void ExceptionsWidget::addException() @@ -765,12 +765,12 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( TQWidget *parent, endDateLayout->addStretch( 1 ); - connect( mNoEndDateButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( showCurrentRange() ) ); - connect( mEndDurationButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( showCurrentRange() ) ); - connect( mEndDateButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( showCurrentRange() ) ); + connect( mNoEndDateButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( showCurrentRange() ) ); + connect( mEndDurationButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( showCurrentRange() ) ); + connect( mEndDateButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( showCurrentRange() ) ); } void RecurrenceRangeWidget::setDefaults( const TQDateTime &from ) @@ -887,7 +887,7 @@ RecurrenceChooser::RecurrenceChooser( TQWidget *parent, const char *name ) : topLayout->addWidget( mTypeCombo ); - connect( mTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( emitChoice() ) ); + connect( mTypeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( emitChoice() ) ); } else { mTypeCombo = 0; @@ -912,14 +912,14 @@ RecurrenceChooser::RecurrenceChooser( TQWidget *parent, const char *name ) : i18n("Sets the event or to-do to recur yearly according " "to the specified rules.") ); - connect( mDailyButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( emitChoice() ) ); - connect( mWeeklyButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( emitChoice() ) ); - connect( mMonthlyButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( emitChoice() ) ); - connect( mYearlyButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( emitChoice() ) ); + connect( mDailyButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( emitChoice() ) ); + connect( mWeeklyButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( emitChoice() ) ); + connect( mMonthlyButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( emitChoice() ) ); + connect( mYearlyButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( emitChoice() ) ); } } @@ -975,8 +975,8 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) : TQWhatsThis::add( mEnabledCheck, i18n("Enables recurrence for this event or to-do according " "to the specified rules.") ); - connect( mEnabledCheck, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( setRecurrenceEnabled( bool ) ) ); + connect( mEnabledCheck, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( setRecurrenceEnabled( bool ) ) ); topLayout->addMultiCellWidget( mEnabledCheck, 0, 0, 0, 1 ); @@ -1013,8 +1013,8 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) : } mRecurrenceChooser = new RecurrenceChooser( mRuleBox ); - connect( mRecurrenceChooser, TQT_SIGNAL( chosen( int ) ), - TQT_SLOT( showCurrentRule( int ) ) ); + connect( mRecurrenceChooser, TQ_SIGNAL( chosen( int ) ), + TQ_SLOT( showCurrentRule( int ) ) ); if ( !KOPrefs::instance()->mCompactDialogs ) { TQFrame *ruleSepFrame = new TQFrame( mRuleBox ); @@ -1047,16 +1047,16 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) : i18n("Options concerning the time range during which " "this event or to-do should recur.") ); topLayout->addWidget( mRecurrenceRangeButton, 3, 0 ); - connect( mRecurrenceRangeButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( showRecurrenceRangeDialog() ) ); + connect( mRecurrenceRangeButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( showRecurrenceRangeDialog() ) ); mExceptionsWidget = 0; mExceptionsDialog = new ExceptionsDialog( this ); mExceptions = mExceptionsDialog; mExceptionsButton = new TQPushButton( i18n("Exceptions..."), this ); topLayout->addWidget( mExceptionsButton, 4, 0 ); - connect( mExceptionsButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( showExceptionsDialog() ) ); + connect( mExceptionsButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( showExceptionsDialog() ) ); } else { mRecurrenceRangeWidget = new RecurrenceRangeWidget( this ); diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp index ef2dc5df..6bc3c0be 100644 --- a/korganizer/koeventeditor.cpp +++ b/korganizer/koeventeditor.cpp @@ -70,39 +70,39 @@ void KOEventEditor::init() setupDesignerTabs( "event" ); // Propagate date time settings to recurrence tab - connect( mGeneral, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), - mRecurrence, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime &) ) ); - connect( mGeneral, TQT_SIGNAL( dateTimeStrChanged( const TQString & ) ), - mRecurrence, TQT_SLOT( setDateTimeStr( const TQString & ) ) ); - connect( mFreeBusy, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), - mRecurrence, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); + connect( mGeneral, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), + mRecurrence, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime &) ) ); + connect( mGeneral, TQ_SIGNAL( dateTimeStrChanged( const TQString & ) ), + mRecurrence, TQ_SLOT( setDateTimeStr( const TQString & ) ) ); + connect( mFreeBusy, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), + mRecurrence, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); // Propagate date time settings to gantt tab and back - connect( mGeneral, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), - mFreeBusy, TQT_SLOT( slotUpdateGanttView( const TQDateTime &, const TQDateTime & ) ) ); - connect( mFreeBusy, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), - mGeneral, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); - - connect( mGeneral, TQT_SIGNAL( focusReceivedSignal() ), - TQT_SIGNAL( focusReceivedSignal() ) ); - - connect( mGeneral, TQT_SIGNAL( openCategoryDialog() ), - TQT_SIGNAL( editCategories() ) ); - connect( this, TQT_SIGNAL( updateCategoryConfig() ), - mGeneral, TQT_SIGNAL( updateCategoryConfig() ) ); - - connect( mFreeBusy, TQT_SIGNAL(updateAttendeeSummary(int)), - mGeneral, TQT_SLOT(updateAttendeeSummary(int)) ); - - connect( mGeneral, TQT_SIGNAL(editRecurrence()), - mRecurrenceDialog, TQT_SLOT(show()) ); - connect( mRecurrenceDialog, TQT_SIGNAL(okClicked()), - TQT_SLOT(updateRecurrenceSummary()) ); - - connect( mGeneral, TQT_SIGNAL(acceptInvitation()), - mFreeBusy, TQT_SLOT(acceptForMe()) ); - connect( mGeneral, TQT_SIGNAL(declineInvitation()), - mFreeBusy, TQT_SLOT(declineForMe()) ); + connect( mGeneral, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), + mFreeBusy, TQ_SLOT( slotUpdateGanttView( const TQDateTime &, const TQDateTime & ) ) ); + connect( mFreeBusy, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), + mGeneral, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); + + connect( mGeneral, TQ_SIGNAL( focusReceivedSignal() ), + TQ_SIGNAL( focusReceivedSignal() ) ); + + connect( mGeneral, TQ_SIGNAL( openCategoryDialog() ), + TQ_SIGNAL( editCategories() ) ); + connect( this, TQ_SIGNAL( updateCategoryConfig() ), + mGeneral, TQ_SIGNAL( updateCategoryConfig() ) ); + + connect( mFreeBusy, TQ_SIGNAL(updateAttendeeSummary(int)), + mGeneral, TQ_SLOT(updateAttendeeSummary(int)) ); + + connect( mGeneral, TQ_SIGNAL(editRecurrence()), + mRecurrenceDialog, TQ_SLOT(show()) ); + connect( mRecurrenceDialog, TQ_SIGNAL(okClicked()), + TQ_SLOT(updateRecurrenceSummary()) ); + + connect( mGeneral, TQ_SIGNAL(acceptInvitation()), + mFreeBusy, TQ_SLOT(acceptForMe()) ); + connect( mGeneral, TQ_SIGNAL(declineInvitation()), + mFreeBusy, TQ_SLOT(declineForMe()) ); } void KOEventEditor::reload() @@ -116,7 +116,7 @@ void KOEventEditor::reload() void KOEventEditor::setupGeneral() { - mGeneral = new KOEditorGeneralEvent( TQT_TQOBJECT(this) ); + mGeneral = new KOEditorGeneralEvent( this ); if( KOPrefs::instance()->mCompactDialogs ) { TQFrame *topFrame = addPage(i18n("General")); @@ -154,10 +154,10 @@ void KOEventEditor::setupGeneral() mGeneral->initTime(topFrame,topLayout); mGeneral->initDescription(topFrame,topLayout); mGeneral->initAttachments(topFrame,topLayout); - connect( mGeneral, TQT_SIGNAL( openURL( const KURL& ) ), - this, TQT_SLOT( openURL( const KURL& ) ) ); - connect( this, TQT_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ), - mGeneral, TQT_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) ); + connect( mGeneral, TQ_SIGNAL( openURL( const KURL& ) ), + this, TQ_SLOT( openURL( const KURL& ) ) ); + connect( this, TQ_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ), + mGeneral, TQ_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) ); } mGeneral->finishSetup(); diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index 73a0942e..1ab4b89e 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp @@ -50,44 +50,44 @@ KOEventPopupMenu::KOEventPopupMenu() mCurrentDate = TQDate(); mHasAdditionalItems = false; - insertItem( i18n("&Show"), this, TQT_SLOT( popupShow() ) ); + insertItem( i18n("&Show"), this, TQ_SLOT( popupShow() ) ); mEditOnlyItems.append( - insertItem(i18n("&Edit..."), this, TQT_SLOT( popupEdit() ) ) ); + insertItem(i18n("&Edit..."), this, TQ_SLOT( popupEdit() ) ) ); #ifndef KORG_NOPRINTER insertItem( KOGlobals::self()->smallIcon("printer"), i18n("&Print..."), - this, TQT_SLOT( print() ) ); + this, TQ_SLOT( print() ) ); #endif //------------------------------------------------------------------------ mEditOnlyItems.append( insertSeparator() ); mEditOnlyItems.append( insertItem( KOGlobals::self()->smallIcon("edit-cut"), i18n("&Cut"), - this, TQT_SLOT( popupCut() ) ) ); + this, TQ_SLOT( popupCut() ) ) ); mEditOnlyItems.append( insertItem( KOGlobals::self()->smallIcon("edit-copy"), i18n("&Copy"), - this, TQT_SLOT( popupCopy() ) ) ); + this, TQ_SLOT( popupCopy() ) ) ); // paste is always possible insertItem( KOGlobals::self()->smallIcon("edit-paste"), i18n("&Paste"), - this, TQT_SLOT( popupPaste() ) ); + this, TQ_SLOT( popupPaste() ) ); mEditOnlyItems.append( insertItem( KOGlobals::self()->smallIcon("edit-delete"), i18n("&Delete"), - this, TQT_SLOT( popupDelete() ) ) ); + this, TQ_SLOT( popupDelete() ) ) ); //------------------------------------------------------------------------ mEditOnlyItems.append( insertSeparator() ); mEditOnlyItems.append( insertItem( KOGlobals::self()->smallIcon("bell"), i18n("&Toggle Reminder"), - this, TQT_SLOT( popupAlarm() ) ) ); + this, TQ_SLOT( popupAlarm() ) ) ); //------------------------------------------------------------------------ mRecurrenceItems.append( insertSeparator() ); mRecurrenceItems.append( insertItem( i18n("&Dissociate This Occurrence"), - this, TQT_SLOT( dissociateOccurrence() ) ) ); + this, TQ_SLOT( dissociateOccurrence() ) ) ); mRecurrenceItems.append( insertItem( i18n("&Dissociate Future Occurrences"), - this, TQT_SLOT( dissociateFutureOccurrence() ) ) ); + this, TQ_SLOT( dissociateFutureOccurrence() ) ) ); insertSeparator(); insertItem( KOGlobals::self()->smallIcon("mail-forward"), i18n( "Send as iCalendar..."), - this, TQT_SLOT(forward()) ); + this, TQ_SLOT(forward()) ); } void KOEventPopupMenu::showIncidencePopup( Calendar *cal, Incidence *incidence, const TQDate &qd ) @@ -142,7 +142,7 @@ void KOEventPopupMenu::print() #ifndef KORG_NOPRINTER KOCoreHelper helper; CalPrinter printer( this, mCalendar, &helper ); - connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) ); + connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) ); Incidence::List selectedIncidences; selectedIncidences.append( mCurrentIncidence ); diff --git a/korganizer/koeventview.cpp b/korganizer/koeventview.cpp index 9bd038d2..7ac37573 100644 --- a/korganizer/koeventview.cpp +++ b/korganizer/koeventview.cpp @@ -61,24 +61,24 @@ KOEventPopupMenu *KOEventView::eventPopup() { KOEventPopupMenu *eventPopup = new KOEventPopupMenu; - connect( eventPopup, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); - connect( eventPopup, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); - connect( eventPopup, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) ); - connect( eventPopup, TQT_SIGNAL(cutIncidenceSignal(Incidence *)), - TQT_SIGNAL(cutIncidenceSignal(Incidence *)) ); - connect( eventPopup, TQT_SIGNAL(copyIncidenceSignal(Incidence *)), - TQT_SIGNAL(copyIncidenceSignal(Incidence *)) ); - connect( eventPopup, TQT_SIGNAL(pasteIncidenceSignal()), - TQT_SIGNAL(pasteIncidenceSignal()) ); - connect( eventPopup, TQT_SIGNAL(toggleAlarmSignal(Incidence *)), - TQT_SIGNAL(toggleAlarmSignal(Incidence*)) ); - connect( eventPopup, TQT_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)) ); - connect( eventPopup, TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)) ); + connect( eventPopup, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); + connect( eventPopup, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); + connect( eventPopup, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) ); + connect( eventPopup, TQ_SIGNAL(cutIncidenceSignal(Incidence *)), + TQ_SIGNAL(cutIncidenceSignal(Incidence *)) ); + connect( eventPopup, TQ_SIGNAL(copyIncidenceSignal(Incidence *)), + TQ_SIGNAL(copyIncidenceSignal(Incidence *)) ); + connect( eventPopup, TQ_SIGNAL(pasteIncidenceSignal()), + TQ_SIGNAL(pasteIncidenceSignal()) ); + connect( eventPopup, TQ_SIGNAL(toggleAlarmSignal(Incidence *)), + TQ_SIGNAL(toggleAlarmSignal(Incidence*)) ); + connect( eventPopup, TQ_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)) ); + connect( eventPopup, TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)) ); return eventPopup; } diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index ddd4fcde..7d36b4aa 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -43,7 +43,7 @@ KOEventViewer::KOEventViewer( Calendar *calendar, TQWidget *parent, const char * : TQTextBrowser( parent, name ), mCalendar( calendar ), mDefaultText("") { mIncidence = 0; - connect( this, TQT_SIGNAL(highlighted(const TQString &)), TQT_SLOT(message(const TQString &)) ); + connect( this, TQ_SIGNAL(highlighted(const TQString &)), TQ_SLOT(message(const TQString &)) ); } KOEventViewer::~KOEventViewer() diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h index 7758cfdc..0a71274b 100644 --- a/korganizer/koeventviewer.h +++ b/korganizer/koeventviewer.h @@ -24,7 +24,7 @@ #ifndef KOEVENTVIEWER_H #define KOEVENTVIEWER_H -#include <kdemacros.h> +#include <tdemacros.h> #include <tdeconfig.h> #include <tqtextbrowser.h> @@ -37,7 +37,7 @@ using namespace KCal; /** Viewer widget for events. */ -class KDE_EXPORT KOEventViewer : public TQTextBrowser +class TDE_EXPORT KOEventViewer : public TQTextBrowser { TQ_OBJECT diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index 7e783695..12a2f79d 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp @@ -43,7 +43,7 @@ KOEventViewerDialog::KOEventViewerDialog( Calendar *calendar, TQWidget *parent, setMinimumSize( 500, 500 ); resize( 520, 500 ); } - connect( this, TQT_SIGNAL(finished()), this, TQT_SLOT(delayedDestruct()) ); + connect( this, TQ_SIGNAL(finished()), this, TQ_SLOT(delayedDestruct()) ); } KOEventViewerDialog::~KOEventViewerDialog() diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h index 48c02c8a..a56fc8a1 100644 --- a/korganizer/koeventviewerdialog.h +++ b/korganizer/koeventviewerdialog.h @@ -25,7 +25,7 @@ #define KOEVENTVIEWERDIALOG_H #include <kdialogbase.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "koeventviewer.h" namespace KCal { @@ -38,7 +38,7 @@ class KOEventViewer; /** Viewer dialog for events. */ -class KDE_EXPORT KOEventViewerDialog : public KDialogBase +class TDE_EXPORT KOEventViewerDialog : public KDialogBase { TQ_OBJECT diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp index 829e8858..5d7b06e2 100644 --- a/korganizer/koglobals.cpp +++ b/korganizer/koglobals.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobalsettings.h> #include <tdelocale.h> #include <kstaticdeleter.h> diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h index b6f48cf7..3e96d941 100644 --- a/korganizer/koglobals.h +++ b/korganizer/koglobals.h @@ -23,7 +23,7 @@ #ifndef KORG_GLOBALS_H #define KORG_GLOBALS_H -#include <kdemacros.h> +#include <tdemacros.h> #include <tqwidget.h> class TQDate; @@ -36,7 +36,7 @@ class TDEConfig; class TDEInstance; class KHolidays; -class KDE_EXPORT KOGlobals +class TDE_EXPORT KOGlobals { public: static KOGlobals *self(); diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp index 6e86c857..bbb8dc01 100644 --- a/korganizer/kogroupware.cpp +++ b/korganizer/kogroupware.cpp @@ -46,7 +46,7 @@ #include <libkcal/incidenceformatter.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdirwatch.h> #include <tqfile.h> #include <tqregexp.h> @@ -84,10 +84,10 @@ KOGroupware::KOGroupware( CalendarView* view, KCal::CalendarResources* cal ) watcher->addDir( locateLocal( "data", "korganizer/income.cancel/" ) ); watcher->addDir( locateLocal( "data", "korganizer/income.reply/" ) ); watcher->addDir( locateLocal( "data", "korganizer/income.delegated/" ) ); - connect( watcher, TQT_SIGNAL( dirty( const TQString& ) ), - this, TQT_SLOT( incomingDirChanged( const TQString& ) ) ); + connect( watcher, TQ_SIGNAL( dirty( const TQString& ) ), + this, TQ_SLOT( incomingDirChanged( const TQString& ) ) ); // Now set the ball rolling - TQTimer::singleShot( 0, this, TQT_SLOT(initialCheckForChanges()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(initialCheckForChanges()) ); } void KOGroupware::initialCheckForChanges() @@ -103,12 +103,12 @@ void KOGroupware::initialCheckForChanges() void KOGroupware::slotViewNewIncidenceChanger( IncidenceChangerBase* changer ) { // Call slot perhapsUploadFB if an incidence was added, changed or removed - connect( changer, TQT_SIGNAL( incidenceAdded( Incidence* ) ), - mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) ); - connect( changer, TQT_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ), - mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) ); - connect( changer, TQT_SIGNAL( incidenceDeleted( Incidence * ) ), - mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) ); + connect( changer, TQ_SIGNAL( incidenceAdded( Incidence* ) ), + mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) ); + connect( changer, TQ_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ), + mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) ); + connect( changer, TQ_SIGNAL( incidenceDeleted( Incidence * ) ), + mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) ); } FreeBusyManager *KOGroupware::freeBusyManager() @@ -116,10 +116,10 @@ FreeBusyManager *KOGroupware::freeBusyManager() if ( !mFreeBusyManager ) { mFreeBusyManager = new FreeBusyManager( this, "freebusymanager" ); mFreeBusyManager->setCalendar( mCalendar ); - connect( mCalendar, TQT_SIGNAL( calendarChanged() ), - mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) ); - connect( mView, TQT_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), - this, TQT_SLOT( slotViewNewIncidenceChanger( IncidenceChangerBase* ) ) ); + connect( mCalendar, TQ_SIGNAL( calendarChanged() ), + mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) ); + connect( mView, TQ_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), + this, TQ_SLOT( slotViewNewIncidenceChanger( IncidenceChangerBase* ) ) ); slotViewNewIncidenceChanger( mView->incidenceChanger() ); } diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui index 83c5799f..587851a1 100644 --- a/korganizer/kogroupwareprefspage.ui +++ b/korganizer/kogroupwareprefspage.ui @@ -617,15 +617,15 @@ For security reasons, it is not recommended to store your password in the config <tabstop>retrieveSavePassword</tabstop> </tabstops> <includes> - <include location="global" impldecl="in declaration">kdemacros.h</include> + <include location="global" impldecl="in declaration">tdemacros.h</include> <include location="local" impldecl="in implementation">kogroupwareprefspage.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>changed()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>slotChanged()</slot> -</Q_SLOTS> -<exportmacro>KDE_EXPORT</exportmacro> +</slots> +<exportmacro>TDE_EXPORT</exportmacro> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korganizer/kohelper.h b/korganizer/kohelper.h index e7348421..cae50fc4 100644 --- a/korganizer/kohelper.h +++ b/korganizer/kohelper.h @@ -25,14 +25,14 @@ #ifndef KOHELPER_H #define KOHELPER_H -#include <kdemacros.h> +#include <tdemacros.h> namespace KCal { class Calendar; class Incidence; } -class KDE_EXPORT KOHelper +class TDE_EXPORT KOHelper { public: /** diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp index 40851e99..72defee4 100644 --- a/korganizer/koincidenceeditor.cpp +++ b/korganizer/koincidenceeditor.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <kinputdialog.h> #include <tdeio/netaccess.h> @@ -75,8 +75,8 @@ KOIncidenceEditor::KOIncidenceEditor( const TQString &caption, setButtonText( Default, i18n("&Templates...") ); } - connect( this, TQT_SIGNAL( defaultClicked() ), TQT_SLOT( slotManageTemplates() ) ); - connect( this, TQT_SIGNAL( finished() ), TQT_SLOT( delayedDestruct() ) ); + connect( this, TQ_SIGNAL( defaultClicked() ), TQ_SLOT( slotManageTemplates() ) ); + connect( this, TQ_SIGNAL( finished() ), TQ_SLOT( delayedDestruct() ) ); } KOIncidenceEditor::~KOIncidenceEditor() @@ -139,12 +139,12 @@ void KOIncidenceEditor::slotManageTemplates() kdDebug(5850) << "KOIncidenceEditor::manageTemplates()" << endl; TemplateManagementDialog * const d = new TemplateManagementDialog( this, templates() ); - connect( d, TQT_SIGNAL( loadTemplate( const TQString& ) ), - this, TQT_SLOT( slotLoadTemplate( const TQString& ) ) ); - connect( d, TQT_SIGNAL( templatesChanged( const TQStringList& ) ), - this, TQT_SLOT( slotTemplatesChanged( const TQStringList& ) ) ); - connect( d, TQT_SIGNAL( saveTemplate( const TQString& ) ), - this, TQT_SLOT( slotSaveTemplate( const TQString& ) ) ); + connect( d, TQ_SIGNAL( loadTemplate( const TQString& ) ), + this, TQ_SLOT( slotLoadTemplate( const TQString& ) ) ); + connect( d, TQ_SIGNAL( templatesChanged( const TQStringList& ) ), + this, TQ_SLOT( slotTemplatesChanged( const TQStringList& ) ) ); + connect( d, TQ_SIGNAL( saveTemplate( const TQString& ) ), + this, TQ_SLOT( slotSaveTemplate( const TQString& ) ) ); d->exec(); return; } @@ -296,8 +296,8 @@ void KOIncidenceEditor::setupEmbeddedURLPage( const TQString &label, topFrame ); topLayout->addWidget( wid ); mEmbeddedURLPages.append( topFrame ); - connect( wid, TQT_SIGNAL( openURL( const KURL & ) ) , - this, TQT_SLOT( openURL( const KURL & ) ) ); + connect( wid, TQ_SIGNAL( openURL( const KURL & ) ) , + this, TQ_SLOT( openURL( const KURL & ) ) ); // TODO: Call this method only when the tab is actually activated! wid->loadContents(); } diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index 3bc78156..252bbc53 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp @@ -71,24 +71,24 @@ void KOJournalView::appendJournal( Journal*journal, const TQDate &dt) entry->setDate( dt ); entry->setIncidenceChanger( mChanger ); entry->show(); - connect( this, TQT_SIGNAL(flushEntries()), - entry, TQT_SIGNAL(flushEntries()) ); + connect( this, TQ_SIGNAL(flushEntries()), + entry, TQ_SIGNAL(flushEntries()) ); - connect( this, TQT_SIGNAL(setIncidenceChangerSignal(IncidenceChangerBase *)), - entry, TQT_SLOT(setIncidenceChanger( IncidenceChangerBase *)) ); + connect( this, TQ_SIGNAL(setIncidenceChangerSignal(IncidenceChangerBase *)), + entry, TQ_SLOT(setIncidenceChanger( IncidenceChangerBase *)) ); - connect( this, TQT_SIGNAL(journalEdited(Journal *)), - entry, TQT_SLOT(journalEdited(Journal *)) ); - connect( this, TQT_SIGNAL(journalDeleted(Journal *)), - entry, TQT_SLOT(journalDeleted(Journal *)) ); + connect( this, TQ_SIGNAL(journalEdited(Journal *)), + entry, TQ_SLOT(journalEdited(Journal *)) ); + connect( this, TQ_SIGNAL(journalDeleted(Journal *)), + entry, TQ_SLOT(journalDeleted(Journal *)) ); - connect( entry, TQT_SIGNAL(editIncidence(Incidence *,const TQDate &)), - this, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); - connect( entry, TQT_SIGNAL(deleteIncidence(Incidence *)), - this, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) ); + connect( entry, TQ_SIGNAL(editIncidence(Incidence *,const TQDate &)), + this, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); + connect( entry, TQ_SIGNAL(deleteIncidence(Incidence *)), + this, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) ); - connect( entry, TQT_SIGNAL(newJournal(ResourceCalendar *,const TQString &,const TQDate &)), - this, TQT_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); + connect( entry, TQ_SIGNAL(newJournal(ResourceCalendar *,const TQString &,const TQDate &)), + this, TQ_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); mEntries.insert( dt, entry ); } diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index a43e61ac..df52e88a 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -227,21 +227,21 @@ KOListView::KOListView( Calendar *calendar, /* mPopupMenu->insertSeparator(); mPopupMenu->insertItem(i18n("Show Dates"), this, - TQT_SLOT(showDates())); + TQ_SLOT(showDates())); mPopupMenu->insertItem(i18n("Hide Dates"), this, - TQT_SLOT(hideDates())); + TQ_SLOT(hideDates())); */ - connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( defaultItemAction( TQListViewItem * ) ) ); - connect( mListView, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - TQT_SLOT( defaultItemAction( TQListViewItem * ) ) ); - connect( mListView, TQT_SIGNAL( rightButtonClicked ( TQListViewItem *, + connect( mListView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( defaultItemAction( TQListViewItem * ) ) ); + connect( mListView, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + TQ_SLOT( defaultItemAction( TQListViewItem * ) ) ); + connect( mListView, TQ_SIGNAL( rightButtonClicked ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) ); - connect( mListView, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( processSelectionChange() ) ); + TQ_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) ); + connect( mListView, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( processSelectionChange() ) ); // setMinimumSize(100,100); mListView->restoreLayout( KOGlobals::self()->config(), "KOListView Layout" ); diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp index 60855bda..a03db92a 100644 --- a/korganizer/komailclient.cpp +++ b/korganizer/komailclient.cpp @@ -26,13 +26,13 @@ #include <stdio.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdemessagebox.h> #include <kurl.h> #include <tdeapplication.h> #include <dcopclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <libemailfunctions/email.h> @@ -242,7 +242,7 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString pclose(fd); } else { - if (!kapp->dcopClient()->isApplicationRegistered("kmail")) { + if (!tdeApp->dcopClient()->isApplicationRegistered("kmail")) { if (TDEApplication::startServiceByDesktopName("kmail")) { KMessageBox::error(0,i18n("No running instance of KMail found.")); return false; @@ -293,9 +293,9 @@ int KOMailClient::kMailOpenComposer(const TQString& arg0,const TQString& arg1, arg << arg5; arg << arg6; #if KDE_IS_VERSION( 3, 2, 90 ) - kapp->updateRemoteUserTimestamp( "kmail" ); + tdeApp->updateRemoteUserTimestamp( "kmail" ); #endif - if (kapp->dcopClient()->call("kmail","KMailIface","openComposer(TQString,TQString,TQString,TQString,TQString,int,KURL)", data, replyType, replyData ) ) { + if (tdeApp->dcopClient()->call("kmail","KMailIface","openComposer(TQString,TQString,TQString,TQString,TQString,int,KURL)", data, replyType, replyData ) ) { if ( replyType == "int" ) { TQDataStream _reply_stream( replyData, IO_ReadOnly ); _reply_stream >> result; @@ -345,9 +345,9 @@ int KOMailClient::kMailOpenComposer( const TQString& arg0, const TQString& arg1, arg << arg14; arg << identity; #if KDE_IS_VERSION( 3, 2, 90 ) - kapp->updateRemoteUserTimestamp("kmail"); + tdeApp->updateRemoteUserTimestamp("kmail"); #endif - if ( kapp->dcopClient()->call("kmail","KMailIface", + if ( tdeApp->dcopClient()->call("kmail","KMailIface", "openComposer(TQString,TQString,TQString,TQString,TQString,int,TQString,TQCString,TQCString,TQCString,TQCString,TQCString,TQString,TQCString,TQCString,uint)", data, replyType, replyData ) ) { if ( replyType == "int" ) { TQDataStream _reply_stream( replyData, IO_ReadOnly ); diff --git a/korganizer/komessagebox.cpp b/korganizer/komessagebox.cpp index 9c843b59..641d5106 100644 --- a/korganizer/komessagebox.cpp +++ b/korganizer/komessagebox.cpp @@ -41,9 +41,9 @@ int KOMessageBox::fourBtnMsgBox( TQWidget *parent, TQMessageBox::Icon type, dialog->setButtonOK( button3 ); dialog->setButtonText( KDialogBase::Yes, button1.text() ); dialog->setButtonText( KDialogBase::No, button2.text() ); - TQObject::connect( dialog->actionButton( KDialogBase::Yes ), TQT_SIGNAL( clicked() ), dialog, TQT_SLOT(slotYes())); - TQObject::connect( dialog->actionButton( KDialogBase::No ), TQT_SIGNAL( clicked() ), dialog, TQT_SLOT(slotNo())); -// TQObject::connect( dialog, TQT_SIGNAL( noClicked() ), dialog, TQT_SLOT(slotNo())); + TQObject::connect( dialog->actionButton( KDialogBase::Yes ), TQ_SIGNAL( clicked() ), dialog, TQ_SLOT(slotYes())); + TQObject::connect( dialog->actionButton( KDialogBase::No ), TQ_SIGNAL( clicked() ), dialog, TQ_SLOT(slotNo())); +// TQObject::connect( dialog, TQ_SIGNAL( noClicked() ), dialog, TQ_SLOT(slotNo())); bool checkboxResult = false; diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 9000361c..23b477e1 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -405,13 +405,13 @@ MonthViewCell::MonthViewCell( KOMonthView *parent) updateConfig(); - connect( mItemList, TQT_SIGNAL( doubleClicked( TQListBoxItem *) ), - TQT_SLOT( defaultAction( TQListBoxItem * ) ) ); - connect( mItemList, TQT_SIGNAL( rightButtonPressed( TQListBoxItem *, + connect( mItemList, TQ_SIGNAL( doubleClicked( TQListBoxItem *) ), + TQ_SLOT( defaultAction( TQListBoxItem * ) ) ); + connect( mItemList, TQ_SIGNAL( rightButtonPressed( TQListBoxItem *, const TQPoint &) ), - TQT_SLOT( contextMenu( TQListBoxItem * ) ) ); - connect( mItemList, TQT_SIGNAL( clicked( TQListBoxItem * ) ), - TQT_SLOT( select() ) ); + TQ_SLOT( contextMenu( TQListBoxItem * ) ) ); + connect( mItemList, TQ_SIGNAL( clicked( TQListBoxItem * ) ), + TQ_SLOT( select() ) ); } void MonthViewCell::setDate( const TQDate &date ) @@ -861,10 +861,10 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name mCells.insert( row * mDaysPerWeek + col, cell ); dayLayout->addWidget( cell, row + 2, col ); - connect( cell, TQT_SIGNAL(defaultAction(Incidence *)), - TQT_SLOT(defaultAction(Incidence *)) ); - connect( cell, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); + connect( cell, TQ_SIGNAL(defaultAction(Incidence *)), + TQ_SLOT(defaultAction(Incidence *)) ); + connect( cell, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); } dayLayout->setRowStretch( row + 2, 1 ); } diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 3e57a77c..0c57134e 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -26,7 +26,7 @@ #include <tqdict.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "koprefs_base.h" @@ -38,7 +38,7 @@ class TQStringList; TQColor getTextColor(const TQColor &c); -class KDE_EXPORT KOPrefs : public KOPrefsBase +class TDE_EXPORT KOPrefs : public KOPrefsBase { public: virtual ~KOPrefs(); diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 498c8cf8..31ad7778 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -56,8 +56,8 @@ #include <ktrader.h> #include <kpushbutton.h> #include <kocore.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include <kholidays.h> #include <kurlrequester.h> @@ -77,7 +77,7 @@ #include "ktimeedit.h" #include "koglobals.h" #include "stdcalendar.h" -#include <kdemacros.h> +#include <tdemacros.h> KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name ) @@ -92,8 +92,8 @@ KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name ) KPrefsWidBool *emailControlCenter = addWidBool( KOPrefs::instance()->emailControlCenterItem(), topFrame ); - connect(emailControlCenter->checkBox(),TQT_SIGNAL(toggled(bool)), - TQT_SLOT(toggleEmailSettings(bool))); + connect(emailControlCenter->checkBox(),TQ_SIGNAL(toggled(bool)), + TQ_SLOT(toggleEmailSettings(bool))); mUserEmailSettings = new TQGrid( 2, topFrame ); @@ -109,8 +109,8 @@ KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name ) TQHBox *intervalBox = new TQHBox( saveGroup ); addWidInt( KOPrefs::instance()->autoSaveIntervalItem(), intervalBox ); - connect( autoSave->checkBox(), TQT_SIGNAL( toggled( bool ) ), - intervalBox, TQT_SLOT( setEnabled( bool ) ) ); + connect( autoSave->checkBox(), TQ_SIGNAL( toggled( bool ) ), + intervalBox, TQ_SLOT( setEnabled( bool ) ) ); intervalBox->setSpacing( KDialog::spacingHint() ); new TQWidget( intervalBox ); @@ -138,7 +138,7 @@ void KOPrefsDialogMain::toggleEmailSettings( bool on ) extern "C" { - KDE_EXPORT TDECModule *create_korganizerconfigmain( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_korganizerconfigmain( TQWidget *parent, const char * ) { return new KOPrefsDialogMain( parent, "kcmkorganizermain" ); } @@ -171,8 +171,8 @@ class KOPrefsDialogTime : public KPrefsModule TQWhatsThis::add( timeZoneLabel, whatsThis ); mTimeZoneCombo = new TQComboBox( timeZoneBox ); - connect( mTimeZoneCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotWidChanged() ) ); + connect( mTimeZoneCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotWidChanged() ) ); FILE *f; char tempstring[101] = "Unknown"; @@ -264,8 +264,8 @@ class KOPrefsDialogTime : public KPrefsModule TQWhatsThis::add( holidayLabel, whatsThis ); mHolidayCombo = new TQComboBox( holidayRegBox ); - connect( mHolidayCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotWidChanged() ) ); + connect( mHolidayCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotWidChanged() ) ); TQWhatsThis::add( mHolidayCombo, whatsThis ); @@ -279,7 +279,7 @@ class KOPrefsDialogTime : public KPrefsModule "l10n/" + (*it) + "/entry.desktop" ); TQString regionName; if ( !countryFile.isEmpty() ) { - KSimpleConfig cfg( countryFile ); + TDESimpleConfig cfg( countryFile ); cfg.setGroup( "KCM Locale" ); regionName = cfg.readEntry( "Name" ); } @@ -328,10 +328,10 @@ class KOPrefsDialogTime : public KPrefsModule new TQLabel( i18n( "Default reminder time:" ), remindersBox ); mReminderTimeSpin = new KIntSpinBox( remindersBox ); - connect( mReminderTimeSpin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotWidChanged()) ); + connect( mReminderTimeSpin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotWidChanged()) ); mReminderUnitsCombo = new KComboBox( remindersBox ); - connect( mReminderUnitsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWidChanged()) ); + connect( mReminderUnitsCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotWidChanged()) ); mReminderUnitsCombo->insertItem( i18n( "minute(s)" ) ); mReminderUnitsCombo->insertItem( i18n( "hour(s)" ) ); mReminderUnitsCombo->insertItem( i18n( "day(s)" ) ); @@ -351,8 +351,8 @@ class KOPrefsDialogTime : public KPrefsModule KURLRequester *rq = addWidPath( KOPrefs::instance()->audioFilePathItem(), audioFileRemindersBox, filter )->urlRequester(); rq->setEnabled( cb->isChecked() ); - connect( cb, TQT_SIGNAL(toggled(bool)), - rq, TQT_SLOT(setEnabled( bool)) ); + connect( cb, TQ_SIGNAL(toggled(bool)), + rq, TQ_SLOT(setEnabled( bool)) ); TQHBox *eventRemindersBox = new TQHBox( remindersGroupBox ); addWidBool( KOPrefs::instance()->defaultEventRemindersItem(), eventRemindersBox )->checkBox(); @@ -364,8 +364,8 @@ class KOPrefsDialogTime : public KPrefsModule topLayout->addWidget( alarmDefaultLabel, 6, 0 ); mAlarmTimeDefaultCheckBox = new TQCheckBox( topFrame ); topLayout->addWidget( mAlarmTimeDefaultCheckBox, 6, 1 ); - connect( mAlarmTimeDefaultCheckBox, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotWidChanged() ) ); + connect( mAlarmTimeDefaultCheckBox, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotWidChanged() ) ); TQGroupBox *workingHoursGroup = new TQGroupBox(1,TQt::Horizontal, i18n("Working Hours"), @@ -390,8 +390,8 @@ class KOPrefsDialogTime : public KPrefsModule "this box, or the working hours will not be " "marked with color." ) ); - connect( mWorkDays[ index ], TQT_SIGNAL( stateChanged( int ) ), - TQT_SLOT( slotWidChanged() ) ); + connect( mWorkDays[ index ], TQ_SIGNAL( stateChanged( int ) ), + TQ_SLOT( slotWidChanged() ) ); } TQHBox *workStartBox = new TQHBox(workingHoursGroup); @@ -542,8 +542,8 @@ class KOPrefsDialogViews : public KPrefsModule KPrefsWidBool *marcusBainsShowSeconds = addWidBool( KOPrefs::instance()->marcusBainsShowSecondsItem(), agendaGroup ); - connect( marcusBainsEnabled->checkBox(), TQT_SIGNAL( toggled( bool ) ), - marcusBainsShowSeconds->checkBox(), TQT_SLOT( setEnabled( bool ) ) ); + connect( marcusBainsEnabled->checkBox(), TQ_SIGNAL( toggled( bool ) ), + marcusBainsShowSeconds->checkBox(), TQ_SLOT( setEnabled( bool ) ) ); addWidBool( KOPrefs::instance()->selectionStartsEditorItem(), agendaGroup ); @@ -711,13 +711,13 @@ KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name ) i18n( "Select here the event category you want to modify. " "You can change the selected category color using " "the button below." ) ); - connect(mCategoryCombo,TQT_SIGNAL(activated(int)),TQT_SLOT(updateCategoryColor())); + connect(mCategoryCombo,TQ_SIGNAL(activated(int)),TQ_SLOT(updateCategoryColor())); mCategoryButton = new KColorButton(categoryGroup); TQWhatsThis::add( mCategoryButton, i18n( "Choose here the color of the event category selected " "using the combo box above." ) ); - connect(mCategoryButton,TQT_SIGNAL(changed(const TQColor &)),TQT_SLOT(setCategoryColor())); + connect(mCategoryButton,TQ_SIGNAL(changed(const TQColor &)),TQ_SLOT(setCategoryColor())); updateCategoryColor(); // resources colors @@ -730,13 +730,13 @@ KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name ) i18n( "Select here resource you want to modify. " "You can change the selected resource color using " "the button below." ) ); - connect(mResourceCombo,TQT_SIGNAL(activated(int)),TQT_SLOT(updateResourceColor())); + connect(mResourceCombo,TQ_SIGNAL(activated(int)),TQ_SLOT(updateResourceColor())); mResourceButton = new KColorButton(resourceGroup); TQWhatsThis::add( mResourceButton, i18n( "Choose here the color of the resource selected " "using the combo box above." ) ); - connect(mResourceButton,TQT_SIGNAL(changed(const TQColor &)),TQT_SLOT(setResourceColor())); + connect(mResourceButton,TQ_SIGNAL(changed(const TQColor &)),TQ_SLOT(setResourceColor())); updateResources(); topLayout->setRowStretch(9,1); @@ -865,8 +865,8 @@ KOPrefsDialogGroupScheduling::KOPrefsDialogGroupScheduling( TQWidget *parent, co topFrame ); topLayout->addMultiCellWidget(useGroupwareBool->checkBox(),0,0,0,1); // FIXME: This radio button should only be available when KMail is chosen -// connect(thekmailradiobuttonupthere,TQT_SIGNAL(toggled(bool)), -// useGroupwareBool->checkBox(), TQT_SLOT(enabled(bool))); +// connect(thekmailradiobuttonupthere,TQ_SIGNAL(toggled(bool)), +// useGroupwareBool->checkBox(), TQ_SLOT(enabled(bool))); KPrefsWidBool *bcc = addWidBool( KOPrefs::instance()->bccItem(), topFrame ); @@ -927,10 +927,10 @@ KOPrefsDialogGroupScheduling::KOPrefsDialogGroupScheduling( TQWidget *parent, co topLayout->addWidget(del,6,1); //topLayout->setRowStretch(2,1); - connect(add, TQT_SIGNAL( clicked() ), this, TQT_SLOT(addItem()) ); - connect(del, TQT_SIGNAL( clicked() ), this, TQT_SLOT(removeItem()) ); - connect(aEmailsEdit,TQT_SIGNAL( textChanged(const TQString&) ), this,TQT_SLOT(updateItem())); - connect(mAMails,TQT_SIGNAL(selectionChanged(TQListViewItem *)),TQT_SLOT(updateInput())); + connect(add, TQ_SIGNAL( clicked() ), this, TQ_SLOT(addItem()) ); + connect(del, TQ_SIGNAL( clicked() ), this, TQ_SLOT(removeItem()) ); + connect(aEmailsEdit,TQ_SIGNAL( textChanged(const TQString&) ), this,TQ_SLOT(updateItem())); + connect(mAMails,TQ_SIGNAL(selectionChanged(TQListViewItem *)),TQ_SLOT(updateInput())); load(); } @@ -1018,7 +1018,7 @@ KOPrefsDialogGroupwareScheduling::KOPrefsDialogGroupwareScheduling( TQWidget *pa : KPrefsModule( KOPrefs::instance(), parent, name ) { mGroupwarePage = new KOGroupwarePrefsPage( this ); - connect( mGroupwarePage, TQT_SIGNAL( changed() ), TQT_SLOT( slotWidChanged() ) ); + connect( mGroupwarePage, TQ_SIGNAL( changed() ), TQ_SLOT( slotWidChanged() ) ); ( new TQVBoxLayout( this ) )->addWidget( mGroupwarePage ); load(); @@ -1127,12 +1127,12 @@ KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *parent, const char* name ) buttonRowLayout->addWidget( mConfigureButton ); buttonRowLayout->addItem( new TQSpacerItem(1, 1, TQSizePolicy::Expanding) ); topLayout->addWidget( buttonRow ); - connect( mConfigureButton, TQT_SIGNAL( clicked() ), TQT_SLOT( configure() ) ); + connect( mConfigureButton, TQ_SIGNAL( clicked() ), TQ_SLOT( configure() ) ); - connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - TQT_SLOT( selectionChanged( TQListViewItem* ) ) ); - connect( mListView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - TQT_SLOT( slotWidChanged() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + TQ_SLOT( selectionChanged( TQListViewItem* ) ) ); + connect( mListView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + TQ_SLOT( slotWidChanged() ) ); load(); // usrReadConfig(); diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h index e6fec99c..bd51386d 100644 --- a/korganizer/koprefsdialog.h +++ b/korganizer/koprefsdialog.h @@ -38,7 +38,7 @@ class KPushButton; class TQColor; class TQListView; -class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule +class TDE_EXPORT KOPrefsDialogMain : public KPrefsModule { TQ_OBJECT @@ -51,7 +51,7 @@ class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule TQWidget *mUserEmailSettings; }; -class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule +class TDE_EXPORT KOPrefsDialogColors : public KPrefsModule { TQ_OBJECT @@ -82,7 +82,7 @@ class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule TQStringList mResourceIdentifier; }; -class KDE_EXPORT KOPrefsDialogGroupScheduling : public KPrefsModule +class TDE_EXPORT KOPrefsDialogGroupScheduling : public KPrefsModule { TQ_OBJECT @@ -106,7 +106,7 @@ class KDE_EXPORT KOPrefsDialogGroupScheduling : public KPrefsModule class KOGroupwarePrefsPage; -class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule +class TDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule { TQ_OBJECT @@ -121,7 +121,7 @@ class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule KOGroupwarePrefsPage* mGroupwarePage; }; -class KDE_EXPORT KOPrefsDialogPlugins : public KPrefsModule +class TDE_EXPORT KOPrefsDialogPlugins : public KPrefsModule { TQ_OBJECT @@ -141,7 +141,7 @@ class KDE_EXPORT KOPrefsDialogPlugins : public KPrefsModule KPushButton *mConfigureButton; }; -class KDE_EXPORT KOPrefsDesignerFields : public KPIM::KCMDesignerFields +class TDE_EXPORT KOPrefsDesignerFields : public KPIM::KCMDesignerFields { public: KOPrefsDesignerFields( TQWidget *parent = 0, const char *name = 0 ); diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index 3cc29582..91fb5d59 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -41,7 +41,7 @@ #include <kdcopservicestarter.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kaudioplayer.h> #include <kdebug.h> #include <tdemessagebox.h> @@ -109,8 +109,8 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c // User3 => Dismiss Selected // Ok => Suspend - connect( calendar, TQT_SIGNAL(calendarChanged()), - this, TQT_SLOT(slotCalendarChanged()) ); + connect( calendar, TQ_SIGNAL(calendarChanged()), + this, TQ_SLOT(slotCalendarChanged()) ); TDEGlobal::iconLoader()->addAppDir( "tdepim" ); setButtonOK( i18n( "Suspend" ) ); @@ -135,10 +135,10 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c mIncidenceListView->setShowSortIndicator( true ); mIncidenceListView->setAllColumnsShowFocus( true ); mIncidenceListView->setSelectionMode( TQListView::Extended ); - connect( mIncidenceListView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButtons()) ); - connect( mIncidenceListView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(edit()) ); - connect( mIncidenceListView, TQT_SIGNAL(currentChanged(TQListViewItem*)), TQT_SLOT(showDetails()) ); - connect( mIncidenceListView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(showDetails()) ); + connect( mIncidenceListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateButtons()) ); + connect( mIncidenceListView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(edit()) ); + connect( mIncidenceListView, TQ_SIGNAL(currentChanged(TQListViewItem*)), TQ_SLOT(showDetails()) ); + connect( mIncidenceListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(showDetails()) ); mDetailView = new KOEventViewer( mCalendar, mSplitter ); mDetailView->setFocus(); // set focus here to start with to make it harder @@ -160,7 +160,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c mSuspendUnit->insertItem( i18n("week(s)") ); mSuspendUnit->setCurrentItem( defSuspendUnit ); - connect( &mSuspendTimer, TQT_SIGNAL(timeout()), TQT_SLOT(wakeUp()) ); + connect( &mSuspendTimer, TQ_SIGNAL(timeout()), TQ_SLOT(wakeUp()) ); setMainWidget( mIncidenceListView ); mIncidenceListView->setMinimumSize( 500, 50 ); @@ -203,7 +203,7 @@ static TQString cleanSummary( const TQString &summary ) void AlarmDialog::readLayout() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "Layout" ); TQValueList<int> sizes = config->readIntListEntry( "SplitterSizes" ); if ( sizes.count() == 2 ) { @@ -215,7 +215,7 @@ void AlarmDialog::readLayout() void AlarmDialog::writeLayout() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "Layout" ); TQValueList<int> list = mSplitter->sizes(); config->writeEntry( "SplitterSizes", list ); @@ -344,7 +344,7 @@ void AlarmDialog::edit() arg << incidence->uid(); arg << dt; //kdDebug(5890) << "editing incidence " << incidence->summary() << endl; - if ( !kapp->dcopClient()->send( "korganizer", "KOrganizerIface", + if ( !tdeApp->dcopClient()->send( "korganizer", "KOrganizerIface", "editIncidence(TQString,TQDate)", data ) ) { KMessageBox::error( @@ -356,9 +356,9 @@ void AlarmDialog::edit() // get desktop # where korganizer (or kontact) runs TQByteArray replyData; TQCString object, replyType; - object = kapp->dcopClient()->isApplicationRegistered( "kontact" ) ? + object = tdeApp->dcopClient()->isApplicationRegistered( "kontact" ) ? "kontact-mainwindow#1" : "KOrganizer MainWindow"; - if (!kapp->dcopClient()->call( "korganizer", object, + if (!tdeApp->dcopClient()->call( "korganizer", object, "getWinID()", 0, replyType, replyData, true, -1 ) ) { } @@ -566,7 +566,7 @@ void AlarmDialog::wakeUp() void AlarmDialog::slotSave() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TDELockFile::Ptr lock = config->lockFile(); if ( lock.data()->lock() != TDELockFile::LockOK ) return; @@ -673,12 +673,12 @@ bool AlarmDialog::ensureKorganizerRunning() const // but korganizer not loaded into it...] static const char* const dcopObjectId = "KOrganizerIface"; TQCString dummy; - if ( !kapp->dcopClient()->findObject( + if ( !tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { - DCOPRef ref( dcopService, dcopService ); // talk to KUniqueApplication or its kontact wrapper + DCOPRef ref( dcopService, dcopService ); // talk to TDEUniqueApplication or its kontact wrapper DCOPReply reply = ref.call( "load()" ); if ( reply.isValid() && (bool)reply ) { - Q_ASSERT( kapp->dcopClient()->findObject( + Q_ASSERT( tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); } else { kdWarning() << "Error loading " << dcopService << endl; diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index 92b8002c..c5960b76 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -32,7 +32,7 @@ #include <kiconloader.h> #include <tdeconfig.h> #include <kurl.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <dcopclient.h> #include <tdepopupmenu.h> #include <tdemessagebox.h> @@ -48,7 +48,7 @@ AlarmDockWindow::AlarmDockWindow( const char *name ) : KSystemTray( 0, name ) { // Read the autostart status from the config file - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General"); bool autostart = config->readBoolEntry( "Autostart", true ); bool alarmsEnabled = config->readBoolEntry( "Enabled", true ); @@ -64,16 +64,16 @@ AlarmDockWindow::AlarmDockWindow( const char *name ) setPixmap( alarmsEnabled ? mPixmapEnabled : mPixmapDisabled ); // Set up the context menu - mSuspendAll = contextMenu()->insertItem( i18n("Suspend All"), this, TQT_SLOT( slotSuspendAll() ) ); - mDismissAll = contextMenu()->insertItem( i18n("Dismiss All"), this, TQT_SLOT( slotDismissAll() ) ); + mSuspendAll = contextMenu()->insertItem( i18n("Suspend All"), this, TQ_SLOT( slotSuspendAll() ) ); + mDismissAll = contextMenu()->insertItem( i18n("Dismiss All"), this, TQ_SLOT( slotDismissAll() ) ); contextMenu()->setItemEnabled( mSuspendAll, false ); contextMenu()->setItemEnabled( mDismissAll, false ); contextMenu()->insertSeparator(); mAlarmsEnabledId = contextMenu()->insertItem( i18n("Reminders Enabled"), this, - TQT_SLOT( toggleAlarmsEnabled() ) ); + TQ_SLOT( toggleAlarmsEnabled() ) ); mAutostartId = contextMenu()->insertItem( i18n("Start Reminder Daemon at Login"), this, - TQT_SLOT( toggleAutostart() ) ); + TQ_SLOT( toggleAutostart() ) ); contextMenu()->setItemChecked( mAutostartId, autostart ); contextMenu()->setItemChecked( mAlarmsEnabledId, alarmsEnabled ); @@ -86,15 +86,15 @@ AlarmDockWindow::AlarmDockWindow( const char *name ) kdDebug(5890) << "No Quit standard action." << endl; } else { #if KDE_IS_VERSION(3,3,90) - quit->disconnect( TQT_SIGNAL( activated() ), this, - TQT_SLOT( maybeQuit() ) ); - connect( quit, TQT_SIGNAL( activated() ), TQT_SLOT( slotQuit() ) ); + quit->disconnect( TQ_SIGNAL( activated() ), this, + TQ_SLOT( maybeQuit() ) ); + connect( quit, TQ_SIGNAL( activated() ), TQ_SLOT( slotQuit() ) ); } #else //FIXME: remove for KDE 4.0 - quit->disconnect( TQT_SIGNAL( activated() ), tqApp, - TQT_SLOT( closeAllWindows() ) ); + quit->disconnect( TQ_SIGNAL( activated() ), tqApp, + TQ_SLOT( closeAllWindows() ) ); } - connect( this, TQT_SIGNAL( quitSelected() ), TQT_SLOT( slotQuit() ) ); + connect( this, TQ_SIGNAL( quitSelected() ), TQ_SLOT( slotQuit() ) ); #endif TQToolTip::add(this, mName ); @@ -110,7 +110,7 @@ void AlarmDockWindow::resizeTrayIcon () mPixmapEnabled = loadSizedIcon( "korgac", width() ); mPixmapDisabled = loadSizedIcon( "korgac_disabled", width() ); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); bool alarmsEnabled = config->readBoolEntry( "Enabled", true ); setPixmap( alarmsEnabled ? mPixmapEnabled : mPixmapDisabled ); } @@ -148,7 +148,7 @@ void AlarmDockWindow::toggleAlarmsEnabled() { kdDebug(5890) << "AlarmDockWindow::toggleAlarmsEnabled()" << endl; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "General" ); bool enabled = !contextMenu()->isItemChecked( mAlarmsEnabledId ); @@ -178,7 +178,7 @@ void AlarmDockWindow::slotDismissAll() void AlarmDockWindow::enableAutostart( bool enable ) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "General" ); config->writeEntry( "Autostart", enable ); config->sync(); @@ -189,7 +189,7 @@ void AlarmDockWindow::enableAutostart( bool enable ) void AlarmDockWindow::mousePressEvent( TQMouseEvent *e ) { if ( e->button() == TQt::LeftButton ) { - kapp->startServiceByDesktopName( "korganizer", TQString() ); + tdeApp->startServiceByDesktopName( "korganizer", TQString() ); } else { KSystemTray::mousePressEvent( e ); } diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp index 2a87c7fd..e102c1dc 100644 --- a/korganizer/korgac/koalarmclient.cpp +++ b/korganizer/korgac/koalarmclient.cpp @@ -31,7 +31,7 @@ #include <libkcal/calendarresources.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdelocale.h> #include <tdeapplication.h> @@ -46,8 +46,8 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name ) mDocker = new AlarmDockWindow; mDocker->show(); - connect( this, TQT_SIGNAL( reminderCount( int ) ), mDocker, TQT_SLOT( slotUpdate( int ) ) ); - connect( mDocker, TQT_SIGNAL( quitSignal() ), TQT_SLOT( slotQuit() ) ); + connect( this, TQ_SIGNAL( reminderCount( int ) ), mDocker, TQ_SLOT( slotUpdate( int ) ) ); + connect( mDocker, TQ_SIGNAL( quitSignal() ), TQ_SLOT( slotQuit() ) ); TDEConfig c( locate( "config", "korganizerrc" ) ); c.setGroup( "Time & Date" ); @@ -58,9 +58,9 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name ) mCalendar->readConfig(); mCalendar->load(); - connect( &mCheckTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkAlarms() ) ); + connect( &mCheckTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkAlarms() ) ); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "Alarms" ); int interval = config->readNumEntry( "Interval", 60 ); kdDebug(5890) << "KOAlarmClient check interval: " << interval << " seconds." @@ -102,7 +102,7 @@ KOAlarmClient::~KOAlarmClient() void KOAlarmClient::checkAlarms() { - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); cfg->setGroup( "General" ); if ( !cfg->readBoolEntry( "Enabled", true ) ) return; @@ -132,10 +132,10 @@ void KOAlarmClient::createReminder( KCal::CalendarResources *calendar, if ( !mDialog ) { mDialog = new AlarmDialog( calendar ); - connect( mDialog, TQT_SIGNAL(reminderCount(int)), mDocker, TQT_SLOT(slotUpdate(int)) ); - connect( mDocker, TQT_SIGNAL(suspendAllSignal()), mDialog, TQT_SLOT(suspendAll()) ); - connect( mDocker, TQT_SIGNAL(dismissAllSignal()), mDialog, TQT_SLOT(dismissAll()) ); - connect( this, TQT_SIGNAL( saveAllSignal() ), mDialog, TQT_SLOT( slotSave() ) ); + connect( mDialog, TQ_SIGNAL(reminderCount(int)), mDocker, TQ_SLOT(slotUpdate(int)) ); + connect( mDocker, TQ_SIGNAL(suspendAllSignal()), mDialog, TQ_SLOT(suspendAll()) ); + connect( mDocker, TQ_SIGNAL(dismissAllSignal()), mDialog, TQ_SLOT(dismissAll()) ); + connect( this, TQ_SIGNAL( saveAllSignal() ), mDialog, TQ_SLOT( slotSave() ) ); } mDialog->addIncidence( incidence, dt, displayText ); @@ -160,7 +160,7 @@ void KOAlarmClient::saveLastCheckTime() void KOAlarmClient::quit() { kdDebug(5890) << "KOAlarmClient::quit()" << endl; - kapp->quit(); + tdeApp->quit(); } bool KOAlarmClient::commitData( TQSessionManager& ) @@ -178,7 +178,7 @@ void KOAlarmClient::forceAlarmCheck() void KOAlarmClient::dumpDebug() { - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); cfg->setGroup( "Alarms" ); TQDateTime lastChecked = cfg->readDateTimeEntry( "CalendarsLastChecked" ); diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp index d44ac4a2..c278f3c8 100644 --- a/korganizer/korgac/korgacmain.cpp +++ b/korganizer/korgac/korgacmain.cpp @@ -29,11 +29,11 @@ #include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include "koalarmclient.h" -class MyApp : public KUniqueApplication +class MyApp : public TDEUniqueApplication { public: MyApp() : mClient( 0 ) {} @@ -74,7 +74,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); if ( !MyApp::start() ) exit( 0 ); diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp index de4f839e..1f4fcfb2 100644 --- a/korganizer/korgac/testalarmdlg.cpp +++ b/korganizer/korgac/testalarmdlg.cpp @@ -30,7 +30,7 @@ #include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "alarmdialog.h" diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp index 5646d709..363ee43e 100644 --- a/korganizer/korganizer.cpp +++ b/korganizer/korganizer.cpp @@ -57,7 +57,7 @@ #include <tdeglobal.h> #include <kdebug.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdestdaccel.h> #include <tdefiledialog.h> #include <tdeaction.h> @@ -67,7 +67,7 @@ #include <tdeio/netaccess.h> #include <tdemessagebox.h> #include <dcopclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <twin.h> #include <ktip.h> #include <kstdguiitem.h> @@ -101,8 +101,8 @@ KOrganizer::KOrganizer( const char *name ) mCalendarView = new CalendarView( this, "KOrganizer::CalendarView" ); setCentralWidget(mCalendarView); - mActionManager = new ActionManager( this, mCalendarView, TQT_TQOBJECT(this), this, false ); - (void)new KOrganizerIfaceImpl( mActionManager, TQT_TQOBJECT(this), "IfaceImpl" ); + mActionManager = new ActionManager( this, mCalendarView, this, this, false ); + (void)new KOrganizerIfaceImpl( mActionManager, this, "IfaceImpl" ); } KOrganizer::~KOrganizer() @@ -128,8 +128,8 @@ void KOrganizer::init( bool document ) } mActionManager->init(); - connect( mActionManager, TQT_SIGNAL( actionNew( const KURL & ) ), - TQT_SLOT( newMainWindow( const KURL & ) ) ); + connect( mActionManager, TQ_SIGNAL( actionNew( const KURL & ) ), + TQ_SLOT( newMainWindow( const KURL & ) ) ); mActionManager->loadParts(); @@ -139,7 +139,7 @@ void KOrganizer::init( bool document ) KStatusBar *bar = statusBar(); bar->insertItem( "", ID_GENERAL, 10 ); - connect( bar, TQT_SIGNAL( pressed( int ) ), TQT_SLOT( statusBarPressed( int ) ) ); + connect( bar, TQ_SIGNAL( pressed( int ) ), TQ_SLOT( statusBarPressed( int ) ) ); KPIM::ProgressDialog *progressDialog = new KPIM::ProgressDialog( bar, this ); progressDialog->hide(); @@ -150,8 +150,8 @@ void KOrganizer::init( bool document ) bar->addWidget( progressWidget, 0, true ); - connect( mActionManager->view(), TQT_SIGNAL( statusMessage( const TQString & ) ), - TQT_SLOT( showStatusMessage( const TQString & ) ) ); + connect( mActionManager->view(), TQ_SIGNAL( statusMessage( const TQString & ) ), + TQ_SLOT( showStatusMessage( const TQString & ) ) ); setStandardToolBarMenuEnabled( true ); setTitle(); @@ -208,9 +208,9 @@ void KOrganizer::initActions() setStandardToolBarMenuEnabled( true ); createStandardStatusBarAction(); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars() ), actionCollection()); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(configureToolbars() ), actionCollection()); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); setAutoSaveSettings(); createGUI( 0 ); diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h index 56614604..e569a906 100644 --- a/korganizer/korganizer.h +++ b/korganizer/korganizer.h @@ -104,7 +104,7 @@ class KOrganizer : public KPartsMainWindow, public KOrgMainWindow protected slots: - /** using the TDEConfig associated with the kapp variable, read in the + /** using the TDEConfig associated with the tdeApp variable, read in the * settings from the config file. */ void readSettings(); diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp index b318dc98..f0581b33 100644 --- a/korganizer/korganizer_part.cpp +++ b/korganizer/korganizer_part.cpp @@ -41,14 +41,14 @@ #include <libkcal/resourcecalendar.h> #include <tdepopupmenu.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <kiconloader.h> #include <tdeaction.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdetempfile.h> #include <kstatusbar.h> #include <tdeparts/genericfactory.h> @@ -109,10 +109,10 @@ KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName, KParts::InfoExtension *ie = new KParts::InfoExtension( this, "KOrganizerInfo" ); - connect( mView, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), - TQT_SLOT( slotChangeInfo( Incidence *,const TQDate & ) ) ); - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), - ie, TQT_SIGNAL( textChanged( const TQString & ) ) ); + connect( mView, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), + TQ_SLOT( slotChangeInfo( Incidence *,const TQDate & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), + ie, TQ_SIGNAL( textChanged( const TQString & ) ) ); mActionManager->init(); mActionManager->readSettings(); diff --git a/korganizer/korganizerifaceimpl.h b/korganizer/korganizerifaceimpl.h index c91a715e..12409868 100644 --- a/korganizer/korganizerifaceimpl.h +++ b/korganizer/korganizerifaceimpl.h @@ -34,12 +34,12 @@ #include "korganizeriface.h" #include <tqobject.h> -#include <kdemacros.h> +#include <tdemacros.h> class ActionManager; -class KDE_EXPORT KOrganizerIfaceImpl : public TQObject, virtual public KOrganizerIface { +class TDE_EXPORT KOrganizerIfaceImpl : public TQObject, virtual public KOrganizerIface { public: KOrganizerIfaceImpl( ActionManager* mActionManager, TQObject* parent=0, const char* name=0 ); diff --git a/korganizer/kotimelineview.cpp b/korganizer/kotimelineview.cpp index a93c6d68..fc2bf0cf 100644 --- a/korganizer/kotimelineview.cpp +++ b/korganizer/kotimelineview.cpp @@ -62,18 +62,18 @@ KOTimelineView::KOTimelineView(Calendar *calendar, TQWidget *parent, vbox->addWidget( mGantt ); - connect( mGantt, TQT_SIGNAL(gvCurrentChanged(KDGanttViewItem*)), - TQT_SLOT(itemSelected(KDGanttViewItem*)) ); - connect( mGantt, TQT_SIGNAL(itemDoubleClicked(KDGanttViewItem*)), - TQT_SLOT(itemDoubleClicked(KDGanttViewItem*)) ); - connect( mGantt, TQT_SIGNAL(itemRightClicked(KDGanttViewItem*)), - TQT_SLOT(itemRightClicked(KDGanttViewItem*)) ); - connect( mGantt, TQT_SIGNAL(gvItemMoved(KDGanttViewItem*)), - TQT_SLOT(itemMoved(KDGanttViewItem*)) ); - connect( mGantt, TQT_SIGNAL(rescaling(KDGanttView::Scale)), - TQT_SLOT(overscale(KDGanttView::Scale)) ); - connect( mGantt, TQT_SIGNAL( dateTimeDoubleClicked( const TQDateTime& ) ), - TQT_SLOT( newEventWithHint( const TQDateTime& ) ) ); + connect( mGantt, TQ_SIGNAL(gvCurrentChanged(KDGanttViewItem*)), + TQ_SLOT(itemSelected(KDGanttViewItem*)) ); + connect( mGantt, TQ_SIGNAL(itemDoubleClicked(KDGanttViewItem*)), + TQ_SLOT(itemDoubleClicked(KDGanttViewItem*)) ); + connect( mGantt, TQ_SIGNAL(itemRightClicked(KDGanttViewItem*)), + TQ_SLOT(itemRightClicked(KDGanttViewItem*)) ); + connect( mGantt, TQ_SIGNAL(gvItemMoved(KDGanttViewItem*)), + TQ_SLOT(itemMoved(KDGanttViewItem*)) ); + connect( mGantt, TQ_SIGNAL(rescaling(KDGanttView::Scale)), + TQ_SLOT(overscale(KDGanttView::Scale)) ); + connect( mGantt, TQ_SIGNAL( dateTimeDoubleClicked( const TQDateTime& ) ), + TQ_SLOT( newEventWithHint( const TQDateTime& ) ) ); } KOTimelineView::~KOTimelineView() diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index 9da33659..3a41d1ff 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp @@ -68,21 +68,21 @@ void KOTodoEditor::init() setupRecurrence(); setupAttendeesTab(); - connect( mGeneral, TQT_SIGNAL( dateTimeStrChanged( const TQString & ) ), - mRecurrence, TQT_SLOT( setDateTimeStr( const TQString & ) ) ); - connect( mGeneral, TQT_SIGNAL( signalDateTimeChanged( const TQDateTime &, const TQDateTime & ) ), - mRecurrence, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); + connect( mGeneral, TQ_SIGNAL( dateTimeStrChanged( const TQString & ) ), + mRecurrence, TQ_SLOT( setDateTimeStr( const TQString & ) ) ); + connect( mGeneral, TQ_SIGNAL( signalDateTimeChanged( const TQDateTime &, const TQDateTime & ) ), + mRecurrence, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); - connect( mGeneral, TQT_SIGNAL( openCategoryDialog() ), - TQT_SIGNAL( editCategories() ) ); + connect( mGeneral, TQ_SIGNAL( openCategoryDialog() ), + TQ_SIGNAL( editCategories() ) ); - connect( mDetails, TQT_SIGNAL(updateAttendeeSummary(int)), - mGeneral, TQT_SLOT(updateAttendeeSummary(int)) ); + connect( mDetails, TQ_SIGNAL(updateAttendeeSummary(int)), + mGeneral, TQ_SLOT(updateAttendeeSummary(int)) ); - connect( mGeneral, TQT_SIGNAL(editRecurrence()), - mRecurrenceDialog, TQT_SLOT(show()) ); - connect( mRecurrenceDialog, TQT_SIGNAL(okClicked()), - TQT_SLOT(updateRecurrenceSummary()) ); + connect( mGeneral, TQ_SIGNAL(editRecurrence()), + mRecurrenceDialog, TQ_SLOT(show()) ); + connect( mRecurrenceDialog, TQ_SIGNAL(okClicked()), + TQ_SLOT(updateRecurrenceSummary()) ); } void KOTodoEditor::reload() @@ -94,7 +94,7 @@ void KOTodoEditor::reload() void KOTodoEditor::setupGeneral() { - mGeneral = new KOEditorGeneralTodo(TQT_TQOBJECT(this)); + mGeneral = new KOEditorGeneralTodo(this); if (KOPrefs::instance()->mCompactDialogs) { TQFrame *topFrame = addPage(i18n("General")); @@ -131,10 +131,10 @@ void KOTodoEditor::setupGeneral() mGeneral->iniStatus(topFrame,topLayout); mGeneral->initDescription(topFrame,topLayout); mGeneral->initAttachments(topFrame,topLayout); - connect( mGeneral, TQT_SIGNAL( openURL( const KURL& ) ), - this, TQT_SLOT( openURL( const KURL& ) ) ); - connect( this, TQT_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ), - mGeneral, TQT_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) ); + connect( mGeneral, TQ_SIGNAL( openURL( const KURL& ) ), + this, TQ_SLOT( openURL( const KURL& ) ) ); + connect( this, TQ_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ), + mGeneral, TQ_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) ); } mGeneral->finishSetup(); } diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index b919602e..bbbb71db 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -424,16 +424,16 @@ KOTodoView::KOTodoView( Calendar *calendar, TQWidget *parent, const char* name) mPriority[ mPriorityPopupMenu->insertItem( i18n( "7" ) ) ] = 7; mPriority[ mPriorityPopupMenu->insertItem( i18n( "8" ) ) ] = 8; mPriority[ mPriorityPopupMenu->insertItem( i18n( "9 (lowest)" ) ) ] = 9; - connect( mPriorityPopupMenu, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( setNewPriority( int ) )); + connect( mPriorityPopupMenu, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( setNewPriority( int ) )); mPercentageCompletedPopupMenu = new TQPopupMenu(this); for (int i = 0; i <= 100; i+=10) { TQString label = TQString ("%1 %").arg (i); mPercentage[mPercentageCompletedPopupMenu->insertItem (label)] = i; } - connect( mPercentageCompletedPopupMenu, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( setNewPercentage( int ) ) ); + connect( mPercentageCompletedPopupMenu, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( setNewPercentage( int ) ) ); mMovePopupMenu = new KDatePickerPopup( KDatePickerPopup::NoDate | @@ -445,76 +445,76 @@ KOTodoView::KOTodoView( Calendar *calendar, TQWidget *parent, const char* name) KDatePickerPopup::Words ); - connect( mMovePopupMenu, TQT_SIGNAL( dateChanged( TQDate )), - TQT_SLOT( setNewDate( TQDate ) ) ); - connect( mCopyPopupMenu, TQT_SIGNAL( dateChanged( TQDate )), - TQT_SLOT( copyTodoToDate( TQDate ) ) ); + connect( mMovePopupMenu, TQ_SIGNAL( dateChanged( TQDate )), + TQ_SLOT( setNewDate( TQDate ) ) ); + connect( mCopyPopupMenu, TQ_SIGNAL( dateChanged( TQDate )), + TQ_SLOT( copyTodoToDate( TQDate ) ) ); mItemPopupMenu = new TQPopupMenu(this); mItemPopupMenu->insertItem(i18n("&Show"), this, - TQT_SLOT (showTodo())); + TQ_SLOT (showTodo())); mItemPopupMenu->insertItem(i18n("&Edit..."), this, - TQT_SLOT (editTodo()), 0, ePopupEdit ); + TQ_SLOT (editTodo()), 0, ePopupEdit ); #ifndef KORG_NOPRINTER - mItemPopupMenu->insertItem(KOGlobals::self()->smallIcon("printer"), i18n("&Print..."), this, TQT_SLOT( printTodo() ) ); + mItemPopupMenu->insertItem(KOGlobals::self()->smallIcon("printer"), i18n("&Print..."), this, TQ_SLOT( printTodo() ) ); #endif mItemPopupMenu->insertItem(KOGlobals::self()->smallIconSet("edit-delete"), i18n("&Delete"), this, - TQT_SLOT (deleteTodo()), 0, ePopupDelete ); + TQ_SLOT (deleteTodo()), 0, ePopupDelete ); mItemPopupMenu->insertSeparator(); mItemPopupMenu->insertItem(KOGlobals::self()->smallIconSet("todo"), i18n("New &To-do..."), this, - TQT_SLOT (newTodo()) ); + TQ_SLOT (newTodo()) ); mItemPopupMenu->insertItem(i18n("New Su&b-to-do..."), this, - TQT_SLOT (newSubTodo())); + TQ_SLOT (newSubTodo())); mItemPopupMenu->insertItem( i18n("&Make this To-do Independent"), this, - TQT_SIGNAL( unSubTodoSignal() ), 0, ePopupUnSubTodo ); + TQ_SIGNAL( unSubTodoSignal() ), 0, ePopupUnSubTodo ); mItemPopupMenu->insertItem( i18n("Make all Sub-to-dos &Independent"), this, - TQT_SIGNAL( unAllSubTodoSignal() ), 0, ePopupUnAllSubTodo ); + TQ_SIGNAL( unAllSubTodoSignal() ), 0, ePopupUnAllSubTodo ); mItemPopupMenu->insertSeparator(); mItemPopupMenu->insertItem( i18n("&Copy To"), mCopyPopupMenu, ePopupCopyTo ); mItemPopupMenu->insertItem(i18n("&Move To"), mMovePopupMenu, ePopupMoveTo ); mItemPopupMenu->insertSeparator(); mItemPopupMenu->insertItem(i18n("delete completed to-dos","Pur&ge Completed"), - this, TQT_SLOT( purgeCompleted() ) ); + this, TQ_SLOT( purgeCompleted() ) ); - connect( mMovePopupMenu, TQT_SIGNAL( dateChanged( TQDate ) ), - mItemPopupMenu, TQT_SLOT( hide() ) ); - connect( mCopyPopupMenu, TQT_SIGNAL( dateChanged( TQDate ) ), - mItemPopupMenu, TQT_SLOT( hide() ) ); + connect( mMovePopupMenu, TQ_SIGNAL( dateChanged( TQDate ) ), + mItemPopupMenu, TQ_SLOT( hide() ) ); + connect( mCopyPopupMenu, TQ_SIGNAL( dateChanged( TQDate ) ), + mItemPopupMenu, TQ_SLOT( hide() ) ); mPopupMenu = new TQPopupMenu(this); mPopupMenu->insertItem(KOGlobals::self()->smallIconSet("todo"), i18n("&New To-do..."), this, - TQT_SLOT(newTodo()) ); + TQ_SLOT(newTodo()) ); mPopupMenu->insertItem(i18n("delete completed to-dos","&Purge Completed"), - this, TQT_SLOT(purgeCompleted())); + this, TQ_SLOT(purgeCompleted())); mDocPrefs = new DocPrefs( name ); // Double clicking conflicts with opening/closing the subtree - connect( mTodoListView, TQT_SIGNAL( doubleClicked( TQListViewItem *, + connect( mTodoListView, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( editItem( TQListViewItem *, const TQPoint &, int ) ) ); - connect( mTodoListView, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - TQT_SLOT( editItem( TQListViewItem * ) ) ); - connect( mTodoListView, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, + TQ_SLOT( editItem( TQListViewItem *, const TQPoint &, int ) ) ); + connect( mTodoListView, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + TQ_SLOT( editItem( TQListViewItem * ) ) ); + connect( mTodoListView, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) ); - connect( mTodoListView, TQT_SIGNAL( expanded( TQListViewItem * ) ), - TQT_SLOT( itemStateChanged( TQListViewItem * ) ) ); - connect( mTodoListView, TQT_SIGNAL( collapsed( TQListViewItem * ) ), - TQT_SLOT( itemStateChanged( TQListViewItem * ) ) ); + TQ_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) ); + connect( mTodoListView, TQ_SIGNAL( expanded( TQListViewItem * ) ), + TQ_SLOT( itemStateChanged( TQListViewItem * ) ) ); + connect( mTodoListView, TQ_SIGNAL( collapsed( TQListViewItem * ) ), + TQ_SLOT( itemStateChanged( TQListViewItem * ) ) ); #if 0 - connect(mTodoListView,TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(selectionChanged(TQListViewItem *))); - connect(mTodoListView,TQT_SIGNAL(clicked(TQListViewItem *)), - TQT_SLOT(selectionChanged(TQListViewItem *))); - connect(mTodoListView,TQT_SIGNAL(pressed(TQListViewItem *)), - TQT_SLOT(selectionChanged(TQListViewItem *))); + connect(mTodoListView,TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(selectionChanged(TQListViewItem *))); + connect(mTodoListView,TQ_SIGNAL(clicked(TQListViewItem *)), + TQ_SLOT(selectionChanged(TQListViewItem *))); + connect(mTodoListView,TQ_SIGNAL(pressed(TQListViewItem *)), + TQ_SLOT(selectionChanged(TQListViewItem *))); #endif - connect( mTodoListView, TQT_SIGNAL(selectionChanged() ), - TQT_SLOT( processSelectionChange() ) ); - connect( mQuickAdd, TQT_SIGNAL( returnPressed () ), - TQT_SLOT( addQuickTodo() ) ); + connect( mTodoListView, TQ_SIGNAL(selectionChanged() ), + TQ_SLOT( processSelectionChange() ) ); + connect( mQuickAdd, TQ_SIGNAL( returnPressed () ), + TQ_SLOT( addQuickTodo() ) ); new KOTodoListViewToolTip( mTodoListView->viewport(), calendar, mTodoListView ); } @@ -648,7 +648,7 @@ bool KOTodoView::scheduleRemoveTodoItem( KOTodoViewItem *todoItem ) { if ( todoItem ) { mItemsToDelete.append( todoItem ); - TQTimer::singleShot( 0, this, TQT_SLOT( removeTodoItems() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( removeTodoItems() ) ); return true; } else return false; @@ -731,13 +731,13 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action) } break; default: - TQTimer::singleShot( 0, this, TQT_SLOT( updateView() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateView() ) ); } } else { // use a TQTimer here, because when marking todos finished using // the checkbox, this slot gets called, but we cannot update the views // because we're still inside KOTodoViewItem::stateChange - TQTimer::singleShot(0,this,TQT_SLOT(updateView())); + TQTimer::singleShot(0,this,TQ_SLOT(updateView())); } } @@ -857,7 +857,7 @@ void KOTodoView::printTodo() #ifndef KORG_NOPRINTER KOCoreHelper helper; CalPrinter printer( this, BaseView::calendar(), &helper ); - connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) ); + connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) ); Incidence::List selectedIncidences; selectedIncidences.append( mActiveItem->todo() ); @@ -1015,8 +1015,8 @@ TQPopupMenu *KOTodoView::getCategoryPopupMenu( KOTodoViewItem *todoItem ) tempMenu->setItemChecked( index, true ); } - connect ( tempMenu, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( changedCategories( int ) ) ); + connect ( tempMenu, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( changedCategories( int ) ) ); return tempMenu; } @@ -1067,7 +1067,7 @@ void KOTodoView::setNewPercentageDelayed( KOTodoViewItem *item, int percentage ) { mPercentChangedMap.append( qMakePair( item, percentage ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( processDelayedNewPercentage() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( processDelayedNewPercentage() ) ); } void KOTodoView::processDelayedNewPercentage() diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 2ee92b12..b983d953 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -225,60 +225,60 @@ void KOViewManager::connectView(KOrg::BaseView *view) if (!view) return; // selecting an incidence - connect( view, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), - mMainView, TQT_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) ); + connect( view, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), + mMainView, TQ_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) ); // showing/editing/deleting an incidence. The calendar view takes care of the action. - connect( view, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(showIncidence(Incidence *,const TQDate &)) ); - connect( view, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(editIncidence(Incidence *,const TQDate &)) ); - connect( view, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - mMainView, TQT_SLOT(deleteIncidence(Incidence *)) ); - connect( view, TQT_SIGNAL(copyIncidenceSignal(Incidence *)), - mMainView, TQT_SLOT(copyIncidence(Incidence *)) ); - connect( view, TQT_SIGNAL(cutIncidenceSignal(Incidence *)), - mMainView, TQT_SLOT(cutIncidence(Incidence *)) ); - connect( view, TQT_SIGNAL(pasteIncidenceSignal()), - mMainView, TQT_SLOT(pasteIncidence())); - connect( view, TQT_SIGNAL(toggleAlarmSignal(Incidence *)), - mMainView, TQT_SLOT(toggleAlarm(Incidence *)) ); - connect( view,TQT_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(dissociateOccurrence(Incidence *,const TQDate &)) ); - connect( view,TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(dissociateFutureOccurrence(Incidence *,const TQDate &)) ); + connect( view, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(showIncidence(Incidence *,const TQDate &)) ); + connect( view, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(editIncidence(Incidence *,const TQDate &)) ); + connect( view, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + mMainView, TQ_SLOT(deleteIncidence(Incidence *)) ); + connect( view, TQ_SIGNAL(copyIncidenceSignal(Incidence *)), + mMainView, TQ_SLOT(copyIncidence(Incidence *)) ); + connect( view, TQ_SIGNAL(cutIncidenceSignal(Incidence *)), + mMainView, TQ_SLOT(cutIncidence(Incidence *)) ); + connect( view, TQ_SIGNAL(pasteIncidenceSignal()), + mMainView, TQ_SLOT(pasteIncidence())); + connect( view, TQ_SIGNAL(toggleAlarmSignal(Incidence *)), + mMainView, TQ_SLOT(toggleAlarm(Incidence *)) ); + connect( view,TQ_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(dissociateOccurrence(Incidence *,const TQDate &)) ); + connect( view,TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(dissociateFutureOccurrence(Incidence *,const TQDate &)) ); // signals to create new incidences - connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), - mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &)) ); - connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), - mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDate &)) ); - connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)), - mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &)) ); - connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)), - mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)) ); - - connect( view, TQT_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)), - mMainView, TQT_SLOT(newTodo(ResourceCalendar *,const TQString &,const TQDate &)) ); - connect( view, TQT_SIGNAL(newSubTodoSignal(Todo *)), - mMainView, TQT_SLOT(newSubTodo(Todo *)) ); - - connect( view, TQT_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)), - mMainView, TQT_SLOT(newJournal(ResourceCalendar *,const TQString &,const TQDate &)) ); + connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), + mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &)) ); + connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), + mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDate &)) ); + connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)), + mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &)) ); + connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)), + mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)) ); + + connect( view, TQ_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)), + mMainView, TQ_SLOT(newTodo(ResourceCalendar *,const TQString &,const TQDate &)) ); + connect( view, TQ_SIGNAL(newSubTodoSignal(Todo *)), + mMainView, TQ_SLOT(newSubTodo(Todo *)) ); + + connect( view, TQ_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)), + mMainView, TQ_SLOT(newJournal(ResourceCalendar *,const TQString &,const TQDate &)) ); // reload settings - connect(mMainView, TQT_SIGNAL(configChanged()), view, TQT_SLOT(updateConfig())); + connect(mMainView, TQ_SIGNAL(configChanged()), view, TQ_SLOT(updateConfig())); // Notifications about added, changed and deleted incidences - connect( mMainView, TQT_SIGNAL( dayPassed( const TQDate & ) ), - view, TQT_SLOT( dayPassed( const TQDate & ) ) ); - connect( view, TQT_SIGNAL( startMultiModify( const TQString & ) ), - mMainView, TQT_SLOT( startMultiModify( const TQString & ) ) ); - connect( view, TQT_SIGNAL( endMultiModify() ), - mMainView, TQT_SLOT( endMultiModify() ) ); - - connect( mMainView, TQT_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), - view, TQT_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) ); + connect( mMainView, TQ_SIGNAL( dayPassed( const TQDate & ) ), + view, TQ_SLOT( dayPassed( const TQDate & ) ) ); + connect( view, TQ_SIGNAL( startMultiModify( const TQString & ) ), + mMainView, TQ_SLOT( startMultiModify( const TQString & ) ) ); + connect( view, TQ_SIGNAL( endMultiModify() ), + mMainView, TQ_SLOT( endMultiModify() ) ); + + connect( mMainView, TQ_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), + view, TQ_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) ); view->setIncidenceChanger( mMainView->incidenceChanger() ); } @@ -287,12 +287,12 @@ void KOViewManager::connectTodoView( KOTodoView* todoView ) if (!todoView) return; // SIGNALS/SLOTS FOR TODO VIEW - connect( todoView, TQT_SIGNAL( purgeCompletedSignal() ), - mMainView, TQT_SLOT( purgeCompleted() ) ); - connect( todoView, TQT_SIGNAL( unSubTodoSignal() ), - mMainView, TQT_SLOT( todo_unsub() ) ); - connect( todoView, TQT_SIGNAL( unAllSubTodoSignal() ), - mMainView, TQT_SLOT( makeSubTodosIndependent() ) ); + connect( todoView, TQ_SIGNAL( purgeCompletedSignal() ), + mMainView, TQ_SLOT( purgeCompleted() ) ); + connect( todoView, TQ_SIGNAL( unSubTodoSignal() ), + mMainView, TQ_SLOT( todo_unsub() ) ); + connect( todoView, TQ_SIGNAL( unAllSubTodoSignal() ), + mMainView, TQ_SLOT( makeSubTodosIndependent() ) ); } void KOViewManager::zoomInHorizontally() @@ -357,8 +357,8 @@ void KOViewManager::showAgendaView() TQWidget *parent = mMainView->viewStack(); if ( !mAgendaViewTabs && showBoth ) { mAgendaViewTabs = new TQTabWidget( mMainView->viewStack() ); - connect( mAgendaViewTabs, TQT_SIGNAL( currentChanged( TQWidget* ) ), - this, TQT_SLOT( currentAgendaViewTabChanged( TQWidget* ) ) ); + connect( mAgendaViewTabs, TQ_SIGNAL( currentChanged( TQWidget* ) ), + this, TQ_SLOT( currentAgendaViewTabChanged( TQWidget* ) ) ); parent = mAgendaViewTabs; TDEConfig *config = KOGlobals::self()->config(); @@ -374,13 +374,13 @@ void KOViewManager::showAgendaView() addView(mAgendaView); - connect(mAgendaView, TQT_SIGNAL( toggleExpand() ), - mMainView, TQT_SLOT( toggleExpand() ) ); - connect(mMainView, TQT_SIGNAL( calendarViewExpanded( bool ) ), - mAgendaView, TQT_SLOT( setExpandedButton( bool ) ) ); + connect(mAgendaView, TQ_SIGNAL( toggleExpand() ), + mMainView, TQ_SLOT( toggleExpand() ) ); + connect(mMainView, TQ_SIGNAL( calendarViewExpanded( bool ) ), + mAgendaView, TQ_SLOT( setExpandedButton( bool ) ) ); - connect( mAgendaView,TQT_SIGNAL( zoomViewHorizontally(const TQDate &, int )), - mMainView->dateNavigator(),TQT_SLOT( selectDates( const TQDate &, int ) ) ); + connect( mAgendaView,TQ_SIGNAL( zoomViewHorizontally(const TQDate &, int )), + mMainView->dateNavigator(),TQ_SLOT( selectDates( const TQDate &, int ) ) ); mAgendaView->readSettings(); } @@ -391,13 +391,13 @@ void KOViewManager::showAgendaView() addView(mAgendaSideBySideView); -/* connect(mAgendaSideBySideView, TQT_SIGNAL( toggleExpand() ), - mMainView, TQT_SLOT( toggleExpand() ) ); - connect(mMainView, TQT_SIGNAL( calendarViewExpanded( bool ) ), - mAgendaSideBySideView, TQT_SLOT( setExpandedButton( bool ) ) ); +/* connect(mAgendaSideBySideView, TQ_SIGNAL( toggleExpand() ), + mMainView, TQ_SLOT( toggleExpand() ) ); + connect(mMainView, TQ_SIGNAL( calendarViewExpanded( bool ) ), + mAgendaSideBySideView, TQ_SLOT( setExpandedButton( bool ) ) ); - connect( mAgendaSideBySideView,TQT_SIGNAL( zoomViewHorizontally(const TQDate &, int )), - mMainView->dateNavigator(),TQT_SLOT( selectDates( const TQDate &, int ) ) );*/ + connect( mAgendaSideBySideView,TQ_SIGNAL( zoomViewHorizontally(const TQDate &, int )), + mMainView->dateNavigator(),TQ_SLOT( selectDates( const TQDate &, int ) ) );*/ } if ( showBoth && mAgendaViewTabs ) { diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 7b8ab992..7c8ce447 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -70,7 +70,7 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *parent, // dateLabel->setAlignment(AlignCenter); mView = new WhatsNextTextBrowser(this); - connect(mView,TQT_SIGNAL(showIncidence(const TQString &)),TQT_SLOT(showIncidence(const TQString &))); + connect(mView,TQ_SIGNAL(showIncidence(const TQString &)),TQ_SLOT(showIncidence(const TQString &))); TQBoxLayout *topLayout = new TQVBoxLayout(this); // topLayout->addWidget(dateLabel); diff --git a/korganizer/mailscheduler.cpp b/korganizer/mailscheduler.cpp index c57cd6f2..666869ce 100644 --- a/korganizer/mailscheduler.cpp +++ b/korganizer/mailscheduler.cpp @@ -27,7 +27,7 @@ #include <tqregexp.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <libkcal/calendar.h> diff --git a/korganizer/main.cpp b/korganizer/main.cpp index 9090b949..8640c092 100644 --- a/korganizer/main.cpp +++ b/korganizer/main.cpp @@ -41,7 +41,7 @@ int main ( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( korganizer_options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); if ( !KOrganizerApp::start() ) return 0; diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp index cc21b249..e900fa48 100644 --- a/korganizer/multiagendaview.cpp +++ b/korganizer/multiagendaview.cpp @@ -142,13 +142,13 @@ void MultiAgendaView::recreateViews() } setupViews(); - TQTimer::singleShot( 0, this, TQT_SLOT(slotResizeScrollView()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotResizeScrollView()) ); mTimeLabels->updateConfig(); - connect( mTimeLabels->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), - mScrollBar, TQT_SLOT(setValue(int)) ); - connect( mScrollBar, TQT_SIGNAL(valueChanged(int)), - mTimeLabels, TQT_SLOT(positionChanged(int)) ); + connect( mTimeLabels->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)), + mScrollBar, TQ_SLOT(setValue(int)) ); + connect( mScrollBar, TQ_SIGNAL(valueChanged(int)), + mTimeLabels, TQ_SLOT(positionChanged(int)) ); installSplitterEventFilter( mLeftSplitter ); installSplitterEventFilter( mRightSplitter ); @@ -163,7 +163,7 @@ void MultiAgendaView::recreateViews() mLeftSplitter->setSizes( sizes ); mRightSplitter->setSizes( sizes ); - TQTimer::singleShot( 0, this, TQT_SLOT(setupScrollBar()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(setupScrollBar()) ); mTimeLabels->positionChanged(); } @@ -185,79 +185,79 @@ void MultiAgendaView::setupViews() FOREACH_VIEW( agenda ) { if ( !agenda->readOnly() ) { connect( agenda, - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) ); + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) ); connect( agenda, - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); connect( agenda, - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)) ); + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)) ); connect( agenda, - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime&)) ); + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime&)) ); connect( agenda, - TQT_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)), - TQT_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); + TQ_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)), + TQ_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); connect( agenda, - TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); + TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); connect( agenda, - TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) ); + TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) ); connect( agenda, - TQT_SIGNAL(startMultiModify(const TQString &)), - TQT_SIGNAL(startMultiModify(const TQString &)) ); + TQ_SIGNAL(startMultiModify(const TQString &)), + TQ_SIGNAL(startMultiModify(const TQString &)) ); connect( agenda, - TQT_SIGNAL(endMultiModify()), - TQT_SIGNAL(endMultiModify()) ); + TQ_SIGNAL(endMultiModify()), + TQ_SIGNAL(endMultiModify()) ); connect( agenda, - TQT_SIGNAL(cutIncidenceSignal(Incidence*)), - TQT_SIGNAL(cutIncidenceSignal(Incidence*)) ); + TQ_SIGNAL(cutIncidenceSignal(Incidence*)), + TQ_SIGNAL(cutIncidenceSignal(Incidence*)) ); connect( agenda, - TQT_SIGNAL(pasteIncidenceSignal()), - TQT_SIGNAL(pasteIncidenceSignal()) ); + TQ_SIGNAL(pasteIncidenceSignal()), + TQ_SIGNAL(pasteIncidenceSignal()) ); connect( agenda, - TQT_SIGNAL(toggleAlarmSignal(Incidence*)), - TQT_SIGNAL(toggleAlarmSignal(Incidence*)) ); + TQ_SIGNAL(toggleAlarmSignal(Incidence*)), + TQ_SIGNAL(toggleAlarmSignal(Incidence*)) ); connect( agenda, - TQT_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)), - TQT_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)) ); + TQ_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)), + TQ_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)) ); connect( agenda, - TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)), - TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)) ); + TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)), + TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)) ); } connect( agenda, - TQT_SIGNAL(copyIncidenceSignal(Incidence*)), - TQT_SIGNAL(copyIncidenceSignal(Incidence*)) ); + TQ_SIGNAL(copyIncidenceSignal(Incidence*)), + TQ_SIGNAL(copyIncidenceSignal(Incidence*)) ); connect( agenda, - TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); + TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); connect( agenda, - TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), - TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) ); + TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), + TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) ); connect( agenda, - TQT_SIGNAL(incidenceSelected(Incidence*,const TQDate &)), - TQT_SLOT(slotSelectionChanged()) ); + TQ_SIGNAL(incidenceSelected(Incidence*,const TQDate &)), + TQ_SLOT(slotSelectionChanged()) ); connect( agenda, - TQT_SIGNAL(timeSpanSelectionChanged()), - TQT_SLOT(slotClearTimeSpanSelection()) ); + TQ_SIGNAL(timeSpanSelectionChanged()), + TQ_SLOT(slotClearTimeSpanSelection()) ); disconnect( agenda->agenda(), - TQT_SIGNAL(zoomView(const int,const TQPoint&,const TQt::Orientation)), + TQ_SIGNAL(zoomView(const int,const TQPoint&,const TQt::Orientation)), agenda, 0 ); connect( agenda->agenda(), - TQT_SIGNAL(zoomView(const int,const TQPoint&,const TQt::Orientation)), - TQT_SLOT(zoomView(const int,const TQPoint&,const TQt::Orientation)) ); + TQ_SIGNAL(zoomView(const int,const TQPoint&,const TQt::Orientation)), + TQ_SLOT(zoomView(const int,const TQPoint&,const TQt::Orientation)) ); } KOAgenda *anAgenda = mAgendaViews.first()->agenda(); - connect( anAgenda, TQT_SIGNAL(lowerYChanged(int) ), TQT_SLOT(resizeSpacers(int)) ); + connect( anAgenda, TQ_SIGNAL(lowerYChanged(int) ), TQ_SLOT(resizeSpacers(int)) ); FOREACH_VIEW( agenda ) { agenda->readSettings(); @@ -409,10 +409,10 @@ void MultiAgendaView::addView( const TQString &label, ResourceCalendar *res, con box->show(); mTimeLabels->setAgenda( av->agenda() ); - connect( av->agenda()->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), - mTimeLabels, TQT_SLOT(positionChanged(int)) ); - connect( mTimeLabels->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), - av, TQT_SLOT(setContentsPos(int)) ); + connect( av->agenda()->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)), + mTimeLabels, TQ_SLOT(positionChanged(int)) ); + connect( mTimeLabels->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)), + av, TQ_SLOT(setContentsPos(int)) ); av->installEventFilter( this ); installSplitterEventFilter( av->splitter() ); @@ -471,7 +471,7 @@ bool MultiAgendaView::eventFilter(TQObject * obj, TQEvent * event) mLastMovedSplitter = mLeftSplitter; else if ( mRightSplitter == obj->parent() ) mLastMovedSplitter = mRightSplitter; - TQTimer::singleShot( 0, this, TQT_SLOT(resizeSplitters()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(resizeSplitters()) ); } } diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index 223cbb98..23581036 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp @@ -118,12 +118,12 @@ NavigatorBar::NavigatorBar( TQWidget *parent, const char *name ) ctrlLayout->addWidget( mNextMonth ); ctrlLayout->addWidget( mNextYear ); - connect( mPrevYear, TQT_SIGNAL( clicked() ), TQT_SIGNAL( prevYearClicked() ) ); - connect( mPrevMonth, TQT_SIGNAL( clicked() ), TQT_SIGNAL( prevMonthClicked() ) ); - connect( mNextMonth, TQT_SIGNAL( clicked() ), TQT_SIGNAL( nextMonthClicked() ) ); - connect( mNextYear, TQT_SIGNAL( clicked() ), TQT_SIGNAL( nextYearClicked() ) ); - connect( mMonth, TQT_SIGNAL( clicked() ), TQT_SLOT( selectMonthFromMenu() ) ); - connect( mYear, TQT_SIGNAL( clicked() ), TQT_SLOT( selectYearFromMenu() ) ); + connect( mPrevYear, TQ_SIGNAL( clicked() ), TQ_SIGNAL( prevYearClicked() ) ); + connect( mPrevMonth, TQ_SIGNAL( clicked() ), TQ_SIGNAL( prevMonthClicked() ) ); + connect( mNextMonth, TQ_SIGNAL( clicked() ), TQ_SIGNAL( nextMonthClicked() ) ); + connect( mNextYear, TQ_SIGNAL( clicked() ), TQ_SIGNAL( nextYearClicked() ) ); + connect( mMonth, TQ_SIGNAL( clicked() ), TQ_SLOT( selectMonthFromMenu() ) ); + connect( mYear, TQ_SIGNAL( clicked() ), TQ_SLOT( selectYearFromMenu() ) ); } NavigatorBar::~NavigatorBar() diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp index 5b3b47d8..ebff01c7 100644 --- a/korganizer/plugins/datenums/configdialog.cpp +++ b/korganizer/plugins/datenums/configdialog.cpp @@ -28,8 +28,8 @@ #include <tdeapplication.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include "configdialog.h" #include "configdialog.moc" diff --git a/korganizer/plugins/datenums/datenums.cpp b/korganizer/plugins/datenums/datenums.cpp index 468095a9..ad3e8ea8 100644 --- a/korganizer/plugins/datenums/datenums.cpp +++ b/korganizer/plugins/datenums/datenums.cpp @@ -20,7 +20,7 @@ #include "datenums.h" #include "koglobals.h" #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "configdialog.h" #include <kcalendarsystem.h> diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index e0bc1ab7..bb91a5b1 100644 --- a/korganizer/plugins/exchange/exchange.cpp +++ b/korganizer/plugins/exchange/exchange.cpp @@ -21,7 +21,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> #include <kdebug.h> @@ -69,29 +69,29 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) : setXMLFile("plugins/exchangeui.rc"); - new TDEAction(i18n("&Download..."), 0, this, TQT_SLOT(download()), + new TDEAction(i18n("&Download..."), 0, this, TQ_SLOT(download()), actionCollection(), "exchange_download"); - TDEAction *action = new TDEAction(i18n("&Upload Event..."), 0, this, TQT_SLOT(upload()), + TDEAction *action = new TDEAction(i18n("&Upload Event..."), 0, this, TQ_SLOT(upload()), actionCollection(), "exchange_upload"); - TQObject::connect(mainWindow()->view(),TQT_SIGNAL(incidenceSelected(Incidence *)), - this, TQT_SLOT(slotIncidenceSelected(Incidence *))); + TQObject::connect(mainWindow()->view(),TQ_SIGNAL(incidenceSelected(Incidence *)), + this, TQ_SLOT(slotIncidenceSelected(Incidence *))); action->setEnabled( false ); - TQObject::connect(this,TQT_SIGNAL(enableIncidenceActions(bool)), - action,TQT_SLOT(setEnabled(bool))); + TQObject::connect(this,TQ_SIGNAL(enableIncidenceActions(bool)), + action,TQ_SLOT(setEnabled(bool))); - action = new TDEAction(i18n("De&lete Event"), 0, this, TQT_SLOT(remove()), + action = new TDEAction(i18n("De&lete Event"), 0, this, TQ_SLOT(remove()), actionCollection(), "exchange_delete"); - TQObject::connect(this,TQT_SIGNAL(enableIncidenceActions(bool)), - action,TQT_SLOT(setEnabled(bool))); + TQObject::connect(this,TQ_SIGNAL(enableIncidenceActions(bool)), + action,TQ_SLOT(setEnabled(bool))); action->setEnabled( false ); - new TDEAction(i18n("&Configure..."), 0, this, TQT_SLOT(configure()), + new TDEAction(i18n("&Configure..."), 0, this, TQ_SLOT(configure()), actionCollection(), "exchange_configure"); - connect( this, TQT_SIGNAL( calendarChanged() ), mainWindow()->view(), TQT_SLOT( updateView() ) ); - connect( this, TQT_SIGNAL( calendarChanged(const TQDate &, const TQDate &)), - mainWindow()->view(), TQT_SLOT(updateView(const TQDate &, const TQDate &)) ); + connect( this, TQ_SIGNAL( calendarChanged() ), mainWindow()->view(), TQ_SLOT( updateView() ) ); + connect( this, TQ_SIGNAL( calendarChanged(const TQDate &, const TQDate &)), + mainWindow()->view(), TQ_SLOT(updateView(const TQDate &, const TQDate &)) ); } Exchange::~Exchange() diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp index 106fc867..2c398560 100644 --- a/korganizer/plugins/exchange/exchangeconfig.cpp +++ b/korganizer/plugins/exchange/exchangeconfig.cpp @@ -53,7 +53,7 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent m_user = new KLineEdit( mAccount->account(), topFrame ); topLayout->addWidget( new TQLabel( i18n( "User:" ), topFrame ), 2, 0 ); topLayout->addWidget( m_user, 2, 1 ); - connect( m_user, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUserChanged(const TQString&)) ); + connect( m_user, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotUserChanged(const TQString&)) ); m_password = new KLineEdit( mAccount->password(), topFrame ); topLayout->addWidget( new TQLabel( i18n( "Password:" ), topFrame ), 3, 0 ); @@ -62,7 +62,7 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent m_autoMailbox = new TQCheckBox( i18n( "Determine mailbox automatically" ), topFrame ); topLayout->addMultiCellWidget( m_autoMailbox, 4, 4, 0, 1 ); - connect( m_autoMailbox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAuto(bool)) ); + connect( m_autoMailbox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAuto(bool)) ); m_mailbox= new KLineEdit( mAccount->mailbox(), topFrame ); topLayout->addWidget( new TQLabel( i18n( "Mailbox URL:" ), topFrame ), 5, 0 ); @@ -70,10 +70,10 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent m_tryFindMailbox = new TQPushButton( "&Find", topFrame ); topLayout->addWidget( m_tryFindMailbox, 5, 2 ); - connect( m_tryFindMailbox, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFindClicked()) ); + connect( m_tryFindMailbox, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFindClicked()) ); - kapp->config()->setGroup( "Calendar/Exchange Plugin" ); - bool autoChecked = kapp->config()->readBoolEntry( "auto-mailbox", true ); + tdeApp->config()->setGroup( "Calendar/Exchange Plugin" ); + bool autoChecked = tdeApp->config()->readBoolEntry( "auto-mailbox", true ); m_autoMailbox->setChecked( autoChecked ); } @@ -116,8 +116,8 @@ void ExchangeConfig::slotOk() mAccount->setAccount( m_user->text() ); mAccount->setPassword( m_password->text() ); - kapp->config()->setGroup( "Calendar/Exchange Plugin" ); - kapp->config()->writeEntry( "auto-mailbox", m_autoMailbox->isChecked() ); + tdeApp->config()->setGroup( "Calendar/Exchange Plugin" ); + tdeApp->config()->writeEntry( "auto-mailbox", m_autoMailbox->isChecked() ); accept(); } diff --git a/korganizer/plugins/exchange/exchangedialog.cpp b/korganizer/plugins/exchange/exchangedialog.cpp index e457de38..b4dc2dc7 100644 --- a/korganizer/plugins/exchange/exchangedialog.cpp +++ b/korganizer/plugins/exchange/exchangedialog.cpp @@ -25,8 +25,8 @@ #include <tdemessagebox.h> #include <tdeapplication.h> #include <tdeglobal.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include "exchangedialog.h" diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp index 06f0b1b7..736308eb 100644 --- a/korganizer/plugins/hebrew/configdialog.cpp +++ b/korganizer/plugins/hebrew/configdialog.cpp @@ -23,8 +23,8 @@ #include <tdeapplication.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> ConfigDialog::ConfigDialog(TQWidget * parent):KDialogBase(Plain, i18n("Configure Holidays"), Ok|Cancel, Ok, parent) diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp index a96859a6..dd734b42 100644 --- a/korganizer/plugins/hebrew/hebrew.cpp +++ b/korganizer/plugins/hebrew/hebrew.cpp @@ -19,8 +19,8 @@ #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include <kcalendarsystem.h> #include <kcalendarsystemfactory.h> #include "hebrew.h" diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp index 033b6ba6..d0eb7298 100644 --- a/korganizer/plugins/projectview/koprojectview.cpp +++ b/korganizer/plugins/projectview/koprojectview.cpp @@ -35,7 +35,7 @@ #include <kiconloader.h> #include <tdemessagebox.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <libkcal/vcaldrag.h> @@ -79,15 +79,15 @@ KOProjectView::KOProjectView(Calendar *calendar,TQWidget* parent, TQPushButton *zoomIn = new TQPushButton(i18n("Zoom In"),this); topBar->addWidget(zoomIn,0); - connect(zoomIn,TQT_SIGNAL(clicked()),TQT_SLOT(zoomIn())); + connect(zoomIn,TQ_SIGNAL(clicked()),TQ_SLOT(zoomIn())); TQPushButton *zoomOut = new TQPushButton(i18n("Zoom Out"),this); topBar->addWidget(zoomOut,0); - connect(zoomOut,TQT_SIGNAL(clicked()),TQT_SLOT(zoomOut())); + connect(zoomOut,TQ_SIGNAL(clicked()),TQ_SLOT(zoomOut())); TQPushButton *menuButton = new TQPushButton(i18n("Select Mode"),this); topBar->addWidget(menuButton,0); - connect(menuButton,TQT_SIGNAL(clicked()),TQT_SLOT(showModeMenu())); + connect(menuButton,TQ_SIGNAL(clicked()),TQ_SLOT(showModeMenu())); createMainTask(); @@ -118,7 +118,7 @@ void KOProjectView::readSettings() { kdDebug(5850) << "KOProjectView::readSettings()" << endl; - //TDEConfig *config = kapp->config(); + //TDEConfig *config = tdeApp->config(); TDEConfig config( "korganizerrc", true, false); // Open read-only, no kdeglobals config.setGroup("Views"); @@ -239,8 +239,8 @@ KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo) KGanttItem *task = new KOProjectViewItem(todo,parent,todo->summary(),startDt, endDt); - connect(task,TQT_SIGNAL(changed(KGanttItem*, KGanttItem::Change)), - TQT_SLOT(taskChanged(KGanttItem*,KGanttItem::Change))); + connect(task,TQ_SIGNAL(changed(KGanttItem*, KGanttItem::Change)), + TQ_SLOT(taskChanged(KGanttItem*,KGanttItem::Change))); if (todo->relations().count() > 0) { task->setBrush(TQBrush(TQColor(240,240,240), TQBrush::Dense4Pattern)); } diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp index 60257623..5a39a7ba 100644 --- a/korganizer/plugins/projectview/projectview.cpp +++ b/korganizer/plugins/projectview/projectview.cpp @@ -21,7 +21,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> #include <tdeaction.h> @@ -52,7 +52,7 @@ ProjectView::ProjectView(KOrg::MainWindow *parent, const char *name) : setXMLFile("plugins/projectviewui.rc"); - new TDEAction(i18n("&Project"), "project", 0, this, TQT_SLOT(showView()), + new TDEAction(i18n("&Project"), "project", 0, this, TQ_SLOT(showView()), actionCollection(), "view_project"); } diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp index 8445edf4..8b5f4a82 100644 --- a/korganizer/plugins/timespanview/kotimespanview.cpp +++ b/korganizer/plugins/timespanview/kotimespanview.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <libkcal/calendar.h> @@ -44,7 +44,7 @@ KOTimeSpanView::KOTimeSpanView(Calendar *calendar, TQWidget *parent, mTimeSpanWidget = new TimeSpanWidget( this ); topLayout->addWidget( mTimeSpanWidget ); - connect( mTimeSpanWidget, TQT_SIGNAL( dateRangeChanged() ), TQT_SLOT( updateView() ) ); + connect( mTimeSpanWidget, TQ_SIGNAL( dateRangeChanged() ), TQ_SLOT( updateView() ) ); } KOTimeSpanView::~KOTimeSpanView() diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp index 4b3df7ef..56d46ebd 100644 --- a/korganizer/plugins/timespanview/timespanview.cpp +++ b/korganizer/plugins/timespanview/timespanview.cpp @@ -21,7 +21,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> #include <tdeaction.h> @@ -51,7 +51,7 @@ TimespanView::TimespanView(KOrg::MainWindow *parent, const char *name) : setXMLFile( "plugins/timespanviewui.rc" ); - new TDEAction( i18n("&Timespan"), "timespan", 0, this, TQT_SLOT( showView() ), + new TDEAction( i18n("&Timespan"), "timespan", 0, this, TQ_SLOT( showView() ), actionCollection(), "view_timespan" ); } diff --git a/korganizer/plugins/timespanview/timespanwidget.cpp b/korganizer/plugins/timespanview/timespanwidget.cpp index 8b0ff4b3..99f529b3 100644 --- a/korganizer/plugins/timespanview/timespanwidget.cpp +++ b/korganizer/plugins/timespanview/timespanwidget.cpp @@ -63,19 +63,19 @@ TimeSpanWidget::TimeSpanWidget( TQWidget *parent, const char *name ) : TQBoxLayout *buttonLayout = new TQHBoxLayout( rightPaneLayout ); TQPushButton *zoomInButton = new TQPushButton( i18n("Zoom In"), rightPane ); - connect( zoomInButton, TQT_SIGNAL( clicked() ), TQT_SLOT( zoomIn() ) ); + connect( zoomInButton, TQ_SIGNAL( clicked() ), TQ_SLOT( zoomIn() ) ); buttonLayout->addWidget( zoomInButton ); TQPushButton *zoomOutButton = new TQPushButton( i18n("Zoom Out"), rightPane ); - connect( zoomOutButton, TQT_SIGNAL( clicked() ), TQT_SLOT( zoomOut() ) ); + connect( zoomOutButton, TQ_SIGNAL( clicked() ), TQ_SLOT( zoomOut() ) ); buttonLayout->addWidget( zoomOutButton ); TQPushButton *centerButton = new TQPushButton( i18n("Center View"), rightPane ); - connect( centerButton, TQT_SIGNAL( clicked() ), TQT_SLOT( centerView() ) ); + connect( centerButton, TQ_SIGNAL( clicked() ), TQ_SLOT( centerView() ) ); buttonLayout->addWidget( centerButton ); - connect(mLineView->horizontalScrollBar(),TQT_SIGNAL(valueChanged(int)), - mTimeLine,TQT_SLOT(setContentsPos(int))); + connect(mLineView->horizontalScrollBar(),TQ_SIGNAL(valueChanged(int)), + mTimeLine,TQ_SLOT(setContentsPos(int))); } TimeSpanWidget::~TimeSpanWidget() diff --git a/korganizer/previewdialog.cpp b/korganizer/previewdialog.cpp index dade7791..ddf80396 100644 --- a/korganizer/previewdialog.cpp +++ b/korganizer/previewdialog.cpp @@ -36,7 +36,7 @@ #include <libkcal/calendarlocal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <tdemessagebox.h> #include <tdeio/netaccess.h> @@ -64,8 +64,8 @@ PreviewDialog::PreviewDialog( const KURL &url, TQWidget *parent ) topLayout->setSpacing( spacingHint() ); topLayout->setMargin( marginHint() ); - connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotMerge()) ); - connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(slotAdd()) ); + connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotMerge()) ); + connect( this, TQ_SIGNAL(user2Clicked()), TQ_SLOT(slotAdd()) ); // when someone edits a kmail attachment he's editing a tmp file, check for that // and if it's a tmp file then open a save dialog diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp index b202cb6d..596ece08 100644 --- a/korganizer/printing/calprinter.cpp +++ b/korganizer/printing/calprinter.cpp @@ -34,7 +34,7 @@ #include <tqsplitter.h> #include <kprinter.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kdebug.h> #include <tdeversion.h> @@ -50,7 +50,7 @@ CalPrinter::CalPrinter( TQWidget *parent, Calendar *calendar, KOrg::CoreHelper * : TQObject( parent, "CalPrinter" ) { mParent = parent; - mConfig = new KSimpleConfig( "korganizer_printing.rc" ); + mConfig = new TDESimpleConfig( "korganizer_printing.rc" ); mCoreHelper = helper; init( calendar ); @@ -202,7 +202,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins, splitterRightLayout->addWidget( mOrientationSelection, 1, 1 ); // signals and slots connections - connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( setPrintType( int ) ) ); + connect( mTypeGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( setPrintType( int ) ) ); orientationLabel->setBuddy( mOrientationSelection ); // First insert the config widgets into the widget stack. This possibly assigns diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h index 5d5035f4..f8d25a4b 100644 --- a/korganizer/printing/calprinter.h +++ b/korganizer/printing/calprinter.h @@ -31,7 +31,7 @@ #include <kdialogbase.h> #include <korganizer/baseview.h> #include <korganizer/printplugin.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KOrg { class CoreHelper; @@ -50,7 +50,7 @@ class TQLabel; different formats (day, week, month). It also provides a way for setting up the printer and remembering these preferences. */ -class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase +class TDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase { TQ_OBJECT diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp index c094ad84..4aff9a46 100644 --- a/korganizer/printing/calprintpluginbase.cpp +++ b/korganizer/printing/calprintpluginbase.cpp @@ -1742,7 +1742,7 @@ void CalPrintPluginBase::drawSplitHeaderRight( TQPainter &p, const TQDate &fd, p.drawLine(300, lineSpacing * 1, width, lineSpacing * 1); p.setPen( oldPen ); - p.setFont(TQFont("Times", 20, TQFont::Bold, TRUE)); + p.setFont(TQFont("Times", 20, TQFont::Bold, true)); int newlineSpacing = p.fontMetrics().lineSpacing(); title += TQString::number(fd.year()); p.drawText( 0, lineSpacing * 1 + 4, width, newlineSpacing, diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h index 7b9e52e0..7c265f38 100644 --- a/korganizer/printing/calprintpluginbase.h +++ b/korganizer/printing/calprintpluginbase.h @@ -30,7 +30,7 @@ #include <tqdatetime.h> #include <kprinter.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <libkcal/calendar.h> #include <libkcal/event.h> #include <libkcal/todo.h> @@ -61,7 +61,7 @@ using namespace KCal; Base class for KOrganizer printing classes. Each sub class represents one calendar print format. */ -class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin +class TDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin { public: enum DisplayFlags { diff --git a/korganizer/printing/cellitem.h b/korganizer/printing/cellitem.h index 4d8206bc..6e030365 100644 --- a/korganizer/printing/cellitem.h +++ b/korganizer/printing/cellitem.h @@ -27,11 +27,11 @@ #include <tqstring.h> #include <tqptrlist.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KOrg { -class KDE_EXPORT CellItem +class TDE_EXPORT CellItem { public: CellItem() diff --git a/korganizer/publishdialog.cpp b/korganizer/publishdialog.cpp index c8366add..5e597524 100644 --- a/korganizer/publishdialog.cpp +++ b/korganizer/publishdialog.cpp @@ -46,18 +46,18 @@ PublishDialog::PublishDialog( TQWidget* parent, const char* name, setMainWidget( mWidget ); mWidget->mNameLineEdit->setEnabled( false ); mWidget->mEmailLineEdit->setEnabled( false ); - connect( mWidget->mAddressListView, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), - TQT_SLOT(updateInput())); - connect( mWidget->mNew, TQT_SIGNAL( clicked() ), - TQT_SLOT( addItem() ) ); - connect( mWidget->mRemove, TQT_SIGNAL( clicked() ), - TQT_SLOT( removeItem() ) ); - connect( mWidget->mSelectAddressee, TQT_SIGNAL( clicked() ), - TQT_SLOT( openAddressbook() ) ); - connect( mWidget->mNameLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( updateItem() ) ); - connect( mWidget->mEmailLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( updateItem() ) ); + connect( mWidget->mAddressListView, TQ_SIGNAL( selectionChanged(TQListViewItem *) ), + TQ_SLOT(updateInput())); + connect( mWidget->mNew, TQ_SIGNAL( clicked() ), + TQ_SLOT( addItem() ) ); + connect( mWidget->mRemove, TQ_SIGNAL( clicked() ), + TQ_SLOT( removeItem() ) ); + connect( mWidget->mSelectAddressee, TQ_SIGNAL( clicked() ), + TQ_SLOT( openAddressbook() ) ); + connect( mWidget->mNameLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( updateItem() ) ); + connect( mWidget->mEmailLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( updateItem() ) ); } PublishDialog::~PublishDialog() diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp index ea640bb9..d8d1b637 100644 --- a/korganizer/resourceview.cpp +++ b/korganizer/resourceview.cpp @@ -100,23 +100,23 @@ CalendarViewExtension *ResourceViewFactory::create( TQWidget *parent ) { mResourceView = new ResourceView( mCalendar, mCalendarView, parent ); - TQObject::connect( mResourceView, TQT_SIGNAL( resourcesChanged() ), - mCalendarView, TQT_SLOT( resourcesChanged() ) ); - TQObject::connect( mResourceView, TQT_SIGNAL( resourcesChanged() ), - mCalendarView, TQT_SLOT( updateCategories() ) ); + TQObject::connect( mResourceView, TQ_SIGNAL( resourcesChanged() ), + mCalendarView, TQ_SLOT( resourcesChanged() ) ); + TQObject::connect( mResourceView, TQ_SIGNAL( resourcesChanged() ), + mCalendarView, TQ_SLOT( updateCategories() ) ); TQObject::connect( mCalendar, - TQT_SIGNAL( signalResourceAdded( ResourceCalendar * ) ), + TQ_SIGNAL( signalResourceAdded( ResourceCalendar * ) ), mResourceView, - TQT_SLOT( addResourceItem( ResourceCalendar * ) ) ); + TQ_SLOT( addResourceItem( ResourceCalendar * ) ) ); TQObject::connect( mCalendar, - TQT_SIGNAL( signalResourceModified( ResourceCalendar * ) ), + TQ_SIGNAL( signalResourceModified( ResourceCalendar * ) ), mResourceView, - TQT_SLOT( updateResourceItem( ResourceCalendar * ) ) ); - TQObject::connect( mCalendar, TQT_SIGNAL( signalResourceAdded( ResourceCalendar * ) ), - mCalendarView, TQT_SLOT( updateCategories() ) ); - TQObject::connect( mCalendar, TQT_SIGNAL( signalResourceModified( ResourceCalendar * ) ), - mCalendarView, TQT_SLOT( updateCategories() ) ); + TQ_SLOT( updateResourceItem( ResourceCalendar * ) ) ); + TQObject::connect( mCalendar, TQ_SIGNAL( signalResourceAdded( ResourceCalendar * ) ), + mCalendarView, TQ_SLOT( updateCategories() ) ); + TQObject::connect( mCalendar, TQ_SIGNAL( signalResourceModified( ResourceCalendar * ) ), + mCalendarView, TQ_SLOT( updateCategories() ) ); return mResourceView; } @@ -322,17 +322,17 @@ ResourceView::ResourceView( CalendarResources *calendar, mListView->setResizeMode( TQListView::LastColumn ); topLayout->addWidget( mListView ); - connect( mListView, TQT_SIGNAL( clicked( TQListViewItem * ) ), - TQT_SLOT( currentChanged( TQListViewItem * ) ) ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addResource() ) ); - connect( mDeleteButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeResource() ) ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editResource() ) ); - connect( mListView, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, + connect( mListView, TQ_SIGNAL( clicked( TQListViewItem * ) ), + TQ_SLOT( currentChanged( TQListViewItem * ) ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addResource() ) ); + connect( mDeleteButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeResource() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editResource() ) ); + connect( mListView, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( editResource() ) ); - connect( mListView, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, + TQ_SLOT( editResource() ) ); + connect( mListView, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &, + TQ_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ) ); updateView(); @@ -449,21 +449,21 @@ void ResourceView::addResourceItem( ResourceCalendar *resource ) item->update(); } - connect( resource, TQT_SIGNAL( signalSubresourceAdded( ResourceCalendar *, + connect( resource, TQ_SIGNAL( signalSubresourceAdded( ResourceCalendar *, const TQString &, const TQString &, const TQString & ) ), - TQT_SLOT( slotSubresourceAdded( ResourceCalendar *, const TQString &, + TQ_SLOT( slotSubresourceAdded( ResourceCalendar *, const TQString &, const TQString &, const TQString & ) ) ); - connect( resource, TQT_SIGNAL( signalSubresourceRemoved( ResourceCalendar *, + connect( resource, TQ_SIGNAL( signalSubresourceRemoved( ResourceCalendar *, const TQString &, const TQString & ) ), - TQT_SLOT( slotSubresourceRemoved( ResourceCalendar *, const TQString &, + TQ_SLOT( slotSubresourceRemoved( ResourceCalendar *, const TQString &, const TQString & ) ) ); - connect( resource, TQT_SIGNAL( resourceSaved( ResourceCalendar * ) ), - TQT_SLOT( closeResource( ResourceCalendar * ) ) ); + connect( resource, TQ_SIGNAL( resourceSaved( ResourceCalendar * ) ), + TQ_SLOT( closeResource( ResourceCalendar * ) ) ); updateResourceList(); emit resourcesChanged(); @@ -686,44 +686,44 @@ void ResourceView::contextMenuRequested ( TQListViewItem *lvitem, const TQPoint ResourceItem *item = static_cast<ResourceItem *>( lvitem ); TQPopupMenu *menu = new TQPopupMenu( this ); - connect( menu, TQT_SIGNAL( aboutToHide() ), menu, TQT_SLOT( deleteLater() ) ); + connect( menu, TQ_SIGNAL( aboutToHide() ), menu, TQ_SLOT( deleteLater() ) ); if ( item ) { int reloadId = menu->insertItem( i18n("Re&load"), this, - TQT_SLOT( reloadResource() ) ); + TQ_SLOT( reloadResource() ) ); menu->setItemEnabled( reloadId, item->resource()->isActive() ); int saveId = menu->insertItem( i18n("&Save"), this, - TQT_SLOT( saveResource() ) ); + TQ_SLOT( saveResource() ) ); menu->setItemEnabled( saveId, item->resource()->isActive() ); menu->insertSeparator(); - menu->insertItem( i18n("Show &Info"), this, TQT_SLOT( showInfo() ) ); + menu->insertItem( i18n("Show &Info"), this, TQ_SLOT( showInfo() ) ); //FIXME: This is better on the resource dialog if ( KOPrefs::instance()->agendaViewColors() != KOPrefs::CategoryOnly ) { TQPopupMenu *assignMenu= new TQPopupMenu( menu ); - assignMenu->insertItem( i18n( "&Assign Color" ), this, TQT_SLOT( assignColor() ) ); + assignMenu->insertItem( i18n( "&Assign Color" ), this, TQ_SLOT( assignColor() ) ); if ( item->resourceColor().isValid() ) - assignMenu->insertItem( i18n( "&Disable Color" ), this, TQT_SLOT( disableColor() ) ); + assignMenu->insertItem( i18n( "&Disable Color" ), this, TQ_SLOT( disableColor() ) ); menu->insertItem( i18n( "Resources Colors" ), assignMenu ); } if ( item->isSubresource() && ( item->resource()->type() == "imap" || item->resource()->type() == "scalix" ) ) { if ( item->resourceIdentifier().contains( "/.INBOX.directory/" ) ) { - menu->insertItem( i18n("&Rename..."), this, TQT_SLOT( editResource() ) ); + menu->insertItem( i18n("&Rename..."), this, TQ_SLOT( editResource() ) ); } } else { - menu->insertItem( i18n("&Edit..."), this, TQT_SLOT( editResource() ) ); + menu->insertItem( i18n("&Edit..."), this, TQ_SLOT( editResource() ) ); } - menu->insertItem( i18n("&Remove"), this, TQT_SLOT( removeResource() ) ); + menu->insertItem( i18n("&Remove"), this, TQ_SLOT( removeResource() ) ); if ( item->resource() != manager->standardResource() ) { menu->insertSeparator(); menu->insertItem( i18n("Use as &Default Calendar"), this, - TQT_SLOT( setStandard() ) ); + TQ_SLOT( setStandard() ) ); } menu->insertSeparator(); } - menu->insertItem( i18n("&Add..."), this, TQT_SLOT( addResource() ) ); + menu->insertItem( i18n("&Add..."), this, TQ_SLOT( addResource() ) ); menu->popup( pos ); } diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index f2ddb4a8..4087a810 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -63,8 +63,8 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) subLayout->addWidget( searchLabel ); subLayout->addWidget( searchEdit ); searchEdit->setFocus(); - connect( searchEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( searchTextChanged( const TQString & ) ) ); + connect( searchEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( searchTextChanged( const TQString & ) ) ); TQHButtonGroup *itemsGroup = new TQHButtonGroup( i18n("Search For"), topFrame ); @@ -117,15 +117,15 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) KOGlobals::fitDialogToScreen( this, true ); } - connect( this,TQT_SIGNAL(user1Clicked()),TQT_SLOT(doSearch())); + connect( this,TQ_SIGNAL(user1Clicked()),TQ_SLOT(doSearch())); // Propagate edit and delete event signals from event list view - connect( listView, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); - connect( listView, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); - connect( listView, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) ); + connect( listView, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); + connect( listView, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); + connect( listView, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) ); } SearchDialog::~SearchDialog() diff --git a/korganizer/statusdialog.cpp b/korganizer/statusdialog.cpp index 1d406447..d46f018c 100644 --- a/korganizer/statusdialog.cpp +++ b/korganizer/statusdialog.cpp @@ -56,11 +56,11 @@ StatusDialog::StatusDialog(TQWidget* parent, const char* name) : TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout ); TQPushButton *ok = new KPushButton(KStdGuiItem::ok(), this); - connect ( ok,TQT_SIGNAL(clicked()), this,TQT_SLOT(accept()) ); + connect ( ok,TQ_SIGNAL(clicked()), this,TQ_SLOT(accept()) ); buttonLayout->addWidget( ok ); TQPushButton *cancel = new KPushButton(KStdGuiItem::cancel(), this); - connect ( cancel,TQT_SIGNAL(clicked()), this,TQT_SLOT(reject()) ); + connect ( cancel,TQ_SIGNAL(clicked()), this,TQ_SLOT(reject()) ); buttonLayout->addWidget( cancel ); } diff --git a/korganizer/stdcalendar.cpp b/korganizer/stdcalendar.cpp index 481fd3fd..06799718 100644 --- a/korganizer/stdcalendar.cpp +++ b/korganizer/stdcalendar.cpp @@ -26,7 +26,7 @@ #include <kstaticdeleter.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kurl.h> diff --git a/korganizer/stdcalendar.h b/korganizer/stdcalendar.h index 0b91d611..158cbbe0 100644 --- a/korganizer/stdcalendar.h +++ b/korganizer/stdcalendar.h @@ -25,7 +25,7 @@ namespace KOrg { -class KDE_EXPORT StdCalendar : public KCal::CalendarResources +class TDE_EXPORT StdCalendar : public KCal::CalendarResources { public: static StdCalendar *self(); diff --git a/korganizer/templatemanagementdialog.cpp b/korganizer/templatemanagementdialog.cpp index 57209cd0..3d673c37 100644 --- a/korganizer/templatemanagementdialog.cpp +++ b/korganizer/templatemanagementdialog.cpp @@ -52,15 +52,15 @@ TemplateManagementDialog::TemplateManagementDialog(TQWidget *parent, const TQStr { m_base = new TemplateManagementDialog_base( this, "template_management_dialog_base" ); setMainWidget( m_base ); - connect( m_base->m_buttonAdd, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotAddTemplate() ) ); - connect( m_base->m_buttonDelete, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotDeleteTemplate() ) ); + connect( m_base->m_buttonAdd, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotAddTemplate() ) ); + connect( m_base->m_buttonDelete, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotDeleteTemplate() ) ); m_base->m_listBox->insertStringList( m_templates ); - connect( m_base->m_listBox, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ), - TQT_SLOT( slotUpdateDeleteButton( TQListBoxItem * ) ) ); - connect( m_base->m_buttonApply, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotApplyTemplate() ) ); + connect( m_base->m_listBox, TQ_SIGNAL( selectionChanged( TQListBoxItem * ) ), + TQ_SLOT( slotUpdateDeleteButton( TQListBoxItem * ) ) ); + connect( m_base->m_buttonApply, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotApplyTemplate() ) ); } @@ -75,7 +75,7 @@ void TemplateManagementDialog::slotAddTemplate() if ( m_templates.find( newTemplate) != m_templates.end() ) { int rc = KMessageBox::warningContinueCancel( this, i18n("A template with that name already exists, do you want to overwrite it?."), i18n("Duplicate Template Name"), i18n("Overwrite")); if ( rc == KMessageBox::Cancel ) { - TQTimer::singleShot(0, this, TQT_SLOT( slotAddTemplate() ) ); + TQTimer::singleShot(0, this, TQ_SLOT( slotAddTemplate() ) ); return; } duplicate = true; diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp index 27a253c0..19ae5721 100644 --- a/korganizer/timelabels.cpp +++ b/korganizer/timelabels.cpp @@ -230,10 +230,10 @@ void TimeLabels::setAgenda( KOAgenda* agenda ) { mAgenda = agenda; - connect(mAgenda, TQT_SIGNAL(mousePosSignal(const TQPoint &)), this, TQT_SLOT(mousePosChanged(const TQPoint &))); - connect(mAgenda, TQT_SIGNAL(enterAgenda()), this, TQT_SLOT(showMousePos())); - connect(mAgenda, TQT_SIGNAL(leaveAgenda()), this, TQT_SLOT(hideMousePos())); - connect(mAgenda, TQT_SIGNAL(gridSpacingYChanged( double ) ), this, TQT_SLOT( setCellHeight( double ) ) ); + connect(mAgenda, TQ_SIGNAL(mousePosSignal(const TQPoint &)), this, TQ_SLOT(mousePosChanged(const TQPoint &))); + connect(mAgenda, TQ_SIGNAL(enterAgenda()), this, TQ_SLOT(showMousePos())); + connect(mAgenda, TQ_SIGNAL(leaveAgenda()), this, TQ_SLOT(hideMousePos())); + connect(mAgenda, TQ_SIGNAL(gridSpacingYChanged( double ) ), this, TQ_SLOT( setCellHeight( double ) ) ); } diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp index 96644240..27a6e970 100644 --- a/korganizer/urihandler.cpp +++ b/korganizer/urihandler.cpp @@ -41,7 +41,7 @@ using namespace KCal; #include <tdefiledialog.h> #include <tdemessagebox.h> #include <kmimetype.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krun.h> #include <tdetempfile.h> #include <kdebug.h> @@ -77,7 +77,7 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri ) if ( uri.startsWith( "kmail:" ) ) { // make sure kmail is running or the part is shown - kapp->startServiceByDesktopPath("kmail"); + tdeApp->startServiceByDesktopPath("kmail"); // parse string, show int colon = uri.find( ':' ); @@ -91,13 +91,13 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri ) } else if ( uri.startsWith( "mailto:" ) ) { - TDEApplication::kApplication()->invokeMailer( uri.mid(7), TQString() ); + tdeApp->invokeMailer( uri.mid(7), TQString() ); return true; } else if ( uri.startsWith( "uid:" ) ) { TQString uid = uidFromUri( uri ); - DCOPClient *client = TDEApplication::kApplication()->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); const TQByteArray noParamData; const TQByteArray paramData; TQByteArray replyData; @@ -108,7 +108,7 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri ) if ( foundAbbrowser ) { // KAddressbook is already running, so just DCOP to it to bring up the contact editor #if KDE_IS_VERSION( 3, 2, 90 ) - kapp->updateRemoteUserTimestamp("kaddressbook"); + tdeApp->updateRemoteUserTimestamp("kaddressbook"); #endif DCOPRef kaddressbook( "kaddressbook", "KAddressBookIface" ); kaddressbook.send( "showContactEditor", uid ); diff --git a/korganizer/urihandler.h b/korganizer/urihandler.h index ccf8338f..1284b248 100644 --- a/korganizer/urihandler.h +++ b/korganizer/urihandler.h @@ -24,12 +24,12 @@ #ifndef URIHANDLER_H #define URIHANDLER_H -#include <kdemacros.h> +#include <tdemacros.h> class TQString; class TQWidget; -class KDE_EXPORT UriHandler +class TDE_EXPORT UriHandler { public: /** diff --git a/korn/account_input.cpp b/korn/account_input.cpp index 7603e56b..d7584805 100644 --- a/korn/account_input.cpp +++ b/korn/account_input.cpp @@ -65,7 +65,7 @@ TextInput::TextInput( TQWidget *parent, const TQString& title, int min, int max, { _left = new TQLabel( title, parent, "label" ); _right = new KLineEdit( "", parent, "edit" ); - _right->setValidator( new TQIntValidator( min, max, TQT_TQOBJECT(_right), "validator" ) ); + _right->setValidator( new TQIntValidator( min, max, _right, "validator" ) ); setValue( defaul ); } diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp index 187f79bd..5a30e56a 100644 --- a/korn/accountmanager.cpp +++ b/korn/accountmanager.cpp @@ -84,12 +84,12 @@ void AccountManager::readConfig( TDEConfig* config, const int index ) } //TODO: connect some stuff - connect( kiodrop, TQT_SIGNAL( changed( int, KMailDrop* ) ), this, TQT_SLOT( slotChanged( int, KMailDrop* ) ) ); - connect( kiodrop, TQT_SIGNAL( showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ), - this, TQT_SLOT( slotShowPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ) ); - connect( kiodrop, TQT_SIGNAL( showPassivePopup( const TQString&, const TQString& ) ), - this, TQT_SLOT( slotShowPassivePopup( const TQString&, const TQString& ) ) ); - connect( kiodrop, TQT_SIGNAL( validChanged( bool ) ), this, TQT_SLOT( slotValidChanged( bool ) ) ); + connect( kiodrop, TQ_SIGNAL( changed( int, KMailDrop* ) ), this, TQ_SLOT( slotChanged( int, KMailDrop* ) ) ); + connect( kiodrop, TQ_SIGNAL( showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ), + this, TQ_SLOT( slotShowPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ) ); + connect( kiodrop, TQ_SIGNAL( showPassivePopup( const TQString&, const TQString& ) ), + this, TQ_SLOT( slotShowPassivePopup( const TQString&, const TQString& ) ) ); + connect( kiodrop, TQ_SIGNAL( validChanged( bool ) ), this, TQ_SLOT( slotValidChanged( bool ) ) ); kiodrop->readGeneralConfigGroup( *masterGroup ); if( !kiodrop->readConfigGroup( *accountGroup ) || !kiodrop->readConfigGroup( *configmap, nproto ) ) @@ -119,9 +119,9 @@ void AccountManager::readConfig( TDEConfig* config, const int index ) DCOPDrop *dcopdrop = new DCOPDrop; Dropinfo *info = new Dropinfo; - connect( dcopdrop, TQT_SIGNAL( changed( int, KMailDrop* ) ), this, TQT_SLOT( slotChanged( int, KMailDrop* ) ) ); - connect( dcopdrop, TQT_SIGNAL( showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ), - this, TQT_SLOT( slotShowPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ) ); + connect( dcopdrop, TQ_SIGNAL( changed( int, KMailDrop* ) ), this, TQ_SLOT( slotChanged( int, KMailDrop* ) ) ); + connect( dcopdrop, TQ_SIGNAL( showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ), + this, TQ_SLOT( slotShowPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ) ); dcopdrop->readConfigGroup( *masterGroup ); dcopdrop->setDCOPName( *it ); diff --git a/korn/boxcontainer.cpp b/korn/boxcontainer.cpp index d881b6c8..44e1e8ab 100644 --- a/korn/boxcontainer.cpp +++ b/korn/boxcontainer.cpp @@ -76,7 +76,7 @@ void BoxContainer::slotShowConfiguration() void BoxContainer::addItem( BoxContainerItem* item ) { - connect( item, TQT_SIGNAL( showConfiguration() ), this, TQT_SLOT( slotShowConfiguration() ) ); + connect( item, TQ_SIGNAL( showConfiguration() ), this, TQ_SLOT( slotShowConfiguration() ) ); _items->append( item ); } diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index 386baaef..99f54dd9 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -32,7 +32,7 @@ #include <tdelocale.h> #include <kpassivepopup.h> #include <tdepopupmenu.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeshortcut.h> #include <tqbitmap.h> @@ -164,7 +164,7 @@ void BoxContainerItem::runCommand( const TQString& cmd ) TDEProcess *process = new TDEProcess; process->setUseShell( true ); *process << cmd; - connect( process, TQT_SIGNAL( processExited (TDEProcess *) ), this, TQT_SLOT( processExited( TDEProcess * ) ) ); + connect( process, TQ_SIGNAL( processExited (TDEProcess *) ), this, TQ_SLOT( processExited( TDEProcess * ) ) ); process->start(); } @@ -194,21 +194,21 @@ void BoxContainerItem::mouseButtonPressed( TQt::ButtonState state ) void BoxContainerItem::fillTDEPopupMenu( TDEPopupMenu* popupMenu, TDEActionCollection* actions ) const { - /*popupMenu->insertItem( i18n( "&Configure" ), this, TQT_SLOT( slotConfigure() ) ); - popupMenu->insertItem( i18n( "&Recheck" ), this, TQT_SLOT( slotRecheck() ) ); - popupMenu->insertItem( i18n( "R&eset Counter" ), this, TQT_SLOT( slotReset() ) ); - popupMenu->insertItem( i18n( "&View Emails" ), this, TQT_SLOT( slotView() ) ); - popupMenu->insertItem( i18n( "R&un Command" ), this, TQT_SLOT( slotRunCommand() ) );*/ - - (new TDEAction( i18n("&Configure"), TDEShortcut(), this, TQT_SLOT( slotConfigure() ), actions ))->plug( popupMenu ); - (new TDEAction( i18n("&Recheck"), TDEShortcut(), this, TQT_SLOT( slotRecheck() ), actions ))->plug( popupMenu ); - (new TDEAction( i18n("R&eset Counter"), TDEShortcut(), this, TQT_SLOT( slotReset() ), actions ))->plug( popupMenu ); - (new TDEAction( i18n("&View Emails"), TDEShortcut(), this, TQT_SLOT( slotView() ), actions ))->plug( popupMenu ); - (new TDEAction( i18n("R&un Command"), TDEShortcut(), this, TQT_SLOT( slotRunCommand() ), actions ))->plug( popupMenu ); + /*popupMenu->insertItem( i18n( "&Configure" ), this, TQ_SLOT( slotConfigure() ) ); + popupMenu->insertItem( i18n( "&Recheck" ), this, TQ_SLOT( slotRecheck() ) ); + popupMenu->insertItem( i18n( "R&eset Counter" ), this, TQ_SLOT( slotReset() ) ); + popupMenu->insertItem( i18n( "&View Emails" ), this, TQ_SLOT( slotView() ) ); + popupMenu->insertItem( i18n( "R&un Command" ), this, TQ_SLOT( slotRunCommand() ) );*/ + + (new TDEAction( i18n("&Configure"), TDEShortcut(), this, TQ_SLOT( slotConfigure() ), actions ))->plug( popupMenu ); + (new TDEAction( i18n("&Recheck"), TDEShortcut(), this, TQ_SLOT( slotRecheck() ), actions ))->plug( popupMenu ); + (new TDEAction( i18n("R&eset Counter"), TDEShortcut(), this, TQ_SLOT( slotReset() ), actions ))->plug( popupMenu ); + (new TDEAction( i18n("&View Emails"), TDEShortcut(), this, TQ_SLOT( slotView() ), actions ))->plug( popupMenu ); + (new TDEAction( i18n("R&un Command"), TDEShortcut(), this, TQ_SLOT( slotRunCommand() ), actions ))->plug( popupMenu ); popupMenu->insertSeparator(); - KStdAction::help( this, TQT_SLOT( help() ), actions )->plug( popupMenu ); - KStdAction::reportBug( this, TQT_SLOT( reportBug() ), actions )->plug( popupMenu ); - KStdAction::aboutApp( this, TQT_SLOT( about() ), actions )->plug( popupMenu ); + KStdAction::help( this, TQ_SLOT( help() ), actions )->plug( popupMenu ); + KStdAction::reportBug( this, TQ_SLOT( reportBug() ), actions )->plug( popupMenu ); + KStdAction::aboutApp( this, TQ_SLOT( about() ), actions )->plug( popupMenu ); } void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSubject >* list, int total, @@ -400,7 +400,7 @@ void BoxContainerItem::runCommand()//Possible_unsafe? void BoxContainerItem::help() { - kapp->invokeHelp(); + tdeApp->invokeHelp(); } void BoxContainerItem::reportBug() diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp index 660bc849..55edda74 100644 --- a/korn/dcopdrop.cpp +++ b/korn/dcopdrop.cpp @@ -106,7 +106,7 @@ TQValueVector< KornMailSubject >* DCOPDrop::doReadSubjects( bool * ) * This way, the function is really asynchrone. * So, the return value arraves before any data arrives. */ - TQTimer::singleShot( 1, this, TQT_SLOT( doReadSubjectsASync( void ) ) ); + TQTimer::singleShot( 1, this, TQ_SLOT( doReadSubjectsASync( void ) ) ); /* * A empty TQValueVector is made here. diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp index 40274474..fc97fa2d 100644 --- a/korn/dockeditem.cpp +++ b/korn/dockeditem.cpp @@ -37,14 +37,14 @@ #include <tqmovie.h> DockedItem::DockedItem( TQWidget * parent, const char * name ) - : BoxContainerItem( TQT_TQOBJECT(parent), name ), + : BoxContainerItem( parent, name ), _systemtray( new SystemTray( parent, "System tray" ) ) { this->fillTDEPopupMenu( _systemtray->contextMenu(), _systemtray->actionCollection() ); - connect( _systemtray, TQT_SIGNAL( quitSelected() ), kapp, TQT_SLOT( quit() ) ); - connect( _systemtray, TQT_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), - this, TQT_SLOT( mouseButtonPressed( TQt::ButtonState ) ) ); + connect( _systemtray, TQ_SIGNAL( quitSelected() ), tdeApp, TQ_SLOT( quit() ) ); + connect( _systemtray, TQ_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), + this, TQ_SLOT( mouseButtonPressed( TQt::ButtonState ) ) ); } DockedItem::~DockedItem() diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp index cede9c47..47ee53d2 100644 --- a/korn/hvitem.cpp +++ b/korn/hvitem.cpp @@ -36,12 +36,12 @@ HVItem::HVItem( TQWidget *parent, const char *name ) _popup( new TDEPopupMenu( _label, "popupmenu" ) ), _actions( new TDEActionCollection( _popup, "actions" ) ) { - _popup->insertTitle( kapp->miniIcon(), kapp->caption() ); + _popup->insertTitle( tdeApp->miniIcon(), tdeApp->caption() ); this->fillTDEPopupMenu( _popup, _actions ); _popup->insertSeparator(); - KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), _actions )->plug( _popup ); + KStdAction::quit( tdeApp, TQ_SLOT( quit() ), _actions )->plug( _popup ); - connect( _label, TQT_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), this, TQT_SLOT( mouseButtonPressed( TQt::ButtonState ) ) ); + connect( _label, TQ_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), this, TQ_SLOT( mouseButtonPressed( TQt::ButtonState ) ) ); } HVItem::~HVItem() diff --git a/korn/imap_proto.cpp b/korn/imap_proto.cpp index caedb459..aae646d9 100644 --- a/korn/imap_proto.cpp +++ b/korn/imap_proto.cpp @@ -50,15 +50,15 @@ void Imap_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec result->append( new TextInput( (TQWidget*)vector->at( 0 ), i18n( "Server" ), TextInput::text, "", "server" ) ); result->append( new TextInput( (TQWidget*)vector->at( 0 ), i18n( "Port" ), 0, 65535, "143", "port" ) ); result->append( new ComboInput( (TQWidget*)vector->at( 0 ), i18n( "Encryption" ), encrList, "tls=auto", "encryption" ) ); - TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( activated( int) ), - configDialog, TQT_SLOT( slotSSLChanged() ) ); + TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( activated( int) ), + configDialog, TQ_SLOT( slotSSLChanged() ) ); result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Username" ), TextInput::text, "", "username" ) ); result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Mailbox" ), TextInput::text, "INBOX", "mailbox" ) ); result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Password" ), TextInput::password, "", "password" ) ); result->append( new CheckboxInput( (TQWidget*)vector->at( 1 ), i18n( "Save password" ), "true", "savepassword" ) ); - TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( toggled( bool ) ), - (TQObject*)result->prev()->rightWidget(), TQT_SLOT( setEnabled( bool ) ) ); + TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( toggled( bool ) ), + (TQObject*)result->prev()->rightWidget(), TQ_SLOT( setEnabled( bool ) ) ); result->last()->setValue( "false" ); result->append( new ComboInput( (TQWidget*)vector->at( 1 ), i18n( "Authentication" ), authList, "auth=*", "auth" ) ); } diff --git a/korn/keditlistboxman.cpp b/korn/keditlistboxman.cpp index 440b2c83..a3e8b4d4 100644 --- a/korn/keditlistboxman.cpp +++ b/korn/keditlistboxman.cpp @@ -96,12 +96,12 @@ void KEditListBoxManager::setSubGroupName( const TQString& name ) void KEditListBoxManager::init() { - connect( this, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); - connect( this, TQT_SIGNAL( added( const TQString& ) ), this, TQT_SLOT( slotAdded( const TQString& ) ) ); - connect( this, TQT_SIGNAL( removed( const TQString& ) ), this, TQT_SLOT( slotRemoved( const TQString& ) ) ); + connect( this, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) ); + connect( this, TQ_SIGNAL( added( const TQString& ) ), this, TQ_SLOT( slotAdded( const TQString& ) ) ); + connect( this, TQ_SIGNAL( removed( const TQString& ) ), this, TQ_SLOT( slotRemoved( const TQString& ) ) ); - connect( this->listBox(), TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotActivated( TQListBoxItem * ) ) ); - connect( this->listBox(), TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQT_SLOT( slotActivated( TQListBoxItem * ) ) ); + connect( this->listBox(), TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQ_SLOT( slotActivated( TQListBoxItem * ) ) ); + connect( this->listBox(), TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQ_SLOT( slotActivated( TQListBoxItem * ) ) ); } void KEditListBoxManager::readNames() diff --git a/korn/kornaccountcfg.ui b/korn/kornaccountcfg.ui index be877365..5a46dc39 100644 --- a/korn/kornaccountcfg.ui +++ b/korn/kornaccountcfg.ui @@ -234,9 +234,9 @@ <tabstop>chPassivePopup</tabstop> <tabstop>chPassiveDate</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotProtocolChanged( const TQString& )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp index a6193e2e..bf1e614c 100644 --- a/korn/kornaccountcfgimpl.cpp +++ b/korn/kornaccountcfgimpl.cpp @@ -49,8 +49,8 @@ KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * parent, const char * name ) _groupBoxes( 0 ), _accountinput( new TQPtrList< AccountInput >() ) { - connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); - connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( parent, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOK() ) ); + connect( parent, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancel() ) ); this->cbProtocol->insertStringList( Protocols::getProtocols() ); @@ -195,7 +195,7 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto ) delete groupBoxes; AccountInput *input; - protocol->configFields( _groupBoxes, TQT_TQOBJECT(this), _accountinput ); + protocol->configFields( _groupBoxes, this, _accountinput ); for( unsigned int groupCounter = 0; groupCounter < _groupBoxes->count(); ++groupCounter ) { diff --git a/korn/kornapp.h b/korn/kornapp.h index 9ef87f2f..03f7ae4b 100644 --- a/korn/kornapp.h +++ b/korn/kornapp.h @@ -5,7 +5,7 @@ #ifndef SSK_KORNAPP_H #define SSK_KORNAPP_H -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> class KornShell; @@ -14,7 +14,7 @@ class KornShell; * @author Sirtaj Singh Kang (taj@kde.org) * @version $Id$ */ -class KornApp : public KUniqueApplication +class KornApp : public TDEUniqueApplication { TQ_OBJECT @@ -23,7 +23,7 @@ public: /** * KornApp Constructor */ - KornApp() : KUniqueApplication(), _shell( 0 ), _instanceCount( 0 ) {} + KornApp() : TDEUniqueApplication(), _shell( 0 ), _instanceCount( 0 ) {} /** * KornApp Destructor diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui index 1ae40345..88d04d67 100644 --- a/korn/kornboxcfg.ui +++ b/korn/kornboxcfg.ui @@ -1665,7 +1665,7 @@ <tabstop>chPassiveDate</tabstop> <tabstop>pbEdit</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotEditBox()</slot> <slot access="protected">slotActivated( const TQString& )</slot> <slot access="protected">slotActivated( const int )</slot> @@ -1676,7 +1676,7 @@ <slot access="protected">slotChangeNewAnim()</slot> <slot access="protected">slotNormalAnimToggled( bool )</slot> <slot access="protected">slotNewAnimToggled( bool )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcolorbutton.h</include> diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp index 7d29e1f5..cd9cbdf3 100644 --- a/korn/kornboxcfgimpl.cpp +++ b/korn/kornboxcfgimpl.cpp @@ -56,13 +56,13 @@ KornBoxCfgImpl::KornBoxCfgImpl( TQWidget * parent, const char * name ) if( lbRight->text() == "Right" ) lbRight->setText( i18n( "Right" ) ); - connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); - connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( parent, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOK() ) ); + connect( parent, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancel() ) ); elbAccounts->setTitle( i18n( "Accounts" ) ); - connect( elbAccounts, TQT_SIGNAL( elementsSwapped( int, int ) ), this, TQT_SLOT( slotAccountsSwapped( int, int ) ) ); - connect( elbAccounts, TQT_SIGNAL( elementDeleted( int ) ), this, TQT_SLOT( slotAccountDeleted( int ) ) ); + connect( elbAccounts, TQ_SIGNAL( elementsSwapped( int, int ) ), this, TQ_SLOT( slotAccountsSwapped( int, int ) ) ); + connect( elbAccounts, TQ_SIGNAL( elementDeleted( int ) ), this, TQ_SLOT( slotAccountDeleted( int ) ) ); } KornBoxCfgImpl::~KornBoxCfgImpl() @@ -247,7 +247,7 @@ void KornBoxCfgImpl::slotEditBox() _base->setMainWidget( widget ); - connect( _base, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogDestroyed() ) ); + connect( _base, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogDestroyed() ) ); _group = new TDEConfigGroup( _config, TQString( "korn-%1-%2" ). arg( _index ).arg(elbAccounts->listBox()->currentItem() ) ); diff --git a/korn/korncfg.ui b/korn/korncfg.ui index e3bed083..5179b93c 100644 --- a/korn/korncfg.ui +++ b/korn/korncfg.ui @@ -163,7 +163,7 @@ <slot>slotEditBox()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">slotActivated( const TQString& )</slot> <slot access="protected">slotActivated( const int )</slot> <slot>slotOK()</slot> @@ -171,6 +171,6 @@ <slot>slotCancel()</slot> <slot access="protected">slotSetDefaults( const TQString&, const int, TDEConfig* )</slot> <slot access="protected">slotEditBox()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp index c4fa1359..f0e4f983 100644 --- a/korn/korncfgimpl.cpp +++ b/korn/korncfgimpl.cpp @@ -47,12 +47,12 @@ KornCfgImpl::KornCfgImpl( TQWidget * parent, const char * name ) elbBoxes->setConfig( _config ); elbBoxes->setTitle( i18n( "Boxes" ) ); - connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); - connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); - connect( parent, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) ); + connect( parent, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOK() ) ); + connect( parent, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancel() ) ); + connect( parent, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( slotApply() ) ); - connect( elbBoxes, TQT_SIGNAL( elementsSwapped( int, int ) ), this, TQT_SLOT( slotElementsSwapped( int, int ) ) ); - connect( elbBoxes, TQT_SIGNAL( elementDeleted( int ) ), this, TQT_SLOT( slotElementDeleted( int ) ) ); + connect( elbBoxes, TQ_SIGNAL( elementsSwapped( int, int ) ), this, TQ_SLOT( slotElementsSwapped( int, int ) ) ); + connect( elbBoxes, TQ_SIGNAL( elementDeleted( int ) ), this, TQ_SLOT( slotElementDeleted( int ) ) ); readConfig(); } @@ -74,7 +74,7 @@ void KornCfgImpl::slotEditBox() KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ); KornBoxCfgImpl *widget = new KornBoxCfgImpl( _base, "Box Widget" ); - connect( _base, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogDestroyed() ) ); + connect( _base, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogDestroyed() ) ); _base->setMainWidget( widget ); widget->readConfig( _config, elbBoxes->listBox()->currentItem() ); diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp index 20533de3..c3567414 100644 --- a/korn/kornshell.cpp +++ b/korn/kornshell.cpp @@ -40,10 +40,10 @@ KornShell::KornShell( TQWidget * parent, const char * name ) _show( false ) { _config->checkUpdate( "korn_kde_3_4_config_change", "korn-3-4-config_change.upd" ); - if( kapp->isRestored() ) + if( tdeApp->isRestored() ) { _config->setGroup( "korn" ); - TQTimer::singleShot( _config->readNumEntry( "session_startup_delay", 2000 ), this, TQT_SLOT(readConfig()) ); + TQTimer::singleShot( _config->readNumEntry( "session_startup_delay", 2000 ), this, TQ_SLOT(readConfig()) ); kdDebug() << "startup delayed" << endl; } else @@ -84,8 +84,8 @@ void KornShell::optionDlg() KornCfgImpl *widget = new KornCfgImpl( _configDialog, "Configuration widget" ); _configDialog->setMainWidget( widget ); - connect( _configDialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogClosed() ) ); - connect( _configDialog, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) ); + connect( _configDialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogClosed() ) ); + connect( _configDialog, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( slotApply() ) ); _configDialog->show(); } @@ -99,13 +99,13 @@ void KornShell::readConfig() KOrnPassword::setUseWallet( _config->readBoolEntry( "usewallet", false ) ); if( layout == 'H' ) - _box = new HVContainer( TQt::Horizontal, TQT_TQOBJECT(this), "horizontal container" ); + _box = new HVContainer( TQt::Horizontal, this, "horizontal container" ); else if( layout == 'V' ) - _box = new HVContainer( TQt::Vertical, TQT_TQOBJECT(this), "vertical container" ); + _box = new HVContainer( TQt::Vertical, this, "vertical container" ); else - _box = new DockedContainer( TQT_TQOBJECT(this), "docked container" ); + _box = new DockedContainer( this, "docked container" ); - connect( _box, TQT_SIGNAL( showConfiguration() ), this, TQT_SLOT( optionDlg() ) ); + connect( _box, TQ_SIGNAL( showConfiguration() ), this, TQ_SLOT( optionDlg() ) ); _box->readConfig( _config ); @@ -119,7 +119,7 @@ void KornShell::readConfig() } else { - kapp->quit(); + tdeApp->quit(); } if( _show ) diff --git a/korn/maildlg.cpp b/korn/maildlg.cpp index d912c447..d8a1b653 100644 --- a/korn/maildlg.cpp +++ b/korn/maildlg.cpp @@ -17,7 +17,7 @@ KornMailDlg::KornMailDlg( TQWidget *parent ) _editCtrl = new KEdit(page); topLayout->addWidget(_editCtrl, 10); _editCtrl->setReadOnly(true); - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(showFullMessage())); + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(showFullMessage())); setInitialSize(TQSize(TQApplication::desktop()->width()*9/10, TQApplication::desktop()->height()/2)); } @@ -36,7 +36,7 @@ void KornMailDlg::showFullMessage() _loadMailCanceled = false; // create progress dialog - _progress = new TQProgressDialog(this, "bla", TRUE); + _progress = new TQProgressDialog(this, "bla", true); _progress->setMinimumDuration(0); _progress->setLabelText(i18n("Loading full mail. Please wait...")); @@ -46,14 +46,14 @@ void KornMailDlg::showFullMessage() tqApp->processEvents(); // connect the mailbox with the progress dialog in case it supports progress bars - connect(_mailDrop, TQT_SIGNAL(readMailTotalSteps(int)), _progress, TQT_SLOT(setTotalSteps(int))); - connect(_mailDrop, TQT_SIGNAL(readMailProgress(int)), _progress, TQT_SLOT(setProgress(int))); + connect(_mailDrop, TQ_SIGNAL(readMailTotalSteps(int)), _progress, TQ_SLOT(setTotalSteps(int))); + connect(_mailDrop, TQ_SIGNAL(readMailProgress(int)), _progress, TQ_SLOT(setProgress(int))); tqApp->processEvents(); // connect the mailbox's cancel button - connect(_progress, TQT_SIGNAL(canceled()), this, TQT_SLOT(loadMailCanceled())); + connect(_progress, TQ_SIGNAL(canceled()), this, TQ_SLOT(loadMailCanceled())); - connect(_mailDrop, TQT_SIGNAL(readMailReady(TQString*)), this, TQT_SLOT(readMailReady(TQString*))); + connect(_mailDrop, TQ_SIGNAL(readMailReady(TQString*)), this, TQ_SLOT(readMailReady(TQString*))); // now load the mail fully if( _mailDrop->synchrone() ) @@ -100,7 +100,7 @@ void KornMailDlg::deleteProgress() _progress->setProgress(_progress->totalSteps()); _progress->hide(); - disconnect( _mailDrop, TQT_SIGNAL(readMailReady(TQString*)), this, TQT_SLOT(readMailReady(TQString*))); + disconnect( _mailDrop, TQ_SIGNAL(readMailReady(TQString*)), this, TQ_SLOT(readMailReady(TQString*))); delete _progress; _progress = 0; diff --git a/korn/maildrop.cpp b/korn/maildrop.cpp index 2224c74e..b9747906 100644 --- a/korn/maildrop.cpp +++ b/korn/maildrop.cpp @@ -37,7 +37,7 @@ KMailDrop::KMailDrop() : _style(Plain), _lastCount(0) { - connect(this, TQT_SIGNAL(changed( int, KMailDrop* )), TQT_SLOT(setCount( int, KMailDrop* ))); + connect(this, TQ_SIGNAL(changed( int, KMailDrop* )), TQ_SLOT(setCount( int, KMailDrop* ))); //Set default colours; this prevents black (TQColor::invalid) boxes after creating a new box. _bgColour = TQApplication::palette().active().background(); diff --git a/korn/maildrop.h b/korn/maildrop.h index 3a885e6c..71bd111d 100644 --- a/korn/maildrop.h +++ b/korn/maildrop.h @@ -85,7 +85,7 @@ class KMailDrop : public TQObject virtual ~KMailDrop(); /** - * @return TRUE if the mailbox and its configuration are valid. + * @return true if the mailbox and its configuration are valid. */ virtual bool valid() = 0; diff --git a/korn/main.cpp b/korn/main.cpp index f3e8cf9a..9efbc369 100644 --- a/korn/main.cpp +++ b/korn/main.cpp @@ -28,9 +28,9 @@ int main(int argc, char *argv[]) aboutData.addAuthor("Mart Kelder",0,"mart@kelder31.nl"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - if( !KUniqueApplication::start() ) { + if( !TDEUniqueApplication::start() ) { // Already running. Should pop up the preferences dialog return 0; } diff --git a/korn/nntp_proto.cpp b/korn/nntp_proto.cpp index f5c59a77..645f73bc 100644 --- a/korn/nntp_proto.cpp +++ b/korn/nntp_proto.cpp @@ -41,8 +41,8 @@ void Nntp_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Username" ), TextInput::text, "", "username" ) ); result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Password" ), TextInput::password, "", "password" ) ); result->append( new CheckboxInput( (TQWidget*)vector->at( 1 ), i18n( "Save password" ), "true", "savepassword" ) ); - TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( toggled( bool ) ), - (TQObject*)result->prev()->rightWidget(), TQT_SLOT( setEnabled( bool ) ) ); + TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( toggled( bool ) ), + (TQObject*)result->prev()->rightWidget(), TQ_SLOT( setEnabled( bool ) ) ); result->last()->setValue( "false" ); } diff --git a/korn/pop3_proto.cpp b/korn/pop3_proto.cpp index 732f85cf..37b44dc3 100644 --- a/korn/pop3_proto.cpp +++ b/korn/pop3_proto.cpp @@ -50,14 +50,14 @@ void Pop3_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec result->append( new TextInput( (TQWidget*)vector->at( 0 ), i18n( "Server" ), TextInput::text, "", "server" ) ); result->append( new TextInput( (TQWidget*)vector->at( 0 ), i18n( "Port" ), 0, 65535, "110", "port" ) ); result->append( new ComboInput( (TQWidget*)vector->at( 0 ), i18n( "Encryption" ), encrList, "tls=auto", "encryption" ) ); - TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( activated( int) ), - configDialog, TQT_SLOT( slotSSLChanged() ) ); + TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( activated( int) ), + configDialog, TQ_SLOT( slotSSLChanged() ) ); result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Username" ), TextInput::text, "", "username" ) ); result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Password" ), TextInput::password, "", "password" ) ); result->append( new CheckboxInput( (TQWidget*)vector->at( 1 ), i18n( "Save password" ), "true", "savepassword" ) ); - TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( toggled( bool ) ), - (TQObject*)result->prev()->rightWidget(), TQT_SLOT( setEnabled( bool ) ) ); + TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( toggled( bool ) ), + (TQObject*)result->prev()->rightWidget(), TQ_SLOT( setEnabled( bool ) ) ); result->last()->setValue( "false" ); result->append( new ComboInput( (TQWidget*)vector->at( 1 ), i18n( "Authentication" ), authList, "", "auth" ) ); } diff --git a/korn/progress_dialog.ui b/korn/progress_dialog.ui index 9c891028..a5d5dc2f 100644 --- a/korn/progress_dialog.ui +++ b/korn/progress_dialog.ui @@ -105,16 +105,16 @@ <includes> <include location="local" impldecl="in implementation">progress_dialog.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>cancelPressed()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>setText( const TQString & str )</slot> <slot>setNumberOfBoxes( int number )</slot> <slot>setProgressOfBoxes( int number )</slot> <slot>setNumberOfSteps( int number )</slot> <slot>setProgress( int number )</slot> <slot access="private" specifier="non virtual">cancelbutton()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp index f3e4b3f4..4b10691d 100644 --- a/korn/subjectsdlg.cpp +++ b/korn/subjectsdlg.cpp @@ -93,14 +93,14 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent ) _list->setItemMargin(3); // connect the selection changed and double click events of the list view - connect(_list, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(listSelectionChanged())); - connect(_list, TQT_SIGNAL(executed(TQListViewItem *)), this, TQT_SLOT(doubleClicked(TQListViewItem *))); + connect(_list, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(listSelectionChanged())); + connect(_list, TQ_SIGNAL(executed(TQListViewItem *)), this, TQ_SLOT(doubleClicked(TQListViewItem *))); // connect the buttons - connect(invertSelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(invertSelection())); - connect(clearSelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelection())); - connect(showButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMessage())); - connect(deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteMessage())); + connect(invertSelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(invertSelection())); + connect(clearSelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeSelection())); + connect(showButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMessage())); + connect(deleteButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteMessage())); setInitialSize(TQSize(TQApplication::desktop()->width(), TQApplication::desktop()->height())); } @@ -215,7 +215,7 @@ void KornSubjectsDlg::showSubjectsDlg( const TQString& name ) void KornSubjectsDlg::closeDialog( ) { - disconnect( this, TQT_SIGNAL( finished() ), this, TQT_SLOT( closeDialog() ) ); + disconnect( this, TQ_SIGNAL( finished() ), this, TQ_SLOT( closeDialog() ) ); } //---------------------------- @@ -253,13 +253,13 @@ void KornSubjectsDlg::prepareStep1Subjects( KMailDrop *drop ) _subjects->progress->setProgress( 0 ); _subjects->atRechecking = true; - connect( drop, TQT_SIGNAL( rechecked() ), this, TQT_SLOT( slotReloadRechecked() ) ); + connect( drop, TQ_SIGNAL( rechecked() ), this, TQ_SLOT( slotReloadRechecked() ) ); drop->recheck(); } void KornSubjectsDlg::removeStep1Subjects( KMailDrop *drop ) { - disconnect( drop, TQT_SIGNAL( rechecked() ), this, TQT_SLOT( slotReloadRechecked() ) ); + disconnect( drop, TQ_SIGNAL( rechecked() ), this, TQ_SLOT( slotReloadRechecked() ) ); } void KornSubjectsDlg::prepareStep2Subjects( KMailDrop *drop ) @@ -267,11 +267,11 @@ void KornSubjectsDlg::prepareStep2Subjects( KMailDrop *drop ) _subjects->progress->setText( i18n( "Fetching messages..." ) ); _subjects->atRechecking = false; - connect( drop, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( subjectAvailable( KornMailSubject* ) ) ); - connect( drop, TQT_SIGNAL( readSubjectsReady( bool ) ), this, TQT_SLOT( subjectsReady( bool ) ) ); - connect( drop, TQT_SIGNAL( readSubjectsTotalSteps( int ) ), _subjects->progress, TQT_SLOT( setNumberOfSteps( int ) ) ); - connect( drop, TQT_SIGNAL( readSubjectsProgress( int ) ), _subjects->progress, TQT_SLOT( setProgress( int ) ) ); - connect( _subjects->progress, TQT_SIGNAL( cancelPressed() ), drop, TQT_SLOT( readSubjectsCanceled() ) ); + connect( drop, TQ_SIGNAL( readSubject( KornMailSubject* ) ), this, TQ_SLOT( subjectAvailable( KornMailSubject* ) ) ); + connect( drop, TQ_SIGNAL( readSubjectsReady( bool ) ), this, TQ_SLOT( subjectsReady( bool ) ) ); + connect( drop, TQ_SIGNAL( readSubjectsTotalSteps( int ) ), _subjects->progress, TQ_SLOT( setNumberOfSteps( int ) ) ); + connect( drop, TQ_SIGNAL( readSubjectsProgress( int ) ), _subjects->progress, TQ_SLOT( setProgress( int ) ) ); + connect( _subjects->progress, TQ_SIGNAL( cancelPressed() ), drop, TQ_SLOT( readSubjectsCanceled() ) ); if( _subjects->it->current()->canReadSubjects() ) _subjects->it->current()->readSubjects( 0 ); @@ -281,11 +281,11 @@ void KornSubjectsDlg::prepareStep2Subjects( KMailDrop *drop ) void KornSubjectsDlg::removeStep2Subjects( KMailDrop *drop ) { - disconnect( drop, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( subjectAvailable( KornMailSubject* ) ) ); - disconnect( drop, TQT_SIGNAL( readSubjectsReady( bool ) ), this, TQT_SLOT( subjectsReady( bool ) ) ); - disconnect( drop, TQT_SIGNAL( readSubjectsTotalSteps( int ) ), _subjects->progress, TQT_SLOT( setNumberOfSteps( int ) ) ); - disconnect( drop, TQT_SIGNAL( readSubjectsProgress( int ) ), _subjects->progress, TQT_SLOT( setProgress( int ) ) ); - disconnect( _subjects->progress, TQT_SIGNAL( cancelPressed() ), drop, TQT_SLOT( readSubjectsCanceled() ) ); + disconnect( drop, TQ_SIGNAL( readSubject( KornMailSubject* ) ), this, TQ_SLOT( subjectAvailable( KornMailSubject* ) ) ); + disconnect( drop, TQ_SIGNAL( readSubjectsReady( bool ) ), this, TQ_SLOT( subjectsReady( bool ) ) ); + disconnect( drop, TQ_SIGNAL( readSubjectsTotalSteps( int ) ), _subjects->progress, TQ_SLOT( setNumberOfSteps( int ) ) ); + disconnect( drop, TQ_SIGNAL( readSubjectsProgress( int ) ), _subjects->progress, TQ_SLOT( setProgress( int ) ) ); + disconnect( _subjects->progress, TQ_SIGNAL( cancelPressed() ), drop, TQ_SLOT( readSubjectsCanceled() ) ); } bool KornSubjectsDlg::makeSubjectsStruct() @@ -299,7 +299,7 @@ bool KornSubjectsDlg::makeSubjectsStruct() _subjects->progress = new DoubleProgressDialog( this, "progress" ); _subjects->atRechecking = true; - connect( _subjects->progress, TQT_SIGNAL( cancelPressed() ), this, TQT_SLOT( slotSubjectsCanceled() ) ); + connect( _subjects->progress, TQ_SIGNAL( cancelPressed() ), this, TQ_SLOT( slotSubjectsCanceled() ) ); return true; } @@ -309,7 +309,7 @@ void KornSubjectsDlg::deleteSubjectsStruct() if( !_subjects ) return; - disconnect( _subjects->progress, TQT_SIGNAL( cancelPressed() ), this, TQT_SLOT( slotSubjectsCanceled() ) ); + disconnect( _subjects->progress, TQ_SIGNAL( cancelPressed() ), this, TQ_SLOT( slotSubjectsCanceled() ) ); this->unsetCursor(); @@ -441,12 +441,12 @@ void KornSubjectsDlg::makeDeleteStruct() _delete->progress = new TQProgressDialog( this, "progress" ); _delete->totalNumberOfMessages = 0; - connect( _delete->progress, TQT_SIGNAL( canceled() ), this, TQT_SLOT( slotDeleteCanceled() ) ); + connect( _delete->progress, TQ_SIGNAL( canceled() ), this, TQ_SLOT( slotDeleteCanceled() ) ); } void KornSubjectsDlg::deleteDeleteStruct() { - disconnect( _delete->progress, TQT_SIGNAL( canceled() ), this, TQT_SLOT( slotDeleteCanceled() ) ); + disconnect( _delete->progress, TQ_SIGNAL( canceled() ), this, TQ_SLOT( slotDeleteCanceled() ) ); delete _delete->messages; delete _delete->ids; @@ -487,7 +487,7 @@ void KornSubjectsDlg::deleteNextMessage() { if( _delete->messages->count() == 0 ) //No more messages to delete { - TQTimer::singleShot( 100, this, TQT_SLOT( reloadSubjects() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( reloadSubjects() ) ); deleteDeleteStruct(); //reloadSubjects(); //Reload all subjects again return; @@ -499,12 +499,12 @@ void KornSubjectsDlg::deleteNextMessage() fillDeleteIdList( _delete->drop ); // Connect the progress bar signals of the mail box - connect( _delete->drop, TQT_SIGNAL( deleteMailsTotalSteps( int ) ), _delete->progress, TQT_SLOT( setTotalSteps( int ) ) ); - connect( _delete->drop, TQT_SIGNAL( deleteMailsProgress( int ) ), _delete->progress, TQT_SLOT( setProgress( int ) ) ); - connect( _delete->drop, TQT_SIGNAL( deleteMailsReady( bool ) ), this, TQT_SLOT( deleteMailsReady( bool ) ) ); + connect( _delete->drop, TQ_SIGNAL( deleteMailsTotalSteps( int ) ), _delete->progress, TQ_SLOT( setTotalSteps( int ) ) ); + connect( _delete->drop, TQ_SIGNAL( deleteMailsProgress( int ) ), _delete->progress, TQ_SLOT( setProgress( int ) ) ); + connect( _delete->drop, TQ_SIGNAL( deleteMailsReady( bool ) ), this, TQ_SLOT( deleteMailsReady( bool ) ) ); // connect the cancel button of the progress bar - connect( _delete->progress, TQT_SIGNAL( canceled() ), _delete->drop, TQT_SLOT( deleteMailsCanceled() ) ); + connect( _delete->progress, TQ_SIGNAL( canceled() ), _delete->drop, TQ_SLOT( deleteMailsCanceled() ) ); // delete the mails _delete->drop->deleteMails( _delete->ids, 0 ); @@ -515,12 +515,12 @@ void KornSubjectsDlg::deleteMailsReady( bool /*success*/ ) if( !_delete ) return; - disconnect( _delete->drop, TQT_SIGNAL( deleteMailsTotalSteps( int ) ), _delete->progress, TQT_SLOT( setTotalSteps( int ) ) ); - disconnect( _delete->drop, TQT_SIGNAL( deleteMailsProgress( int ) ), _delete->progress, TQT_SLOT( setProgress( int ) ) ); - disconnect( _delete->drop, TQT_SIGNAL( deleteMailsReady( bool ) ), this, TQT_SLOT( deleteMailsReady( bool ) ) ); + disconnect( _delete->drop, TQ_SIGNAL( deleteMailsTotalSteps( int ) ), _delete->progress, TQ_SLOT( setTotalSteps( int ) ) ); + disconnect( _delete->drop, TQ_SIGNAL( deleteMailsProgress( int ) ), _delete->progress, TQ_SLOT( setProgress( int ) ) ); + disconnect( _delete->drop, TQ_SIGNAL( deleteMailsReady( bool ) ), this, TQ_SLOT( deleteMailsReady( bool ) ) ); // disconnect the cancel button of the progress bar - disconnect( _delete->progress, TQT_SIGNAL( canceled() ), _delete->drop, TQT_SLOT( deleteMailsCanceled() ) ); + disconnect( _delete->progress, TQ_SIGNAL( canceled() ), _delete->drop, TQ_SLOT( deleteMailsCanceled() ) ); deleteNextMessage(); } diff --git a/korn/tdeio.cpp b/korn/tdeio.cpp index faf05214..4db8d91c 100644 --- a/korn/tdeio.cpp +++ b/korn/tdeio.cpp @@ -44,7 +44,7 @@ #include<tdeconfigbase.h> #include<kdebug.h> #include<tdelocale.h> -#include<kprocess.h> +#include<tdeprocess.h> #include<tqptrlist.h> #include<tqregexp.h> @@ -466,10 +466,10 @@ bool KKioDrop::startProcess() // only reading stdin yet - connect( _process,TQT_SIGNAL(receivedStdout( TDEProcess *, char *, int)), - this, TQT_SLOT(receivedStdout( TDEProcess *,char *,int)) ); - connect( _process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(processExit(TDEProcess*)) ); + connect( _process,TQ_SIGNAL(receivedStdout( TDEProcess *, char *, int)), + this, TQ_SLOT(receivedStdout( TDEProcess *,char *,int)) ); + connect( _process, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(processExit(TDEProcess*)) ); *_process << _kurl->path(); _process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ); diff --git a/korn/tdeio_count.cpp b/korn/tdeio_count.cpp index 515e322b..3c35a6a4 100644 --- a/korn/tdeio_count.cpp +++ b/korn/tdeio_count.cpp @@ -95,9 +95,9 @@ void TDEIO_Count::count( KKioDrop *drop ) return; } - connect( _slave, TQT_SIGNAL( error( int, const TQString& ) ), _tdeio, TQT_SLOT( slotConnectionError( int, const TQString& ) ) ); - connect( _slave, TQT_SIGNAL( warning( const TQString& ) ), _tdeio, TQT_SLOT( slotConnectionWarning( const TQString& ) ) ); - connect( _slave, TQT_SIGNAL( infoMessage( const TQString& ) ), _tdeio, TQT_SLOT( slotConnectionInfoMessage( const TQString& ) ) ); + connect( _slave, TQ_SIGNAL( error( int, const TQString& ) ), _tdeio, TQ_SLOT( slotConnectionError( int, const TQString& ) ) ); + connect( _slave, TQ_SIGNAL( warning( const TQString& ) ), _tdeio, TQ_SLOT( slotConnectionWarning( const TQString& ) ) ); + connect( _slave, TQ_SIGNAL( infoMessage( const TQString& ) ), _tdeio, TQ_SLOT( slotConnectionInfoMessage( const TQString& ) ) ); /* * _protocol->recheckConnectKURL could have change kurl and metadata in order to have the right @@ -125,9 +125,9 @@ void TDEIO_Count::count( KKioDrop *drop ) _job = TDEIO::listDir( kurl, false ); _job->addMetaData( metadata ); - connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) ); - connect( _job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( _job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( result( TDEIO::Job* ) ) ); + connect( _job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + this, TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); if( _protocol->connectionBased() ) TDEIO::Scheduler::assignJobToSlave( _slave, _job ); @@ -140,9 +140,9 @@ void TDEIO_Count::stopActiveCount() if( !_new_mailurls ) return; - disconnect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) ); - disconnect( _job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + disconnect( _job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( result( TDEIO::Job* ) ) ); + disconnect( _job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + this, TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); TDEIO::Scheduler::cancelJob( _job ); @@ -175,8 +175,8 @@ void TDEIO_Count::showPassive( const TQString& id ) _subjects_pending++; - connect( subject, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( addtoPassivePopup( KornMailSubject* ) ) ); - connect( subject, TQT_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQT_SLOT( deleteSingleSubject( TDEIO_Single_Subject* ) ) ); + connect( subject, TQ_SIGNAL( readSubject( KornMailSubject* ) ), this, TQ_SLOT( addtoPassivePopup( KornMailSubject* ) ) ); + connect( subject, TQ_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQ_SLOT( deleteSingleSubject( TDEIO_Single_Subject* ) ) ); } void TDEIO_Count::disconnectSlave() @@ -213,9 +213,9 @@ void TDEIO_Count::result( TDEIO::Job* job ) _tdeio->emitValidChanged(); } - disconnect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) ); - disconnect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + disconnect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( result( TDEIO::Job* ) ) ); + disconnect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + this, TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); disconnectSlave(); diff --git a/korn/tdeio_delete.cpp b/korn/tdeio_delete.cpp index f26b5fe3..6b8b06fe 100644 --- a/korn/tdeio_delete.cpp +++ b/korn/tdeio_delete.cpp @@ -142,7 +142,7 @@ void TDEIO_Delete::deleteItem( const KornMailId *item, KURL kurl, TDEIO::MetaDat else return; //Unknown deleteFunction - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); job->addMetaData( metadata ); @@ -161,7 +161,7 @@ void TDEIO_Delete::commitDelete( KURL kurl, TDEIO::MetaData metadata, const TDEI TDEIO::TransferJob *job = TDEIO::get( kurl, true, false ); job->addMetaData( metadata ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); _jobs->append( dynamic_cast< TDEIO::Job* >( job ) ); diff --git a/korn/tdeio_read.cpp b/korn/tdeio_read.cpp index c34e7429..ee61243d 100644 --- a/korn/tdeio_read.cpp +++ b/korn/tdeio_read.cpp @@ -60,8 +60,8 @@ void TDEIO_Read::readMail( const KornMailId *& mailid, KKioDrop* drop ) _job = TDEIO::get( kurl, false, false ); _job->addMetaData( metadata ); - connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); - connect( _job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); + connect( _job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( _job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); } void TDEIO_Read::canceled( ) diff --git a/korn/tdeio_single_subject.cpp b/korn/tdeio_single_subject.cpp index 3ac765de..9e3975cc 100644 --- a/korn/tdeio_single_subject.cpp +++ b/korn/tdeio_single_subject.cpp @@ -65,9 +65,9 @@ void TDEIO_Single_Subject::init( TDEIO::Slave *& slave) _job = TDEIO::get( *_kurl, false, false ); _job->addMetaData( *_metadata ); - connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); - connect( _job, TQT_SIGNAL( data (TDEIO::Job *, const TQByteArray &) ), - this, TQT_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) ); + connect( _job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( _job, TQ_SIGNAL( data (TDEIO::Job *, const TQByteArray &) ), + this, TQ_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) ); if( _protocol->connectionBased( ) && slave ) TDEIO::Scheduler::assignJobToSlave( slave , _job ); diff --git a/korn/tdeio_subjects.cpp b/korn/tdeio_subjects.cpp index 985a89e5..47b51458 100644 --- a/korn/tdeio_subjects.cpp +++ b/korn/tdeio_subjects.cpp @@ -127,8 +127,8 @@ void TDEIO_Subjects::startJob( const TQString &name, const long size ) subject = new TDEIO_Single_Subject( this, name.latin1(), kurl, metadata, _protocol, _slave, name, size ); - connect( subject, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( slotReadSubject( KornMailSubject* ) ) ); - connect( subject, TQT_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQT_SLOT( slotFinished( TDEIO_Single_Subject* ) ) ); + connect( subject, TQ_SIGNAL( readSubject( KornMailSubject* ) ), this, TQ_SLOT( slotReadSubject( KornMailSubject* ) ) ); + connect( subject, TQ_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQ_SLOT( slotFinished( TDEIO_Single_Subject* ) ) ); _jobs->append( subject ); } diff --git a/ktnef/gui/attachpropertydialogbase.ui b/ktnef/gui/attachpropertydialogbase.ui index ca34103a..afc6e500 100644 --- a/ktnef/gui/attachpropertydialogbase.ui +++ b/ktnef/gui/attachpropertydialogbase.ui @@ -271,9 +271,9 @@ <slot>saveClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">saveClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdelistview.h</include> diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp index 35e6607d..057cb166 100644 --- a/ktnef/gui/ktnefmain.cpp +++ b/ktnef/gui/ktnefmain.cpp @@ -35,9 +35,9 @@ #include <tqmessagebox.h> #include <tdefiledialog.h> #include <tqdir.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeaction.h> #include <kstdaction.h> #include <kdialogbase.h> @@ -85,19 +85,19 @@ KTNEFMain::~KTNEFMain() void KTNEFMain::setupActions() { // File menu - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openFile()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::open(this, TQ_SLOT(openFile()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); // Action menu - new TDEAction(i18n("View"), TQString("viewmag"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewFile()), actionCollection(), "view_file"); - new TDEAction(i18n("View With..."), TQString("package_applications"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewFileAs()), actionCollection(), "view_file_as"); - new TDEAction(i18n("Extract"), 0, TQT_TQOBJECT(this), TQT_SLOT(extractFile()), actionCollection(), "extract_file"); - new TDEAction(i18n("Extract To..."), TQString("ktnef_extract_to"), 0, TQT_TQOBJECT(this), TQT_SLOT(extractFileTo()), actionCollection(), "extract_file_to"); - new TDEAction(i18n("Extract All To..."), TQString("ktnef_extract_all_to"), 0, TQT_TQOBJECT(this), TQT_SLOT(extractAllFiles()), actionCollection(), "extract_all_files"); - new TDEAction( i18n( "Message Properties" ), "help", 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowMessageProperties() ), actionCollection(), "msg_properties" ); - new TDEAction(i18n("Properties"), TQString("contents"), 0, TQT_TQOBJECT(this), TQT_SLOT(propertiesFile()), actionCollection(), "properties_file"); - new TDEAction( i18n( "Show Message Text" ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowMessageText() ), actionCollection(), "msg_text" ); - new TDEAction( i18n( "Save Message Text As..." ), "document-save", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveMessageText() ), actionCollection(), "msg_save" ); + new TDEAction(i18n("View"), TQString("viewmag"), 0, this, TQ_SLOT(viewFile()), actionCollection(), "view_file"); + new TDEAction(i18n("View With..."), TQString("package_applications"), 0, this, TQ_SLOT(viewFileAs()), actionCollection(), "view_file_as"); + new TDEAction(i18n("Extract"), 0, this, TQ_SLOT(extractFile()), actionCollection(), "extract_file"); + new TDEAction(i18n("Extract To..."), TQString("ktnef_extract_to"), 0, this, TQ_SLOT(extractFileTo()), actionCollection(), "extract_file_to"); + new TDEAction(i18n("Extract All To..."), TQString("ktnef_extract_all_to"), 0, this, TQ_SLOT(extractAllFiles()), actionCollection(), "extract_all_files"); + new TDEAction( i18n( "Message Properties" ), "help", 0, this, TQ_SLOT( slotShowMessageProperties() ), actionCollection(), "msg_properties" ); + new TDEAction(i18n("Properties"), TQString("contents"), 0, this, TQ_SLOT(propertiesFile()), actionCollection(), "properties_file"); + new TDEAction( i18n( "Show Message Text" ), "mail_generic", 0, this, TQ_SLOT( slotShowMessageText() ), actionCollection(), "msg_text" ); + new TDEAction( i18n( "Save Message Text As..." ), "document-save", 0, this, TQ_SLOT( slotSaveMessageText() ), actionCollection(), "msg_save" ); actionCollection()->action("view_file")->setEnabled(false); actionCollection()->action("view_file_as")->setEnabled(false); actionCollection()->action("extract_file")->setEnabled(false); @@ -106,12 +106,12 @@ void KTNEFMain::setupActions() actionCollection()->action("properties_file")->setEnabled(false); // Option menu - new TDEAction(i18n("Default Folder..."), TQString("folder_open"), 0, TQT_TQOBJECT(this), TQT_SLOT(optionDefaultDir()), actionCollection(), "options_default_dir"); + new TDEAction(i18n("Default Folder..."), TQString("folder_open"), 0, this, TQ_SLOT(optionDefaultDir()), actionCollection(), "options_default_dir"); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); - KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys() ), actionCollection() ); + KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection()); + KStdAction::keyBindings( this, TQ_SLOT( slotConfigureKeys() ), actionCollection() ); createGUI(); } @@ -135,10 +135,10 @@ void KTNEFMain::setupTNEF() parser_ = new KTNEFParser; setCentralWidget(view_); - connect(view_, TQT_SIGNAL(selectionChanged()), TQT_SLOT(viewSelectionChanged())); - connect(view_, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), TQT_SLOT(viewRightButtonPressed(TQListViewItem*,const TQPoint&,int))); - connect(view_, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(viewDoubleClicked(TQListViewItem*))); - connect(view_, TQT_SIGNAL(dragRequested(const TQValueList<KTNEFAttach*>&)), TQT_SLOT(viewDragRequested(const TQValueList<KTNEFAttach*>&))); + connect(view_, TQ_SIGNAL(selectionChanged()), TQ_SLOT(viewSelectionChanged())); + connect(view_, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), TQ_SLOT(viewRightButtonPressed(TQListViewItem*,const TQPoint&,int))); + connect(view_, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(viewDoubleClicked(TQListViewItem*))); + connect(view_, TQ_SIGNAL(dragRequested(const TQValueList<KTNEFAttach*>&)), TQ_SLOT(viewDragRequested(const TQValueList<KTNEFAttach*>&))); } void KTNEFMain::loadFile(const TQString& filename) @@ -321,16 +321,16 @@ void KTNEFMain::viewRightButtonPressed(TQListViewItem*, const TQPoint& p, int) { if (list->count() == 1u) { - m.insertItem(SmallIcon("viewmag"), i18n("View"), this, TQT_SLOT(viewFile())); - m.insertItem(SmallIcon("package_applications"), i18n("View With..."), this, TQT_SLOT(viewFileAs())); + m.insertItem(SmallIcon("viewmag"), i18n("View"), this, TQ_SLOT(viewFile())); + m.insertItem(SmallIcon("package_applications"), i18n("View With..."), this, TQ_SLOT(viewFileAs())); m.insertSeparator(); } - m.insertItem(i18n("Extract"), this, TQT_SLOT(extractFile())); - m.insertItem(SmallIcon("ktnef_extract_to"), i18n("Extract To..."), this, TQT_SLOT(extractFileTo())); + m.insertItem(i18n("Extract"), this, TQ_SLOT(extractFile())); + m.insertItem(SmallIcon("ktnef_extract_to"), i18n("Extract To..."), this, TQ_SLOT(extractFileTo())); if (list->count() == 1u) { m.insertSeparator(); - m.insertItem(SmallIcon("contents"), i18n("Properties"), this, TQT_SLOT(propertiesFile())); + m.insertItem(SmallIcon("contents"), i18n("Properties"), this, TQ_SLOT(propertiesFile())); } } else if ( list->count() == 0 ) @@ -360,7 +360,7 @@ void KTNEFMain::slotEditToolbars() { saveMainWindowSettings( TDEGlobal::config(), TQString::fromLatin1("MainWindow") ); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg, TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } diff --git a/ktnef/gui/ktnefview.cpp b/ktnef/gui/ktnefview.cpp index a28a7d51..058a11c2 100644 --- a/ktnef/gui/ktnefview.cpp +++ b/ktnef/gui/ktnefview.cpp @@ -75,7 +75,7 @@ KTNEFView::KTNEFView(TQWidget *parent, const char *name) setSelectionMode(TQListView::Extended); setHScrollBarMode(TQScrollView::AlwaysOff); setVScrollBarMode(TQScrollView::AlwaysOn); - TQTimer::singleShot( 0, this, TQT_SLOT(adjustColumnWidth()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(adjustColumnWidth()) ); } KTNEFView::~KTNEFView() diff --git a/ktnef/gui/ktnefview.h b/ktnef/gui/ktnefview.h index 60321bf4..00d29721 100644 --- a/ktnef/gui/ktnefview.h +++ b/ktnef/gui/ktnefview.h @@ -20,11 +20,11 @@ #include <tdelistview.h> #include <tqptrlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class KTNEFAttach; -class KDE_EXPORT KTNEFView : public TDEListView +class TDE_EXPORT KTNEFView : public TDEListView { TQ_OBJECT diff --git a/ktnef/gui/qwmf.cpp b/ktnef/gui/qwmf.cpp index 5719eda2..325cccc7 100644 --- a/ktnef/gui/qwmf.cpp +++ b/ktnef/gui/qwmf.cpp @@ -352,7 +352,7 @@ bool TQWinMetaFile::paint( const TQPaintDevice* aTarget, bool absolute ) mWinding = false; mAbsoluteCoord = absolute; - mPainter.begin( TQT_TQPAINTDEVICE(const_cast<TQPaintDevice*>(aTarget)) ); + mPainter.begin( const_cast<TQPaintDevice*>(aTarget) ); if ( TQWMF_DEBUG ) { kdDebug() << "Bounding box : " << mBBox.left() << " " << mBBox.top() << " " << mBBox.right() << " " << mBBox.bottom() << endl; diff --git a/ktnef/ktnef/ktnefattach.h b/ktnef/ktnef/ktnefattach.h index 24a14c2d..b2acfe38 100644 --- a/ktnef/ktnef/ktnefattach.h +++ b/ktnef/ktnef/ktnefattach.h @@ -22,11 +22,11 @@ #include <tqmap.h> #include <tqvariant.h> #include <ktnef/ktnefpropertyset.h> -#include <kdemacros.h> +#include <tdemacros.h> class KTNEFProperty; -class KDE_EXPORT KTNEFAttach : public KTNEFPropertySet +class TDE_EXPORT KTNEFAttach : public KTNEFPropertySet { public: enum ParseState { Unparsed = 0x0000, TitleParsed = 0x0001, DataParsed = 0x0002, InfoParsed = 0x0004}; diff --git a/ktnef/ktnef/ktnefmessage.h b/ktnef/ktnef/ktnefmessage.h index 48d397c4..6c0128bf 100644 --- a/ktnef/ktnef/ktnefmessage.h +++ b/ktnef/ktnef/ktnefmessage.h @@ -20,11 +20,11 @@ #include <ktnef/ktnefpropertyset.h> #include <tqptrlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class KTNEFAttach; -class KDE_EXPORT KTNEFMessage : public KTNEFPropertySet +class TDE_EXPORT KTNEFMessage : public KTNEFPropertySet { public: KTNEFMessage(); diff --git a/ktnef/ktnef/ktnefparser.h b/ktnef/ktnef/ktnefparser.h index ea098dd6..da3c324a 100644 --- a/ktnef/ktnef/ktnefparser.h +++ b/ktnef/ktnef/ktnefparser.h @@ -21,13 +21,13 @@ #include <tqptrlist.h> #include <tqstring.h> #include <tqmap.h> -#include <kdemacros.h> +#include <tdemacros.h> class KTNEFAttach; class KTNEFMessage; class KTNEFProperty; -class KDE_EXPORT KTNEFParser +class TDE_EXPORT KTNEFParser { public: KTNEFParser(); diff --git a/ktnef/ktnef/ktnefproperty.h b/ktnef/ktnef/ktnefproperty.h index c0af8d94..ccd04b68 100644 --- a/ktnef/ktnef/ktnefproperty.h +++ b/ktnef/ktnef/ktnefproperty.h @@ -20,9 +20,9 @@ #include <tqvariant.h> #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT KTNEFProperty +class TDE_EXPORT KTNEFProperty { public: enum MAPIType diff --git a/ktnef/ktnef/ktnefpropertyset.h b/ktnef/ktnef/ktnefpropertyset.h index c35aa0e3..19cb9067 100644 --- a/ktnef/ktnef/ktnefpropertyset.h +++ b/ktnef/ktnef/ktnefpropertyset.h @@ -20,11 +20,11 @@ #include <tqmap.h> #include <tqvariant.h> -#include <kdemacros.h> +#include <tdemacros.h> class KTNEFProperty; -class KDE_EXPORT KTNEFPropertySet +class TDE_EXPORT KTNEFPropertySet { public: KTNEFPropertySet(); diff --git a/ktnef/lib/ktnefparser.cpp b/ktnef/lib/ktnefparser.cpp index 749cb948..26bc157f 100644 --- a/ktnef/lib/ktnefparser.cpp +++ b/ktnef/lib/ktnefparser.cpp @@ -447,7 +447,7 @@ bool KTNEFParser::openFile(const TQString& filename) deleteDevice(); delete d->message_; d->message_ = new KTNEFMessage(); - d->device_ = TQT_TQIODEVICE(new TQFile( filename )); + d->device_ = new TQFile( filename ); d->deleteDevice_ = true; return parseDevice(); } diff --git a/ktnef/tests/parsertest.cpp b/ktnef/tests/parsertest.cpp index cc7efe73..29a08e3e 100644 --- a/ktnef/tests/parsertest.cpp +++ b/ktnef/tests/parsertest.cpp @@ -91,7 +91,7 @@ void ParserTest::testMAPIAttachments() assert( att->name() == TQString( "VIA_Nytt_14021.htm" ) ); } -#include <kinstance.h> +#include <tdeinstance.h> int main( int argc, char** argv ) { diff --git a/libemailfunctions/CMakeLists.txt b/libemailfunctions/CMakeLists.txt index 725dbe07..abd46f50 100644 --- a/libemailfunctions/CMakeLists.txt +++ b/libemailfunctions/CMakeLists.txt @@ -33,6 +33,5 @@ endif() tde_add_library( emailfunctions STATIC_PIC AUTOMOC SOURCES - email.cpp idmapper.cpp kasciistricmp.cpp - kasciistringtools.cpp networkstatus.cpp networkstatus.skel + email.cpp idmapper.cpp networkstatus.cpp networkstatus.skel ) diff --git a/libemailfunctions/Makefile.am b/libemailfunctions/Makefile.am index f631afa3..2d8fc3df 100644 --- a/libemailfunctions/Makefile.am +++ b/libemailfunctions/Makefile.am @@ -1,9 +1,7 @@ INCLUDES = $(all_includes) -I$(srcdir)/../libkmime/ noinst_LTLIBRARIES = libemailfunctions.la -libemailfunctions_la_SOURCES = email.cpp idmapper.cpp kasciistricmp.cpp \ - kasciistringtools.cpp \ - networkstatus.cpp networkstatus.skel +libemailfunctions_la_SOURCES = email.cpp idmapper.cpp networkstatus.cpp networkstatus.skel libemailfunctions_la_LDFLAGS = $(all_libraries) -no-undefined ## Since this is a noinst library, in case of --enable-closure we need ## to link it explicitly to the libraries that it uses. diff --git a/libemailfunctions/email.h b/libemailfunctions/email.h index 6f5f44e0..abde8e05 100644 --- a/libemailfunctions/email.h +++ b/libemailfunctions/email.h @@ -24,7 +24,7 @@ #include <tqstringlist.h> #include <tqcstring.h> -#include <kdemacros.h> +#include <tdemacros.h> /** @file */ @@ -50,7 +50,7 @@ enum EmailParseResult { AddressOk, AddressEmpty, UnexpectedEnd, // Helper functions /** Split a comma separated list of email addresses. */ -KDE_EXPORT TQStringList splitEmailAddrList(const TQString& aStr); +TDE_EXPORT TQStringList splitEmailAddrList(const TQString& aStr); /** Splits the given address into display name, email address and comment. Returns AddressOk if no error was encountered. Otherwise an appropriate @@ -71,7 +71,7 @@ KDE_EXPORT TQStringList splitEmailAddrList(const TQString& aStr); @return AddressOk if no error was encountered. Otherwise an appropriate error code is returned. */ -KDE_EXPORT EmailParseResult splitAddress( const TQCString & address, +TDE_EXPORT EmailParseResult splitAddress( const TQCString & address, TQCString & displayName, TQCString & addrSpec, TQCString & comment ); @@ -98,7 +98,7 @@ KDE_EXPORT EmailParseResult splitAddress( const TQCString & address, @return AddressOk if no error was encountered. Otherwise an appropriate error code is returned. */ -KDE_EXPORT EmailParseResult splitAddress( const TQString & address, +TDE_EXPORT EmailParseResult splitAddress( const TQString & address, TQString & displayName, TQString & addrSpec, TQString & comment ); @@ -112,7 +112,7 @@ KDE_EXPORT EmailParseResult splitAddress( const TQString & address, @return AddressOk if no error was encountered. Otherwise an appropriate error code is returned. */ -KDE_EXPORT EmailParseResult isValidEmailAddress( const TQString& aStr ); +TDE_EXPORT EmailParseResult isValidEmailAddress( const TQString& aStr ); /** Translate the enum errorcodes from emailParseResult into i18n'd strings that can be used for msg boxes. @@ -121,7 +121,7 @@ KDE_EXPORT EmailParseResult isValidEmailAddress( const TQString& aStr ); @return An i18n ready string for use in msgboxes. */ -KDE_EXPORT TQString emailParseResultToString( EmailParseResult errorCode ); +TDE_EXPORT TQString emailParseResultToString( EmailParseResult errorCode ); /** Validates an email address in the form of joe@example.org. Returns true if no error was encountered. @@ -133,7 +133,7 @@ KDE_EXPORT TQString emailParseResultToString( EmailParseResult errorCode ); example: joe.user@example.org @return true if no error was encountered. */ -KDE_EXPORT bool isValidSimpleEmailAddress( const TQString& aStr ); +TDE_EXPORT bool isValidSimpleEmailAddress( const TQString& aStr ); /** Returns a i18n string to be used in msgboxes this allows for error messages to be the same @@ -142,7 +142,7 @@ KDE_EXPORT bool isValidSimpleEmailAddress( const TQString& aStr ); @return An i18n ready string for use in msgboxes. */ -KDE_EXPORT TQString simpleEmailAddressErrorMsg(); +TDE_EXPORT TQString simpleEmailAddressErrorMsg(); /** Returns the pure email address (addr-spec in RFC2822) of the given address (mailbox in RFC2822). @@ -151,7 +151,7 @@ KDE_EXPORT TQString simpleEmailAddressErrorMsg(); @return the addr-spec of @a address, i.e. joe.user@example.org in the example */ -KDE_EXPORT TQCString getEmailAddress( const TQCString & address ); +TDE_EXPORT TQCString getEmailAddress( const TQCString & address ); /** This is an overloaded member function, provided for convenience. It behaves essentially like the above function. @@ -163,7 +163,7 @@ KDE_EXPORT TQCString getEmailAddress( const TQCString & address ); @return the addr-spec of @a address, i.e. joe.user@example.org in the example */ -KDE_EXPORT TQString getEmailAddress( const TQString & address ); +TDE_EXPORT TQString getEmailAddress( const TQString & address ); /** Returns the pure email address (addr-spec in RFC2822) of the first email address of a list of addresses. @@ -172,7 +172,7 @@ KDE_EXPORT TQString getEmailAddress( const TQString & address ); @return the addr-spec of @a addresses, i.e. joe.user@example.org in the example */ -KDE_EXPORT TQCString getFirstEmailAddress( const TQCString & addresses ); +TDE_EXPORT TQCString getFirstEmailAddress( const TQCString & addresses ); /** This is an overloaded member function, provided for convenience. It behaves essentially like the above function. @@ -184,24 +184,24 @@ KDE_EXPORT TQCString getFirstEmailAddress( const TQCString & addresses ); @return the addr-spec of @a addresses, i.e. joe.user@example.org in the example */ -KDE_EXPORT TQString getFirstEmailAddress( const TQString & addresses ); +TDE_EXPORT TQString getFirstEmailAddress( const TQString & addresses ); /** Return email address and name from string. Examples: * "Stefan Taferner <taferner@example.org>" returns "taferner@example.org" * and "Stefan Taferner". "joe@example.com" returns "joe@example.com" * and "". Note that this only returns the first address. - * Also note that the return value is TRUE if both the name and the + * Also note that the return value is true if both the name and the * mail are not empty: this does NOT tell you if mail contains a * valid email address or just some rubbish. */ -KDE_EXPORT bool getNameAndMail(const TQString& aStr, TQString& name, TQString& mail); +TDE_EXPORT bool getNameAndMail(const TQString& aStr, TQString& name, TQString& mail); /** * Compare two email addresses. If matchName is false, it just checks * the email address, and returns true if this matches. If matchName * is true, both the name and the email must be the same. */ -KDE_EXPORT bool compareEmail( const TQString& email1, const TQString& email2, +TDE_EXPORT bool compareEmail( const TQString& email1, const TQString& email2, bool matchName ); /** Returns a normalized address built from the given parts. The normalized @@ -216,7 +216,7 @@ KDE_EXPORT bool compareEmail( const TQString& email1, const TQString& email2, @param comment a comment @return a normalized address built from the given parts */ -KDE_EXPORT TQString normalizedAddress( const TQString & displayName, +TDE_EXPORT TQString normalizedAddress( const TQString & displayName, const TQString & addrSpec, const TQString & comment ); @@ -225,7 +225,7 @@ KDE_EXPORT TQString normalizedAddress( const TQString & displayName, @param addrSpec a pure 7-bit email address (addr-spec in RFC2822) @return the email address with Unicode domain */ -KDE_EXPORT TQString decodeIDN( const TQString & addrSpec ); +TDE_EXPORT TQString decodeIDN( const TQString & addrSpec ); /** Encodes the domain part of the given addr-spec in punycode if it's an IDN. @@ -233,7 +233,7 @@ KDE_EXPORT TQString decodeIDN( const TQString & addrSpec ); @param addrSpec a pure email address with Unicode domain @return the email address with domain in punycode */ -KDE_EXPORT TQString encodeIDN( const TQString & addrSpec ); +TDE_EXPORT TQString encodeIDN( const TQString & addrSpec ); /** Normalizes all email addresses in the given list and decodes all IDNs. @@ -241,17 +241,17 @@ KDE_EXPORT TQString encodeIDN( const TQString & addrSpec ); @return the email addresses in normalized form with Unicode IDNs */ -KDE_EXPORT TQString normalizeAddressesAndDecodeIDNs( const TQString & addresses ); +TDE_EXPORT TQString normalizeAddressesAndDecodeIDNs( const TQString & addresses ); /** Normalizes all email addresses in the given list and encodes all IDNs in punycode. */ -KDE_EXPORT TQString normalizeAddressesAndEncodeIDNs( const TQString & str ); +TDE_EXPORT TQString normalizeAddressesAndEncodeIDNs( const TQString & str ); /** Add quote characters around the given string if it contains a * character that makes that necessary, in an email name, such as ",". */ -KDE_EXPORT TQString quoteNameIfNecessary( const TQString& str ); +TDE_EXPORT TQString quoteNameIfNecessary( const TQString& str ); } // namespace diff --git a/libemailfunctions/idmapper.cpp b/libemailfunctions/idmapper.cpp index 34bcf6cc..9e197af5 100644 --- a/libemailfunctions/idmapper.cpp +++ b/libemailfunctions/idmapper.cpp @@ -22,7 +22,7 @@ #include "idmapper.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tqfile.h> diff --git a/libemailfunctions/idmapper.h b/libemailfunctions/idmapper.h index fcd97451..557e61ec 100644 --- a/libemailfunctions/idmapper.h +++ b/libemailfunctions/idmapper.h @@ -25,7 +25,7 @@ #include <tqmap.h> #include <tqvariant.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KPIM { @@ -34,7 +34,7 @@ namespace KPIM { clear, but maps have categories. This is probably an adjoint functor, since adjoint functors are everywhere. */ -class KDE_EXPORT IdMapper +class TDE_EXPORT IdMapper { public: /** diff --git a/libemailfunctions/kasciistricmp.cpp b/libemailfunctions/kasciistricmp.cpp deleted file mode 100644 index 2852bb42..00000000 --- a/libemailfunctions/kasciistricmp.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (C) 2004 David Faure <faure@kde.org> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "kasciistricmp.h" - -#if ! KDE_IS_VERSION(3,3,89) - -static unsigned char tdepim_ASCIIToLower( unsigned char ch ) -{ - if ( ch >= 'A' && ch <= 'Z' ) - return ch - 'A' + 'a'; - else - return ch; -} - -int tdepim_kasciistricmp( const char *str1, const char *str2 ) -{ - const unsigned char *s1 = (const unsigned char *) str1; - const unsigned char *s2 = (const unsigned char *) str2; - int res; - unsigned char c; - - if ( !s1 || !s2 ) - return s1 ? 1 : ( s2 ? -1 : 0 ); - for ( ; !( res = ( c = tdepim_ASCIIToLower( *s1 ) ) - tdepim_ASCIIToLower( *s2 ) ); - ++s1, ++s2 ) - if ( !c ) // strings are equal - break; - return res; -} - -#endif diff --git a/libemailfunctions/kasciistricmp.h b/libemailfunctions/kasciistricmp.h deleted file mode 100644 index 10c1551e..00000000 --- a/libemailfunctions/kasciistricmp.h +++ /dev/null @@ -1,28 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (C) 2004 David Faure <faure@kde.org> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <tdeversion.h> - -#if KDE_IS_VERSION(3,3,89) -// get kasciistricmp from tdeglobal.h -#include <tdeglobal.h> -#else -// define kasciistricmp to this tdepim symbol (renamed to avoid problems when upgrading tdelibs later) -int tdepim_kasciistricmp( const char *str1, const char *str2 ); -#define kasciistricmp tdepim_kasciistricmp -#endif diff --git a/libemailfunctions/kasciistringtools.cpp b/libemailfunctions/kasciistringtools.cpp deleted file mode 100644 index 9d7590af..00000000 --- a/libemailfunctions/kasciistringtools.cpp +++ /dev/null @@ -1,62 +0,0 @@ -/* - kasciistringtools.cpp - - This file is part of libtdepim. - - Copyright (c) 2005 Ingo Kloecker <kloecker@kde.org> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "kasciistringtools.h" - -namespace KPIM { - -static unsigned char ASCIIToLower( unsigned char ch ) -{ - if ( ch >= 'A' && ch <= 'Z' ) - return ch - 'A' + 'a'; - else - return ch; -} - -char * kAsciiToLower( char *s ) -{ - if ( !s ) - return 0; - for ( unsigned char *p = (unsigned char *) s; *p; ++p ) - *p = ASCIIToLower( *p ); - return s; -} - -static unsigned char ASCIIToUpper( unsigned char ch ) -{ - if ( ch >= 'a' && ch <= 'z' ) - return ch - 'a' + 'A'; - else - return ch; -} - -char * kAsciiToUpper( char *s ) -{ - if ( !s ) - return 0; - for ( unsigned char *p = (unsigned char *) s; *p; ++p ) - *p = ASCIIToUpper( *p ); - return s; -} - -} // namespace KPIM diff --git a/libemailfunctions/kasciistringtools.h b/libemailfunctions/kasciistringtools.h deleted file mode 100644 index c67e5c31..00000000 --- a/libemailfunctions/kasciistringtools.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - kasciistringtools.h - - This file is part of libtdepim. - - Copyright (c) 2005 Ingo Kloecker <kloecker@kde.org> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KPIM_KASCIISTRINGTOOLS_H -#define KPIM_KASCIISTRINGTOOLS_H - -namespace KPIM { - -/** - Locale-independent function to convert ASCII strings to lower case ASCII - strings. This means that it affects @em only the ASCII characters A-Z. - - @param str pointer to the string which should be converted to lower case - @return pointer to the converted string (same as @a str) -*/ -char * kAsciiToLower( char *str ); - -/** - Locale-independent function to convert ASCII strings to upper case ASCII - strings. This means that it affects @em only the ASCII characters a-z. - - @param str pointer to the string which should be converted to upper case - @return pointer to the converted string (same as @a str) -*/ -char * kAsciiToUpper( char *str ); - -} // namespace KPIM - -#endif diff --git a/libkcal/alarm.h b/libkcal/alarm.h index 01969cae..ec927005 100644 --- a/libkcal/alarm.h +++ b/libkcal/alarm.h @@ -33,7 +33,7 @@ #include "listbase.h" #include "libkcal_export.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace KCal { diff --git a/libkcal/attachment.h b/libkcal/attachment.h index 9d36274c..8377836e 100644 --- a/libkcal/attachment.h +++ b/libkcal/attachment.h @@ -31,7 +31,7 @@ namespace KCal { /** This class represents information related to an attachment. */ -class KDE_EXPORT Attachment +class TDE_EXPORT Attachment { public: typedef ListBase<Attachment> List; diff --git a/libkcal/attachmenthandler.cpp b/libkcal/attachmenthandler.cpp index 0d1c63f2..5f027a3c 100644 --- a/libkcal/attachmenthandler.cpp +++ b/libkcal/attachmenthandler.cpp @@ -165,7 +165,7 @@ bool AttachmentHandler::view( TQWidget *parent, Attachment *attachment ) bool stat = true; if ( attachment->isUri() ) { - kapp->invokeBrowser( attachment->uri() ); + tdeApp->invokeBrowser( attachment->uri() ); } else { // put the attachment in a temporary file and launch it KURL tempUrl = tempFileForAttachment( attachment ); diff --git a/libkcal/calendar.h b/libkcal/calendar.h index 2c76832e..19b87687 100644 --- a/libkcal/calendar.h +++ b/libkcal/calendar.h @@ -39,7 +39,7 @@ #include "kcalversion.h" #include "person.h" -#include <kdemacros.h> +#include <tdemacros.h> #include <tqobject.h> #include <tqstring.h> diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h index e021a9b6..b14607fc 100644 --- a/libkcal/calendarlocal.h +++ b/libkcal/calendarlocal.h @@ -24,7 +24,7 @@ #include "calendar.h" #include <tqdict.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KCal { diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp index bfc493ba..bee2bf31 100644 --- a/libkcal/calendarresources.cpp +++ b/libkcal/calendarresources.cpp @@ -33,7 +33,7 @@ #include <tqptrlist.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include "vcaldrag.h" @@ -131,8 +131,8 @@ void CalendarResources::init( const TQString &family ) mDestinationPolicy = mStandardPolicy; mPendingDeleteFromResourceMap = false; - connect( this, TQT_SIGNAL(batchAddingBegins()), this, TQT_SLOT(beginAddingIncidences()) ); - connect( this, TQT_SIGNAL(batchAddingEnds()), this, TQT_SLOT(endAddingIncidences()) ); + connect( this, TQ_SIGNAL(batchAddingBegins()), this, TQ_SLOT(beginAddingIncidences()) ); + connect( this, TQ_SIGNAL(batchAddingEnds()), this, TQ_SLOT(endAddingIncidences()) ); } CalendarResources::~CalendarResources() @@ -756,17 +756,17 @@ Journal::List CalendarResources::rawJournalsForDate( const TQDate &date ) void CalendarResources::connectResource( ResourceCalendar *resource ) { - connect( resource, TQT_SIGNAL( resourceChanged( ResourceCalendar * ) ), - TQT_SIGNAL( calendarChanged() ) ); - connect( resource, TQT_SIGNAL( resourceSaved( ResourceCalendar * ) ), - TQT_SIGNAL( calendarSaved() ) ); + connect( resource, TQ_SIGNAL( resourceChanged( ResourceCalendar * ) ), + TQ_SIGNAL( calendarChanged() ) ); + connect( resource, TQ_SIGNAL( resourceSaved( ResourceCalendar * ) ), + TQ_SIGNAL( calendarSaved() ) ); - connect( resource, TQT_SIGNAL( resourceLoadError( ResourceCalendar *, + connect( resource, TQ_SIGNAL( resourceLoadError( ResourceCalendar *, const TQString & ) ), - TQT_SLOT( slotLoadError( ResourceCalendar *, const TQString & ) ) ); - connect( resource, TQT_SIGNAL( resourceSaveError( ResourceCalendar *, + TQ_SLOT( slotLoadError( ResourceCalendar *, const TQString & ) ) ); + connect( resource, TQ_SIGNAL( resourceSaveError( ResourceCalendar *, const TQString & ) ), - TQT_SLOT( slotSaveError( ResourceCalendar *, const TQString & ) ) ); + TQ_SLOT( slotSaveError( ResourceCalendar *, const TQString & ) ) ); } ResourceCalendar *CalendarResources::resource( Incidence *incidence ) diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h index 20d5850c..23539fc3 100644 --- a/libkcal/calendarresources.h +++ b/libkcal/calendarresources.h @@ -340,7 +340,7 @@ class LIBKCAL_EXPORT CalendarResources : @deprecated use addIncidence(Incidence *,ResourceCalendar *,const TQString &) instead. */ - KDE_DEPRECATED bool addIncidence( Incidence *incidence, ResourceCalendar *resource ); + TDE_DEPRECATED bool addIncidence( Incidence *incidence, ResourceCalendar *resource ); /** Insert an Incidence into a Calendar Resource. @@ -362,7 +362,7 @@ class LIBKCAL_EXPORT CalendarResources : @return false if the resource could not be computed or if a ticket request fails; true otherwise. */ - KDE_DEPRECATED bool beginChange( Incidence *incidence ); + TDE_DEPRECATED bool beginChange( Incidence *incidence ); /** Flag that a change to a Calendar Incidence is starting. @@ -385,7 +385,7 @@ class LIBKCAL_EXPORT CalendarResources : @return false if the resource could not be computed or if a ticket save fails; true otherwise. */ - KDE_DEPRECATED bool endChange( Incidence *incidence ); + TDE_DEPRECATED bool endChange( Incidence *incidence ); /** Flag that a change to a Calendar Incidence has completed. @@ -427,7 +427,7 @@ class LIBKCAL_EXPORT CalendarResources : @deprecated use addIncidence(Incidence *,ResourceCalendar *,const TQString&) instead. */ - KDE_DEPRECATED bool addEvent( Event *event, ResourceCalendar *resource ); + TDE_DEPRECATED bool addEvent( Event *event, ResourceCalendar *resource ); /** Insert an Event into a Calendar Resource. @@ -544,7 +544,7 @@ class LIBKCAL_EXPORT CalendarResources : @deprecated use addIncidence(Incidence *,ResourceCalendar *,const TQString &) instead. */ - KDE_DEPRECATED bool addTodo( Todo *todo, ResourceCalendar *resource ); + TDE_DEPRECATED bool addTodo( Todo *todo, ResourceCalendar *resource ); /** Insert an Todo into a Calendar Resource. @@ -629,7 +629,7 @@ class LIBKCAL_EXPORT CalendarResources : @deprecated use addIncidence(Incidence *,ResourceCalendar *,const TQString &) instead. */ - KDE_DEPRECATED bool addJournal( Journal *journal, ResourceCalendar *resource ); + TDE_DEPRECATED bool addJournal( Journal *journal, ResourceCalendar *resource ); /** Insert a Journal into a Calendar Resource. diff --git a/libkcal/calformat.h b/libkcal/calformat.h index b3b7160d..39bd98bf 100644 --- a/libkcal/calformat.h +++ b/libkcal/calformat.h @@ -50,7 +50,7 @@ class LIBKCAL_EXPORT CalFormat /** loads a calendar on disk into the calendar associated with this format. - Returns TRUE if successful,else returns FALSE. + Returns true if successful,else returns false. @param fileName the name of the calendar on disk. */ virtual bool load(Calendar *, const TQString &fileName) = 0; diff --git a/libkcal/calselectdialog.cpp b/libkcal/calselectdialog.cpp index b72a1627..c2a7f897 100644 --- a/libkcal/calselectdialog.cpp +++ b/libkcal/calselectdialog.cpp @@ -65,10 +65,10 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label mListBox->ensureCurrentVisible(); layout->addWidget( mListBox, 10 ); - connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), - TQT_SLOT(slotOk()) ); - connect( mListBox, TQT_SIGNAL(returnPressed(TQListBoxItem *)), - TQT_SLOT(slotOk()) ); + connect( mListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), + TQ_SLOT(slotOk()) ); + connect( mListBox, TQ_SIGNAL(returnPressed(TQListBoxItem *)), + TQ_SLOT(slotOk()) ); mListBox->setFocus(); diff --git a/libkcal/confirmsavedialog.h b/libkcal/confirmsavedialog.h index bc0fcb09..401af879 100644 --- a/libkcal/confirmsavedialog.h +++ b/libkcal/confirmsavedialog.h @@ -23,13 +23,13 @@ #include <libkcal/incidence.h> #include <kdialogbase.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEListView; namespace KCal { -class KDE_EXPORT ConfirmSaveDialog : public KDialogBase +class TDE_EXPORT ConfirmSaveDialog : public KDialogBase { public: ConfirmSaveDialog( const TQString &destination, TQWidget *parent, diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp index a626231f..e6273c5a 100644 --- a/libkcal/convertqtopia.cpp +++ b/libkcal/convertqtopia.cpp @@ -30,7 +30,7 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <iostream> diff --git a/libkcal/customproperties.h b/libkcal/customproperties.h index de6b8bd7..60de5c50 100644 --- a/libkcal/customproperties.h +++ b/libkcal/customproperties.h @@ -24,7 +24,7 @@ #include <tqstring.h> #include <tqmap.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "libkcal_export.h" diff --git a/libkcal/dummyscheduler.cpp b/libkcal/dummyscheduler.cpp index 7a824f08..c3cc6123 100644 --- a/libkcal/dummyscheduler.cpp +++ b/libkcal/dummyscheduler.cpp @@ -27,7 +27,7 @@ #include <tqtextstream.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "event.h" #include "icalformat.h" diff --git a/libkcal/event.h b/libkcal/event.h index ba0780fb..93b439f8 100644 --- a/libkcal/event.h +++ b/libkcal/event.h @@ -22,7 +22,7 @@ #define KCAL_EVENT_H #include "incidence.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace KCal { @@ -74,7 +74,7 @@ class LIBKCAL_EXPORT Event : public Incidence settings. @deprecated use IncidenceFormatter::timeToString() */ - TQString KDE_DEPRECATED dtEndTimeStr() const; + TQString TDE_DEPRECATED dtEndTimeStr() const; /** Return end date as string formatted according to the users locale settings. @@ -83,13 +83,13 @@ class LIBKCAL_EXPORT Event : public Incidence long format @deprecated use IncidenceFormatter::dateToString() */ - TQString KDE_DEPRECATED dtEndDateStr( bool shortfmt = true ) const; + TQString TDE_DEPRECATED dtEndDateStr( bool shortfmt = true ) const; /** Return end date and time as string formatted according to the users locale settings. @deprecated use IncidenceFormatter::dateTimeToString() */ - TQString KDE_DEPRECATED dtEndStr() const; + TQString TDE_DEPRECATED dtEndStr() const; /** Set whether the event has an end date/time. diff --git a/libkcal/freebusyurlstore.cpp b/libkcal/freebusyurlstore.cpp index a4a42b5c..03204f35 100644 --- a/libkcal/freebusyurlstore.cpp +++ b/libkcal/freebusyurlstore.cpp @@ -23,7 +23,7 @@ #include <kstaticdeleter.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> using namespace KCal; diff --git a/libkcal/htmlexport.h b/libkcal/htmlexport.h index 0fbe8022..bcf5af96 100644 --- a/libkcal/htmlexport.h +++ b/libkcal/htmlexport.h @@ -39,7 +39,7 @@ namespace KCal { /** This class provides the functions to export a calendar as an HTML page. */ -class KDE_EXPORT HtmlExport +class TDE_EXPORT HtmlExport { public: /** diff --git a/libkcal/htmlexportsettings.kcfgc b/libkcal/htmlexportsettings.kcfgc index db2360aa..e756d7e2 100644 --- a/libkcal/htmlexportsettings.kcfgc +++ b/libkcal/htmlexportsettings.kcfgc @@ -7,4 +7,4 @@ MemberVariables=public GlobalEnums=true ItemAccessors=true SetUserTexts=true -Visibility=KDE_EXPORT +Visibility=TDE_EXPORT diff --git a/libkcal/icalformat.h b/libkcal/icalformat.h index f277b14a..423738df 100644 --- a/libkcal/icalformat.h +++ b/libkcal/icalformat.h @@ -26,7 +26,7 @@ #include "scheduler.h" #include "calformat.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace KCal { diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp index e4296bce..d8fe62df 100644 --- a/libkcal/icalformatimpl.cpp +++ b/libkcal/icalformatimpl.cpp @@ -69,15 +69,6 @@ static void _dumpIcaltime( const icaltimetype& t) } */ -static TQString quoteForParam( const TQString &text ) -{ - TQString tmp = text; - tmp.remove( '"' ); - if ( tmp.contains( ';' ) || tmp.contains( ':' ) || tmp.contains( ',' ) ) - return tmp; // libical quotes in this case already, see icalparameter_as_ical_string() - return TQString::fromLatin1( "\"" ) + tmp + TQString::fromLatin1( "\"" ); -} - const int gSecondsPerMinute = 60; const int gSecondsPerHour = gSecondsPerMinute * 60; const int gSecondsPerDay = gSecondsPerHour * 24; @@ -576,7 +567,7 @@ icalproperty *ICalFormatImpl::writeOrganizer( const Person &organizer ) icalproperty *p = icalproperty_new_organizer("MAILTO:" + organizer.email().utf8()); if (!organizer.name().isEmpty()) { - icalproperty_add_parameter( p, icalparameter_new_cn(quoteForParam(organizer.name()).utf8()) ); + icalproperty_add_parameter( p, icalparameter_new_cn(organizer.name().utf8()) ); } // TODO: Write dir, sent-by and language @@ -589,7 +580,7 @@ icalproperty *ICalFormatImpl::writeAttendee(Attendee *attendee) icalproperty *p = icalproperty_new_attendee("mailto:" + attendee->email().utf8()); if (!attendee->name().isEmpty()) { - icalproperty_add_parameter(p,icalparameter_new_cn(quoteForParam(attendee->name()).utf8())); + icalproperty_add_parameter(p,icalparameter_new_cn(attendee->name().utf8())); } @@ -869,7 +860,7 @@ icalcomponent *ICalFormatImpl::writeAlarm(Alarm *alarm) for (TQValueList<Person>::Iterator ad = addresses.begin(); ad != addresses.end(); ++ad) { icalproperty *p = icalproperty_new_attendee("MAILTO:" + (*ad).email().utf8()); if (!(*ad).name().isEmpty()) { - icalproperty_add_parameter(p,icalparameter_new_cn(quoteForParam((*ad).name()).utf8())); + icalproperty_add_parameter(p,icalparameter_new_cn((*ad).name().utf8())); } icalcomponent_add_property(a,p); } diff --git a/libkcal/imipscheduler.h b/libkcal/imipscheduler.h index 59379403..698ef0b5 100644 --- a/libkcal/imipscheduler.h +++ b/libkcal/imipscheduler.h @@ -34,7 +34,7 @@ namespace KCal { This class implements the iTIP interface using the email interface specified as iMIP. */ -class KDE_EXPORT IMIPScheduler : public Scheduler +class TDE_EXPORT IMIPScheduler : public Scheduler { public: IMIPScheduler( Calendar * ); diff --git a/libkcal/incidence.h b/libkcal/incidence.h index f5fedc34..2f3bb3e8 100644 --- a/libkcal/incidence.h +++ b/libkcal/incidence.h @@ -32,7 +32,7 @@ #include "libkcal_export.h" #include "incidencebase.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace KCal { diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h index d54ca879..10a9ab20 100644 --- a/libkcal/incidencebase.h +++ b/libkcal/incidencebase.h @@ -139,20 +139,20 @@ class LIBKCAL_EXPORT IncidenceBase : public CustomProperties users locale settings. @deprecated use IncidenceFormatter::timeToString() */ - virtual KDE_DEPRECATED TQString dtStartTimeStr() const; + virtual TDE_DEPRECATED TQString dtStartTimeStr() const; /** returns an event's starting date as a string formatted according to the users locale settings @deprecated use IncidenceFormatter::dateToString() */ - virtual KDE_DEPRECATED TQString dtStartDateStr( bool shortfmt = true ) const; + virtual TDE_DEPRECATED TQString dtStartDateStr( bool shortfmt = true ) const; /** returns an event's starting date and time as a string formatted according to the users locale settings @deprecated use IncidenceFormatter::dateTimeToString() */ - virtual KDE_DEPRECATED TQString dtStartStr() const; + virtual TDE_DEPRECATED TQString dtStartStr() const; virtual void setDuration( int seconds ); int duration() const; diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp index 785a681b..887d000a 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -575,9 +575,22 @@ static TQString displayViewFormatEvent( Calendar *calendar, Event *event, } if ( !event->description().isEmpty() ) { + TQString description = event->description(); + + // Regular expression to match URLs + TQRegExp urlRegex("https?://[^\\s]+"); + + int pos = 0; + while ((pos = urlRegex.search(description, pos)) != -1) { + TQString url = urlRegex.cap(0); + TQString link = "<a href=\"" + url + "\">" + url + "</a>"; + description.replace(pos, url.length(), link); + pos += link.length(); + } + tmpStr += "<tr>"; tmpStr += "<td><b>" + i18n( "Description:" ) + "</b></td>"; - tmpStr += "<td>" + event->description() + "</td>"; + tmpStr += "<td>" + description + "</td>"; tmpStr += "</tr>"; } diff --git a/libkcal/incidenceformatter.h b/libkcal/incidenceformatter.h index b2dcd432..9d6e8a75 100644 --- a/libkcal/incidenceformatter.h +++ b/libkcal/incidenceformatter.h @@ -52,20 +52,20 @@ class LIBKCAL_EXPORT InvitationFormatterHelper class LIBKCAL_EXPORT IncidenceFormatter { public: - static TQString KDE_DEPRECATED toolTipString( IncidenceBase *incidence, bool richText = true ); + static TQString TDE_DEPRECATED toolTipString( IncidenceBase *incidence, bool richText = true ); static TQString toolTipStr( Calendar *calendar, IncidenceBase *incidence, const TQDate &date=TQDate(), bool richText = true ); static TQString mailBodyString( IncidenceBase *incidencebase ); - static TQString KDE_DEPRECATED extensiveDisplayString( IncidenceBase *incidence ); + static TQString TDE_DEPRECATED extensiveDisplayString( IncidenceBase *incidence ); static TQString extensiveDisplayStr( Calendar *calendar, IncidenceBase *incidence, const TQDate &date=TQDate() ); static TQString formatICalInvitation( TQString invitation, Calendar *mCalendar, InvitationFormatterHelper *helper ); - static TQString KDE_DEPRECATED formatICalInvitationNoHtml( TQString invitation, + static TQString TDE_DEPRECATED formatICalInvitationNoHtml( TQString invitation, Calendar *mCalendar, InvitationFormatterHelper *helper ); static TQString formatICalInvitationNoHtml( TQString invitation, diff --git a/libkcal/journal.h b/libkcal/journal.h index d2ca83c4..3bd10729 100644 --- a/libkcal/journal.h +++ b/libkcal/journal.h @@ -23,7 +23,7 @@ #define KCAL_JOURNAL_H #include "incidence.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace KCal { diff --git a/libkcal/libkcal_export.h b/libkcal/libkcal_export.h index 7fca2dbe..e6ffe4f9 100644 --- a/libkcal/libkcal_export.h +++ b/libkcal/libkcal_export.h @@ -21,8 +21,8 @@ #ifndef KCAL_KCALEXPORT_H #define KCAL_KCALEXPORT_H -#include <kdemacros.h> +#include <tdemacros.h> -#define LIBKCAL_EXPORT KDE_EXPORT +#define LIBKCAL_EXPORT TDE_EXPORT #endif diff --git a/libkcal/period.h b/libkcal/period.h index b0ca32a3..64250a43 100644 --- a/libkcal/period.h +++ b/libkcal/period.h @@ -32,7 +32,7 @@ namespace KCal { This class represents a period of time. The period can be defined by either a start time and an end time or by a start time and a duration. */ -class KDE_EXPORT Period +class TDE_EXPORT Period { public: Period(); diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index 38110431..aeb7e44e 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kurl.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "event.h" #include "exceptions.h" @@ -55,8 +55,8 @@ ResourceCached::ResourceCached( const TDEConfig* config ) mSavePolicy( SaveNever ), mSaveInterval( 10 ), mSaveTimer( 0, "mSaveTimer" ), mIdMapper( "kcal/uidmaps/" ) { - connect( &mReloadTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotReload() ) ); - connect( &mSaveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotSave() ) ); + connect( &mReloadTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotReload() ) ); + connect( &mSaveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotSave() ) ); } ResourceCached::~ResourceCached() diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h index 6fc30a1c..34356377 100644 --- a/libkcal/resourcecached.h +++ b/libkcal/resourcecached.h @@ -34,7 +34,7 @@ #include <tqdatetime.h> #include <tqtimer.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KCal { @@ -42,7 +42,7 @@ namespace KCal { This class provides a calendar resource using a local CalendarLocal object to cache the calendar data. */ -class KDE_EXPORT ResourceCached : public ResourceCalendar, +class TDE_EXPORT ResourceCached : public ResourceCalendar, public KCal::Calendar::Observer { TQ_OBJECT @@ -137,7 +137,7 @@ class KDE_EXPORT ResourceCached : public ResourceCalendar, /** Add event to calendar. */ - KDE_DEPRECATED bool addEvent( Event *event ); + TDE_DEPRECATED bool addEvent( Event *event ); bool addEvent( Event *event, const TQString &subresource ); /** @@ -177,7 +177,7 @@ class KDE_EXPORT ResourceCached : public ResourceCalendar, /** Add a todo to the todolist. */ - KDE_DEPRECATED bool addTodo( Todo *todo ); + TDE_DEPRECATED bool addTodo( Todo *todo ); bool addTodo( Todo *todo, const TQString &subresource ); /** @@ -200,7 +200,7 @@ class KDE_EXPORT ResourceCached : public ResourceCalendar, /** Add a Journal entry to calendar */ - KDE_DEPRECATED bool addJournal( Journal *journal ); + TDE_DEPRECATED bool addJournal( Journal *journal ); bool addJournal( Journal *journal, const TQString &subresource ); /** diff --git a/libkcal/resourcecachedconfig.cpp b/libkcal/resourcecachedconfig.cpp index a1940e99..6d6ada34 100644 --- a/libkcal/resourcecachedconfig.cpp +++ b/libkcal/resourcecachedconfig.cpp @@ -48,8 +48,8 @@ ResourceCachedReloadConfig::ResourceCachedReloadConfig( TQWidget *parent, TQRadioButton *intervalRadio = new TQRadioButton( i18n("Regular interval"), mGroup ); - connect( intervalRadio, TQT_SIGNAL( stateChanged( int ) ), - TQT_SLOT( slotIntervalStateChanged( int ) ) ); + connect( intervalRadio, TQ_SIGNAL( stateChanged( int ) ), + TQ_SLOT( slotIntervalStateChanged( int ) ) ); TQHBox *intervalBox = new TQHBox( mGroup ); new TQLabel( i18n("Interval in minutes"), intervalBox ); mIntervalSpin = new TQSpinBox( 1,900, 1,intervalBox ); @@ -88,8 +88,8 @@ ResourceCachedSaveConfig::ResourceCachedSaveConfig( TQWidget *parent, TQRadioButton *intervalRadio = new TQRadioButton( i18n("Regular interval"), mGroup ); - connect( intervalRadio, TQT_SIGNAL( stateChanged( int ) ), - TQT_SLOT( slotIntervalStateChanged( int ) ) ); + connect( intervalRadio, TQ_SIGNAL( stateChanged( int ) ), + TQ_SLOT( slotIntervalStateChanged( int ) ) ); TQHBox *intervalBox = new TQHBox( mGroup ); new TQLabel( i18n("Interval in minutes"), intervalBox ); mIntervalSpin = new TQSpinBox( 1,900, 1,intervalBox ); diff --git a/libkcal/resourcecachedconfig.h b/libkcal/resourcecachedconfig.h index 81e4ee8e..f30cc63c 100644 --- a/libkcal/resourcecachedconfig.h +++ b/libkcal/resourcecachedconfig.h @@ -22,7 +22,7 @@ #define KCAL_RESOURCECACHEDCONFIG_H #include <tqwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQButtonGroup; class TQSpinBox; @@ -36,7 +36,7 @@ class ResourceCached; @see ResourceCached */ -class KDE_EXPORT ResourceCachedReloadConfig : public TQWidget +class TDE_EXPORT ResourceCachedReloadConfig : public TQWidget { TQ_OBJECT @@ -63,7 +63,7 @@ class KDE_EXPORT ResourceCachedReloadConfig : public TQWidget @see ResourceCached */ -class KDE_EXPORT ResourceCachedSaveConfig : public TQWidget +class TDE_EXPORT ResourceCachedSaveConfig : public TQWidget { TQ_OBJECT diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h index e4c97b5c..f3713143 100644 --- a/libkcal/resourcecalendar.h +++ b/libkcal/resourcecalendar.h @@ -41,7 +41,7 @@ #include <tderesources/resource.h> #include <tderesources/manager.h> #include <tdeabc/lock.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KCal { @@ -144,7 +144,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource Add incidence to resource. @deprecated use addIncidence(Incidence *,const TQString &) instead. */ - virtual KDE_DEPRECATED bool addIncidence( Incidence * ); + virtual TDE_DEPRECATED bool addIncidence( Incidence * ); /** Add incidence to resource and subresource. @@ -166,7 +166,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource Add event to resource. @deprecated use addEvent(Event *,const TQString&) instead. */ - virtual KDE_DEPRECATED bool addEvent( Event *event ) = 0; + virtual TDE_DEPRECATED bool addEvent( Event *event ) = 0; virtual bool addEvent( Event *event, const TQString &subresource ) = 0; /** @@ -270,7 +270,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource Add a todo to the todolist. @deprecated use addTodo(Todo *,const TQString &) instead. */ - virtual KDE_DEPRECATED bool addTodo( Todo *todo ) = 0; + virtual TDE_DEPRECATED bool addTodo( Todo *todo ) = 0; virtual bool addTodo( Todo *todo, const TQString &subresource ) = 0; /** @@ -297,7 +297,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource Add a Journal entry to the resource. @deprecated use addJournal(Journal *,const TQString &) instead. */ - virtual KDE_DEPRECATED bool addJournal( Journal * ) = 0; + virtual TDE_DEPRECATED bool addJournal( Journal * ) = 0; virtual bool addJournal( Journal *journal, const TQString &subresource ) = 0; /** diff --git a/libkcal/resourcelocal.cpp b/libkcal/resourcelocal.cpp index a193b0b7..f6ba2b8f 100644 --- a/libkcal/resourcelocal.cpp +++ b/libkcal/resourcelocal.cpp @@ -30,7 +30,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kurl.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "vcaldrag.h" #include "vcalformat.h" @@ -111,12 +111,12 @@ void ResourceLocal::init() setSavePolicy( SaveDelayed ); - connect( &mDirWatch, TQT_SIGNAL( dirty( const TQString & ) ), - TQT_SLOT( reload() ) ); - connect( &mDirWatch, TQT_SIGNAL( created( const TQString & ) ), - TQT_SLOT( reload() ) ); - connect( &mDirWatch, TQT_SIGNAL( deleted( const TQString & ) ), - TQT_SLOT( reload() ) ); + connect( &mDirWatch, TQ_SIGNAL( dirty( const TQString & ) ), + TQ_SLOT( reload() ) ); + connect( &mDirWatch, TQ_SIGNAL( created( const TQString & ) ), + TQ_SLOT( reload() ) ); + connect( &mDirWatch, TQ_SIGNAL( deleted( const TQString & ) ), + TQ_SLOT( reload() ) ); mLock = new TDEABC::Lock( mURL.path() ); diff --git a/libkcal/resourcelocal.h b/libkcal/resourcelocal.h index 1ef4cf01..0c6773f8 100644 --- a/libkcal/resourcelocal.h +++ b/libkcal/resourcelocal.h @@ -27,7 +27,7 @@ #include <kurl.h> #include <kdirwatch.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEConfig; #include "calendarlocal.h" diff --git a/libkcal/resourcelocalconfig.cpp b/libkcal/resourcelocalconfig.cpp index 0999aaae..5d3c40ff 100644 --- a/libkcal/resourcelocalconfig.cpp +++ b/libkcal/resourcelocalconfig.cpp @@ -28,7 +28,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "vcaldrag.h" #include "vcalformat.h" diff --git a/libkcal/resourcelocalconfig.h b/libkcal/resourcelocalconfig.h index 2bb732ee..d7747b63 100644 --- a/libkcal/resourcelocalconfig.h +++ b/libkcal/resourcelocalconfig.h @@ -28,7 +28,7 @@ #include <tderesources/resource.h> #include <tderesources/configwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "libkcal_export.h" diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp index 33fa42f7..d3d19f0b 100644 --- a/libkcal/resourcelocaldir.cpp +++ b/libkcal/resourcelocaldir.cpp @@ -31,7 +31,7 @@ #include <tdelocale.h> #include <kurl.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "vcaldrag.h" #include "vcalformat.h" @@ -92,12 +92,12 @@ void ResourceLocalDir::init() setSavePolicy( SaveDelayed ); - connect( &mDirWatch, TQT_SIGNAL( dirty( const TQString & ) ), - TQT_SLOT( reload( const TQString & ) ) ); - connect( &mDirWatch, TQT_SIGNAL( created( const TQString & ) ), - TQT_SLOT( reload( const TQString & ) ) ); - connect( &mDirWatch, TQT_SIGNAL( deleted( const TQString & ) ), - TQT_SLOT( reload( const TQString & ) ) ); + connect( &mDirWatch, TQ_SIGNAL( dirty( const TQString & ) ), + TQ_SLOT( reload( const TQString & ) ) ); + connect( &mDirWatch, TQ_SIGNAL( created( const TQString & ) ), + TQ_SLOT( reload( const TQString & ) ) ); + connect( &mDirWatch, TQ_SIGNAL( deleted( const TQString & ) ), + TQ_SLOT( reload( const TQString & ) ) ); mLock = new TDEABC::Lock( mURL.path() ); diff --git a/libkcal/resourcelocaldir.h b/libkcal/resourcelocaldir.h index de7d35b2..144397c4 100644 --- a/libkcal/resourcelocaldir.h +++ b/libkcal/resourcelocaldir.h @@ -23,7 +23,7 @@ #include <kurl.h> #include <kdirwatch.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "resourcecached.h" diff --git a/libkcal/resourcelocaldirconfig.cpp b/libkcal/resourcelocaldirconfig.cpp index afe9c95b..5725452f 100644 --- a/libkcal/resourcelocaldirconfig.cpp +++ b/libkcal/resourcelocaldirconfig.cpp @@ -27,7 +27,7 @@ #include <tdelocale.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "vcaldrag.h" #include "vcalformat.h" diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp index c398a77c..3481f9cb 100644 --- a/libkcal/scheduler.cpp +++ b/libkcal/scheduler.cpp @@ -23,7 +23,7 @@ #include <tdelocale.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "calhelper.h" #include "event.h" diff --git a/libkcal/scheduler.h b/libkcal/scheduler.h index 4d97ab51..fe6c430a 100644 --- a/libkcal/scheduler.h +++ b/libkcal/scheduler.h @@ -174,7 +174,7 @@ class LIBKCAL_EXPORT Scheduler bool acceptRequest( IncidenceBase *, ScheduleMessage::Status status, const TQString & attendee ); bool acceptAdd( IncidenceBase *, ScheduleMessage::Status status ); - KDE_DEPRECATED bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status ); + TDE_DEPRECATED bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status ); bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status, const TQString & attendee ); bool acceptDeclineCounter( IncidenceBase *, diff --git a/libkcal/tests/fbrecurring.cpp b/libkcal/tests/fbrecurring.cpp index be70a7c8..e4678a54 100644 --- a/libkcal/tests/fbrecurring.cpp +++ b/libkcal/tests/fbrecurring.cpp @@ -20,7 +20,7 @@ int main() event1->setDtStart( TQDateTime(TQDate(2006,1,1), TQTime(12,0,0)) ); //event1->setDuration(60*60); event1->setDtEnd( TQDateTime(TQDate(2006,1,1), TQTime(13,0,0)) ); - event1->setFloats(FALSE); + event1->setFloats(false); event1->recurrence()->setDaily( 1 ); //event1->recurrence()->setDuration( 2 ); event1->recurrence()->setEndDateTime( TQDateTime(TQDate(2006,1,3), TQTime(13,0,0)) ); @@ -32,7 +32,7 @@ int main() event2->setDtStart( TQDateTime(TQDate(2006,1,1), TQTime(13,0,0)) ); //event2->setDuration(60*60); event2->setDtEnd( TQDateTime(TQDate(2006,1,1), TQTime(14,0,0)) ); - event2->setFloats(FALSE); + event2->setFloats(false); event2->recurrence()->setDaily( 1 ); //event2->recurrence()->setDuration( 3 ); event2->recurrence()->setEndDateTime( TQDateTime(TQDate(2006,1,4), TQTime(13,0,0)) ); diff --git a/libkcal/todo.h b/libkcal/todo.h index 74e1b39d..25e63045 100644 --- a/libkcal/todo.h +++ b/libkcal/todo.h @@ -68,7 +68,7 @@ class LIBKCAL_EXPORT Todo : public Incidence settings. @deprecated use IncidenceFormatter::timeToString() */ - KDE_DEPRECATED TQString dtDueTimeStr() const; + TDE_DEPRECATED TQString dtDueTimeStr() const; /** Returns due date as string formatted according to the users locale @@ -78,14 +78,14 @@ class LIBKCAL_EXPORT Todo : public Incidence long format. @deprecated use IncidenceFormatter::dateToString() */ - KDE_DEPRECATED TQString dtDueDateStr( bool shortfmt = true ) const; + TDE_DEPRECATED TQString dtDueDateStr( bool shortfmt = true ) const; /** Returns due date and time as string formatted according to the users locale settings. @deprecated use IncidenceFormatter::dateTimeToString() */ - KDE_DEPRECATED TQString dtDueStr() const; + TDE_DEPRECATED TQString dtDueStr() const; /** Returns true if the todo has a due date, otherwise return false. diff --git a/libkcal/vcaldrag.h b/libkcal/vcaldrag.h index 7cb8c6bb..7cfbff52 100644 --- a/libkcal/vcaldrag.h +++ b/libkcal/vcaldrag.h @@ -32,7 +32,7 @@ class Calendar; /** vCalendar drag&drop class. */ -class KDE_EXPORT VCalDrag : public TQStoredDrag +class TDE_EXPORT VCalDrag : public TQStoredDrag { public: /** diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp index f78ad2a3..539921fa 100644 --- a/libkcal/vcalformat.cpp +++ b/libkcal/vcalformat.cpp @@ -71,7 +71,7 @@ bool VCalFormat::load(Calendar *calendar, const TQString &fileName) if (!vcal) { setException(new ErrorFormat(ErrorFormat::CalVersionUnknown)); - return FALSE; + return false; } // any other top-level calendar stuff should be added/initialized here @@ -503,7 +503,7 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent) } else if (recur->duration() == -1) { tmpStr += "#0"; // defined as repeat forever } else { - tmpStr += qDateTimeToISO(recur->endDateTime(), FALSE); + tmpStr += qDateTimeToISO(recur->endDateTime(), false); } // Only write out the rrule if we have a valid recurrence (i.e. a known // type in thee switch above) @@ -948,11 +948,11 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) // "take up" any time. /*if ((isAPropertyOf(vevent, VCDTstartProp) == 0) || (isAPropertyOf(vevent, VCDTendProp) == 0)) { - anEvent->setFloats(TRUE); + anEvent->setFloats(true); } else { }*/ - anEvent->setFloats(FALSE); + anEvent->setFloats(false); // start time if ((vo = isAPropertyOf(vevent, VCDTstartProp)) != 0) { @@ -960,7 +960,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) // kdDebug(5800) << "s is " << // s << ", ISO is " << ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo))).toString() << endl; deleteStr(s); if (anEvent->dtStart().time().isNull()) - anEvent->setFloats(TRUE); + anEvent->setFloats(true); } // stop time @@ -968,7 +968,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) anEvent->setDtEnd(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); deleteStr(s); if (anEvent->dtEnd().time().isNull()) - anEvent->setFloats(TRUE); + anEvent->setFloats(true); } // at this point, there should be at least a start or end time. @@ -1071,7 +1071,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) } anEvent->recurrence()->addMonthlyPos( tmpPos, qba ); qba.detach(); - qba.fill(FALSE); // clear out + qba.fill(false); // clear out } // while != "#" } break;} diff --git a/libkcal/vcalformat.h b/libkcal/vcalformat.h index facda241..60151ff9 100644 --- a/libkcal/vcalformat.h +++ b/libkcal/vcalformat.h @@ -86,7 +86,7 @@ class LIBKCAL_EXPORT VCalFormat : public CalFormat /** takes a TQDate and returns a string in the format YYYYMMDDTHHMMSS */ TQString qDateToISO(const TQDate &); /** takes a TQDateTime and returns a string in format YYYYMMDDTHHMMSS */ - TQString qDateTimeToISO(const TQDateTime &, bool zulu=TRUE); + TQString qDateTimeToISO(const TQDateTime &, bool zulu=true); /** takes a string in the format YYYYMMDDTHHMMSS and returns a * valid TQDateTime. */ TQDateTime ISOToTQDateTime(const TQString & dtStr); diff --git a/libkholidays/kholidays.cpp b/libkholidays/kholidays.cpp index ec9a770f..44ed99de 100644 --- a/libkholidays/kholidays.cpp +++ b/libkholidays/kholidays.cpp @@ -20,7 +20,7 @@ #include <tqfile.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "kholidays.h" diff --git a/libkholidays/kholidays.h b/libkholidays/kholidays.h index 19805377..a7501c66 100644 --- a/libkholidays/kholidays.h +++ b/libkholidays/kholidays.h @@ -25,7 +25,7 @@ #include <tqdatetime.h> #include <tqvaluelist.h> -#include <kdemacros.h> +#include <tdemacros.h> struct KHoliday { TQString text; @@ -33,7 +33,7 @@ struct KHoliday { int Category; }; -class KDE_EXPORT KHolidays { +class TDE_EXPORT KHolidays { public: /** Return a list of all available locations which have a holiday definition. @@ -63,11 +63,11 @@ class KDE_EXPORT KHolidays { TQValueList<KHoliday> getHolidays( const TQDate& ); - KDE_DEPRECATED TQString shortText( const TQDate& ); - KDE_DEPRECATED TQString getHoliday( const TQDate& ); + TDE_DEPRECATED TQString shortText( const TQDate& ); + TDE_DEPRECATED TQString getHoliday( const TQDate& ); enum { WORKDAY, HOLIDAY }; - KDE_DEPRECATED int category( const TQDate& ); + TDE_DEPRECATED int category( const TQDate& ); private: bool parseFile( const TQDate& ); diff --git a/libkmime/boolflags.h b/libkmime/boolflags.h index 0964c19a..8fdda365 100644 --- a/libkmime/boolflags.h +++ b/libkmime/boolflags.h @@ -17,7 +17,7 @@ #ifndef __KMIME_BOOLFLAGS_H__ #define __KMIME_BOOLFLAGS_H__ -#include <kdemacros.h> +#include <tdemacros.h> /** This class stores boolean values in single bytes. It provides a similar functionality as TQBitArray @@ -25,7 +25,7 @@ We use it to store the flags of an article @internal */ -class KDE_EXPORT BoolFlags { +class TDE_EXPORT BoolFlags { public: BoolFlags() { clear(); } diff --git a/libkmime/kmime_charfreq.h b/libkmime/kmime_charfreq.h index 64a6e213..535445f1 100644 --- a/libkmime/kmime_charfreq.h +++ b/libkmime/kmime_charfreq.h @@ -16,12 +16,12 @@ #define __KMIME_CHARFREQ_H__ #include <tqcstring.h> -#include <kdemacros.h> +#include <tdemacros.h> #undef None namespace KMime { -class KDE_EXPORT CharFreq { +class TDE_EXPORT CharFreq { public: CharFreq( const TQByteArray & buf ); CharFreq( const char * buf, size_t len ); diff --git a/libkmime/kmime_codecs.h b/libkmime/kmime_codecs.h index 2a2f4d79..bf4fdecb 100644 --- a/libkmime/kmime_codecs.h +++ b/libkmime/kmime_codecs.h @@ -40,7 +40,7 @@ #include <tqcstring.h> // TQByteArray #include <kdebug.h> // for kdFatal() -#include <kdemacros.h> +#include <tdemacros.h> namespace KMime { @@ -54,7 +54,7 @@ class Decoder; @short Codecs for common mail transfer encodings. @author Marc Mutz <mutz@kde.org> */ -class KDE_EXPORT Codec { +class TDE_EXPORT Codec { protected: static TQAsciiDict<Codec>* all; diff --git a/libkmime/kmime_content.h b/libkmime/kmime_content.h index 1d2aac2d..784179c6 100644 --- a/libkmime/kmime_content.h +++ b/libkmime/kmime_content.h @@ -56,7 +56,7 @@ class Base { structure, that represents the structure of the message */ -class KDE_EXPORT Content : public Base { +class TDE_EXPORT Content : public Base { public: typedef TQPtrList<KMime::Content> List; diff --git a/libkmime/kmime_header_parsing.h b/libkmime/kmime_header_parsing.h index c4c69945..a446c2f5 100644 --- a/libkmime/kmime_header_parsing.h +++ b/libkmime/kmime_header_parsing.h @@ -38,7 +38,7 @@ #include <time.h> -#include <kdemacros.h> +#include <tdemacros.h> template <typename K, typename V> class TQMap; class TQStringList; @@ -48,32 +48,32 @@ namespace KMime { namespace Types { // for when we can't make up our mind what to use... - struct KDE_EXPORT TQStringOrTQPair { + struct TDE_EXPORT TQStringOrTQPair { TQStringOrTQPair() : qstring(), qpair(0,0) {} TQString qstring; TQPair<const char*,int> qpair; }; - struct KDE_EXPORT AddrSpec { + struct TDE_EXPORT AddrSpec { TQString asString() const; TQString localPart; TQString domain; }; typedef TQValueList<AddrSpec> AddrSpecList; - struct KDE_EXPORT Mailbox { + struct TDE_EXPORT Mailbox { TQString displayName; AddrSpec addrSpec; }; typedef TQValueList<Mailbox> MailboxList; - struct KDE_EXPORT Address { + struct TDE_EXPORT Address { TQString displayName; MailboxList mailboxList; }; typedef TQValueList<Address> AddressList; - struct KDE_EXPORT DateTime { + struct TDE_EXPORT DateTime { time_t time; // secs since 1.1.1970, 0:00 UTC/GMT long int secsEastOfGMT; // timezone bool timeZoneKnown; // do we know the timezone? (e.g. on -0000) @@ -98,7 +98,7 @@ namespace HeaderParsing { @return the decoded string the encoded word represented. */ bool parseEncodedWord( const char* & scursor, const char * const send, - TQString & result, TQCString & language ) KDE_EXPORT; + TQString & result, TQCString & language ) TDE_EXPORT; // // The parsing squad: // @@ -106,34 +106,34 @@ namespace HeaderParsing { /** You may or may not have already started parsing into the atom. This function will go on where you left off. */ bool parseAtom( const char* & scursor, const char * const send, - TQString & result, bool allow8Bit=false ) KDE_EXPORT; + TQString & result, bool allow8Bit=false ) TDE_EXPORT; bool parseAtom( const char* & scursor, const char * const send, - TQPair<const char*,int> & result, bool allow8Bit=false ) KDE_EXPORT; + TQPair<const char*,int> & result, bool allow8Bit=false ) TDE_EXPORT; /** You may or may not have already started parsing into the token. This function will go on where you left off. */ bool parseToken( const char* & scursor, const char * const send, - TQString & result, bool allow8Bit=false ) KDE_EXPORT; + TQString & result, bool allow8Bit=false ) TDE_EXPORT; bool parseToken( const char* & scursor, const char * const send, - TQPair<const char*,int> & result, bool allow8Bit=false ) KDE_EXPORT; + TQPair<const char*,int> & result, bool allow8Bit=false ) TDE_EXPORT; /** @p scursor must be positioned after the opening openChar. */ bool parseGenericQuotedString( const char* & scursor, const char* const send, TQString & result, bool isCRLF, const char openChar='"', - const char closeChar='"' ) KDE_EXPORT; + const char closeChar='"' ) TDE_EXPORT; /** @p scursor must be positioned right after the opening '(' */ bool parseComment( const char* & scursor, const char * const send, - TQString & result, bool isCRLF=false, bool reallySave=true ) KDE_EXPORT; + TQString & result, bool isCRLF=false, bool reallySave=true ) TDE_EXPORT; /** You may or may not have already started parsing into the phrase, but only if it starts with atext. If you setup this function to parse a phrase starting with an encoded-word or quoted-string, @p scursor has to point to the char introducing the encoded-word or quoted-string, resp. */ bool parsePhrase( const char* & scursor, const char * const send, - TQString & result, bool isCRLF=false ) KDE_EXPORT; + TQString & result, bool isCRLF=false ) TDE_EXPORT; /** You may or may not have already started parsing into the initial atom, but not up to it's end. */ bool parseDotAtom( const char* & scursor, const char * const send, - TQString & result, bool isCRLF=false ) KDE_EXPORT; + TQString & result, bool isCRLF=false ) TDE_EXPORT; /** Eats comment-folding-white-space, skips whitespace, folding and comments (even nested ones) and stops at the next non-CFWS @@ -144,42 +144,42 @@ namespace HeaderParsing { scursor is being positioned on the opening '(' of the outmost comment. */ - void eatCFWS( const char* & scursor, const char * const send, bool isCRLF ) KDE_EXPORT; + void eatCFWS( const char* & scursor, const char * const send, bool isCRLF ) TDE_EXPORT; bool parseDomain( const char* & scursor, const char * const send, - TQString & result, bool isCRLF=false ) KDE_EXPORT; + TQString & result, bool isCRLF=false ) TDE_EXPORT; bool parseObsRoute( const char* & scursor, const char * const send, TQStringList & result, - bool isCRLF=false, bool save=false ) KDE_EXPORT; + bool isCRLF=false, bool save=false ) TDE_EXPORT; bool parseAddrSpec( const char* & scursor, const char * const send, - Types::AddrSpec & result, bool isCRLF=false ) KDE_EXPORT; + Types::AddrSpec & result, bool isCRLF=false ) TDE_EXPORT; bool parseAngleAddr( const char* & scursor, const char * const send, - Types::AddrSpec & result, bool isCRLF=false ) KDE_EXPORT; + Types::AddrSpec & result, bool isCRLF=false ) TDE_EXPORT; bool parseMailbox( const char* & scursor, const char * const send, - Types::Mailbox & result, bool isCRLF=false ) KDE_EXPORT; + Types::Mailbox & result, bool isCRLF=false ) TDE_EXPORT; bool parseGroup( const char* & scursor, const char * const send, - Types::Address & result, bool isCRLF=false ) KDE_EXPORT; + Types::Address & result, bool isCRLF=false ) TDE_EXPORT; bool parseAddress( const char* & scursor, const char * const send, - Types::Address & result, bool isCRLF=false ) KDE_EXPORT; + Types::Address & result, bool isCRLF=false ) TDE_EXPORT; bool parseAddressList( const char* & scursor, const char * const send, - Types::AddressList & result, bool isCRLF=false ) KDE_EXPORT; + Types::AddressList & result, bool isCRLF=false ) TDE_EXPORT; bool parseParameter( const char* & scursor, const char * const send, TQPair<TQString,Types::TQStringOrTQPair> & result, - bool isCRLF=false ) KDE_EXPORT; + bool isCRLF=false ) TDE_EXPORT; bool parseParameterList( const char* & scursor, const char * const send, - TQMap<TQString,TQString> & result, bool isCRLF=false ) KDE_EXPORT; + TQMap<TQString,TQString> & result, bool isCRLF=false ) TDE_EXPORT; bool parseRawParameterList( const char* & scursor, const char * const send, TQMap<TQString,Types::TQStringOrTQPair> & result, - bool isCRLF=false ) KDE_EXPORT; + bool isCRLF=false ) TDE_EXPORT; bool parseTime( const char* & scursor, const char * const send, int & hour, int & min, int & sec, long int & secsEastOfGMT, - bool & timeZoneKnown, bool isCRLF=false ) KDE_EXPORT; + bool & timeZoneKnown, bool isCRLF=false ) TDE_EXPORT; bool parseDateTime( const char* & scursor, const char * const send, - Types::DateTime & result, bool isCRLF=false ) KDE_EXPORT; + Types::DateTime & result, bool isCRLF=false ) TDE_EXPORT; #if 0 bool tryToMakeAnySenseOfDateString( const char* & scursor, diff --git a/libkmime/kmime_headers.h b/libkmime/kmime_headers.h index 02d0ad6a..d550e507 100644 --- a/libkmime/kmime_headers.h +++ b/libkmime/kmime_headers.h @@ -35,7 +35,7 @@ #include <time.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KMime { @@ -108,7 +108,7 @@ mk_parsing_subclass_with_name( subclass, subclass, baseclass ) /** Baseclass of all header-classes. It represents a header-field as described in RFC-822. */ -class KDE_EXPORT Base { +class TDE_EXPORT Base { public: typedef TQPtrList<Base> List; @@ -213,7 +213,7 @@ namespace Generics { // known issues: // - uses old decodeRFC2047String function, instead of our own... -class KDE_EXPORT GUnstructured : public Base { +class TDE_EXPORT GUnstructured : public Base { public: GUnstructured() : Base() {} @@ -266,7 +266,7 @@ private: @author Marc Mutz <mutz@kde.org> */ -class KDE_EXPORT GStructured : public Base { +class TDE_EXPORT GStructured : public Base { public: GStructured() : Base() {} GStructured( Content * p ) : Base( p ) {} @@ -300,7 +300,7 @@ protected: }; -class KDE_EXPORT GAddress : public GStructured { +class TDE_EXPORT GAddress : public GStructured { public: GAddress() : GStructured() {} GAddress( Content * p ) : GStructured( p ) {} @@ -316,7 +316,7 @@ protected: /** Base class for headers that deal with (possibly multiple) addresses, but don't allow groups: */ -class KDE_EXPORT MailboxList : public GAddress { +class TDE_EXPORT MailboxList : public GAddress { public: MailboxList() : GAddress() {} MailboxList( Content * p ) : GAddress( p ) {} @@ -340,7 +340,7 @@ mk_parsing_subclass(SingleMailbox,MailboxList); /** Base class for headers that deal with (possibly multiple) addresses, allowing groups. */ -class KDE_EXPORT AddressList : public GAddress { +class TDE_EXPORT AddressList : public GAddress { public: AddressList() : GAddress() {} AddressList( Content * p ) : GAddress( p ) {} @@ -358,7 +358,7 @@ protected: }; /** Base class for headers which deal with a list of msg-id's */ -class KDE_EXPORT GIdent : public GAddress { +class TDE_EXPORT GIdent : public GAddress { public: GIdent() : GAddress() {} GIdent( Content * p ) : GAddress( p ) {} @@ -379,7 +379,7 @@ protected: mk_parsing_subclass(GSingleIdent,GIdent); /** Base class for headers which deal with a single atom. */ -class KDE_EXPORT GToken : public GStructured { +class TDE_EXPORT GToken : public GStructured { public: GToken() : GStructured() {} GToken( Content * p ) : GStructured( p ) {} @@ -396,7 +396,7 @@ protected: }; -class KDE_EXPORT GPhraseList : public GStructured { +class TDE_EXPORT GPhraseList : public GStructured { public: GPhraseList() : GStructured() {} GPhraseList( Content * p ) : GStructured( p ) {} @@ -412,7 +412,7 @@ protected: TQStringList mPhraseList; }; -class KDE_EXPORT GDotAtom : public GStructured { +class TDE_EXPORT GDotAtom : public GStructured { public: GDotAtom() : GStructured() {} GDotAtom( Content * p ) : GStructured( p ) {} @@ -428,7 +428,7 @@ protected: TQString mDotAtom; }; -class KDE_EXPORT GParametrized : public GStructured { +class TDE_EXPORT GParametrized : public GStructured { public: GParametrized() : GStructured() {} GParametrized( Content * p ) : GStructured( p ) {} @@ -444,7 +444,7 @@ protected: private: }; -class KDE_EXPORT GContentType : public GParametrized { +class TDE_EXPORT GContentType : public GParametrized { public: GContentType() : GParametrized() {} GContentType( Content * p ) : GParametrized( p ) {} @@ -462,7 +462,7 @@ protected: }; -class KDE_EXPORT GCISTokenWithParameterList : public GParametrized { +class TDE_EXPORT GCISTokenWithParameterList : public GParametrized { public: GCISTokenWithParameterList() : GParametrized() {} GCISTokenWithParameterList( Content * p ) : GParametrized( p ) {} @@ -489,7 +489,7 @@ protected: /** Represents the Return-Path header field. */ -class KDE_EXPORT ReturnPath : public Generics::GAddress { +class TDE_EXPORT ReturnPath : public Generics::GAddress { public: ReturnPath() : Generics::GAddress() {} ReturnPath( Content * p ) : Generics::GAddress( p ) {} @@ -565,7 +565,7 @@ mk_trivial_subclass_with_name(ContentDisposition,Content-Disposition, Adds a type over GUnstructured. @see GUnstructured */ -class KDE_EXPORT Generic : public Generics::GUnstructured { +class TDE_EXPORT Generic : public Generics::GUnstructured { public: Generic() : Generics::GUnstructured(), t_ype(0) {} @@ -591,7 +591,7 @@ class KDE_EXPORT Generic : public Generics::GUnstructured { /** Represents a "Subject" header */ -class KDE_EXPORT Subject : public Generics::GUnstructured { +class TDE_EXPORT Subject : public Generics::GUnstructured { public: Subject() : Generics::GUnstructured() {} @@ -610,7 +610,7 @@ class KDE_EXPORT Subject : public Generics::GUnstructured { }; /** Represents a "Organization" header */ -class KDE_EXPORT Organization : public Generics::GUnstructured { +class TDE_EXPORT Organization : public Generics::GUnstructured { public: Organization() : Generics::GUnstructured() {} @@ -634,7 +634,7 @@ class KDE_EXPORT Organization : public Generics::GUnstructured { /** Represents a "Control" header */ -class KDE_EXPORT Control : public Base { +class TDE_EXPORT Control : public Base { public: Control() : Base() {} @@ -659,7 +659,7 @@ class KDE_EXPORT Control : public Base { }; /** Represents a "Date" header */ -class KDE_EXPORT Date : public Base { +class TDE_EXPORT Date : public Base { public: Date() : Base(), t_ime(0) {} @@ -690,7 +690,7 @@ class KDE_EXPORT Date : public Base { /** Represents a "Newsgroups" header */ -class KDE_EXPORT Newsgroups : public Base { +class TDE_EXPORT Newsgroups : public Base { public: Newsgroups() : Base() {} @@ -718,7 +718,7 @@ class KDE_EXPORT Newsgroups : public Base { /** Represents a "Followup-To" header */ -class KDE_EXPORT FollowUpTo : public Newsgroups { +class TDE_EXPORT FollowUpTo : public Newsgroups { public: FollowUpTo() : Newsgroups() {} @@ -733,7 +733,7 @@ class KDE_EXPORT FollowUpTo : public Newsgroups { /** Represents a "Lines" header */ -class KDE_EXPORT Lines : public Base { +class TDE_EXPORT Lines : public Base { public: Lines() : Base(),l_ines(-1) {} @@ -762,7 +762,7 @@ class KDE_EXPORT Lines : public Base { /** Represents a "User-Agent" header */ -class KDE_EXPORT UserAgent : public Base { +class TDE_EXPORT UserAgent : public Base { public: UserAgent() : Base() {} diff --git a/libkmime/kmime_headers_obs.h b/libkmime/kmime_headers_obs.h index 8905d1c5..51e4d5ba 100644 --- a/libkmime/kmime_headers_obs.h +++ b/libkmime/kmime_headers_obs.h @@ -20,10 +20,10 @@ #error You cannot use this file with the new header classes! #endif -#include <kdemacros.h> +#include <tdemacros.h> /** Represents a "Message-Id" header */ -class KDE_EXPORT MessageID : public Base { +class TDE_EXPORT MessageID : public Base { public: MessageID() : Base() {} @@ -48,7 +48,7 @@ class KDE_EXPORT MessageID : public Base { }; /** Represents a "Supersedes" header */ -class KDE_EXPORT Supersedes : public MessageID { +class TDE_EXPORT Supersedes : public MessageID { public: Supersedes() : MessageID() {} @@ -63,7 +63,7 @@ class KDE_EXPORT Supersedes : public MessageID { /** This class encapsulates an address-field, containing an email-address and a real name */ -class KDE_EXPORT AddressField : public Base { +class TDE_EXPORT AddressField : public Base { public: AddressField() : Base() {} @@ -98,7 +98,7 @@ class KDE_EXPORT AddressField : public Base { typedef TQPtrList<AddressField> ObsAddressList; /** Represent a "From" header */ -class KDE_EXPORT From : public AddressField { +class TDE_EXPORT From : public AddressField { public: From() : AddressField() {} @@ -112,7 +112,7 @@ class KDE_EXPORT From : public AddressField { /** Represents a "Reply-To" header */ -class KDE_EXPORT ReplyTo : public AddressField { +class TDE_EXPORT ReplyTo : public AddressField { public: ReplyTo() : AddressField() {} @@ -128,7 +128,7 @@ class KDE_EXPORT ReplyTo : public AddressField { /** Represents a "Mail-Copies-To" header http://www.newsreaders.com/misc/mail-copies-to.html */ -class KDE_EXPORT MailCopiesTo : public AddressField { +class TDE_EXPORT MailCopiesTo : public AddressField { public: MailCopiesTo() : AddressField() {} @@ -146,7 +146,7 @@ class KDE_EXPORT MailCopiesTo : public AddressField { }; /** Represents a "To" header */ -class KDE_EXPORT To : public Base { +class TDE_EXPORT To : public Base { public: To() : Base(),a_ddrList(0) {} @@ -176,7 +176,7 @@ class KDE_EXPORT To : public Base { /** Represents a "CC" header */ -class KDE_EXPORT CC : public To { +class TDE_EXPORT CC : public To { public: CC() : To() {} @@ -191,7 +191,7 @@ class KDE_EXPORT CC : public To { /** Represents a "BCC" header */ -class KDE_EXPORT BCC : public To { +class TDE_EXPORT BCC : public To { public: BCC() : To() {} @@ -205,7 +205,7 @@ class KDE_EXPORT BCC : public To { }; /** Represents a "References" header */ -class KDE_EXPORT References : public Base { +class TDE_EXPORT References : public Base { public: References() : Base(),p_os(-1) {} @@ -235,7 +235,7 @@ class KDE_EXPORT References : public Base { }; /** Represents a "Content-Type" header */ -class KDE_EXPORT ContentType : public Base { +class TDE_EXPORT ContentType : public Base { public: ContentType() : Base(),m_imeType("invalid/invalid"),c_ategory(CCsingle) {} @@ -294,7 +294,7 @@ class KDE_EXPORT ContentType : public Base { /** Represents a "Content-Transfer-Encoding" header */ -class KDE_EXPORT CTEncoding : public Base { +class TDE_EXPORT CTEncoding : public Base { public: CTEncoding() : Base(),c_te(CE7Bit),d_ecoded(true) {} @@ -324,7 +324,7 @@ class KDE_EXPORT CTEncoding : public Base { /** Represents a "Content-Disposition" header */ -class KDE_EXPORT CDisposition : public Base { +class TDE_EXPORT CDisposition : public Base { public: CDisposition() : Base(),d_isp(CDinline) {} @@ -355,7 +355,7 @@ class KDE_EXPORT CDisposition : public Base { /** Represents a "Content-Description" header */ -class KDE_EXPORT CDescription : public Generics::GUnstructured { +class TDE_EXPORT CDescription : public Generics::GUnstructured { public: CDescription() : Generics::GUnstructured() {} diff --git a/libkmime/kmime_mdn.h b/libkmime/kmime_mdn.h index c261b5fd..37dbd3e9 100644 --- a/libkmime/kmime_mdn.h +++ b/libkmime/kmime_mdn.h @@ -35,7 +35,7 @@ #include <tqvaluelist.h> #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQCString; @@ -178,7 +178,7 @@ namespace KMime { /** Main function. Generates the content of the message/disposition-notification body part. */ - KDE_EXPORT extern TQCString dispositionNotificationBodyContent( const TQString & finalRecipient, + TDE_EXPORT extern TQCString dispositionNotificationBodyContent( const TQString & finalRecipient, const TQCString & originalRecipient, const TQCString & originalMsgID, DispositionType disposition, @@ -188,7 +188,7 @@ namespace KMime { =TQValueList<DispositionModifier>(), const TQString & special=TQString() ); - KDE_EXPORT extern TQString descriptionFor( DispositionType d, + TDE_EXPORT extern TQString descriptionFor( DispositionType d, const TQValueList<DispositionModifier> & m =TQValueList<DispositionModifier>() ); diff --git a/libkmime/kmime_message.h b/libkmime/kmime_message.h index 8f6a0a39..0cfa2015 100644 --- a/libkmime/kmime_message.h +++ b/libkmime/kmime_message.h @@ -22,7 +22,7 @@ namespace KMime { -class KDE_EXPORT Message : public Content { +class TDE_EXPORT Message : public Content { public: typedef TQPtrList<Message> List; diff --git a/libkmime/kmime_newsarticle.h b/libkmime/kmime_newsarticle.h index accb8f5c..b0197f65 100644 --- a/libkmime/kmime_newsarticle.h +++ b/libkmime/kmime_newsarticle.h @@ -18,11 +18,11 @@ #include "kmime_message.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace KMime { -class KDE_EXPORT NewsArticle : public Message { +class TDE_EXPORT NewsArticle : public Message { public: diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp index d93c4990..1df85e61 100644 --- a/libkmime/kmime_util.cpp +++ b/libkmime/kmime_util.cpp @@ -149,20 +149,20 @@ TQString decodeRFC2047String(const TQCString &src, const char **usedCS, } beg = pos+2; end = beg; - valid = TRUE; + valid = true; // parse charset name declaredCS=""; for (i=2,pos+=2; i<maxLen && (*pos!='?'&&(ispunct(*pos)||isalnum(*pos))); i++) { declaredCS+=(*pos); pos++; } - if (*pos!='?' || i<4 || i>=maxLen) valid = FALSE; + if (*pos!='?' || i<4 || i>=maxLen) valid = false; else { // get encoding and check delimiting question marks encoding = toupper(pos[1]); if (pos[2]!='?' || (encoding!='Q' && encoding!='B')) - valid = FALSE; + valid = false; pos+=3; i+=3; } @@ -176,7 +176,7 @@ TQString decodeRFC2047String(const TQCString &src, const char **usedCS, pos++; } end = pos+2;//end now points to the first char after the encoded string - if (i>=maxLen || !*pos) valid = FALSE; + if (i>=maxLen || !*pos) valid = false; } if (valid) { diff --git a/libkmime/kmime_util.h b/libkmime/kmime_util.h index 7acc861c..23553216 100644 --- a/libkmime/kmime_util.h +++ b/libkmime/kmime_util.h @@ -21,7 +21,7 @@ #include "tqcstring.h" #include "tqvaluelist.h" #include "time.h" -#include <kdemacros.h> +#include <tdemacros.h> typedef TQValueList<TQCString> QCStringList; @@ -29,14 +29,14 @@ namespace KMime { /** Consult the charset cache. Only used for reducing mem usage by keeping strings in a common repository.*/ - extern const char* cachedCharset(const TQCString &name) KDE_EXPORT; + extern const char* cachedCharset(const TQCString &name) TDE_EXPORT; /** Consult the language cache. Only used for reducing mem usage by keeping strings in a common repository.*/ - extern const char* cachedLanguage(const TQCString &name) KDE_EXPORT; + extern const char* cachedLanguage(const TQCString &name) TDE_EXPORT; /** checks whether @p s contains any non-us-ascii characters */ - extern bool isUsAscii(const TQString &s) KDE_EXPORT; + extern bool isUsAscii(const TQString &s) TDE_EXPORT; inline bool isOfSet(const uchar map[16], unsigned char ch) { Q_ASSERT( ch < 128 ); @@ -75,14 +75,14 @@ namespace KMime { @return the decoded string. */ extern TQString decodeRFC2047String(const TQCString &src, const char **usedCS, - const TQCString &defaultCS, bool forceCS) KDE_EXPORT; + const TQCString &defaultCS, bool forceCS) TDE_EXPORT; /** Decode string @p src according to RFC2047 (ie. the =?charset?[qb]?encoded?= construct). @param src source string. @return the decoded string. */ - extern TQString decodeRFC2047String(const TQCString &src) KDE_EXPORT; + extern TQString decodeRFC2047String(const TQCString &src) TDE_EXPORT; /** Encode string @p src according to RFC2047 using charset @p charset. @@ -95,7 +95,7 @@ namespace KMime { @return the encoded string. */ extern TQCString encodeRFC2047String(const TQString &src, const char *charset, - bool addressHeader=false, bool allow8bitHeaders=false) KDE_EXPORT; + bool addressHeader=false, bool allow8bitHeaders=false) TDE_EXPORT; /** Uses current time, pid and random numbers to construct a string that aims to be unique on a per-host basis (ie. for the local @@ -103,7 +103,7 @@ namespace KMime { @return the unique string. @see multiPartBoundary */ - extern TQCString uniqueString() KDE_EXPORT; + extern TQCString uniqueString() TDE_EXPORT; /** Constructs a random string (sans leading/trailing "--") that can be used as a multipart delimiter (ie. as @p boundary parameter @@ -111,7 +111,7 @@ namespace KMime { @return the randomized string. @see uniqueString */ - extern TQCString multiPartBoundary() KDE_EXPORT; + extern TQCString multiPartBoundary() TDE_EXPORT; /** Tries to extract the header with name @p name from the string @p src, unfolding it if necessary. @@ -120,7 +120,7 @@ namespace KMime { @return the first instance of the header @p name in @p src or a null TQCString if no such header was found. */ - extern TQCString extractHeader(const TQCString &src, const char *name) KDE_EXPORT; + extern TQCString extractHeader(const TQCString &src, const char *name) TDE_EXPORT; /** Converts all occurrences of "\r\n" (CRLF) in @p s to "\n" (LF). This function is expensive and should be used only if the mail @@ -130,7 +130,7 @@ namespace KMime { @return the string with CRLF's substitued for LF's @see CRLFtoLF(const char*) LFtoCRLF */ - extern TQCString CRLFtoLF(const TQCString &s) KDE_EXPORT; + extern TQCString CRLFtoLF(const TQCString &s) TDE_EXPORT; /** Converts all occurrences of "\r\n" (CRLF) in @p s to "\n" (LF). This function is expensive and should be used only if the mail @@ -140,7 +140,7 @@ namespace KMime { @return the string with CRLF's substitued for LF's @see CRLFtoLF(const TQCString&) LFtoCRLF */ - extern TQCString CRLFtoLF(const char *s) KDE_EXPORT; + extern TQCString CRLFtoLF(const char *s) TDE_EXPORT; /** Converts all occurrences of "\n" (LF) in @p s to "\r\n" (CRLF). This function is expensive and should be used only if the mail @@ -152,27 +152,27 @@ namespace KMime { @return the string with CRLF's substitued for LF's @see CRLFtoLF(const TQCString&) LFtoCRLF */ - extern TQCString LFtoCRLF(const TQCString &s) KDE_EXPORT; + extern TQCString LFtoCRLF(const TQCString &s) TDE_EXPORT; /** Removes quote (DQUOTE) characters and decodes "quoted-pairs" (ie. backslash-escaped characters) @param str the string to work on. @see addQuotes */ - KDE_EXPORT extern void removeQuots(TQCString &str); + TDE_EXPORT extern void removeQuots(TQCString &str); /** Removes quote (DQUOTE) characters and decodes "quoted-pairs" (ie. backslash-escaped characters) @param str the string to work on. @see addQuotes */ - KDE_EXPORT extern void removeQuots(TQString &str); + TDE_EXPORT extern void removeQuots(TQString &str); /** Converts the given string into a quoted-string if the string contains any special characters (ie. one of ()<>@,.;:[]=\"). @param str us-ascii string to work on. @param forceQuotes if @p true, always add quote characters. */ - KDE_EXPORT extern void addQuotes(TQCString &str, bool forceQuotes); + TDE_EXPORT extern void addQuotes(TQCString &str, bool forceQuotes); /** @@ -191,7 +191,7 @@ namespace KMime { * * */ - class KDE_EXPORT DateFormatter { + class TDE_EXPORT DateFormatter { public: enum FormatType { CTime, //< ctime "Sun Mar 31 02:08:35 2002" diff --git a/libkmime/kqcstringsplitter.h b/libkmime/kqcstringsplitter.h index cc992a48..a5cf97ee 100644 --- a/libkmime/kqcstringsplitter.h +++ b/libkmime/kqcstringsplitter.h @@ -19,9 +19,9 @@ #include <tqcstring.h> -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT KTQCStringSplitter { +class TDE_EXPORT KTQCStringSplitter { public: KTQCStringSplitter(); diff --git a/libkmime/tests/test_dates.cpp b/libkmime/tests/test_dates.cpp index 47441adf..79b37766 100644 --- a/libkmime/tests/test_dates.cpp +++ b/libkmime/tests/test_dates.cpp @@ -1,7 +1,7 @@ #include <kmime_util.h> #include <kmime_header_parsing.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> using namespace KMime; diff --git a/libkmime/tests/test_kmime_header_parsing.cpp b/libkmime/tests/test_kmime_header_parsing.cpp index c272b006..bd908ad4 100644 --- a/libkmime/tests/test_kmime_header_parsing.cpp +++ b/libkmime/tests/test_kmime_header_parsing.cpp @@ -2,7 +2,7 @@ #include <../kmime_headers.h> #include <../kmime_header_parsing.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tqfile.h> #include <tqcstring.h> diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp index bd4193bf..e535abe3 100644 --- a/libkpgp/kpgp.cpp +++ b/libkpgp/kpgp.cpp @@ -73,7 +73,7 @@ Module::~Module() writeAddressData(); if (kpgpObject == this) kpgpObject = kpgpod.setObject( Module::kpgpObject, 0, false ); - clear(TRUE); + clear(true); delete config; delete pgp; } @@ -268,7 +268,7 @@ Module::decrypt( Block& block ) // loop as long as the user enters a wrong passphrase and doesn't abort // everything ready if( prepare( true, &block ) != 1 ) - return FALSE; + return false; // ok now try to decrypt the message. retval = pgp->decrypt( block, passphrase ); // loop on bad passphrase @@ -678,7 +678,7 @@ Module::signKey(const KeyID& keyId) if (0 == pgp) assignPGPBase(); if( prepare( true ) != 1 ) - return FALSE; + return false; if(pgp->signKey(keyId, passphrase) & ERROR) { errMsg = pgp->lastErrorMessage(); @@ -855,7 +855,7 @@ Module::changePassPhrase() { //FIXME... KMessageBox::information(0,i18n("This feature is\nstill missing")); - return FALSE; + return false; } void @@ -1310,7 +1310,7 @@ Module::checkForPGP(void) int index = 0; int lastindex = -1; - havePgp=FALSE; + havePgp=false; path = getenv("PATH"); while((index = path.find(":",lastindex+1)) != -1) @@ -1323,7 +1323,7 @@ Module::checkForPGP(void) TQStrListIterator it(pSearchPaths); - haveGpg=FALSE; + haveGpg=false; // lets try gpg for ( it.toFirst() ; it.current() ; ++it ) @@ -1333,14 +1333,14 @@ Module::checkForPGP(void) if ( !access( path, X_OK ) ) { kdDebug(5100) << "Kpgp: gpg found" << endl; - havePgp=TRUE; - haveGpg=TRUE; + havePgp=true; + haveGpg=true; break; } } // search for pgp5.0 - havePGP5=FALSE; + havePGP5=false; for ( it.toFirst() ; it.current() ; ++it ) { path = (*it); @@ -1348,8 +1348,8 @@ Module::checkForPGP(void) if ( !access( path, X_OK ) ) { kdDebug(5100) << "Kpgp: pgp 5 found" << endl; - havePgp=TRUE; - havePGP5=TRUE; + havePgp=true; + havePGP5=true; break; } } @@ -1363,7 +1363,7 @@ Module::checkForPGP(void) if ( !access( path, X_OK ) ) { kdDebug(5100) << "Kpgp: pgp 2 or 6 found" << endl; - havePgp=TRUE; + havePgp=true; break; } } diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h index 5ae06b79..26f56cc8 100644 --- a/libkpgp/kpgp.h +++ b/libkpgp/kpgp.h @@ -36,7 +36,7 @@ #include <kdialogbase.h> #include "kpgpkey.h" -#include <kdemacros.h> +#include <tdemacros.h> class TQLineEdit; class TQCursor; @@ -78,7 +78,7 @@ enum Result class Base; class Block; -class KDE_EXPORT Module +class TDE_EXPORT Module { friend class Block; @@ -198,8 +198,8 @@ public: */ Validity keyTrust( const TQString& userID ); - /** Returns TRUE if the given key is at least trusted marginally. Otherwise - FALSE is returned. + /** Returns true if the given key is at least trusted marginally. Otherwise + false is returned. */ bool isTrusted( const KeyID& keyID ); @@ -231,7 +231,7 @@ public: bool storePassPhrase(void) const; /** clears everything from memory */ - void clear(const bool erasePassPhrase = FALSE); + void clear(const bool erasePassPhrase = false); /** returns the last error that occurred */ const TQString lastErrorMsg(void) const; @@ -308,8 +308,8 @@ public: /** Parses the given message and splits it into OpenPGP blocks and Non-OpenPGP blocks. - Returns TRUE if the message contains at least one OpenPGP block and - FALSE otherwise. + Returns true if the message contains at least one OpenPGP block and + false otherwise. The format is then: <pre> 1st Non-OpenPGP block @@ -340,7 +340,7 @@ private: 0 (together with some warning message) if something is missing -1 if the passphrase dialog was canceled */ - int prepare(bool needPassPhrase=FALSE, Block* block = 0 ); + int prepare(bool needPassPhrase=false, Block* block = 0 ); /** cleanup passphrase if it should not be stored. */ void cleanupPass() { if (!storePass) wipePassPhrase(); } diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp index 255701a6..7299762e 100644 --- a/libkpgp/kpgpbase2.cpp +++ b/libkpgp/kpgpbase2.cpp @@ -29,7 +29,7 @@ #include <tqdatetime.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #define PGP2 "pgp" @@ -115,7 +115,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients, if(!recipients.isEmpty()) { int index = 0; - bool bad = FALSE; + bool bad = false; unsigned int num = 0; TQCString badkeys = ""; if (error.find("Cannot find the public key") != -1) @@ -125,7 +125,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients, while((index = error.find("Cannot find the public key",index)) != -1) { - bad = TRUE; + bad = true; index = error.find('\'',index); int index2 = error.find('\'',index+1); if (num++) @@ -156,7 +156,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients, while((index = error.find("skipping userid",index)) != -1) { - bad = TRUE; + bad = true; int index2 = error.find('\n',index+16); if (num++) badkeys += ", "; diff --git a/libkpgp/kpgpbase5.cpp b/libkpgp/kpgpbase5.cpp index c3a8a9d3..f73ea4a4 100644 --- a/libkpgp/kpgpbase5.cpp +++ b/libkpgp/kpgpbase5.cpp @@ -30,7 +30,7 @@ #include <tqdatetime.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp index 2e5c916f..c4aa0ac1 100644 --- a/libkpgp/kpgpbaseG.cpp +++ b/libkpgp/kpgpbaseG.cpp @@ -24,7 +24,7 @@ #include "kpgp.h" #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <tqtextcodec.h> @@ -128,7 +128,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients, if(!recipients.isEmpty()) { int index = 0; - bool bad = FALSE; + bool bad = false; unsigned int num = 0; TQCString badkeys = ""; // Examples: @@ -140,7 +140,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients, // (untrusted key, 23456789 is the key Id of the encryption sub key) while((index = error.find("skipped: ",index)) != -1) { - bad = TRUE; + bad = true; index = error.find('\'',index); int index2 = error.find('\'',index+1); badkeys += error.mid(index, index2-index+1) + ", "; diff --git a/libkpgp/kpgpblock.h b/libkpgp/kpgpblock.h index a1df95bf..422a04e6 100644 --- a/libkpgp/kpgpblock.h +++ b/libkpgp/kpgpblock.h @@ -23,7 +23,7 @@ #include <tqstring.h> #include <tqstrlist.h> -#include <kdemacros.h> +#include <tdemacros.h> //#include <tqstringlist.h> class TQStringList; @@ -90,7 +90,7 @@ class Module; * BEGIN PGP SIGNED MESSAGE * Used for cleartext signed messages. */ -class KDE_EXPORT Block +class TDE_EXPORT Block { public: diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index 08b2652a..2d364aea 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -82,7 +82,7 @@ PassphraseDialog::PassphraseDialog( TQWidget *parent, lineedit->setEchoMode(TQLineEdit::Password); lineedit->setMinimumWidth( fontMetrics().maxWidth()*20 ); lineedit->setFocus(); - connect( lineedit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotOk()) ); + connect( lineedit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotOk()) ); vlay->addWidget( label ); vlay->addWidget( lineedit ); @@ -146,8 +146,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) << i18n("Do not use any encryption tool") ); label->setBuddy( toolCombo ); hbox->setStretchFactor( toolCombo, 1 ); - connect( toolCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SIGNAL( changed( void ) ) ); + connect( toolCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SIGNAL( changed( void ) ) ); // This is the place to add a KURLRequester to be used for asking // the user for the path to the executable... topLayout->addWidget( group ); @@ -156,8 +156,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) mpOptionsGroupBox->layout()->setSpacing( KDialog::spacingHint() ); storePass = new TQCheckBox( i18n("&Keep passphrase in memory"), mpOptionsGroupBox ); - connect( storePass, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed( void ) ) ); + connect( storePass, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed( void ) ) ); msg = i18n( "<qt><p>When this option is enabled, the passphrase of your " "private key will be remembered by the application as long " "as the application is running. Thus you will only have to " @@ -173,8 +173,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) if( encrypt ) { encToSelf = new TQCheckBox( i18n("Always encr&ypt to self"), mpOptionsGroupBox ); - connect( encToSelf, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed( void ) ) ); + connect( encToSelf, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed( void ) ) ); msg = i18n( "<qt><p>When this option is enabled, the message/file " "will not only be encrypted with the receiver's public key, " @@ -188,8 +188,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) showCipherText = new TQCheckBox( i18n("&Show signed/encrypted text after " "composing"), mpOptionsGroupBox ); - connect( showCipherText, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed( void ) ) ); + connect( showCipherText, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed( void ) ) ); msg = i18n( "<qt><p>When this option is enabled, the signed/encrypted text " "will be shown in a separate window, enabling you to know how " @@ -200,8 +200,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) showKeyApprovalDlg = new TQCheckBox( i18n("Always show the encryption " "keys &for approval"), mpOptionsGroupBox ); - connect( showKeyApprovalDlg, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed( void ) ) ); + connect( showKeyApprovalDlg, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed( void ) ) ); msg = i18n( "<qt><p>When this option is enabled, the application will " "always show you a list of public keys from which you can " "choose the one it will use for encryption. If it is off, " @@ -293,8 +293,8 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList, mAllowedKeys( allowedKeys ), mCurrentContextMenuItem( 0 ) { - if ( kapp ) - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + if ( tdeApp ) + KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() ); Kpgp::Module *pgp = Kpgp::Module::getKpgp(); TDEConfig *config = pgp->getConfig(); TDEConfigGroup dialogConfig( config, "Key Selection Dialog" ); @@ -328,9 +328,9 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList, hlay->addWidget( le, 1 ); le->setFocus(); - connect( le, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotSearch(const TQString&)) ); - connect( mStartSearchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFilter()) ); + connect( le, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotSearch(const TQString&)) ); + connect( mStartSearchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFilter()) ); mListView = new TDEListView( page ); mListView->addColumn( i18n("Key ID") ); @@ -373,24 +373,24 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList, mListView->center( mListView->contentsX(), mListView->itemPos( lvi ) ); if( extendedSelection ) { - connect( mCheckSelectionTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotCheckSelection() ) ); - connect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( mCheckSelectionTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotCheckSelection() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); } else { - connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); } - connect( mListView, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( accept() ) ); + connect( mListView, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQ_SLOT( accept() ) ); - connect( mListView, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, + connect( mListView, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( slotRMB( TQListViewItem*, const TQPoint&, int ) ) ); + this, TQ_SLOT( slotRMB( TQListViewItem*, const TQPoint&, int ) ) ); setButtonText( KDialogBase::Default, i18n("&Reread Keys") ); - connect( this, TQT_SIGNAL( defaultClicked() ), - this, TQT_SLOT( slotRereadKeys() ) ); + connect( this, TQ_SIGNAL( defaultClicked() ), + this, TQ_SLOT( slotRereadKeys() ) ); } @@ -823,25 +823,25 @@ void KeySelectionDialog::slotRereadKeys() int offsetY = mListView->contentsY(); if( mListView->isMultiSelection() ) { - disconnect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + disconnect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); } else { - disconnect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + disconnect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); } initKeylist( keys, KeyIDList( mKeyIds ) ); slotFilter(); if( mListView->isMultiSelection() ) { - connect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); slotSelectionChanged(); } else { - connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); } // restore the saved position of the contents @@ -886,8 +886,8 @@ void KeySelectionDialog::slotCheckSelection( TQListViewItem* plvi /* = 0 */ ) // As we might change the selection, we have to disconnect the slot // to prevent recursion - disconnect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + disconnect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); KeyIDList newKeyIdList; TQValueList<TQListViewItem*> keysToBeChecked; @@ -989,8 +989,8 @@ void KeySelectionDialog::slotCheckSelection( TQListViewItem* plvi /* = 0 */ ) } enableButtonOK( keysAllowed ); - connect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); } } @@ -1015,10 +1015,10 @@ bool KeySelectionDialog::checkKeys( const TQValueList<TQListViewItem*>& keys ) c kdDebug(5100) << "Checking key 0x" << getKeyId( *it ) << "...\n"; pProgressDlg->setLabel( i18n("Checking key 0x%1...") .arg( TQString( getKeyId( *it ) ) ) ); - kapp->processEvents(); + tdeApp->processEvents(); keysAllowed = keysAllowed && ( -1 != keyAdmissibility( *it, AllowExpensiveTrustCheck ) ); pProgressDlg->progressBar()->advance( 1 ); - kapp->processEvents(); + tdeApp->processEvents(); } delete pProgressDlg; @@ -1037,7 +1037,7 @@ void KeySelectionDialog::slotRMB( TQListViewItem* lvi, const TQPoint& pos, int ) mCurrentContextMenuItem = lvi; TQPopupMenu menu(this); - menu.insertItem( i18n( "Recheck Key" ), this, TQT_SLOT( slotRecheckKey() ) ); + menu.insertItem( i18n( "Recheck Key" ), this, TQ_SLOT( slotRecheckKey() ) ); menu.exec( pos ); } @@ -1189,8 +1189,8 @@ KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys, hlay->addWidget( mEraseButton ); hlay->addWidget( mDialogButton ); - connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) ); - connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) ); + connect( mEraseButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEraseButtonClicked()) ); + connect( mDialogButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDialogButtonClicked()) ); setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); @@ -1470,12 +1470,12 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses, default: encrPrefCombo->setCurrentItem( 0 ); } - connect( encrPrefCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPrefsChanged(int)) ); + connect( encrPrefCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPrefsChanged(int)) ); mEncrPrefCombos.insert( i, encrPrefCombo ); } - connect( mChangeButtonGroup, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(slotChangeEncryptionKey(int)) ); + connect( mChangeButtonGroup, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(slotChangeEncryptionKey(int)) ); // calculate the optimal width for the dialog int dialogWidth = marginHint() diff --git a/libkpgp/kpgpui.h b/libkpgp/kpgpui.h index dacfe41b..90888133 100644 --- a/libkpgp/kpgpui.h +++ b/libkpgp/kpgpui.h @@ -29,7 +29,7 @@ #include "kpgp.h" -#include <kdemacros.h> +#include <tdemacros.h> class TQString; class TQRegExp; @@ -52,7 +52,7 @@ class Key; // needed by KeySelectionDialog class KeyIDList; // needed by KeySelectionDialog /** the passphrase dialog */ -class KDE_EXPORT PassphraseDialog : public KDialogBase +class TDE_EXPORT PassphraseDialog : public KDialogBase { TQ_OBJECT @@ -73,7 +73,7 @@ class KDE_EXPORT PassphraseDialog : public KDialogBase /** a widget for configuring the pgp interface. Can be included into a tabdialog. This widget by itself does not provide an apply/cancel button mechanism. */ -class KDE_EXPORT Config : public TQWidget +class TDE_EXPORT Config : public TQWidget { TQ_OBJECT @@ -101,7 +101,7 @@ class KDE_EXPORT Config : public TQWidget // ------------------------------------------------------------------------- #define KeySelectionDialogSuper KDialogBase -class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper +class TDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper { TQ_OBJECT @@ -201,7 +201,7 @@ class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper static const int sCheckSelectionDelay; }; -class KDE_EXPORT KeyRequester: public TQWidget +class TDE_EXPORT KeyRequester: public TQWidget { TQ_OBJECT @@ -254,7 +254,7 @@ protected: }; -class KDE_EXPORT PublicKeyRequester : public KeyRequester { +class TDE_EXPORT PublicKeyRequester : public KeyRequester { TQ_OBJECT public: @@ -274,7 +274,7 @@ protected: }; -class KDE_EXPORT SecretKeyRequester : public KeyRequester { +class TDE_EXPORT SecretKeyRequester : public KeyRequester { TQ_OBJECT public: @@ -295,7 +295,7 @@ protected: // ------------------------------------------------------------------------- -class KDE_EXPORT KeyApprovalDialog: public KDialogBase +class TDE_EXPORT KeyApprovalDialog: public KDialogBase { TQ_OBJECT @@ -331,7 +331,7 @@ class KDE_EXPORT KeyApprovalDialog: public KDialogBase // ------------------------------------------------------------------------- -class KDE_EXPORT CipherTextDialog: public KDialogBase +class TDE_EXPORT CipherTextDialog: public KDialogBase { TQ_OBJECT diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp index a033b6b0..6979bcc5 100644 --- a/libkpimexchange/core/exchangeaccount.cpp +++ b/libkpimexchange/core/exchangeaccount.cpp @@ -96,40 +96,40 @@ TQString endecryptStr( const TQString &aStr ) void ExchangeAccount::save( TQString const &group ) { - kapp->config()->setGroup( group ); - kapp->config()->writeEntry( "host", mHost ); - kapp->config()->writeEntry( "user", mAccount ); - kapp->config()->writeEntry( "mailbox", mMailbox ); - kapp->config()->writeEntry( "MS-ID", endecryptStr( mPassword ) ); - kapp->config()->sync(); + tdeApp->config()->setGroup( group ); + tdeApp->config()->writeEntry( "host", mHost ); + tdeApp->config()->writeEntry( "user", mAccount ); + tdeApp->config()->writeEntry( "mailbox", mMailbox ); + tdeApp->config()->writeEntry( "MS-ID", endecryptStr( mPassword ) ); + tdeApp->config()->sync(); } void ExchangeAccount::load( TQString const &group ) { - kapp->config()->setGroup( group ); + tdeApp->config()->setGroup( group ); - TQString host = kapp->config()->readEntry( "host" ); + TQString host = tdeApp->config()->readEntry( "host" ); if ( ! host.isNull() ) { mHost = host; } else { mHost = "mail.company.com"; } - TQString user = kapp->config()->readEntry( "user" ); + TQString user = tdeApp->config()->readEntry( "user" ); if ( ! user.isNull() ) { mAccount = user; } else { mAccount = "username"; } - TQString mailbox = kapp->config()->readEntry( "mailbox" ); + TQString mailbox = tdeApp->config()->readEntry( "mailbox" ); if ( ! mailbox.isNull() ) { mMailbox = mailbox; } else { mMailbox = "webdav://" + host + "/exchange/" + mAccount; } - TQString password = endecryptStr( kapp->config()->readEntry( "MS-ID" ) ); + TQString password = endecryptStr( tdeApp->config()->readEntry( "MS-ID" ) ); if ( ! password.isNull() ) { mPassword = password; } @@ -239,8 +239,8 @@ void ExchangeAccount::calcFolderURLs() TDEIO::DavJob* job = TDEIO::davPropFind( baseURL(), doc, "1", false ); job->addMetaData( "errorPage", "false" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotFolderResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotFolderResult( TDEIO::Job * ) ) ); } void ExchangeAccount::slotFolderResult( TDEIO::Job *job ) @@ -313,10 +313,10 @@ TQString ExchangeAccount::tryMailbox( const TQString &_url, const TQString &user TQString result; while ( !stream.eof() ) { line = stream.readLine(); // line of text excluding '\n' - int pos = line.find( "<BASE href=\"", 0, FALSE ); + int pos = line.find( "<BASE href=\"", 0, false ); if ( pos < 0 ) continue; - int end = line.find( "\"", pos+12, FALSE ); + int end = line.find( "\"", pos+12, false ); if ( pos < 0 ) { kdWarning() << "Strange, found no closing quote in " << line << endl; continue; diff --git a/libkpimexchange/core/exchangeaccount.h b/libkpimexchange/core/exchangeaccount.h index 032594be..77d94dea 100644 --- a/libkpimexchange/core/exchangeaccount.h +++ b/libkpimexchange/core/exchangeaccount.h @@ -26,13 +26,13 @@ #include <tqobject.h> #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <kurl.h> #include <tdeio/job.h> namespace KPIM { -class KDE_EXPORT ExchangeAccount : public TQObject +class TDE_EXPORT ExchangeAccount : public TQObject { TQ_OBJECT diff --git a/libkpimexchange/core/exchangeclient.cpp b/libkpimexchange/core/exchangeclient.cpp index 5658c707..c3fdd380 100644 --- a/libkpimexchange/core/exchangeclient.cpp +++ b/libkpimexchange/core/exchangeclient.cpp @@ -131,8 +131,8 @@ void ExchangeClient::download( KCal::Calendar *calendar, const TQDate &start, ExchangeDownload *worker = new ExchangeDownload( mAccount, mWindow ); worker->download( calendar, start, end, showProgress ); connect( worker, - TQT_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ), - TQT_SLOT( slotDownloadFinished( ExchangeDownload *, int, + TQ_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ), + TQ_SLOT( slotDownloadFinished( ExchangeDownload *, int, const TQString & ) ) ); } @@ -149,11 +149,11 @@ void ExchangeClient::download( const TQDate &start, const TQDate &end, ExchangeDownload *worker = new ExchangeDownload( mAccount, mWindow ); worker->download( start, end, showProgress ); connect( worker, - TQT_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ), - TQT_SLOT( slotDownloadFinished( ExchangeDownload *, int, + TQ_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ), + TQ_SLOT( slotDownloadFinished( ExchangeDownload *, int, const TQString & ) ) ); - connect( worker, TQT_SIGNAL( gotEvent( KCal::Event *, const KURL & ) ), - TQT_SIGNAL( event( KCal::Event *, const KURL & ) ) ); + connect( worker, TQ_SIGNAL( gotEvent( KCal::Event *, const KURL & ) ), + TQ_SIGNAL( event( KCal::Event *, const KURL & ) ) ); } void ExchangeClient::upload( KCal::Event *event ) @@ -167,8 +167,8 @@ void ExchangeClient::upload( KCal::Event *event ) ExchangeUpload *worker = new ExchangeUpload( event, mAccount, mTimeZoneId, mWindow ); - connect( worker, TQT_SIGNAL( finished( ExchangeUpload *, int, const TQString & ) ), - TQT_SLOT( slotUploadFinished( ExchangeUpload *, int, const TQString & ) ) ); + connect( worker, TQ_SIGNAL( finished( ExchangeUpload *, int, const TQString & ) ), + TQ_SLOT( slotUploadFinished( ExchangeUpload *, int, const TQString & ) ) ); } void ExchangeClient::remove( KCal::Event *event ) @@ -179,8 +179,8 @@ void ExchangeClient::remove( KCal::Event *event ) } ExchangeDelete *worker = new ExchangeDelete( event, mAccount, mWindow ); - connect( worker, TQT_SIGNAL( finished( ExchangeDelete *, int, const TQString & ) ), - TQT_SLOT( slotRemoveFinished( ExchangeDelete *, int, const TQString & ) ) ); + connect( worker, TQ_SIGNAL( finished( ExchangeDelete *, int, const TQString & ) ), + TQ_SLOT( slotRemoveFinished( ExchangeDelete *, int, const TQString & ) ) ); } void ExchangeClient::slotDownloadFinished( ExchangeDownload *worker, @@ -217,8 +217,8 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar, kdDebug() << "ExchangeClient::downloadSynchronous()" << endl; mClientState = WaitingForResult; - connect( this, TQT_SIGNAL( downloadFinished( int, const TQString & ) ), - TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + connect( this, TQ_SIGNAL( downloadFinished( int, const TQString & ) ), + TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); download( calendar, start, end, showProgress ); @@ -230,8 +230,8 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar, } while ( mClientState == WaitingForResult ); TQApplication::restoreOverrideCursor(); - disconnect( this, TQT_SIGNAL( downloadFinished( int, const TQString & ) ), - this, TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + disconnect( this, TQ_SIGNAL( downloadFinished( int, const TQString & ) ), + this, TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); return mSyncResult; } @@ -239,8 +239,8 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar, int ExchangeClient::uploadSynchronous( KCal::Event* event ) { mClientState = WaitingForResult; - connect( this, TQT_SIGNAL( uploadFinished( int, const TQString & ) ), - TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + connect( this, TQ_SIGNAL( uploadFinished( int, const TQString & ) ), + TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); upload( event ); @@ -250,16 +250,16 @@ int ExchangeClient::uploadSynchronous( KCal::Event* event ) tqApp->processEvents(); } while ( mClientState == WaitingForResult ); TQApplication::restoreOverrideCursor(); - disconnect( this, TQT_SIGNAL( uploadFinished( int, const TQString & ) ), - this, TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + disconnect( this, TQ_SIGNAL( uploadFinished( int, const TQString & ) ), + this, TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); return mSyncResult; } int ExchangeClient::removeSynchronous( KCal::Event* event ) { mClientState = WaitingForResult; - connect( this, TQT_SIGNAL( removeFinished( int, const TQString & ) ), - TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + connect( this, TQ_SIGNAL( removeFinished( int, const TQString & ) ), + TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); remove( event ); @@ -269,8 +269,8 @@ int ExchangeClient::removeSynchronous( KCal::Event* event ) tqApp->processEvents(); } while ( mClientState == WaitingForResult ); TQApplication::restoreOverrideCursor(); - disconnect( this, TQT_SIGNAL( removeFinished( int, const TQString & ) ), - this, TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + disconnect( this, TQ_SIGNAL( removeFinished( int, const TQString & ) ), + this, TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); return mSyncResult; } diff --git a/libkpimexchange/core/exchangeclient.h b/libkpimexchange/core/exchangeclient.h index b1a2cbc7..6599b5ed 100644 --- a/libkpimexchange/core/exchangeclient.h +++ b/libkpimexchange/core/exchangeclient.h @@ -26,7 +26,7 @@ #include <tqhostaddress.h> #include <tqptrlist.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KCal { class Event; @@ -45,7 +45,7 @@ class ExchangeUpload; class ExchangeDelete; //class ExchangeMonitor; -class KDE_EXPORT ExchangeClient : public TQObject { +class TDE_EXPORT ExchangeClient : public TQObject { TQ_OBJECT public: diff --git a/libkpimexchange/core/exchangedelete.cpp b/libkpimexchange/core/exchangedelete.cpp index 094b3b5c..d9e8c177 100644 --- a/libkpimexchange/core/exchangedelete.cpp +++ b/libkpimexchange/core/exchangedelete.cpp @@ -74,7 +74,7 @@ void ExchangeDelete::findUidSingleMaster( TQString const& uid ) TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false ); job->setWindow( mWindow ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFindUidResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotFindUidResult(TDEIO::Job *))); } void ExchangeDelete::slotFindUidResult( TDEIO::Job * job ) @@ -104,7 +104,7 @@ void ExchangeDelete::startDelete( const KURL& url ) { TDEIO::SimpleJob* job = TDEIO::file_delete( url, false ); // no GUI job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotDeleteResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotDeleteResult( TDEIO::Job * ) ) ); } void ExchangeDelete::slotDeleteResult( TDEIO::Job* job ) diff --git a/libkpimexchange/core/exchangedelete.h b/libkpimexchange/core/exchangedelete.h index eb832892..1ee3b742 100644 --- a/libkpimexchange/core/exchangedelete.h +++ b/libkpimexchange/core/exchangedelete.h @@ -24,7 +24,7 @@ #include <tqwidget.h> #include <tdeio/job.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <libkcal/calendar.h> #include <libkcal/event.h> @@ -33,7 +33,7 @@ namespace KPIM { class ExchangeAccount; -class KDE_EXPORT ExchangeDelete : public TQObject { +class TDE_EXPORT ExchangeDelete : public TQObject { TQ_OBJECT public: diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp index f3210d7c..035d8565 100644 --- a/libkpimexchange/core/exchangedownload.cpp +++ b/libkpimexchange/core/exchangedownload.cpp @@ -26,7 +26,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <tdeaction.h> @@ -92,10 +92,10 @@ void ExchangeDownload::download( KCal::Calendar *calendar, const TQDate &start, mProgress = new ExchangeProgress(); mProgress->show(); - connect( this, TQT_SIGNAL( startDownload() ), mProgress, - TQT_SLOT( slotTransferStarted() ) ); - connect( this, TQT_SIGNAL(finishDownload() ), mProgress, - TQT_SLOT( slotTransferFinished() ) ); + connect( this, TQ_SIGNAL( startDownload() ), mProgress, + TQ_SLOT( slotTransferStarted() ) ); + connect( this, TQ_SIGNAL(finishDownload() ), mProgress, + TQ_SLOT( slotTransferFinished() ) ); #endif } @@ -112,8 +112,8 @@ void ExchangeDownload::download( KCal::Calendar *calendar, const TQDate &start, sql, false ); TDEIO::Scheduler::scheduleJob( job ); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotSearchResult( TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotSearchResult( TDEIO::Job *) ) ); } void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool showProgress ) @@ -126,8 +126,8 @@ void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool sh mProgress = new ExchangeProgress(); mProgress->show(); - connect( this, TQT_SIGNAL(startDownload()), mProgress, TQT_SLOT(slotTransferStarted()) ); - connect( this, TQT_SIGNAL(finishDownload()), mProgress, TQT_SLOT(slotTransferFinished()) ); + connect( this, TQ_SIGNAL(startDownload()), mProgress, TQ_SLOT(slotTransferStarted()) ); + connect( this, TQ_SIGNAL(finishDownload()), mProgress, TQ_SLOT(slotTransferFinished()) ); } TQString sql = dateSelectQuery( start, end.addDays( 1 ) ); @@ -137,8 +137,8 @@ void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool sh TDEIO::DavJob *job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", sql, false ); TDEIO::Scheduler::scheduleJob(job); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotSearchResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotSearchResult( TDEIO::Job * ) ) ); } // Original query TODO: make query configurable @@ -301,8 +301,8 @@ void ExchangeDownload::handleRecurrence( TQString uid ) query, false ); TDEIO::Scheduler::scheduleJob( job ); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotMasterResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotMasterResult( TDEIO::Job * ) ) ); } void ExchangeDownload::readAppointment( const KURL& url ) @@ -349,8 +349,8 @@ void ExchangeDownload::readAppointment( const KURL& url ) TDEIO::Scheduler::scheduleJob( job ); job->setWindow( mWindow ); job->addMetaData( "errorPage", "false" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotPropFindResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotPropFindResult( TDEIO::Job * ) ) ); } void ExchangeDownload::slotPropFindResult( TDEIO::Job *job ) diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp index df52fdab..aadfb7c8 100644 --- a/libkpimexchange/core/exchangemonitor.cpp +++ b/libkpimexchange/core/exchangemonitor.cpp @@ -94,7 +94,7 @@ ExchangeMonitor::ExchangeMonitor( ExchangeAccount* account, int pollMode, const kdDebug() << "bind() returned false" << endl; mSocket->setBlocking( false ); mNotifier = new TQSocketNotifier( mSocket->socket(), TQSocketNotifier::Read ); - connect( mNotifier, TQT_SIGNAL(activated( int )), this, TQT_SLOT( slotActivated(int))); + connect( mNotifier, TQ_SIGNAL(activated( int )), this, TQ_SLOT( slotActivated(int))); //mSocket.setSocketFlags( KExtendedSocket::inetSocket | KExtendedSocket::passiveSocket | KExtendedSocket::datagramSocket | KExtendedSocket::bufferedSocket ); //mSocket.setHost( "jupiter.tbm.tudelft.nl" ); // Does this work? @@ -110,12 +110,12 @@ ExchangeMonitor::ExchangeMonitor( ExchangeAccount* account, int pollMode, const if ( mPollMode == Poll ) { mPollTimer = new TQTimer( this, "mPollTimer" ); - connect( mPollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotPollTimer()) ); + connect( mPollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotPollTimer()) ); mPollTimer->start( 60000 ); // 1 minute timer } mRenewTimer = new TQTimer( this, "mRenewTimer" ); - connect( mRenewTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRenewTimer()) ); + connect( mRenewTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRenewTimer()) ); mRenewTimer->start( mSubscriptionLifetime * 900 ); // 10% early so as to be in time } @@ -133,7 +133,7 @@ ExchangeMonitor::~ExchangeMonitor() job->addMetaData( "customHTTPHeader", headers ); // Can't do, this is a destructor! // job->addMetaData( "PropagateHttpHeader", "true" ); - // connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(TDEIO::Job *))); + // connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotUnsubscribeResult(TDEIO::Job *))); } kdDebug() << "Finished ExchangeMonitor destructor" << endl; @@ -161,7 +161,7 @@ void ExchangeMonitor::addWatch( const KURL &url, int mode, int depth ) TDEIO::DavJob *job = new TDEIO::DavJob( myURL, (int) TDEIO::DAV_SUBSCRIBE, TQString(), false ); job->addMetaData( "customHTTPHeader", headers ); job->addMetaData( "PropagateHttpHeader", "true" ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotSubscribeResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotSubscribeResult(TDEIO::Job *))); } void ExchangeMonitor::removeWatch( const KURL &url ) @@ -182,7 +182,7 @@ void ExchangeMonitor::removeWatch( ID id ) TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_UNSUBSCRIBE, TQString(), false ); job->addMetaData( "customHTTPHeader", "Subscription-id: " + TQString::number( id )); job->addMetaData( "PropagateHttpHeader", "true" ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotUnsubscribeResult(TDEIO::Job *))); } void ExchangeMonitor::slotSubscribeResult( TDEIO::Job * job ) @@ -323,7 +323,7 @@ void ExchangeMonitor::poll( const IDList& IDs ) { // confirm it TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_POLL, TQString(), false ); job->addMetaData( "customHTTPHeader", "Subscription-ID: " + makeIDString( IDs ) ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotPollResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotPollResult(TDEIO::Job *))); } void ExchangeMonitor::slotPollResult( TDEIO::Job * job ) @@ -368,7 +368,7 @@ void ExchangeMonitor::slotRenewTimer() TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_SUBSCRIBE, TQString(), false ); job->addMetaData( "customHTTPHeader", "Subscription-id: " + makeIDString( mSubscriptionMap.keys() ) ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotRenewResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotRenewResult(TDEIO::Job *))); } void ExchangeMonitor::slotRenewResult( TDEIO::Job* job ) diff --git a/libkpimexchange/core/exchangeprogress.cpp b/libkpimexchange/core/exchangeprogress.cpp index 7d52711f..12a4d9c9 100644 --- a/libkpimexchange/core/exchangeprogress.cpp +++ b/libkpimexchange/core/exchangeprogress.cpp @@ -27,8 +27,8 @@ #include <tdeapplication.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include "exchangeprogress.h" using namespace KPIM; diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp index 226202c5..8e49e0aa 100644 --- a/libkpimexchange/core/exchangeupload.cpp +++ b/libkpimexchange/core/exchangeupload.cpp @@ -88,8 +88,8 @@ void ExchangeUpload::findUid( TQString const &uid ) TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false ); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotFindUidResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotFindUidResult( TDEIO::Job * ) ) ); } void ExchangeUpload::slotFindUidResult( TDEIO::Job * job ) @@ -147,8 +147,8 @@ void ExchangeUpload::tryExist() TDEIO::DavJob *job = TDEIO::davPropFind( url, doc, "0", false ); job->setWindow( mWindow ); job->addMetaData( "errorPage", "false" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotPropFindResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotPropFindResult( TDEIO::Job * ) ) ); } void ExchangeUpload::slotPropFindResult( TDEIO::Job *job ) @@ -332,8 +332,8 @@ void ExchangeUpload::startUpload( const KURL &url ) TDEIO::DavJob *job = TDEIO::davPropPatch( url, doc, false ); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotPatchResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotPatchResult( TDEIO::Job * ) ) ); } void ExchangeUpload::slotPatchResult( TDEIO::Job *job ) diff --git a/libkpimexchange/core/exchangeupload.h b/libkpimexchange/core/exchangeupload.h index 255d9c03..6d570097 100644 --- a/libkpimexchange/core/exchangeupload.h +++ b/libkpimexchange/core/exchangeupload.h @@ -24,7 +24,7 @@ #include <tqwidget.h> #include <tdeio/job.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <libkcal/calendar.h> #include <libkcal/event.h> @@ -33,7 +33,7 @@ namespace KPIM { class ExchangeAccount; -class KDE_EXPORT ExchangeUpload : public TQObject { +class TDE_EXPORT ExchangeUpload : public TQObject { TQ_OBJECT public: diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h index 6a6c972f..bdc31385 100644 --- a/libkpimidentities/identity.h +++ b/libkpimidentities/identity.h @@ -9,7 +9,7 @@ #include <kleo/enum.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tqstring.h> #include <tqcstring.h> @@ -26,17 +26,17 @@ class TQDataStream; namespace KPIM { -KDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Signature & sig ); -KDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Signature & sig ); +TDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Signature & sig ); +TDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Signature & sig ); -KDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Identity & ident ); -KDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Identity & ident ); +TDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Identity & ident ); +TDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Identity & ident ); /** * @short abstraction of a signature (aka "footer"). * @author Marc Mutz <mutz@kde.org> */ -class KDE_EXPORT Signature { +class TDE_EXPORT Signature { friend class Identity; friend TQDataStream & KPIM::operator<<( TQDataStream & stream, const Signature & sig ); @@ -92,7 +92,7 @@ private: }; /** User identity information */ -class KDE_EXPORT Identity +class TDE_EXPORT Identity { // only the identity manager should be able to construct and // destruct us, but then we get into problems with using @@ -186,8 +186,8 @@ public: TQString organization() const { return mOrganization; } void setOrganization(const TQString&); - KDE_DEPRECATED TQCString pgpIdentity() const { return pgpEncryptionKey(); } - KDE_DEPRECATED void setPgpIdentity( const TQCString & key ) { + TDE_DEPRECATED TQCString pgpIdentity() const { return pgpEncryptionKey(); } + TDE_DEPRECATED void setPgpIdentity( const TQCString & key ) { setPGPEncryptionKey( key ); setPGPSigningKey( key ); } @@ -212,8 +212,8 @@ public: void setPreferredCryptoMessageFormat( Kleo::CryptoMessageFormat format ) { mPreferredCryptoMessageFormat = format; } /** email address (without the user name - only name\@host) */ - KDE_DEPRECATED TQString emailAddr() const { return primaryEmailAddress(); } - KDE_DEPRECATED void setEmailAddr( const TQString & email ) { setPrimaryEmailAddress( email ); } + TDE_DEPRECATED TQString emailAddr() const { return primaryEmailAddress(); } + TDE_DEPRECATED void setEmailAddr( const TQString & email ) { setPrimaryEmailAddress( email ); } /** primary email address (without the user name - only name\@host). The primary email address is used for all outgoing mail. */ diff --git a/libkpimidentities/identitycombo.cpp b/libkpimidentities/identitycombo.cpp index 8644cb5a..200f93ac 100644 --- a/libkpimidentities/identitycombo.cpp +++ b/libkpimidentities/identitycombo.cpp @@ -48,9 +48,9 @@ IdentityCombo::IdentityCombo( IdentityManager* manager, TQWidget * parent, const { reloadCombo(); reloadUoidList(); - connect( this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotEmitChanged(int)) ); - connect( manager, TQT_SIGNAL(changed()), - TQT_SLOT(slotIdentityManagerChanged()) ); + connect( this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotEmitChanged(int)) ); + connect( manager, TQ_SIGNAL(changed()), + TQ_SLOT(slotIdentityManagerChanged()) ); } TQString IdentityCombo::currentIdentityName() const { diff --git a/libkpimidentities/identitycombo.h b/libkpimidentities/identitycombo.h index 119983ed..5b780b9a 100644 --- a/libkpimidentities/identitycombo.h +++ b/libkpimidentities/identitycombo.h @@ -34,7 +34,7 @@ #include <tqcombobox.h> #include <tqvaluelist.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQString; @@ -48,7 +48,7 @@ class Identity; * @author Marc Mutz <mutz@kde.org> **/ -class KDE_EXPORT IdentityCombo : public TQComboBox { +class TDE_EXPORT IdentityCombo : public TQComboBox { TQ_OBJECT public: diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp index 35414502..a087974d 100644 --- a/libkpimidentities/identitymanager.cpp +++ b/libkpimidentities/identitymanager.cpp @@ -156,9 +156,9 @@ void IdentityManager::commit() // The emitter is always set to KPIM::IdentityManager, so that the connect works // This is why we can't use k_dcop_signals here, but need to use emitDCOPSignal TQByteArray data; TQDataStream arg( data, IO_WriteOnly ); - arg << kapp->dcopClient()->appId(); + arg << tdeApp->dcopClient()->appId(); arg << DCOPObject::objId(); // the real objId, for checking in slotIdentitiesChanged - kapp->dcopClient()->emitDCOPSignal( "KPIM::IdentityManager", "identitiesChanged(TQCString,TQCString)", data ); + tdeApp->dcopClient()->emitDCOPSignal( "KPIM::IdentityManager", "identitiesChanged(TQCString,TQCString)", data ); } void IdentityManager::rollback() @@ -487,7 +487,7 @@ int IdentityManager::newUoid() // default identity do { - uoid = kapp->random(); + uoid = tdeApp->random(); } while ( usedUOIDs.find( uoid ) != usedUOIDs.end() ); return uoid; @@ -506,7 +506,7 @@ void KPIM::IdentityManager::slotIdentitiesChanged( TQCString appId, TQCString ob { // From standalone kmail to standalone korganizer, the appId will differ // From kontact the appId will match, so we need to test the objId - if ( kapp->dcopClient()->appId() != appId || DCOPObject::objId() != objId ) { + if ( tdeApp->dcopClient()->appId() != appId || DCOPObject::objId() != objId ) { mConfig->reparseConfiguration(); Q_ASSERT( !hasPendingChanges() ); readConfig( mConfig ); diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h index 76b2a290..69a18f50 100644 --- a/libkpimidentities/identitymanager.h +++ b/libkpimidentities/identitymanager.h @@ -35,7 +35,7 @@ #include <tqvaluelist.h> #include <dcopobject.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEConfigBase; class TDEConfig; @@ -50,7 +50,7 @@ class Identity; * @short Manages the list of identities. * @author Marc Mutz <mutz@kde.org> **/ -#define IdentityManager KDE_EXPORT IdentityManager +#define IdentityManager TDE_EXPORT IdentityManager class IdentityManager : public ConfigManager, public DCOPObject #undef IdentityManager { diff --git a/libksieve/ksieve/error.h b/libksieve/ksieve/error.h index 762c49e7..c26fdb58 100644 --- a/libksieve/ksieve/error.h +++ b/libksieve/ksieve/error.h @@ -35,7 +35,7 @@ #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> #ifdef None // X headers # undef None @@ -43,7 +43,7 @@ namespace KSieve { - class KDE_EXPORT Error { + class TDE_EXPORT Error { public: enum Type { None = 0, diff --git a/libksieve/ksieve/parser.h b/libksieve/ksieve/parser.h index 22e6ebf3..1708c10f 100644 --- a/libksieve/ksieve/parser.h +++ b/libksieve/ksieve/parser.h @@ -33,7 +33,7 @@ #ifndef __KSIEVE_PARSING_H__ #define __KSIEVE_PARSING_H__ -#include <kdemacros.h> +#include <tdemacros.h> class TQString; @@ -45,7 +45,7 @@ namespace KSieve { /** @short Parser for the Sieve grammar. @author Marc Mutz <mutz@kde.org> **/ - class KDE_EXPORT Parser { + class TDE_EXPORT Parser { public: Parser( const char * scursor, const char * const send, int options=0 ); diff --git a/libksieve/parser/lexer.cpp b/libksieve/parser/lexer.cpp index 4b0ebf4f..0213f7d7 100644 --- a/libksieve/parser/lexer.cpp +++ b/libksieve/parser/lexer.cpp @@ -42,7 +42,7 @@ #include <tqstringlist.h> #include <tqtextcodec.h> -#include <memory> // std::auto_ptr +#include <memory> #include <assert.h> #include <ctype.h> // isdigit @@ -618,8 +618,8 @@ namespace KSieve { const TQTextCodec * const codec = TQTextCodec::codecForMib( 106 ); // UTF-8 assert( codec ); - const std::auto_ptr<TQTextDecoder> dec( codec->makeDecoder() ); - assert( dec.get() ); + const std::unique_ptr<TQTextDecoder> dec( codec->makeDecoder() ); + assert( dec ); while ( !atEnd() ) switch ( *mState.cursor ) { diff --git a/libtdenetwork/gpgmepp/CMakeLists.txt b/libtdenetwork/gpgmepp/CMakeLists.txt index 93bc16e5..844f34d2 100644 --- a/libtdenetwork/gpgmepp/CMakeLists.txt +++ b/libtdenetwork/gpgmepp/CMakeLists.txt @@ -30,7 +30,7 @@ link_directories( ##### headers ################################### install( FILES - context.h key.h trustitem.h eventloopinteractor.h + context.h key.h eventloopinteractor.h data.h gpgmefw.h result.h keylistresult.h keygenerationresult.h importresult.h decryptionresult.h verificationresult.h signingresult.h encryptionresult.h @@ -42,13 +42,13 @@ install( FILES tde_add_library( gpgme++ SHARED SOURCES - context.cpp key.cpp trustitem.cpp data.cpp + context.cpp key.cpp data.cpp callbacks.cpp eventloopinteractor.cpp keylistresult.cpp keygenerationresult.cpp importresult.cpp decryptionresult.cpp verificationresult.cpp signingresult.cpp encryptionresult.cpp engineinfo.cpp - VERSION 0.4.0 + VERSION 5.0.0 LINK ${TQT_LIBRARIES} ${GPGME_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libtdenetwork/gpgmepp/Makefile.am b/libtdenetwork/gpgmepp/Makefile.am index d4ebfde9..b4489217 100644 --- a/libtdenetwork/gpgmepp/Makefile.am +++ b/libtdenetwork/gpgmepp/Makefile.am @@ -9,7 +9,6 @@ INCLUDES = -I$(top_srcdir)/libtdenetwork -I$(top_srcdir)/libtdenetwork/gpgmepp \ gpgmeppdir = $(includedir)/gpgme++ gpgmepp_HEADERS = context.h \ key.h \ - trustitem.h \ eventloopinteractor.h \ data.h \ gpgmefw.h \ @@ -28,7 +27,6 @@ noinst_HEADERS = context_p.h data_p.h shared.h callbacks.h gpgme-0-3-compat.h re lib_LTLIBRARIES = libgpgme++.la libgpgme___la_SOURCES = context.cpp \ key.cpp \ - trustitem.cpp \ data.cpp \ callbacks.cpp \ eventloopinteractor.cpp \ @@ -46,7 +44,7 @@ libgpgme___la_SOURCES = context.cpp \ # (Interfaces added/removed/changed: CURRENT++, REVISION=0) # (Interfaces added: AGE++) # (Interfaces removed/changed: AGE=0) -libgpgme___la_LDFLAGS = -no-undefined -version-info 4:0:4 +libgpgme___la_LDFLAGS = -no-undefined -version-info 5:0:0 libgpgme___la_LIBADD = $(GPGME_LIBS) libgpgme___la_DEPENDENCIES = $(GPGME_LIBS_DEP) diff --git a/libtdenetwork/gpgmepp/context.cpp b/libtdenetwork/gpgmepp/context.cpp index 547adde9..5c61bd53 100644 --- a/libtdenetwork/gpgmepp/context.cpp +++ b/libtdenetwork/gpgmepp/context.cpp @@ -23,7 +23,7 @@ #include <gpgmepp/context.h> #include <gpgmepp/eventloopinteractor.h> -#include <gpgmepp/trustitem.h> +#include <gpgmepp/key.h> #include <gpgmepp/keylistresult.h> #include <gpgmepp/keygenerationresult.h> #include <gpgmepp/importresult.h> @@ -348,21 +348,6 @@ namespace GpgME { return d->lasterr = gpgme_op_delete_start( d->ctx, key.impl(), int( allowSecretKeyDeletion ) ); } - Error Context::startTrustItemListing( const char * pattern, int maxLevel ) { - d->lastop = Private::TrustList; - return d->lasterr = gpgme_op_trustlist_start( d->ctx, pattern, maxLevel ); - } - - TrustItem Context::nextTrustItem( Error & e ) { - gpgme_trust_item_t ti = 0; - e = d->lasterr = gpgme_op_trustlist_next( d->ctx, &ti ); - return ti; - } - - Error Context::endTrustItemListing() { - return d->lasterr = gpgme_op_trustlist_end( d->ctx ); - } - DecryptionResult Context::decrypt( const Data & cipherText, Data & plainText ) { d->lastop = Private::Decrypt; Data::Private * cdp = cipherText.impl(); diff --git a/libtdenetwork/gpgmepp/context.h b/libtdenetwork/gpgmepp/context.h index 2eaee660..580d766c 100644 --- a/libtdenetwork/gpgmepp/context.h +++ b/libtdenetwork/gpgmepp/context.h @@ -25,13 +25,12 @@ #include <utility> #include <iosfwd> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Key; class Data; - class TrustItem; class ProgressProvider; class PassphraseProvider; class EventLoopInteractor; @@ -46,7 +45,7 @@ namespace GpgME { class EngineInfo; - class KDE_EXPORT Error { + class TDE_EXPORT Error { public: Error( int e=0 ) : mErr( e ) {} @@ -64,9 +63,9 @@ namespace GpgME { int mErr; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, Error err ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, Error err ); - class KDE_EXPORT Context { + class TDE_EXPORT Context { Context( gpgme_ctx_t ); public: enum Protocol { OpenPGP, CMS, Unknown }; @@ -180,14 +179,6 @@ namespace GpgME { GpgME::Error startKeyDeletion( const Key & key, bool allowSecretKeyDeletion=false ); // - // Trust Item Management - // - - GpgME::Error startTrustItemListing( const char * pattern, int maxLevel ); - TrustItem nextTrustItem( GpgME::Error & e ); - GpgME::Error endTrustItemListing(); - - // // // Crypto Operations // @@ -283,12 +274,12 @@ namespace GpgME { const Context & operator=( const Context & ); }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::Protocol proto ); - KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::CertificateInclusion incl ); - KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::KeyListMode mode ); - KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::SignatureMode mode ); - KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::EncryptionFlags flags ); - KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::AuditLogFlags flags ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::Protocol proto ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::CertificateInclusion incl ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::KeyListMode mode ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::SignatureMode mode ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::EncryptionFlags flags ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::AuditLogFlags flags ); // // @@ -296,19 +287,19 @@ namespace GpgME { // // - KDE_EXPORT void initializeLibrary(); + TDE_EXPORT void initializeLibrary(); - KDE_EXPORT GpgME::Error setDefaultLocale( int category, const char * value ); + TDE_EXPORT GpgME::Error setDefaultLocale( int category, const char * value ); - KDE_EXPORT Context * wait( GpgME::Error & e, bool hang=true ); + TDE_EXPORT Context * wait( GpgME::Error & e, bool hang=true ); typedef void (*IdleFunction)(void); - KDE_EXPORT IdleFunction registerIdleFunction( IdleFunction idleFunction ); + TDE_EXPORT IdleFunction registerIdleFunction( IdleFunction idleFunction ); typedef void (*IOCallback)( void * data, int fd ); - KDE_EXPORT EngineInfo engineInfo( Context::Protocol proto ); + TDE_EXPORT EngineInfo engineInfo( Context::Protocol proto ); - KDE_EXPORT GpgME::Error checkEngine( Context::Protocol proto ); + TDE_EXPORT GpgME::Error checkEngine( Context::Protocol proto ); enum Feature { ValidatingKeylistModeFeature = 0x00000001, @@ -319,7 +310,7 @@ namespace GpgME { FeatureMaxValue = 0x80000000 }; - KDE_EXPORT bool hasFeature( unsigned long feature ); + TDE_EXPORT bool hasFeature( unsigned long feature ); } // namespace GpgME diff --git a/libtdenetwork/gpgmepp/context_p.h b/libtdenetwork/gpgmepp/context_p.h index 5d44ba7c..c6f2da8e 100644 --- a/libtdenetwork/gpgmepp/context_p.h +++ b/libtdenetwork/gpgmepp/context_p.h @@ -43,7 +43,7 @@ namespace GpgME { KeyGen = 0x080, KeyList = 0x100, - TrustList = 0x200, // gpgme_trustlist_result_t, but nevertheless... + NOT_USED = 0x200, // was TrustList, no more used GetAuditLog = 0x1000 // no gpgme_getauditlog_result_t, but nevertheless... }; diff --git a/libtdenetwork/gpgmepp/data.h b/libtdenetwork/gpgmepp/data.h index b1c76029..b0bb6b02 100644 --- a/libtdenetwork/gpgmepp/data.h +++ b/libtdenetwork/gpgmepp/data.h @@ -25,14 +25,14 @@ #include <sys/types.h> // for size_t, off_t #include <cstdio> // FILE -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class DataProvider; class Error; - class KDE_EXPORT Data { + class TDE_EXPORT Data { public: Data(); Data( gpgme_data_t data ); diff --git a/libtdenetwork/gpgmepp/decryptionresult.h b/libtdenetwork/gpgmepp/decryptionresult.h index 1721a19e..f23d5fc3 100644 --- a/libtdenetwork/gpgmepp/decryptionresult.h +++ b/libtdenetwork/gpgmepp/decryptionresult.h @@ -26,13 +26,13 @@ #include <iosfwd> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Error; - class KDE_EXPORT DecryptionResult : public Result { + class TDE_EXPORT DecryptionResult : public Result { public: DecryptionResult( gpgme_ctx_t ctx=0, int error=0 ); explicit DecryptionResult( const Error & err ); @@ -52,7 +52,7 @@ namespace GpgME { Private * d; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const DecryptionResult & result ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const DecryptionResult & result ); } diff --git a/libtdenetwork/gpgmepp/encryptionresult.h b/libtdenetwork/gpgmepp/encryptionresult.h index 44ea09a6..62649604 100644 --- a/libtdenetwork/gpgmepp/encryptionresult.h +++ b/libtdenetwork/gpgmepp/encryptionresult.h @@ -27,14 +27,14 @@ #include <vector> #include <iosfwd> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Error; class InvalidRecipient; - class KDE_EXPORT EncryptionResult : public Result { + class TDE_EXPORT EncryptionResult : public Result { public: EncryptionResult( gpgme_ctx_t ctx=0, int error=0 ); explicit EncryptionResult( const Error & err ); @@ -55,9 +55,9 @@ namespace GpgME { Private * d; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const EncryptionResult & result ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const EncryptionResult & result ); - class KDE_EXPORT InvalidRecipient { + class TDE_EXPORT InvalidRecipient { friend class EncryptionResult; InvalidRecipient( EncryptionResult::Private * parent, unsigned int index ); public: @@ -77,7 +77,7 @@ namespace GpgME { unsigned int idx; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const InvalidRecipient & recipient ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const InvalidRecipient & recipient ); } diff --git a/libtdenetwork/gpgmepp/engineinfo.h b/libtdenetwork/gpgmepp/engineinfo.h index 5dcd2f83..98164c70 100644 --- a/libtdenetwork/gpgmepp/engineinfo.h +++ b/libtdenetwork/gpgmepp/engineinfo.h @@ -24,11 +24,11 @@ #include <gpgmepp/gpgmefw.h> #include <gpgmepp/context.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { - class KDE_EXPORT EngineInfo { + class TDE_EXPORT EngineInfo { public: EngineInfo(); EngineInfo( gpgme_engine_info_t engine ); diff --git a/libtdenetwork/gpgmepp/eventloopinteractor.cpp b/libtdenetwork/gpgmepp/eventloopinteractor.cpp index cdac7d56..b04a36c8 100644 --- a/libtdenetwork/gpgmepp/eventloopinteractor.cpp +++ b/libtdenetwork/gpgmepp/eventloopinteractor.cpp @@ -26,7 +26,6 @@ #include <gpgmepp/context.h> #include "context_p.h" #include <gpgmepp/key.h> -#include <gpgmepp/trustitem.h> #include <gpgme.h> @@ -131,13 +130,6 @@ namespace GpgME { instance()->nextKeyEvent( ctx, Key( key, false, ctx ? ctx->keyListMode() : 0 ) ); } break; - case GPGME_EVENT_NEXT_TRUSTITEM: - { - gpgme_trust_item_t item = static_cast<gpgme_trust_item_t>( type_data ); - instance()->nextTrustItemEvent( ctx, TrustItem( item ) ); - gpgme_trust_item_unref( item ); - } - break; default: // warn ; } diff --git a/libtdenetwork/gpgmepp/eventloopinteractor.h b/libtdenetwork/gpgmepp/eventloopinteractor.h index 37acc0f8..9343b501 100644 --- a/libtdenetwork/gpgmepp/eventloopinteractor.h +++ b/libtdenetwork/gpgmepp/eventloopinteractor.h @@ -19,13 +19,12 @@ #ifndef __GPGMEPP_EVENTLOOPINTERACTOR_H__ #define __GPGMEPP_EVENTLOOPINTERACTOR_H__ -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Context; class Error; - class TrustItem; class Key; /*! \file eventloopinteractor.h @@ -38,7 +37,7 @@ namespace GpgME { IO Callback handling and one for gpgme events. The IO Callback interface consists of the three methods \c actOn(), \c registerWatcher() and \c unregisterWatcher(). The event - interface consists of the three methods \c nextTrustItemEvent(), + interface consists of the two methods \c nextKeyEvent() and \c operationDoneEvent(). \sect General Usage @@ -102,7 +101,7 @@ namespace GpgME { */ - class KDE_EXPORT EventLoopInteractor { + class TDE_EXPORT EventLoopInteractor { protected: EventLoopInteractor(); public: @@ -130,7 +129,6 @@ namespace GpgME { // Event Handler Interface // - virtual void nextTrustItemEvent( Context * context, const TrustItem & item ) = 0; virtual void nextKeyEvent( Context * context, const Key & key ) = 0; virtual void operationDoneEvent( Context * context, const Error & e ) = 0; diff --git a/libtdenetwork/gpgmepp/gpgme-0-3-compat.h b/libtdenetwork/gpgmepp/gpgme-0-3-compat.h index 5f8c5b61..1345cfd0 100644 --- a/libtdenetwork/gpgmepp/gpgme-0-3-compat.h +++ b/libtdenetwork/gpgmepp/gpgme-0-3-compat.h @@ -34,7 +34,6 @@ typedef GpgmeRegisterIOCb gpgme_register_io_cb_t; typedef GpgmeRemoveIOCb gpgme_remove_io_cb_t; typedef GpgmeSigStat gpgme_sig_stat_t; typedef GpgmeAttr gpgme_attr_t; -typedef GpgmeTrustItem gpgme_trust_item_t; typedef GpgmeCtx gpgme_ctx_t; typedef GpgmeProtocol gpgme_protocol_t; typedef GpgmeData gpgme_data_t; diff --git a/libtdenetwork/gpgmepp/gpgmefw.h b/libtdenetwork/gpgmepp/gpgmefw.h index 8fe43746..90d958a1 100644 --- a/libtdenetwork/gpgmepp/gpgmefw.h +++ b/libtdenetwork/gpgmepp/gpgmefw.h @@ -36,9 +36,6 @@ struct gpgme_io_cbs; struct _gpgme_key; typedef struct _gpgme_key * gpgme_key_t; -struct _gpgme_trust_item; -typedef struct _gpgme_trust_item * gpgme_trust_item_t; - struct _gpgme_subkey; typedef struct _gpgme_subkey * gpgme_sub_key_t; diff --git a/libtdenetwork/gpgmepp/importresult.h b/libtdenetwork/gpgmepp/importresult.h index 87f9aaf9..e85298e6 100644 --- a/libtdenetwork/gpgmepp/importresult.h +++ b/libtdenetwork/gpgmepp/importresult.h @@ -25,14 +25,14 @@ #include <gpgmepp/result.h> #include <vector> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Error; class Import; - class KDE_EXPORT ImportResult : public Result { + class TDE_EXPORT ImportResult : public Result { public: ImportResult( gpgme_ctx_t ctx=0, int error=0 ); explicit ImportResult( const Error & error ); @@ -68,7 +68,7 @@ namespace GpgME { Private * d; }; - class KDE_EXPORT Import { + class TDE_EXPORT Import { friend class ImportResult; Import( ImportResult::Private * parent, unsigned int idx ); public: diff --git a/libtdenetwork/gpgmepp/interfaces/dataprovider.h b/libtdenetwork/gpgmepp/interfaces/dataprovider.h index be926446..e9886eac 100644 --- a/libtdenetwork/gpgmepp/interfaces/dataprovider.h +++ b/libtdenetwork/gpgmepp/interfaces/dataprovider.h @@ -23,11 +23,11 @@ #include <sys/types.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { - class KDE_EXPORT DataProvider { + class TDE_EXPORT DataProvider { public: virtual ~DataProvider() {} diff --git a/libtdenetwork/gpgmepp/key.h b/libtdenetwork/gpgmepp/key.h index 4bbd24be..b64c564e 100644 --- a/libtdenetwork/gpgmepp/key.h +++ b/libtdenetwork/gpgmepp/key.h @@ -25,7 +25,7 @@ #include <sys/time.h> #include <vector> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { @@ -36,7 +36,7 @@ namespace GpgME { // class Key // - class KDE_EXPORT Key { + class TDE_EXPORT Key { friend class Context; public: Key(); @@ -110,7 +110,7 @@ namespace GpgME { // class Subkey // - class KDE_EXPORT Subkey { + class TDE_EXPORT Subkey { public: Subkey( gpgme_key_t key=0, gpgme_sub_key_t subkey=0 ); Subkey( gpgme_key_t key, unsigned int idx ); @@ -156,7 +156,7 @@ namespace GpgME { // class UserID // - class KDE_EXPORT UserID { + class TDE_EXPORT UserID { public: class Signature; @@ -198,7 +198,7 @@ namespace GpgME { // class UserID::Signature // - class KDE_EXPORT UserID::Signature { + class TDE_EXPORT UserID::Signature { public: class Notation; @@ -255,7 +255,7 @@ namespace GpgME { // // - class KDE_EXPORT UserID::Signature::Notation { + class TDE_EXPORT UserID::Signature::Notation { public: Notation( gpgme_key_t key=0, gpgme_user_id_t uid=0, gpgme_key_sig_t sig=0, gpgme_sig_notation_t nota=0 ); diff --git a/libtdenetwork/gpgmepp/keygenerationresult.h b/libtdenetwork/gpgmepp/keygenerationresult.h index 2cf8c8a7..dcfb56f2 100644 --- a/libtdenetwork/gpgmepp/keygenerationresult.h +++ b/libtdenetwork/gpgmepp/keygenerationresult.h @@ -23,12 +23,12 @@ #include <gpgmepp/gpgmefw.h> #include <gpgmepp/result.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Error; - class KDE_EXPORT KeyGenerationResult : public Result { + class TDE_EXPORT KeyGenerationResult : public Result { public: KeyGenerationResult( gpgme_ctx_t ctx=0, int error=0 ); explicit KeyGenerationResult( const Error & err ); diff --git a/libtdenetwork/gpgmepp/keylistresult.h b/libtdenetwork/gpgmepp/keylistresult.h index 064539cf..877fd517 100644 --- a/libtdenetwork/gpgmepp/keylistresult.h +++ b/libtdenetwork/gpgmepp/keylistresult.h @@ -23,14 +23,14 @@ #include <gpgmepp/gpgmefw.h> #include <gpgmepp/result.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Context; class Error; - class KDE_EXPORT KeyListResult : public Result { + class TDE_EXPORT KeyListResult : public Result { public: KeyListResult( gpgme_ctx_t ctx=0, int error=0 ); explicit KeyListResult( const Error & err ); diff --git a/libtdenetwork/gpgmepp/signingresult.h b/libtdenetwork/gpgmepp/signingresult.h index a31b2928..c43b577e 100644 --- a/libtdenetwork/gpgmepp/signingresult.h +++ b/libtdenetwork/gpgmepp/signingresult.h @@ -30,7 +30,7 @@ #include <vector> #include <iosfwd> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { @@ -38,7 +38,7 @@ namespace GpgME { class CreatedSignature; class InvalidSigningKey; - class KDE_EXPORT SigningResult : public Result { + class TDE_EXPORT SigningResult : public Result { public: SigningResult( gpgme_ctx_t ctx=0, int error=0 ); explicit SigningResult( const Error & err ); @@ -60,9 +60,9 @@ namespace GpgME { Private * d; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const SigningResult & result ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const SigningResult & result ); - class KDE_EXPORT InvalidSigningKey { + class TDE_EXPORT InvalidSigningKey { friend class SigningResult; InvalidSigningKey( SigningResult::Private * parent, unsigned int index ); public: @@ -82,9 +82,9 @@ namespace GpgME { unsigned int idx; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const InvalidSigningKey & key ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const InvalidSigningKey & key ); - class KDE_EXPORT CreatedSignature { + class TDE_EXPORT CreatedSignature { friend class SigningResult; CreatedSignature( SigningResult::Private * parent, unsigned int index ); public: @@ -117,7 +117,7 @@ namespace GpgME { unsigned int idx; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const CreatedSignature & sig ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const CreatedSignature & sig ); } diff --git a/libtdenetwork/gpgmepp/trustitem.cpp b/libtdenetwork/gpgmepp/trustitem.cpp deleted file mode 100644 index 59840ebb..00000000 --- a/libtdenetwork/gpgmepp/trustitem.cpp +++ /dev/null @@ -1,109 +0,0 @@ -/* trustitem.cpp - wraps a gpgme trust item - Copyright (C) 2003 Klarlvdalens Datakonsult AB - - This file is part of GPGME. - - GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - GPGME is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <gpgmepp/trustitem.h> - -#include <gpgme.h> - -#include <cassert> - -namespace GpgME { - - struct TrustItem::Private { - Private( gpgme_trust_item_t aItem ) - : item( aItem ) - { - } - - gpgme_trust_item_t item; - }; - - TrustItem::TrustItem( gpgme_trust_item_t item ) { - d = new Private( item ); - if ( d->item ) - gpgme_trust_item_ref( d->item ); - } - - TrustItem::TrustItem( const TrustItem & other ) { - d = new Private( other.d->item ); - if ( d->item ) - gpgme_trust_item_ref( d->item ); - } - - const TrustItem & TrustItem::operator=( const TrustItem & other ) { - if ( &other == this ) return *this; - - if ( other.d->item ) - gpgme_trust_item_ref( other.d->item ); - if ( d->item ) - gpgme_trust_item_unref( d->item ); - *d = *other.d; - return *this; - } - - TrustItem::~TrustItem() { - if ( d->item ) - gpgme_trust_item_unref( d->item ); - delete d; d = 0; - } - - bool TrustItem::isNull() const { - return !d || !d->item; - } - - gpgme_trust_item_t TrustItem::impl() const { - return d->item; - } - - - const char * TrustItem::keyID() const { - return d->item ? d->item->keyid : 0 ; - } - - const char * TrustItem::userID() const { - return d->item ? d->item->name : 0 ; - } - - const char * TrustItem::ownerTrustAsString() const { - return d->item ? d->item->owner_trust : 0 ; - } - - const char * TrustItem::validityAsString() const { - return d->item ? d->item->validity : 0 ; - } - - int TrustItem::trustLevel() const { - return d->item ? d->item->level : 0 ; - } - - TrustItem::Type TrustItem::type() const { - if ( !d->item ) - return Unknown; - else - return - d->item->type == 1 ? Key : - d->item->type == 2 ? UserID : - Unknown ; - } - -} // namespace GpgME diff --git a/libtdenetwork/gpgmepp/trustitem.h b/libtdenetwork/gpgmepp/trustitem.h deleted file mode 100644 index aa1850b5..00000000 --- a/libtdenetwork/gpgmepp/trustitem.h +++ /dev/null @@ -1,59 +0,0 @@ -/* trustitem.h - wraps a gpgme trust item - Copyright (C) 2003 Klarlvdalens Datakonsult AB - - This file is part of GPGME. - - GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - GPGME is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __GPGMEPP_TRUSTITEM_H__ -#define __GPGMEPP_TRUSTITEM_H__ - -#include <gpgmepp/gpgmefw.h> -#include <gpgmepp/key.h> - -namespace GpgME { - - class Context; - - class TrustItem { - friend class Context; - public: - TrustItem( gpgme_trust_item_t item=0 ); - TrustItem( const TrustItem & other ); - virtual ~TrustItem(); - - const TrustItem & operator=( const TrustItem & other ); - - bool isNull() const; - - const char * keyID() const; - const char * userID() const; - - const char * ownerTrustAsString() const; - const char * validityAsString() const; - - int trustLevel() const; - - enum Type { Unknown=0, Key=1, UserID=2 }; - Type type() const; - - private: - gpgme_trust_item_t impl() const; - class Private; - Private * d; - }; - -} // namepace GpgME - -#endif // __GPGMEPP_TRUSTITEM_H__ diff --git a/libtdenetwork/gpgmepp/verificationresult.h b/libtdenetwork/gpgmepp/verificationresult.h index 70269df3..86d54b8d 100644 --- a/libtdenetwork/gpgmepp/verificationresult.h +++ b/libtdenetwork/gpgmepp/verificationresult.h @@ -29,14 +29,14 @@ #include <vector> #include <iosfwd> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Error; class Signature; - class KDE_EXPORT VerificationResult : public Result { + class TDE_EXPORT VerificationResult : public Result { public: VerificationResult( gpgme_ctx_t ctx=0, int error=0 ); explicit VerificationResult( const Error & err ); @@ -55,9 +55,9 @@ namespace GpgME { Private * d; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const VerificationResult & result ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const VerificationResult & result ); - class KDE_EXPORT Signature { + class TDE_EXPORT Signature { friend class VerificationResult; Signature( VerificationResult::Private * parent, unsigned int index ); public: @@ -113,10 +113,10 @@ namespace GpgME { unsigned int idx; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const Signature & sig ); - KDE_EXPORT std::ostream & operator<<( std::ostream & os, Signature::Summary summary ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const Signature & sig ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, Signature::Summary summary ); - class KDE_EXPORT Signature::Notation { + class TDE_EXPORT Signature::Notation { friend class Signature; Notation( VerificationResult::Private * parent, unsigned int sindex, unsigned int nindex ); public: @@ -137,7 +137,7 @@ namespace GpgME { unsigned int nidx; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const Signature::Notation & nota ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const Signature::Notation & nota ); } diff --git a/libtdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c b/libtdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c index 8ee9c748..354baecf 100644 --- a/libtdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c +++ b/libtdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c @@ -613,7 +613,7 @@ create_inheritable_pipe (int filedes[2], int for_write) memset (&sec_attr, 0, sizeof sec_attr ); sec_attr.nLength = sizeof sec_attr; - sec_attr.bInheritHandle = FALSE; + sec_attr.bInheritHandle = false; if (!CreatePipe (&r, &w, &sec_attr, 0)) { @@ -623,7 +623,7 @@ create_inheritable_pipe (int filedes[2], int for_write) if (!DuplicateHandle (GetCurrentProcess(), for_write? r : w, GetCurrentProcess(), &h, 0, - TRUE, DUPLICATE_SAME_ACCESS )) + true, DUPLICATE_SAME_ACCESS )) { _assuan_log_printf ("DuplicateHandle failed: %s\n", w32_strerror (-1)); CloseHandle (r); @@ -730,7 +730,7 @@ pipe_connect_w32 (assuan_context_t *ctx, /* Start the process. */ memset (&sec_attr, 0, sizeof sec_attr ); sec_attr.nLength = sizeof sec_attr; - sec_attr.bInheritHandle = FALSE; + sec_attr.bInheritHandle = false; memset (&si, 0, sizeof si); si.cb = sizeof (si); @@ -778,7 +778,7 @@ pipe_connect_w32 (assuan_context_t *ctx, cmdline, /* Command line arguments. */ &sec_attr, /* Process security attributes. */ &sec_attr, /* Thread security attributes. */ - TRUE, /* Inherit handles. */ + true, /* Inherit handles. */ (CREATE_DEFAULT_ERROR_MODE | GetPriorityClass (GetCurrentProcess ()) | CREATE_SUSPENDED), /* Creation flags. */ diff --git a/libtdenetwork/qgpgme/dataprovider.h b/libtdenetwork/qgpgme/dataprovider.h index e3613a25..235998f7 100644 --- a/libtdenetwork/qgpgme/dataprovider.h +++ b/libtdenetwork/qgpgme/dataprovider.h @@ -22,11 +22,11 @@ #include <gpgmepp/interfaces/dataprovider.h> #include <tqcstring.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace QGpgME { - class KDE_EXPORT TQByteArrayDataProvider : public GpgME::DataProvider { + class TDE_EXPORT TQByteArrayDataProvider : public GpgME::DataProvider { public: TQByteArrayDataProvider(); TQByteArrayDataProvider( const TQByteArray & initialData ); diff --git a/libtdenetwork/qgpgme/eventloopinteractor.cpp b/libtdenetwork/qgpgme/eventloopinteractor.cpp index 3e75bf89..c9a4764a 100644 --- a/libtdenetwork/qgpgme/eventloopinteractor.cpp +++ b/libtdenetwork/qgpgme/eventloopinteractor.cpp @@ -39,8 +39,8 @@ QGpgME::EventLoopInteractor::EventLoopInteractor( TQObject * parent, const char { if ( !parent ) if ( tqApp ) { - connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) ); - connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SIGNAL(aboutToDestroy()) ); + connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(deleteLater()) ); + connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SIGNAL(aboutToDestroy()) ); } mSelf = this; } @@ -67,9 +67,9 @@ void * QGpgME::EventLoopInteractor::registerWatcher( int fd, Direction dir, bool TQSocketNotifier * sn = new TQSocketNotifier( fd, dir == Read ? TQSocketNotifier::Read : TQSocketNotifier::Write ); if ( dir == Read ) - connect( sn, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReadActivity(int)) ); + connect( sn, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReadActivity(int)) ); else - connect( sn, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWriteActivity(int)) ); + connect( sn, TQ_SIGNAL(activated(int)), TQ_SLOT(slotWriteActivity(int)) ); ok = true; // Can above operations fails? return sn; } @@ -96,10 +96,6 @@ void QGpgME::EventLoopInteractor::slotReadActivity( int socket ) { readActivity.remove(socket); } -void QGpgME::EventLoopInteractor::nextTrustItemEvent( GpgME::Context * context, const GpgME::TrustItem & item ) { - emit nextTrustItemEventSignal( context, item ); -} - void QGpgME::EventLoopInteractor::nextKeyEvent( GpgME::Context * context, const GpgME::Key & key ) { emit nextKeyEventSignal( context, key ); } diff --git a/libtdenetwork/qgpgme/eventloopinteractor.h b/libtdenetwork/qgpgme/eventloopinteractor.h index 10f24031..b28d1f30 100644 --- a/libtdenetwork/qgpgme/eventloopinteractor.h +++ b/libtdenetwork/qgpgme/eventloopinteractor.h @@ -22,18 +22,17 @@ #include <gpgmepp/eventloopinteractor.h> #include <tqobject.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Context; class Error; - class TrustItem; class Key; } // namespace GpgME namespace QGpgME { - class KDE_EXPORT EventLoopInteractor : public TQObject, public GpgME::EventLoopInteractor { + class TDE_EXPORT EventLoopInteractor : public TQObject, public GpgME::EventLoopInteractor { TQ_OBJECT protected: @@ -44,7 +43,6 @@ namespace QGpgME { static EventLoopInteractor * instance(); signals: - void nextTrustItemEventSignal( GpgME::Context * context, const GpgME::TrustItem & item ); void nextKeyEventSignal( GpgME::Context * context, const GpgME::Key & key ); void operationDoneEventSignal( GpgME::Context * context, const GpgME::Error & e ); @@ -69,8 +67,6 @@ namespace QGpgME { // /*! \reimp */ - void nextTrustItemEvent( GpgME::Context * context, const GpgME::TrustItem & item ); - /*! \reimp */ void nextKeyEvent( GpgME::Context * context, const GpgME::Key & key ); /*! \reimp */ void operationDoneEvent( GpgME::Context * context, const GpgME::Error & e ); diff --git a/libtdepim/CMakeLists.txt b/libtdepim/CMakeLists.txt index f96611f3..a252500c 100644 --- a/libtdepim/CMakeLists.txt +++ b/libtdepim/CMakeLists.txt @@ -11,8 +11,6 @@ project( libtdepim ) -include( ConfigureChecks.cmake ) - tde_import( libkmime ) tde_import( libkcal ) tde_import( ktnef ) @@ -96,7 +94,7 @@ tde_add_library( tdepim SHARED AUTOMOC csshelper.cpp distributionlist.cpp kpimurlrequesterdlg.cpp sendsmsdialog.cpp kmailcompletion.cpp VERSION 1.0.0 - LINK kcal-shared tdeimproxy-shared tdeparts-shared ${TQTQUI_LIBRARIES} + LINK kcal-shared tdeimproxy-shared tdeparts-shared tqui DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libtdepim/ConfigureChecks.cmake b/libtdepim/ConfigureChecks.cmake deleted file mode 100644 index b91f0f8f..00000000 --- a/libtdepim/ConfigureChecks.cmake +++ /dev/null @@ -1,12 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -find_package( TQtQUI ) diff --git a/libtdepim/about/top-left.png b/libtdepim/about/top-left.png Binary files differindex b4d4ed60..71756a27 100644..100755 --- a/libtdepim/about/top-left.png +++ b/libtdepim/about/top-left.png diff --git a/libtdepim/addresseediffalgo.h b/libtdepim/addresseediffalgo.h index 7b133823..2cda4ef5 100644 --- a/libtdepim/addresseediffalgo.h +++ b/libtdepim/addresseediffalgo.h @@ -27,7 +27,7 @@ namespace KPIM { -class KDE_EXPORT AddresseeDiffAlgo : public DiffAlgo +class TDE_EXPORT AddresseeDiffAlgo : public DiffAlgo { public: AddresseeDiffAlgo( const TDEABC::Addressee &leftAddressee, const TDEABC::Addressee &rightAddressee ); diff --git a/libtdepim/addresseeemailselection.h b/libtdepim/addresseeemailselection.h index f4394a93..d3464b18 100644 --- a/libtdepim/addresseeemailselection.h +++ b/libtdepim/addresseeemailselection.h @@ -26,7 +26,7 @@ namespace KPIM { -class KDE_EXPORT AddresseeEmailSelection : public Selection +class TDE_EXPORT AddresseeEmailSelection : public Selection { public: AddresseeEmailSelection(); diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index 4060c451..19d2cb53 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -44,7 +44,7 @@ #include <tdecompletionbox.h> #include <kcursor.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <tdestdaccel.h> #include <kurldrag.h> @@ -151,8 +151,8 @@ void AddresseeLineEdit::init() completionSourceWeightsDeleter.setObject( s_completionSourceWeights, new TQMap<TQString,int> ); ldapClientToCompletionSourceMapDeleter.setObject( s_ldapClientToCompletionSourceMap, new TQMap<int,int> ); } -// connect( s_completion, TQT_SIGNAL( match( const TQString& ) ), -// this, TQT_SLOT( slotMatched( const TQString& ) ) ); +// connect( s_completion, TQ_SIGNAL( match( const TQString& ) ), +// this, TQ_SLOT( slotMatched( const TQString& ) ) ); if ( m_useCompletion ) { if ( !s_LDAPTimer ) { @@ -165,25 +165,25 @@ void AddresseeLineEdit::init() if ( !m_completionInitialized ) { setCompletionObject( s_completion, false ); - connect( this, TQT_SIGNAL( completion( const TQString& ) ), - this, TQT_SLOT( slotCompletion() ) ); - connect( this, TQT_SIGNAL( returnPressed( const TQString& ) ), - this, TQT_SLOT( slotReturnPressed( const TQString& ) ) ); + connect( this, TQ_SIGNAL( completion( const TQString& ) ), + this, TQ_SLOT( slotCompletion() ) ); + connect( this, TQ_SIGNAL( returnPressed( const TQString& ) ), + this, TQ_SLOT( slotReturnPressed( const TQString& ) ) ); TDECompletionBox *box = completionBox(); - connect( box, TQT_SIGNAL( highlighted( const TQString& ) ), - this, TQT_SLOT( slotPopupCompletion( const TQString& ) ) ); - connect( box, TQT_SIGNAL( userCancelled( const TQString& ) ), - TQT_SLOT( slotUserCancelled( const TQString& ) ) ); + connect( box, TQ_SIGNAL( highlighted( const TQString& ) ), + this, TQ_SLOT( slotPopupCompletion( const TQString& ) ) ); + connect( box, TQ_SIGNAL( userCancelled( const TQString& ) ), + TQ_SLOT( slotUserCancelled( const TQString& ) ) ); // The emitter is always called KPIM::IMAPCompletionOrder by contract if ( !connectDCOPSignal( 0, "KPIM::IMAPCompletionOrder", "orderChanged()", "slotIMAPCompletionOrderChanged()", false ) ) kdError() << "AddresseeLineEdit: connection to orderChanged() failed" << endl; - connect( s_LDAPTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotStartLDAPLookup() ) ); - connect( s_LDAPSearch, TQT_SIGNAL( searchData( const KPIM::LdapResultList& ) ), - TQT_SLOT( slotLDAPSearchData( const KPIM::LdapResultList& ) ) ); + connect( s_LDAPTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotStartLDAPLookup() ) ); + connect( s_LDAPSearch, TQ_SIGNAL( searchData( const KPIM::LdapResultList& ) ), + TQ_SLOT( slotLDAPSearchData( const KPIM::LdapResultList& ) ) ); m_completionInitialized = true; } @@ -607,7 +607,7 @@ void AddresseeLineEdit::loadContacts() TQApplication::restoreOverrideCursor(); if ( !m_addressBookConnected ) { - connect( addressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), TQT_SLOT( loadContacts() ) ); + connect( addressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ), TQ_SLOT( loadContacts() ) ); m_addressBookConnected = true; } } @@ -925,7 +925,7 @@ TQPopupMenu* AddresseeLineEdit::createPopupMenu() menu->setItemVisible( ShortAutoCompletion, false ); menu->setItemVisible( PopupAutoCompletion, false ); menu->insertItem( i18n( "Configure Completion Order..." ), - this, TQT_SLOT( slotEditCompletionOrder() ) ); + this, TQ_SLOT( slotEditCompletionOrder() ) ); } return menu; } diff --git a/libtdepim/addresseelineedit.h b/libtdepim/addresseelineedit.h index 95457fd1..7bad4c7e 100644 --- a/libtdepim/addresseelineedit.h +++ b/libtdepim/addresseelineedit.h @@ -37,7 +37,7 @@ #include "clicklineedit.h" #include "kmailcompletion.h" #include <dcopobject.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEConfig; @@ -50,7 +50,7 @@ typedef TQMap< TQString, TQPair<int,int> > CompletionItemsMap; namespace KPIM { -class KDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject +class TDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject { K_DCOP TQ_OBJECT diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp index 77f2be02..b89184e6 100644 --- a/libtdepim/addresseeselector.cpp +++ b/libtdepim/addresseeselector.cpp @@ -227,8 +227,8 @@ class SelectionViewItem : public TQListViewItem AddresseeSelector::AddresseeSelector( Selection *selection, TQWidget *parent, const char *name ) : TQWidget( parent, name ), mSelection( selection ), mManager( 0 ) { - mMoveMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - mRemoveMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); + mMoveMapper = new TQSignalMapper( this ); + mRemoveMapper = new TQSignalMapper( this ); mAddressBookManager = new AddressBookManager(); @@ -250,17 +250,17 @@ AddresseeSelector::~AddresseeSelector() void AddresseeSelector::init() { - connect( TDEABC::StdAddressBook::self( true ), TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - this, TQT_SLOT( reloadAddressBook() ) ); - connect( mAddresseeFilter, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( updateAddresseeView() ) ); - connect( mAddressBookCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( updateAddresseeView() ) ); - - connect( mMoveMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( move( int ) ) ); - connect( mRemoveMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( remove( int ) ) ); + connect( TDEABC::StdAddressBook::self( true ), TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + this, TQ_SLOT( reloadAddressBook() ) ); + connect( mAddresseeFilter, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( updateAddresseeView() ) ); + connect( mAddressBookCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( updateAddresseeView() ) ); + + connect( mMoveMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( move( int ) ) ); + connect( mRemoveMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( remove( int ) ) ); reloadAddressBook(); } @@ -298,9 +298,9 @@ void AddresseeSelector::initGUI() listView->setFullWidth( true ); mSelectionViews.append( listView ); - connect( listView, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), - mRemoveMapper, TQT_SLOT( map() ) ); - mRemoveMapper->setMapping( TQT_TQOBJECT(listView), i ); + connect( listView, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), + mRemoveMapper, TQ_SLOT( map() ) ); + mRemoveMapper->setMapping( listView, i ); TQVBoxLayout *buttonLayout = new TQVBoxLayout( this ); buttonLayout->setAlignment( TQt::AlignBottom ); @@ -311,18 +311,18 @@ void AddresseeSelector::initGUI() moveButton->setIconSet( moveSet ); moveButton->setFixedSize( 30, 30 ); - connect( moveButton, TQT_SIGNAL( clicked() ), - mMoveMapper, TQT_SLOT( map() ) ); - mMoveMapper->setMapping( TQT_TQOBJECT(moveButton), i ); + connect( moveButton, TQ_SIGNAL( clicked() ), + mMoveMapper, TQ_SLOT( map() ) ); + mMoveMapper->setMapping( moveButton, i ); // remove button TQToolButton *removeButton = new TQToolButton( this ); removeButton->setIconSet( removeSet ); removeButton->setFixedSize( 30, 30 ); - connect( removeButton, TQT_SIGNAL( clicked() ), - mRemoveMapper, TQT_SLOT( map() ) ); - mRemoveMapper->setMapping( TQT_TQOBJECT(removeButton), i ); + connect( removeButton, TQ_SIGNAL( clicked() ), + mRemoveMapper, TQ_SLOT( map() ) ); + mRemoveMapper->setMapping( removeButton, i ); buttonLayout->addWidget( moveButton ); buttonLayout->addWidget( removeButton ); diff --git a/libtdepim/addresseeselector.h b/libtdepim/addresseeselector.h index fa4a3c76..83b8ad51 100644 --- a/libtdepim/addresseeselector.h +++ b/libtdepim/addresseeselector.h @@ -26,7 +26,7 @@ #include <tdeabc/distributionlist.h> #include <tdeabc/resource.h> #include <kdialogbase.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tqbitarray.h> #include <tqpixmap.h> @@ -41,7 +41,7 @@ namespace KPIM { class AddresseeSelector; -class KDE_EXPORT Selection +class TDE_EXPORT Selection { friend class AddresseeSelector; @@ -163,7 +163,7 @@ class SelectionItem TQBitArray mField; }; -class KDE_EXPORT AddresseeSelector : public TQWidget +class TDE_EXPORT AddresseeSelector : public TQWidget { TQ_OBJECT @@ -213,7 +213,7 @@ class KDE_EXPORT AddresseeSelector : public TQWidget AddressBookManager *mAddressBookManager; }; -class KDE_EXPORT AddresseeSelectorDialog : public KDialogBase +class TDE_EXPORT AddresseeSelectorDialog : public KDialogBase { TQ_OBJECT diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp index 16c9bbf2..a8724991 100644 --- a/libtdepim/addresseeview.cpp +++ b/libtdepim/addresseeview.cpp @@ -64,12 +64,12 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name, TQStyleSheetItem *link = sheet->item( "a" ); link->setColor( TDEGlobalSettings::linkColor() ); - connect( this, TQT_SIGNAL( mailClick( const TQString&, const TQString& ) ), - this, TQT_SLOT( slotMailClicked( const TQString&, const TQString& ) ) ); - connect( this, TQT_SIGNAL( urlClick( const TQString& ) ), - this, TQT_SLOT( slotUrlClicked( const TQString& ) ) ); - connect( this, TQT_SIGNAL( highlighted( const TQString& ) ), - this, TQT_SLOT( slotHighlighted( const TQString& ) ) ); + connect( this, TQ_SIGNAL( mailClick( const TQString&, const TQString& ) ), + this, TQ_SLOT( slotMailClicked( const TQString&, const TQString& ) ) ); + connect( this, TQ_SIGNAL( urlClick( const TQString& ) ), + this, TQ_SLOT( slotUrlClicked( const TQString& ) ) ); + connect( this, TQ_SIGNAL( highlighted( const TQString& ) ), + this, TQ_SLOT( slotHighlighted( const TQString& ) ) ); setNotifyClick( true ); @@ -88,13 +88,13 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name, mActionShowCustomFields = new TDEToggleAction( i18n( "Show Custom Fields" ) ); mActionShowCustomFields->setCheckedState( i18n( "Hide Custom Fields" ) ); - connect( mActionShowBirthday, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowAddresses, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowEmails, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowPhones, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowURLs, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowIMAddresses, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowCustomFields, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); + connect( mActionShowBirthday, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowAddresses, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowEmails, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowPhones, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowURLs, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowIMAddresses, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowCustomFields, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); if ( !config ) { mConfig = new TDEConfig( "kaddressbookrc" ); @@ -105,11 +105,11 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name, load(); // set up IMProxy to display contacts' IM presence and make connections to keep the display live - mKIMProxy = ::KIMProxy::instance( kapp->dcopClient() ); - connect( mKIMProxy, TQT_SIGNAL( sigContactPresenceChanged( const TQString& ) ), - this, TQT_SLOT( slotPresenceChanged( const TQString& ) ) ); - connect( mKIMProxy, TQT_SIGNAL( sigPresenceInfoExpired() ), - this, TQT_SLOT( slotPresenceInfoExpired() ) ); + mKIMProxy = ::KIMProxy::instance( tdeApp->dcopClient() ); + connect( mKIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ), + this, TQ_SLOT( slotPresenceChanged( const TQString& ) ) ); + connect( mKIMProxy, TQ_SIGNAL( sigPresenceInfoExpired() ), + this, TQ_SLOT( slotPresenceInfoExpired() ) ); } AddresseeView::~AddresseeView() @@ -547,10 +547,10 @@ void AddresseeView::updateView() TQMimeSourceFactory::defaultFactory()->setImage( imageURL, TQImage(mImageData) ); else { mImageJob = TDEIO::get( KURL( picture.url() ), false, false ); - connect( mImageJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); - connect( mImageJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( result( TDEIO::Job* ) ) ); + connect( mImageJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( mImageJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( result( TDEIO::Job* ) ) ); } } else { TQMimeSourceFactory::defaultFactory()->setPixmap( imageURL, @@ -569,15 +569,15 @@ TDEABC::Addressee AddresseeView::addressee() const void AddresseeView::urlClicked( const TQString &url ) { - kapp->invokeBrowser( url ); + tdeApp->invokeBrowser( url ); } void AddresseeView::emailClicked( const TQString &email ) { if ( email.startsWith( "mailto:" ) ) - kapp->invokeMailer( email.mid( 7 ), TQString() ); + tdeApp->invokeMailer( email.mid( 7 ), TQString() ); else - kapp->invokeMailer( email, TQString() ); + tdeApp->invokeMailer( email, TQString() ); } void AddresseeView::phoneNumberClicked( const TQString &number ) diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h index 59a02124..13230c11 100644 --- a/libtdepim/addresseeview.h +++ b/libtdepim/addresseeview.h @@ -27,7 +27,7 @@ #include <tdeabc/addressee.h> #include <ktextbrowser.h> #include <tdeimproxy.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace TDEIO { class Job; @@ -40,7 +40,7 @@ class TQPopupMenu; namespace KPIM { -class KDE_EXPORT AddresseeView : public KTextBrowser +class TDE_EXPORT AddresseeView : public KTextBrowser { TQ_OBJECT diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp index e0071ef0..f67a1071 100644 --- a/libtdepim/addressesdialog.cpp +++ b/libtdepim/addressesdialog.cpp @@ -47,10 +47,10 @@ #include <klineedit.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kpushbutton.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqdict.h> #include <tqlayout.h> @@ -241,8 +241,8 @@ AddresseeViewItem* AddressesDialog::selectedToItem() if ( !d->toItem ) { d->toItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("To"), AddresseeViewItem::To ); - connect(d->toItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->toItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } return d->toItem; } @@ -252,8 +252,8 @@ AddresseeViewItem* AddressesDialog::selectedCcItem() if ( !d->ccItem ) { d->ccItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("CC"), AddresseeViewItem::CC ); - connect(d->ccItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->ccItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } return d->ccItem; } @@ -263,8 +263,8 @@ AddresseeViewItem* AddressesDialog::selectedBccItem() if ( !d->bccItem ) { d->bccItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("BCC"), AddresseeViewItem::BCC ); - connect(d->bccItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->bccItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } return d->bccItem; } @@ -325,8 +325,8 @@ AddressesDialog::updateRecentAddresses() if ( !d->recent ) { d->recent = new AddresseeViewItem( d->ui->mAvailableView, recentGroup ); - connect(d->recent, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); + connect(d->recent, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); d->recent->setVisible( false ); d->groupDict.insert( recentGroup, d->recent ); } @@ -464,8 +464,8 @@ AddressesDialog::updateAvailableAddressees() static const TQString &personalGroup = TDEGlobal::staticQString( i18n( "Other Addresses" ) ); d->ui->mAvailableView->setRootIsDecorated( true ); d->personal = new AddresseeViewItem( d->ui->mAvailableView, personalGroup ); - //connect(d->personal, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - // this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + //connect(d->personal, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + // this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); d->personal->setVisible( false ); d->groupDict.insert( personalGroup, d->personal ); @@ -570,36 +570,36 @@ AddressesDialog::selectedAddressSelected( AddresseeViewItem* item, bool selected void AddressesDialog::initConnections() { - connect( d->ui->mFilterEdit, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(filterChanged(const TQString &)) ); - connect( d->ui->mToButton, TQT_SIGNAL(clicked()), - TQT_SLOT(addSelectedTo()) ); - connect( d->ui->mCCButton, TQT_SIGNAL(clicked()), - TQT_SLOT(addSelectedCC()) ); - connect( d->ui->mBCCButton, TQT_SIGNAL(clicked()), - TQT_SLOT(addSelectedBCC()) ); - connect( d->ui->mSaveAs, TQT_SIGNAL(clicked()), - TQT_SLOT(saveAs()) ); - connect( d->ui->mLdapSearch, TQT_SIGNAL(clicked()), - TQT_SLOT(searchLdap()) ); - connect( d->ui->mRemoveButton, TQT_SIGNAL(clicked()), - TQT_SLOT(removeEntry()) ); - connect( d->ui->mAvailableView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(availableSelectionChanged()) ); - connect( d->ui->mAvailableView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(addSelectedTo()) ); - connect( d->ui->mSelectedView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(selectedSelectionChanged()) ); - connect( d->ui->mSelectedView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(removeEntry()) ); + connect( d->ui->mFilterEdit, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(filterChanged(const TQString &)) ); + connect( d->ui->mToButton, TQ_SIGNAL(clicked()), + TQ_SLOT(addSelectedTo()) ); + connect( d->ui->mCCButton, TQ_SIGNAL(clicked()), + TQ_SLOT(addSelectedCC()) ); + connect( d->ui->mBCCButton, TQ_SIGNAL(clicked()), + TQ_SLOT(addSelectedBCC()) ); + connect( d->ui->mSaveAs, TQ_SIGNAL(clicked()), + TQ_SLOT(saveAs()) ); + connect( d->ui->mLdapSearch, TQ_SIGNAL(clicked()), + TQ_SLOT(searchLdap()) ); + connect( d->ui->mRemoveButton, TQ_SIGNAL(clicked()), + TQ_SLOT(removeEntry()) ); + connect( d->ui->mAvailableView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(availableSelectionChanged()) ); + connect( d->ui->mAvailableView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(addSelectedTo()) ); + connect( d->ui->mSelectedView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(selectedSelectionChanged()) ); + connect( d->ui->mSelectedView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(removeEntry()) ); #ifndef TDEPIM_NEW_DISTRLISTS - connect( TDEABC::DistributionListWatcher::self(), TQT_SIGNAL( changed() ), - this, TQT_SLOT( updateAvailableAddressees() ) ); + connect( TDEABC::DistributionListWatcher::self(), TQ_SIGNAL( changed() ), + this, TQ_SLOT( updateAvailableAddressees() ) ); #endif - connect( TDEABC::StdAddressBook::self( true ), TQT_SIGNAL( addressBookChanged(AddressBook*) ), - this, TQT_SLOT( updateAvailableAddressees() ) ); + connect( TDEABC::StdAddressBook::self( true ), TQ_SIGNAL( addressBookChanged(AddressBook*) ), + this, TQ_SLOT( updateAvailableAddressees() ) ); } void @@ -619,8 +619,8 @@ AddressesDialog::addAddresseeToAvailable( const TDEABC::Addressee& addr, Address for ( uint i = 0; i < addr.emails().count(); ++i ) { AddresseeViewItem* addressee = new AddresseeViewItem( d->groupDict[ *it ], addr, i ); - connect(addressee, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); + connect(addressee, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); } } } @@ -634,8 +634,8 @@ AddressesDialog::addAddresseeToAvailable( const TDEABC::Addressee& addr, Address if ( defaultParent && noCategory ) { // only non-categorized items here AddresseeViewItem* addressee = new AddresseeViewItem( defaultParent, addr ); - connect(addressee, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); + connect(addressee, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); } } @@ -653,8 +653,8 @@ AddressesDialog::addAddresseeToSelected( const TDEABC::Addressee& addr, Addresse myChild = static_cast<AddresseeViewItem*>( myChild->nextSibling() ); } AddresseeViewItem* addressee = new AddresseeViewItem( defaultParent, addr ); - connect(addressee, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(addressee, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); defaultParent->setOpen( true ); } @@ -701,8 +701,8 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent, address->setVisible( false ); selectedToAvailableMapping.insert(address, newItem); selectedToAvailableMapping.insert(newItem, address); - connect(newItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(newItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } parent->setOpen( true ); @@ -725,8 +725,8 @@ AddressesDialog::addSelectedTo() if ( !d->toItem ) { d->toItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("To"), AddresseeViewItem::To ); - connect(d->toItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->toItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } addAddresseesToSelected( d->toItem, selectedAvailableAddresses ); @@ -746,8 +746,8 @@ AddressesDialog::addSelectedCC() if ( !d->ccItem ) { d->ccItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("CC"), AddresseeViewItem::CC ); - connect(d->ccItem , TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->ccItem , TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } addAddresseesToSelected( d->ccItem, selectedAvailableAddresses ); @@ -767,8 +767,8 @@ AddressesDialog::addSelectedBCC() if ( !d->bccItem ) { d->bccItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("BCC"), AddresseeViewItem::BCC ); - connect(d->bccItem , TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->bccItem , TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } addAddresseesToSelected( d->bccItem, selectedAvailableAddresses ); @@ -946,8 +946,8 @@ AddressesDialog::searchLdap() { if ( !d->ldapSearchDialog ) { d->ldapSearchDialog = new LDAPSearchDialog( this ); - connect( d->ldapSearchDialog, TQT_SIGNAL( addresseesAdded() ), - TQT_SLOT(ldapSearchResult() ) ); + connect( d->ldapSearchDialog, TQ_SIGNAL( addresseesAdded() ), + TQ_SLOT(ldapSearchResult() ) ); } d->ldapSearchDialog->show(); } @@ -972,7 +972,7 @@ AddressesDialog::ldapSearchResult() void AddressesDialog::launchAddressBook() { - kapp->startServiceByDesktopName( "kaddressbook", TQString() ); + tdeApp->startServiceByDesktopName( "kaddressbook", TQString() ); } void @@ -1169,8 +1169,8 @@ AddressesDialog::addDistributionLists() AddresseeViewItem *item = new AddresseeViewItem( d->topdist, dlist.name() ); d->dists.append( item ); - connect( item, TQT_SIGNAL( addressSelected( AddresseeViewItem*, bool ) ), - this, TQT_SLOT( availableAddressSelected( AddresseeViewItem*, bool ) ) ); + connect( item, TQ_SIGNAL( addressSelected( AddresseeViewItem*, bool ) ), + this, TQ_SLOT( availableAddressSelected( AddresseeViewItem*, bool ) ) ); #ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList::Entry::List::Iterator itemIt; diff --git a/libtdepim/addressesdialog.h b/libtdepim/addressesdialog.h index da56b31f..152938ab 100644 --- a/libtdepim/addressesdialog.h +++ b/libtdepim/addressesdialog.h @@ -31,7 +31,7 @@ #include <tqstringlist.h> #include <tqptrlist.h> #include <tqptrdict.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KPIM { @@ -76,7 +76,7 @@ namespace KPIM { AddresseeViewItemPrivate *d; }; - class KDE_EXPORT AddressesDialog : public KDialogBase + class TDE_EXPORT AddressesDialog : public KDialogBase { TQ_OBJECT diff --git a/libtdepim/alarmclient.cpp b/libtdepim/alarmclient.cpp index 50e7b960..6007f14e 100644 --- a/libtdepim/alarmclient.cpp +++ b/libtdepim/alarmclient.cpp @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <dcopclient.h> #include <dcopref.h> @@ -40,7 +40,7 @@ AlarmClient::~AlarmClient() void AlarmClient::startDaemon() { - if ( kapp->dcopClient()->isApplicationRegistered( "korgac" ) ) { + if ( tdeApp->dcopClient()->isApplicationRegistered( "korgac" ) ) { // Alarm daemon already runs return; } @@ -52,7 +52,7 @@ void AlarmClient::startDaemon() } else { TQString error; - if ( kapp->startServiceByDesktopPath( desktopFile, TQStringList(), &error ) != 0 ) + if ( tdeApp->startServiceByDesktopPath( desktopFile, TQStringList(), &error ) != 0 ) kdWarning() << "Failure starting korgac:" << error << endl; } } diff --git a/libtdepim/broadcaststatus.h b/libtdepim/broadcaststatus.h index 37da6f95..7c93bc5b 100644 --- a/libtdepim/broadcaststatus.h +++ b/libtdepim/broadcaststatus.h @@ -14,7 +14,7 @@ #include <tqobject.h> #include <tqmap.h> -#include <kdemacros.h> +#include <tdemacros.h> #undef None @@ -29,7 +29,7 @@ class ProgressItem; */ -class KDE_EXPORT BroadcastStatus : public TQObject +class TDE_EXPORT BroadcastStatus : public TQObject { TQ_OBJECT diff --git a/libtdepim/calendardiffalgo.h b/libtdepim/calendardiffalgo.h index 9ccd6c8c..c83f3aab 100644 --- a/libtdepim/calendardiffalgo.h +++ b/libtdepim/calendardiffalgo.h @@ -29,7 +29,7 @@ namespace KPIM { -class KDE_EXPORT CalendarDiffAlgo : public DiffAlgo +class TDE_EXPORT CalendarDiffAlgo : public DiffAlgo { public: CalendarDiffAlgo( KCal::Incidence *leftIncidence, KCal::Incidence *rightIncidence ); diff --git a/libtdepim/categoryeditdialog.cpp b/libtdepim/categoryeditdialog.cpp index 26abbc07..d282596d 100644 --- a/libtdepim/categoryeditdialog.cpp +++ b/libtdepim/categoryeditdialog.cpp @@ -87,9 +87,9 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent, fillList(); - connect( d->mAddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( add() ) ); - connect( d->mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) ); - connect( d->mDeleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( remove() ) ); + connect( d->mAddButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( add() ) ); + connect( d->mEditButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( edit() ) ); + connect( d->mDeleteButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( remove() ) ); } /* diff --git a/libtdepim/categoryeditdialog.h b/libtdepim/categoryeditdialog.h index 32d2c26c..4b81f552 100644 --- a/libtdepim/categoryeditdialog.h +++ b/libtdepim/categoryeditdialog.h @@ -23,13 +23,13 @@ #define KPIM_CATEGORYEDITDIALOG_H #include <kdialogbase.h> -#include <kdemacros.h> +#include <tdemacros.h> class KPimPrefs; namespace KPIM { -class KDE_EXPORT CategoryEditDialog : public KDialogBase +class TDE_EXPORT CategoryEditDialog : public KDialogBase { TQ_OBJECT diff --git a/libtdepim/categoryselectdialog.cpp b/libtdepim/categoryselectdialog.cpp index cf1b2ac6..d75948ad 100644 --- a/libtdepim/categoryselectdialog.cpp +++ b/libtdepim/categoryselectdialog.cpp @@ -44,10 +44,10 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, TQWidget* parent, setCategories(); - connect( mWidget->mButtonEdit, TQT_SIGNAL(clicked()), - TQT_SIGNAL(editCategories()) ); - connect( mWidget->mButtonClear, TQT_SIGNAL(clicked()), - TQT_SLOT(clear()) ); + connect( mWidget->mButtonEdit, TQ_SIGNAL(clicked()), + TQ_SIGNAL(editCategories()) ); + connect( mWidget->mButtonClear, TQ_SIGNAL(clicked()), + TQ_SLOT(clear()) ); } void CategorySelectDialog::setCategories( const TQStringList &categoryList ) diff --git a/libtdepim/categoryselectdialog.h b/libtdepim/categoryselectdialog.h index 9c4f4149..38e05064 100644 --- a/libtdepim/categoryselectdialog.h +++ b/libtdepim/categoryselectdialog.h @@ -23,14 +23,14 @@ #define KPIM_CATEGORYSELECTDIALOG_H #include <kdialogbase.h> -#include <kdemacros.h> +#include <tdemacros.h> class KPimPrefs; class CategorySelectDialog_base; namespace KPIM { -class KDE_EXPORT CategorySelectDialog : public KDialogBase +class TDE_EXPORT CategorySelectDialog : public KDialogBase { TQ_OBJECT diff --git a/libtdepim/cfgc/autoexample.cpp b/libtdepim/cfgc/autoexample.cpp index 746c0714..3dc1827a 100644 --- a/libtdepim/cfgc/autoexample.cpp +++ b/libtdepim/cfgc/autoexample.cpp @@ -31,7 +31,7 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kautoconfigdialog.h> #include <tqlabel.h> diff --git a/libtdepim/cfgc/example.cpp b/libtdepim/cfgc/example.cpp index 8af18fc3..2decd110 100644 --- a/libtdepim/cfgc/example.cpp +++ b/libtdepim/cfgc/example.cpp @@ -28,7 +28,7 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <libtdepim/kprefsdialog.h> diff --git a/libtdepim/clicklineedit.h b/libtdepim/clicklineedit.h index 1d6ad5c2..25ad3e3a 100644 --- a/libtdepim/clicklineedit.h +++ b/libtdepim/clicklineedit.h @@ -22,7 +22,7 @@ #define CLICKLINEEDIT_H #include <klineedit.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KPIM { @@ -33,7 +33,7 @@ namespace KPIM { @short LineEdit with customizable "Click here" text @author Daniel Molkentin */ -class KDE_EXPORT ClickLineEdit : public KLineEdit +class TDE_EXPORT ClickLineEdit : public KLineEdit { TQ_OBJECT diff --git a/libtdepim/collectingprocess.cpp b/libtdepim/collectingprocess.cpp index e9d640ce..da665464 100644 --- a/libtdepim/collectingprocess.cpp +++ b/libtdepim/collectingprocess.cpp @@ -61,18 +61,18 @@ CollectingProcess::~CollectingProcess() { bool CollectingProcess::start( RunMode runmode, Communication comm ) { // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); + disconnect( this, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); if ( comm & Stdout ) { - connect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); + connect( this, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); } // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + disconnect( this, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); if ( comm & Stderr ) { - connect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( this, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); } return TDEProcess::start( runmode, comm ); } diff --git a/libtdepim/collectingprocess.h b/libtdepim/collectingprocess.h index f0128a0c..9a1b81bd 100644 --- a/libtdepim/collectingprocess.h +++ b/libtdepim/collectingprocess.h @@ -33,8 +33,8 @@ #ifndef __KPIM_COLLECTINGPROCESS_H__ #define __KPIM_COLLECTINGPROCESS_H__ -#include <kprocess.h> -#include <kdemacros.h> +#include <tdeprocess.h> +#include <tdemacros.h> namespace KPIM { @@ -46,7 +46,7 @@ namespace KPIM { * * @author Ingo Kloecker <kloecker@kde.org> */ -class KDE_EXPORT CollectingProcess : public TDEProcess { +class TDE_EXPORT CollectingProcess : public TDEProcess { TQ_OBJECT public: diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp index 152790c7..a38c8f1e 100644 --- a/libtdepim/completionordereditor.cpp +++ b/libtdepim/completionordereditor.cpp @@ -235,10 +235,10 @@ CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, TQWidget* spacer = new TQWidget( upDownBox ); upDownBox->setStretchFactor( spacer, 100 ); - connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); - connect( mUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveUp() ) ); - connect( mDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveDown() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( mUpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUp() ) ); + connect( mDownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDown() ) ); } CompletionOrderEditor::~CompletionOrderEditor() @@ -297,7 +297,7 @@ void CompletionOrderEditor::slotOk() // Emit DCOP signal // The emitter is always set to KPIM::IMAPCompletionOrder, so that the connect works // This is why we can't use k_dcop_signals here, but need to use emitDCOPSignal - kapp->dcopClient()->emitDCOPSignal( "KPIM::IMAPCompletionOrder", "orderChanged()", TQByteArray() ); + tdeApp->dcopClient()->emitDCOPSignal( "KPIM::IMAPCompletionOrder", "orderChanged()", TQByteArray() ); } KDialogBase::slotOk(); } diff --git a/libtdepim/configmanager.h b/libtdepim/configmanager.h index 213524c4..274dc9cf 100644 --- a/libtdepim/configmanager.h +++ b/libtdepim/configmanager.h @@ -19,7 +19,7 @@ #include <tqobject.h> -#include <kdemacros.h> +#include <tdemacros.h> class KMKernel; @@ -29,7 +29,7 @@ namespace KPIM { * @short Class for managing a set of config options. * @author Marc Mutz <mutz@kde.org> **/ -class KDE_EXPORT ConfigManager : public TQObject { +class TDE_EXPORT ConfigManager : public TQObject { TQ_OBJECT public: diff --git a/libtdepim/designerfields.cpp b/libtdepim/designerfields.cpp index 8e67e55d..33288549 100644 --- a/libtdepim/designerfields.cpp +++ b/libtdepim/designerfields.cpp @@ -34,7 +34,7 @@ #include <kdatetimewidget.h> #include <kdialog.h> #include <klineedit.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "designerfields.h" @@ -83,34 +83,34 @@ void DesignerFields::initGUI( const TQString &uiFile ) if ( name.startsWith( "X_" ) ) { name = name.mid( 2 ); - TQWidget *widget = TQT_TQWIDGET( it.current() ); + TQWidget *widget = static_cast<TQWidget*>( it.current() ); if ( !name.isEmpty() ) mWidgets.insert( name, widget ); if ( it.current()->inherits( "TQLineEdit" ) ) - connect( it.current(), TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "TQSpinBox" ) ) - connect( it.current(), TQT_SIGNAL( valueChanged( int ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( valueChanged( int ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "TQCheckBox" ) ) - connect( it.current(), TQT_SIGNAL( toggled( bool ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( toggled( bool ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "TQComboBox" ) ) - connect( it.current(), TQT_SIGNAL( activated( const TQString& ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( activated( const TQString& ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "TQDateTimeEdit" ) ) - connect( it.current(), TQT_SIGNAL( valueChanged( const TQDateTime& ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( valueChanged( const TQDateTime& ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "KDateTimeWidget" ) ) - connect( it.current(), TQT_SIGNAL( valueChanged( const TQDateTime& ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( valueChanged( const TQDateTime& ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "KDatePicker" ) ) - connect( it.current(), TQT_SIGNAL( dateChanged( TQDate ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( dateChanged( TQDate ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "TQTextEdit" ) ) - connect( it.current(), TQT_SIGNAL( textChanged() ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( textChanged() ), + TQ_SIGNAL( modified() ) ); if ( !widget->isEnabled() ) mDisabledWidgets.append( widget ); diff --git a/libtdepim/designerfields.h b/libtdepim/designerfields.h index b243e48c..c4a23b72 100644 --- a/libtdepim/designerfields.h +++ b/libtdepim/designerfields.h @@ -28,11 +28,11 @@ #include <tqpair.h> #include <tqstringlist.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KPIM { -class KDE_EXPORT DesignerFields : public TQWidget +class TDE_EXPORT DesignerFields : public TQWidget { TQ_OBJECT diff --git a/libtdepim/diffalgo.h b/libtdepim/diffalgo.h index a437d9d5..424756f8 100644 --- a/libtdepim/diffalgo.h +++ b/libtdepim/diffalgo.h @@ -23,7 +23,7 @@ #define DIFFALGO_H #include <tqvaluelist.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KPIM { @@ -76,7 +76,7 @@ class DiffAlgoDisplay }; -class KDE_EXPORT DiffAlgo +class TDE_EXPORT DiffAlgo { public: /** diff --git a/libtdepim/embeddedurlpage.cpp b/libtdepim/embeddedurlpage.cpp index 79bf5863..4a3aed79 100644 --- a/libtdepim/embeddedurlpage.cpp +++ b/libtdepim/embeddedurlpage.cpp @@ -55,16 +55,16 @@ void EmbeddedURLPage::loadContents() if ( mimetype == "auto" ) mimetype == KMimeType::findByURL( mUri )->name(); // "this" is both the parent widget and the parent object - mPart = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0 ); + mPart = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), this, 0, this, 0 ); if ( mPart ) { mPart->openURL( mUri ); mPart->widget()->show(); } //void KParts::BrowserExtension::openURLRequestDelayed( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() ) KParts::BrowserExtension* be = KParts::BrowserExtension::childObject( mPart ); - connect( be, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), -// mPart, TQT_SLOT( openURL( const KURL & ) ) ); - this, TQT_SIGNAL( openURL( const KURL & ) ) ); + connect( be, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), +// mPart, TQ_SLOT( openURL( const KURL & ) ) ); + this, TQ_SIGNAL( openURL( const KURL & ) ) ); } } diff --git a/libtdepim/embeddedurlpage.h b/libtdepim/embeddedurlpage.h index d644ce6f..14a9cffd 100644 --- a/libtdepim/embeddedurlpage.h +++ b/libtdepim/embeddedurlpage.h @@ -22,14 +22,14 @@ #define KPIM_EMBEDDEDURLPAGE_H #include <tqwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <kurl.h> namespace KParts { class ReadOnlyPart; } namespace KPIM { -class KDE_EXPORT EmbeddedURLPage : public TQWidget +class TDE_EXPORT EmbeddedURLPage : public TQWidget { TQ_OBJECT diff --git a/libtdepim/htmldiffalgodisplay.h b/libtdepim/htmldiffalgodisplay.h index e38b7a60..dcce58cb 100644 --- a/libtdepim/htmldiffalgodisplay.h +++ b/libtdepim/htmldiffalgodisplay.h @@ -25,11 +25,11 @@ #include "diffalgo.h" #include <ktextbrowser.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KPIM { -class KDE_EXPORT HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser +class TDE_EXPORT HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser { public: HTMLDiffAlgoDisplay( TQWidget *parent ); diff --git a/libtdepim/infoextension.h b/libtdepim/infoextension.h index 737cbf8e..ea83ae83 100644 --- a/libtdepim/infoextension.h +++ b/libtdepim/infoextension.h @@ -23,7 +23,7 @@ #define INFOEXTENSION_H #include <tqobject.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQWidget; @@ -35,7 +35,7 @@ namespace KParts /** * Provides a way to get information out of a PIM-Part **/ - class KDE_EXPORT InfoExtension : public TQObject + class TDE_EXPORT InfoExtension : public TQObject { TQ_OBJECT diff --git a/libtdepim/interfaces/AddressBookServiceIface.h b/libtdepim/interfaces/AddressBookServiceIface.h index e39b8fc7..2ae23b83 100644 --- a/libtdepim/interfaces/AddressBookServiceIface.h +++ b/libtdepim/interfaces/AddressBookServiceIface.h @@ -27,11 +27,11 @@ #include <kurl.h> #include <tqstring.h> #include <tqcstring.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KPIM { -#define AddressBookServiceIface KDE_EXPORT AddressBookServiceIface +#define AddressBookServiceIface TDE_EXPORT AddressBookServiceIface class AddressBookServiceIface : virtual public DCOPObject #undef AddressBookServiceIface { diff --git a/libtdepim/interfaces/MailTransportServiceIface.h b/libtdepim/interfaces/MailTransportServiceIface.h index 3a69f83b..d6a3883d 100644 --- a/libtdepim/interfaces/MailTransportServiceIface.h +++ b/libtdepim/interfaces/MailTransportServiceIface.h @@ -28,11 +28,11 @@ #include <tqstring.h> #include <tqcstring.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KPim { -#define MailTransportServiceIface KDE_EXPORT MailTransportServiceIface +#define MailTransportServiceIface TDE_EXPORT MailTransportServiceIface class MailTransportServiceIface : virtual public DCOPObject #undef MailTransportServiceIface { diff --git a/libtdepim/kaccount.h b/libtdepim/kaccount.h index e5ec2d79..aed0a46e 100644 --- a/libtdepim/kaccount.h +++ b/libtdepim/kaccount.h @@ -33,11 +33,11 @@ #define __KACCOUNT #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEConfig; -class KDE_EXPORT KAccount +class TDE_EXPORT KAccount { public: /** Type information */ diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp index b32b017e..cb831d41 100644 --- a/libtdepim/kaddrbook.cpp +++ b/libtdepim/kaddrbook.cpp @@ -58,13 +58,13 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) { TDEABC::Addressee::List addressees = ab->findByEmail( email ); if ( addressees.count() > 0 ) { - if ( kapp->dcopClient()->isApplicationRegistered( "kaddressbook" ) ){ + if ( tdeApp->dcopClient()->isApplicationRegistered( "kaddressbook" ) ){ //make sure kaddressbook is loaded, otherwise showContactEditor //won't work as desired, see bug #87233 DCOPRef call ( "kaddressbook", "kaddressbook" ); call.send( "newInstance()" ); } else { - kapp->startServiceByDesktopName( "kaddressbook" ); + tdeApp->startServiceByDesktopName( "kaddressbook" ); } DCOPRef call( "kaddressbook", "KAddressBookIface" ); @@ -162,12 +162,12 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) { } void KAddrBookExternal::openAddressBook(TQWidget *) { - kapp->startServiceByDesktopName( "kaddressbook" ); + tdeApp->startServiceByDesktopName( "kaddressbook" ); } void KAddrBookExternal::addNewAddressee( TQWidget* ) { - kapp->startServiceByDesktopName("kaddressbook"); + tdeApp->startServiceByDesktopName("kaddressbook"); DCOPRef call("kaddressbook", "KAddressBookIface"); call.send("newContact()"); } diff --git a/libtdepim/kaddrbook.h b/libtdepim/kaddrbook.h index bd44e25a..4ec2b6fc 100644 --- a/libtdepim/kaddrbook.h +++ b/libtdepim/kaddrbook.h @@ -9,7 +9,7 @@ #include <tdeversion.h> #include <tdeabc/addressee.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace TDEABC { class AddressBook; @@ -17,7 +17,7 @@ namespace TDEABC { class TQWidget; -class KDE_EXPORT KAddrBookExternal { +class TDE_EXPORT KAddrBookExternal { public: static void addEmail( const TQString &addr, TQWidget *parent ); static void addNewAddressee( TQWidget* ); diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index 64ef02db..777565a1 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/libtdepim/kcmdesignerfields.cpp @@ -41,12 +41,12 @@ #include <tdelistview.h> #include <tdelocale.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kactivelabel.h> #include <kdirwatch.h> #include <tdefiledialog.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeio/netaccess.h> #include "kcmdesignerfields.h" @@ -91,7 +91,7 @@ class PageItem : public TQCheckListItem new TQListViewItem( this, name, allowedTypes[ it.current()->className() ], it.current()->className(), - TQWhatsThis::textFor( TQT_TQWIDGET( it.current() ) ) ); + TQWhatsThis::textFor( static_cast<TQWidget*>( it.current() ) ) ); } } @@ -129,7 +129,7 @@ class PageItem : public TQCheckListItem KCMDesignerFields::KCMDesignerFields( TQWidget *parent, const char *name ) : TDECModule( parent, name ) { - TQTimer::singleShot( 0, this, TQT_SLOT( delayedInit() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( delayedInit() ) ); TDEAboutData *about = new TDEAboutData( I18N_NOOP( "KCMDesignerfields" ), I18N_NOOP( "TQt Designer Fields Dialog" ), @@ -147,27 +147,27 @@ void KCMDesignerFields::delayedInit() initGUI(); - connect( mPageView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( updatePreview( TQListViewItem* ) ) ); - connect( mPageView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - this, TQT_SLOT( itemClicked( TQListViewItem* ) ) ); + connect( mPageView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( updatePreview( TQListViewItem* ) ) ); + connect( mPageView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + this, TQ_SLOT( itemClicked( TQListViewItem* ) ) ); - connect( mDeleteButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( deleteFile() ) ); - connect( mImportButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( importFile() ) ); - connect( mDesignerButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( startDesigner() ) ); + connect( mDeleteButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( deleteFile() ) ); + connect( mImportButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( importFile() ) ); + connect( mDesignerButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( startDesigner() ) ); load(); // Install a dirwatcher that will detect newly created or removed designer files - KDirWatch *dw = new KDirWatch( TQT_TQOBJECT(this) ); + KDirWatch *dw = new KDirWatch( this ); TDEStandardDirs::makeDir(localUiDir()); dw->addDir( localUiDir(), true ); - connect( dw, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( rebuildList() ) ); - connect( dw, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( rebuildList() ) ); - connect( dw, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( rebuildList() ) ); + connect( dw, TQ_SIGNAL( created(const TQString&) ), TQ_SLOT( rebuildList() ) ); + connect( dw, TQ_SIGNAL( deleted(const TQString&) ), TQ_SLOT( rebuildList() ) ); + connect( dw, TQ_SIGNAL( dirty(const TQString&) ), TQ_SLOT( rebuildList() ) ); } void KCMDesignerFields::deleteFile() diff --git a/libtdepim/kcmdesignerfields.h b/libtdepim/kcmdesignerfields.h index c90eff48..3d1b8524 100644 --- a/libtdepim/kcmdesignerfields.h +++ b/libtdepim/kcmdesignerfields.h @@ -23,7 +23,7 @@ #define KPIM_KCMDESIGNERFIELDS_H #include <tdecmodule.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEListView; @@ -33,7 +33,7 @@ class TQPushButton; namespace KPIM { -class KDE_EXPORT KCMDesignerFields : public TDECModule +class TDE_EXPORT KCMDesignerFields : public TDECModule { TQ_OBJECT diff --git a/libtdepim/kdateedit.cpp b/libtdepim/kdateedit.cpp index 16c5e9f8..0f50f75b 100644 --- a/libtdepim/kdateedit.cpp +++ b/libtdepim/kdateedit.cpp @@ -38,7 +38,7 @@ class DateValidator : public TQValidator { public: DateValidator( const TQStringList &keywords, TQWidget* parent, const char* name = 0 ) - : TQValidator( TQT_TQOBJECT(parent), name ), mKeywords( keywords ) + : TQValidator( parent, name ), mKeywords( keywords ) {} virtual State validate( TQString &str, int& ) const @@ -80,17 +80,17 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name ) changeItem( today, 0 ); setMinimumSize( sizeHint() ); - connect( lineEdit(), TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( lineEnterPressed() ) ); - connect( this, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotTextChanged( const TQString& ) ) ); + connect( lineEdit(), TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( lineEnterPressed() ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotTextChanged( const TQString& ) ) ); mPopup = new KDatePickerPopup( KDatePickerPopup::DatePicker | KDatePickerPopup::Words ); mPopup->hide(); mPopup->installEventFilter( this ); - connect( mPopup, TQT_SIGNAL( dateChanged( TQDate ) ), - TQT_SLOT( dateSelected( TQDate ) ) ); + connect( mPopup, TQ_SIGNAL( dateChanged( TQDate ) ), + TQ_SLOT( dateSelected( TQDate ) ) ); // handle keyword entry setupKeywords(); diff --git a/libtdepim/kdateedit.h b/libtdepim/kdateedit.h index 9475f752..41d955b2 100644 --- a/libtdepim/kdateedit.h +++ b/libtdepim/kdateedit.h @@ -28,7 +28,7 @@ #include <tqdatetime.h> #include <tqmap.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "kdatepickerpopup.h" @@ -51,7 +51,7 @@ class TQEvent; @author David Jarvie <software@astrojar.org.uk> @author Tobias Koenig <tokoe@kde.org> */ -class KDE_EXPORT KDateEdit : public TQComboBox +class TDE_EXPORT KDateEdit : public TQComboBox { TQ_OBJECT diff --git a/libtdepim/kdatepickerpopup.cpp b/libtdepim/kdatepickerpopup.cpp index d9ffe8c3..4b544b6f 100644 --- a/libtdepim/kdatepickerpopup.cpp +++ b/libtdepim/kdatepickerpopup.cpp @@ -35,10 +35,10 @@ KDatePickerPopup::KDatePickerPopup( int items, const TQDate &date, TQWidget *par mDatePicker = new KDatePicker( this ); mDatePicker->setCloseButton( false ); - connect( mDatePicker, TQT_SIGNAL( dateEntered( TQDate ) ), - TQT_SLOT( slotDateChanged( TQDate ) ) ); - connect( mDatePicker, TQT_SIGNAL( dateSelected( TQDate ) ), - TQT_SLOT( slotDateChanged( TQDate ) ) ); + connect( mDatePicker, TQ_SIGNAL( dateEntered( TQDate ) ), + TQ_SLOT( slotDateChanged( TQDate ) ) ); + connect( mDatePicker, TQ_SIGNAL( dateSelected( TQDate ) ), + TQ_SLOT( slotDateChanged( TQDate ) ) ); mDatePicker->setDate( date ); @@ -58,17 +58,17 @@ void KDatePickerPopup::buildMenu() } if ( mItems & Words ) { - insertItem( i18n("&Today"), this, TQT_SLOT( slotToday() ) ); - insertItem( i18n("To&morrow"), this, TQT_SLOT( slotTomorrow() ) ); - insertItem( i18n("Next &Week"), this, TQT_SLOT( slotNextWeek() ) ); - insertItem( i18n("Next M&onth"), this, TQT_SLOT( slotNextMonth() ) ); + insertItem( i18n("&Today"), this, TQ_SLOT( slotToday() ) ); + insertItem( i18n("To&morrow"), this, TQ_SLOT( slotTomorrow() ) ); + insertItem( i18n("Next &Week"), this, TQ_SLOT( slotNextWeek() ) ); + insertItem( i18n("Next M&onth"), this, TQ_SLOT( slotNextMonth() ) ); if ( mItems & NoDate ) insertSeparator(); } if ( mItems & NoDate ) - insertItem( i18n("No Date"), this, TQT_SLOT( slotNoDate() ) ); + insertItem( i18n("No Date"), this, TQ_SLOT( slotNoDate() ) ); } KDatePicker *KDatePickerPopup::datePicker() const diff --git a/libtdepim/kdatepickerpopup.h b/libtdepim/kdatepickerpopup.h index 9156fddc..c052c1fc 100644 --- a/libtdepim/kdatepickerpopup.h +++ b/libtdepim/kdatepickerpopup.h @@ -24,7 +24,7 @@ #include <tqdatetime.h> #include <tqpopupmenu.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <kdatepicker.h> /** @@ -42,7 +42,7 @@ @author Bram Schoenmakers <bram_s@softhome.net> */ -class KDE_EXPORT KDatePickerPopup: public TQPopupMenu +class TDE_EXPORT KDatePickerPopup: public TQPopupMenu { TQ_OBJECT diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp index 58e35858..bccbc8aa 100644 --- a/libtdepim/kfoldertree.cpp +++ b/libtdepim/kfoldertree.cpp @@ -379,9 +379,9 @@ KFolderTree::KFolderTree( TQWidget *parent, const char* name ) disableAutoSelection(); setColumnWidth( 0, 120 ); //reasonable default size - disconnect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ) ); - connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), - TQT_SLOT( slotSizeChanged( int, int, int ) ) ); + disconnect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + TQ_SLOT( slotSizeChanged( int, int, int ) ) ); } //----------------------------------------------------------------------------- diff --git a/libtdepim/kfoldertree.h b/libtdepim/kfoldertree.h index d881976d..6045e912 100644 --- a/libtdepim/kfoldertree.h +++ b/libtdepim/kfoldertree.h @@ -26,7 +26,7 @@ #include <tqdragobject.h> #include <tqcolor.h> #include <tdelistview.h> -#include <kdemacros.h> +#include <tdemacros.h> class KFolderTree; @@ -139,7 +139,7 @@ struct KPaintInfo { //========================================================================== -class KDE_EXPORT KFolderTreeItem : public TDEListViewItem +class TDE_EXPORT KFolderTreeItem : public TDEListViewItem { public: /** Protocol information */ @@ -238,7 +238,7 @@ class KDE_EXPORT KFolderTreeItem : public TDEListViewItem //========================================================================== -class KDE_EXPORT KFolderTree : public TDEListView +class TDE_EXPORT KFolderTree : public TDEListView { TQ_OBJECT diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp index 879b6156..19468ff9 100644 --- a/libtdepim/kimportdialog.cpp +++ b/libtdepim/kimportdialog.cpp @@ -43,8 +43,8 @@ #include <klineedit.h> #include <tdelocale.h> #include <kprogress.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include <tdefiledialog.h> @@ -164,15 +164,15 @@ KImportDialog::KImportDialog(TQWidget* parent) new TQLabel(i18n("File to import:"),fileBox); KURLRequester *urlRequester = new KURLRequester(fileBox); urlRequester->setFilter( "*.csv" ); - connect(urlRequester,TQT_SIGNAL(returnPressed(const TQString &)), - TQT_SLOT(setFile(const TQString &))); - connect(urlRequester,TQT_SIGNAL(urlSelected(const TQString &)), - TQT_SLOT(setFile(const TQString &))); - connect(urlRequester->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )), - TQT_SLOT(slotUrlChanged(const TQString & ))); + connect(urlRequester,TQ_SIGNAL(returnPressed(const TQString &)), + TQ_SLOT(setFile(const TQString &))); + connect(urlRequester,TQ_SIGNAL(urlSelected(const TQString &)), + TQ_SLOT(setFile(const TQString &))); + connect(urlRequester->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )), + TQ_SLOT(slotUrlChanged(const TQString & ))); mTable = new TQTable(5,5,topBox); mTable->setMinimumHeight( 150 ); - connect(mTable,TQT_SIGNAL(selectionChanged()),TQT_SLOT(tableSelected())); + connect(mTable,TQ_SIGNAL(selectionChanged()),TQ_SLOT(tableSelected())); TQHBox *separatorBox = new TQHBox( topBox ); separatorBox->setSpacing( spacingHint() ); @@ -185,8 +185,8 @@ KImportDialog::KImportDialog(TQWidget* parent) mSeparatorCombo->insertItem( i18n( "Space" ) ); mSeparatorCombo->insertItem( "=" ); mSeparatorCombo->insertItem( ";" ); - connect(mSeparatorCombo, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT( separatorClicked(int) ) ); + connect(mSeparatorCombo, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( separatorClicked(int) ) ); mSeparatorCombo->setCurrentItem( 0 ); TQHBox *rowsBox = new TQHBox( topBox ); @@ -208,34 +208,34 @@ KImportDialog::KImportDialog(TQWidget* parent) mHeaderList = new TQListView(listsBox); mHeaderList->addColumn(i18n("Header")); - connect(mHeaderList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(headerSelected(TQListViewItem*))); - connect(mHeaderList,TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(assignColumn(TQListViewItem *))); + connect(mHeaderList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(headerSelected(TQListViewItem*))); + connect(mHeaderList,TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(assignColumn(TQListViewItem *))); mFormatCombo = new KComboBox( listsBox ); mFormatCombo->setDuplicatesEnabled( false ); TQPushButton *assignButton = new TQPushButton(i18n("Assign to Selected Column"), assignBox); - connect(assignButton,TQT_SIGNAL(clicked()),TQT_SLOT(assignColumn())); + connect(assignButton,TQ_SIGNAL(clicked()),TQ_SLOT(assignColumn())); TQPushButton *removeButton = new TQPushButton(i18n("Remove Assignment From Selected Column"), assignBox); - connect(removeButton,TQT_SIGNAL(clicked()),TQT_SLOT(removeColumn())); + connect(removeButton,TQ_SIGNAL(clicked()),TQ_SLOT(removeColumn())); TQPushButton *assignTemplateButton = new TQPushButton(i18n("Assign with Template..."), assignBox); - connect(assignTemplateButton,TQT_SIGNAL(clicked()),TQT_SLOT(assignTemplate())); + connect(assignTemplateButton,TQ_SIGNAL(clicked()),TQ_SLOT(assignTemplate())); TQPushButton *saveTemplateButton = new TQPushButton(i18n("Save Current Template"), assignBox); - connect(saveTemplateButton,TQT_SIGNAL(clicked()),TQT_SLOT(saveTemplate())); + connect(saveTemplateButton,TQ_SIGNAL(clicked()),TQ_SLOT(saveTemplate())); resize(500,300); - connect(this,TQT_SIGNAL(okClicked()),TQT_SLOT(applyConverter())); - connect(this,TQT_SIGNAL(applyClicked()),TQT_SLOT(applyConverter())); + connect(this,TQ_SIGNAL(okClicked()),TQ_SLOT(applyConverter())); + connect(this,TQ_SIGNAL(applyClicked()),TQ_SLOT(applyConverter())); enableButtonOK(!urlRequester->lineEdit()->text().isEmpty()); } @@ -338,7 +338,7 @@ void KImportDialog::readFile( int rows ) { progress->setValue(progressValue++); if (progressValue % 15 == 0) // try not to constantly repaint - kapp->processEvents(); + tdeApp->processEvents(); } if (x == '\r') inputStream >> x; // eat '\r', to handle DOS/LOSEDOWS files correctly @@ -572,12 +572,12 @@ void KImportDialog::assignTemplate() TQStringList templates; // load all template files - TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) + + TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( tdeApp->name() ) + "/csv-templates/*.desktop", true, true ); for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) { - KSimpleConfig config( *it, true ); + TDESimpleConfig config( *it, true ); if ( !config.hasGroup( "csv column map" ) ) continue; @@ -597,7 +597,7 @@ void KImportDialog::assignTemplate() if ( !ok ) return; - KSimpleConfig config( fileMap[ tmp ], true ); + TDESimpleConfig config( fileMap[ tmp ], true ); config.setGroup( "General" ); uint numColumns = config.readUnsignedNumEntry( "Columns" ); int format = config.readNumEntry( "Format" ); @@ -666,7 +666,7 @@ void KImportDialog::applyConverter() mCurrentRow = i; progress->setValue(i); if (i % 5 == 0) // try to avoid constantly processing events - kapp->processEvents(); + tdeApp->processEvents(); convertRow(); } @@ -728,7 +728,7 @@ TQString KImportDialog::data( uint row, uint col ) void KImportDialog::saveTemplate() { TQString fileName = KFileDialog::getSaveFileName( - locateLocal( "data", TQString( kapp->name() ) + "/csv-templates/" ), + locateLocal( "data", TQString( tdeApp->name() ) + "/csv-templates/" ), "*.desktop", this ); if ( fileName.isEmpty() ) diff --git a/libtdepim/kincidencechooser.cpp b/libtdepim/kincidencechooser.cpp index 84fede01..f11b0360 100644 --- a/libtdepim/kincidencechooser.cpp +++ b/libtdepim/kincidencechooser.cpp @@ -61,11 +61,11 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) : topLayout->addMultiCellWidget(b_box, iii,iii,0,2); ++iii; TQPushButton* button = new TQPushButton( i18n("Take Local"), b_box ); - connect ( button, TQT_SIGNAL( clicked()), this, TQT_SLOT (takeIncidence1() ) ); + connect ( button, TQ_SIGNAL( clicked()), this, TQ_SLOT (takeIncidence1() ) ); button = new TQPushButton( i18n("Take New"), b_box ); - connect ( button, TQT_SIGNAL( clicked()), this, TQT_SLOT (takeIncidence2() ) ); + connect ( button, TQ_SIGNAL( clicked()), this, TQ_SLOT (takeIncidence2() ) ); button = new TQPushButton( i18n("Take Both"), b_box ); - connect ( button, TQT_SIGNAL( clicked()), this, TQT_SLOT (takeBoth() ) ); + connect ( button, TQ_SIGNAL( clicked()), this, TQ_SLOT (takeBoth() ) ); topLayout->setSpacing(spacingHint()); topLayout->setMargin(marginHint()); // text is not translated, because text has to be set later @@ -78,7 +78,7 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) : mMod1lab = new TQLabel ( "Set Last modified", topFrame); topLayout->addWidget(mMod1lab,iii,1); mShowDetails1 = new TQPushButton( i18n("Show Details"),topFrame ); - connect ( mShowDetails1, TQT_SIGNAL( clicked()), this, TQT_SLOT (showIncidence1() ) ); + connect ( mShowDetails1, TQ_SIGNAL( clicked()), this, TQ_SLOT (showIncidence1() ) ); topLayout->addWidget(mShowDetails1,iii,2); ++iii; @@ -91,14 +91,14 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) : mMod2lab = new TQLabel ( "Set Last modified", topFrame); topLayout->addWidget(mMod2lab,iii,1); mShowDetails2 = new TQPushButton( i18n("Show Details"), topFrame); - connect ( mShowDetails2, TQT_SIGNAL( clicked()), this, TQT_SLOT (showIncidence2() ) ); + connect ( mShowDetails2, TQ_SIGNAL( clicked()), this, TQ_SLOT (showIncidence2() ) ); topLayout->addWidget(mShowDetails2,iii,2); ++iii; // #if 0 // commented out for now, because the diff code has too many bugs mDiffBut = new TQPushButton( i18n("Show Differences"), topFrame ); - connect ( mDiffBut, TQT_SIGNAL( clicked()), this, TQT_SLOT ( showDiff() ) ); + connect ( mDiffBut, TQ_SIGNAL( clicked()), this, TQ_SLOT ( showDiff() ) ); topLayout->addMultiCellWidget(mDiffBut, iii,iii,0,2); ++iii; #else @@ -118,7 +118,7 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) : mDisplayDiff = 0; mSelIncidence = 0; button = new TQPushButton( i18n("Apply This to All Conflicts of This Sync"), topFrame ); - connect ( button, TQT_SIGNAL( clicked()), this, TQT_SLOT ( setSyncMode() ) ); + connect ( button, TQ_SIGNAL( clicked()), this, TQ_SLOT ( setSyncMode() ) ); topLayout->addMultiCellWidget(button, iii,iii,0,2); } @@ -237,7 +237,7 @@ void KIncidenceChooser::showIncidence1() } mTbL = new KDialogBase( this, "", false /*not modal*/, mInc1lab->text(), KDialogBase::Ok ); mTbL->setEscapeButton( KDialogBase::Ok ); - connect( mTbL, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( detailsDialogClosed() ) ); + connect( mTbL, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( detailsDialogClosed() ) ); TQTextBrowser* textBrowser = new TQTextBrowser( mTbL ); mTbL->setMainWidget( textBrowser ); textBrowser->setText( KCal::IncidenceFormatter::extensiveDisplayString( mInc1 ) ); @@ -249,7 +249,7 @@ void KIncidenceChooser::showIncidence1() void KIncidenceChooser::detailsDialogClosed() { - KDialogBase* dialog = static_cast<KDialogBase *>(TQT_TQWIDGET(const_cast<TQObject*>(sender()))) ; + KDialogBase* dialog = static_cast<KDialogBase *>(const_cast<TQObject*>(sender())) ; if ( dialog == mTbL ) mShowDetails1->setText( i18n( "Show details..." ) ); else @@ -293,7 +293,7 @@ void KIncidenceChooser::showIncidence2() } mTbN = new KDialogBase( this, "", false /*not modal*/, mInc2lab->text(), KDialogBase::Ok ); mTbN->setEscapeButton( KDialogBase::Ok ); - connect( mTbN, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( detailsDialogClosed() ) ); + connect( mTbN, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( detailsDialogClosed() ) ); TQTextBrowser* textBrowser = new TQTextBrowser( mTbN ); mTbN->setMainWidget( textBrowser ); textBrowser->setText( KCal::IncidenceFormatter::extensiveDisplayString( mInc2 ) ); diff --git a/libtdepim/kincidencechooser.h b/libtdepim/kincidencechooser.h index 4a2a507e..ceffc0b0 100644 --- a/libtdepim/kincidencechooser.h +++ b/libtdepim/kincidencechooser.h @@ -39,7 +39,7 @@ class TQButtonGroup; /** Dialog to change the korganizer configuration. */ -class KDE_EXPORT KIncidenceChooser : public KDialog +class TDE_EXPORT KIncidenceChooser : public KDialog { TQ_OBJECT diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp index 2616f8e2..1a6d9c1c 100644 --- a/libtdepim/komposer/core/core.cpp +++ b/libtdepim/komposer/core/core.cpp @@ -34,7 +34,7 @@ #include <kstdaction.h> #include <tdelistbox.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeshortcut.h> #include <tdelocale.h> #include <kstatusbar.h> @@ -225,10 +225,10 @@ void Core::initCore() { m_pluginManager = new PluginManager( this ); - connect( m_pluginManager, TQT_SIGNAL(pluginLoaded(Plugin*)), - TQT_SLOT(slotPluginLoaded(Plugin*)) ); - connect( m_pluginManager, TQT_SIGNAL(allPluginsLoaded()), - TQT_SLOT(slotAllPluginsLoaded()) ); + connect( m_pluginManager, TQ_SIGNAL(pluginLoaded(Plugin*)), + TQ_SLOT(slotPluginLoaded(Plugin*)) ); + connect( m_pluginManager, TQ_SIGNAL(allPluginsLoaded()), + TQ_SLOT(slotAllPluginsLoaded()) ); m_pluginManager->loadAllPlugins(); @@ -238,39 +238,39 @@ Core::initCore() void Core::initConnections() { - connect( kapp, TQT_SIGNAL(shutDown()), - TQT_SLOT(slotQuit()) ); + connect( tdeApp, TQ_SIGNAL(shutDown()), + TQ_SLOT(slotQuit()) ); } void Core::createActions() { - KStdAction::close( this, TQT_SLOT(slotClose()), actionCollection() ); + KStdAction::close( this, TQ_SLOT(slotClose()), actionCollection() ); (void) new TDEAction( i18n( "&Send" ), "mail-send", CTRL+Key_Return, - this, TQT_SLOT(slotSendNow()), actionCollection(), + this, TQ_SLOT(slotSendNow()), actionCollection(), "send_default" ); (void) new TDEAction( i18n( "&Queue" ), "queue", 0, - this, TQT_SLOT(slotSendLater()), + this, TQ_SLOT(slotSendLater()), actionCollection(), "send_alternative" ); (void) new TDEAction( i18n( "Save in &Drafts Folder" ), "document-save", 0, - this, TQT_SLOT(slotSaveDraft()), + this, TQ_SLOT(slotSaveDraft()), actionCollection(), "save_in_drafts" ); (void) new TDEAction( i18n( "&Insert File..." ), "document-open", 0, - this, TQT_SLOT(slotInsertFile()), + this, TQ_SLOT(slotInsertFile()), actionCollection(), "insert_file" ); (void) new TDEAction( i18n( "&Address Book" ), "contents",0, - this, TQT_SLOT(slotAddrBook()), + this, TQ_SLOT(slotAddrBook()), actionCollection(), "addressbook" ); (void) new TDEAction( i18n( "&New Composer" ), "mail-message-new", TDEStdAccel::shortcut( TDEStdAccel::New ), - this, TQT_SLOT(slotNewComposer()), + this, TQ_SLOT(slotNewComposer()), actionCollection(), "new_composer" ); (void) new TDEAction( i18n( "&Attach File..." ), "attach", - 0, this, TQT_SLOT(slotAttachFile()), + 0, this, TQ_SLOT(slotAttachFile()), actionCollection(), "attach_file" ); } diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp index 9a33b990..577baf15 100644 --- a/libtdepim/komposer/core/pluginmanager.cpp +++ b/libtdepim/komposer/core/pluginmanager.cpp @@ -34,8 +34,8 @@ #include <tdeparts/componentfactory.h> #include <kplugininfo.h> #include <ksettings/dispatcher.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <kurl.h> @@ -74,11 +74,11 @@ PluginManager::PluginManager( TQObject *parent ) // can remain in control when all windows are removed. // This way we can unload plugins asynchronously, which is more // robust if they are still doing processing. - kapp->ref(); + tdeApp->ref(); d->shutdownMode = Private::StartingUp; KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(), - this, TQT_SLOT( loadAllPlugins() ) ); + this, TQ_SLOT( loadAllPlugins() ) ); d->plugins = KPluginInfo::fromServices( TDETrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ), @@ -168,7 +168,7 @@ PluginManager::shutdown() } } - TQTimer::singleShot( 3000, this, TQT_SLOT(slotShutdownTimeout()) ); + TQTimer::singleShot( 3000, this, TQ_SLOT(slotShutdownTimeout()) ); } void @@ -216,7 +216,7 @@ PluginManager::slotShutdownDone() { d->shutdownMode = Private::DoneShutdown; - kapp->deref(); + tdeApp->deref(); } void @@ -256,7 +256,7 @@ PluginManager::loadAllPlugins() } // Schedule the plugins to load - TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) ); } void PluginManager::slotLoadNextPlugin() @@ -278,7 +278,7 @@ void PluginManager::slotLoadNextPlugin() // allPluginsLoaded() signal's handling. This has the added benefit that // the signal is delayed one event loop, so the accounts are more likely // to be instantiated. - TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) ); } Plugin* @@ -289,7 +289,7 @@ PluginManager::loadPlugin( const TQString &pluginId, return loadPluginInternal( pluginId ); } else { d->pluginsToLoad.push( pluginId ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) ); return 0; } } @@ -317,10 +317,10 @@ PluginManager::loadPluginInternal( const TQString &pluginId ) d->loadedPlugins.insert( info, plugin ); info->setPluginEnabled( true ); - connect( plugin, TQT_SIGNAL(destroyed(TQObject*)), - this, TQT_SLOT(slotPluginDestroyed(TQObject*)) ); - connect( plugin, TQT_SIGNAL(readyForUnload()), - this, TQT_SLOT(slotPluginReadyForUnload()) ); + connect( plugin, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(slotPluginDestroyed(TQObject*)) ); + connect( plugin, TQ_SIGNAL(readyForUnload()), + this, TQ_SLOT(slotPluginReadyForUnload()) ); kdDebug() << k_funcinfo << "Successfully loaded plugin '" << pluginId << "'" << endl; @@ -396,7 +396,7 @@ PluginManager::slotPluginDestroyed( TQObject *plugin ) { // Use a timer to make sure any pending deleteLater() calls have // been handled first - TQTimer::singleShot( 0, this, TQT_SLOT(slotShutdownDone()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotShutdownDone()) ); } } diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp index abacd0eb..c58f2b49 100644 --- a/libtdepim/komposer/core/prefsmodule.cpp +++ b/libtdepim/komposer/core/prefsmodule.cpp @@ -31,11 +31,11 @@ #include <tqlabel.h> #include <tqbuttongroup.h> -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { - KDE_EXPORT TDECModule *create_komposerconfig( TQWidget *parent, const char * ) { + TDE_EXPORT TDECModule *create_komposerconfig( TQWidget *parent, const char * ) { return new Komposer::PrefsModule( parent, "komposerprefs" ); } } @@ -81,8 +81,8 @@ EditorSelection::EditorSelection( const TQString &text, TQString &reference, m_editorsCombo = new KComboBox( m_box ); boxLayout->addWidget( m_editorsCombo ); - connect( m_editorsCombo, TQT_SIGNAL(activated(constTQString&)), - TQT_SLOT(slotActivated(const TQString&)) ); + connect( m_editorsCombo, TQ_SIGNAL(activated(constTQString&)), + TQ_SLOT(slotActivated(const TQString&)) ); } EditorSelection::~EditorSelection() diff --git a/libtdepim/komposer/core/tests/testmanager.cpp b/libtdepim/komposer/core/tests/testmanager.cpp index a690c67c..40fe5181 100644 --- a/libtdepim/komposer/core/tests/testmanager.cpp +++ b/libtdepim/komposer/core/tests/testmanager.cpp @@ -15,10 +15,10 @@ TestManager::TestManager( TQObject *parent ) : TQObject( parent ) { m_manager = new PluginManager( this ); - connect( m_manager, TQT_SIGNAL(pluginLoaded(Plugin*)), - TQT_SLOT(slotPluginLoaded(Plugin*)) ); - connect( m_manager, TQT_SIGNAL(allPluginsLoaded()), - TQT_SLOT(slotAllPluginsLoaded()) ); + connect( m_manager, TQ_SIGNAL(pluginLoaded(Plugin*)), + TQ_SLOT(slotPluginLoaded(Plugin*)) ); + connect( m_manager, TQ_SIGNAL(allPluginsLoaded()), + TQ_SLOT(slotAllPluginsLoaded()) ); m_manager->loadAllPlugins(); TQValueList<KPluginInfo*> plugins = m_manager->availablePlugins(); diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp index fe059b9e..da46e550 100644 --- a/libtdepim/komposer/plugins/default/defaulteditor.cpp +++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp @@ -30,7 +30,7 @@ #include <tdeaction.h> #include <kcolordialog.h> #include <tdefiledialog.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <kstdaction.h> #include <kprinter.h> @@ -98,71 +98,71 @@ DefaultEditor::createActions( TDEActionCollection *ac ) // // File Actions // - (void) KStdAction::open( this, TQT_SLOT(open()), ac ); - (void) KStdAction::openRecent( this, TQT_SLOT(openURL(const KURL &)), ac ); - (void) KStdAction::save( this, TQT_SLOT(save()), ac ); - (void) KStdAction::saveAs( this, TQT_SLOT(saveAs()), ac ); + (void) KStdAction::open( this, TQ_SLOT(open()), ac ); + (void) KStdAction::openRecent( this, TQ_SLOT(openURL(const KURL &)), ac ); + (void) KStdAction::save( this, TQ_SLOT(save()), ac ); + (void) KStdAction::saveAs( this, TQ_SLOT(saveAs()), ac ); // // Edit Actions // - TDEAction *actionUndo = KStdAction::undo( m_textEdit, TQT_SLOT(undo()), ac ); + TDEAction *actionUndo = KStdAction::undo( m_textEdit, TQ_SLOT(undo()), ac ); actionUndo->setEnabled( false ); - connect( m_textEdit, TQT_SIGNAL(undoAvailable(bool)), - actionUndo, TQT_SLOT(setEnabled(bool)) ); + connect( m_textEdit, TQ_SIGNAL(undoAvailable(bool)), + actionUndo, TQ_SLOT(setEnabled(bool)) ); - TDEAction *actionRedo = KStdAction::redo( m_textEdit, TQT_SLOT(redo()), ac ); + TDEAction *actionRedo = KStdAction::redo( m_textEdit, TQ_SLOT(redo()), ac ); actionRedo->setEnabled( false ); - connect( m_textEdit, TQT_SIGNAL(redoAvailable(bool)), - actionRedo, TQT_SLOT(setEnabled(bool)) ); + connect( m_textEdit, TQ_SIGNAL(redoAvailable(bool)), + actionRedo, TQ_SLOT(setEnabled(bool)) ); - TDEAction *action_cut = KStdAction::cut( m_textEdit, TQT_SLOT(cut()), ac ); + TDEAction *action_cut = KStdAction::cut( m_textEdit, TQ_SLOT(cut()), ac ); action_cut->setEnabled( false ); - connect( m_textEdit, TQT_SIGNAL(copyAvailable(bool)), - action_cut, TQT_SLOT(setEnabled(bool)) ); + connect( m_textEdit, TQ_SIGNAL(copyAvailable(bool)), + action_cut, TQ_SLOT(setEnabled(bool)) ); - TDEAction *action_copy = KStdAction::copy( m_textEdit, TQT_SLOT(copy()), ac ); + TDEAction *action_copy = KStdAction::copy( m_textEdit, TQ_SLOT(copy()), ac ); action_copy->setEnabled( false ); - connect( m_textEdit, TQT_SIGNAL(copyAvailable(bool)), - action_copy, TQT_SLOT(setEnabled(bool)) ); + connect( m_textEdit, TQ_SIGNAL(copyAvailable(bool)), + action_copy, TQ_SLOT(setEnabled(bool)) ); - (void) KStdAction::print( this, TQT_SLOT(print()), ac ); + (void) KStdAction::print( this, TQ_SLOT(print()), ac ); - (void) KStdAction::paste( m_textEdit, TQT_SLOT(paste()), ac ); + (void) KStdAction::paste( m_textEdit, TQ_SLOT(paste()), ac ); (void) new TDEAction( i18n( "C&lear" ), 0, - m_textEdit, TQT_SLOT(removeSelectedText()), + m_textEdit, TQ_SLOT(removeSelectedText()), ac, "edit_clear" ); - (void) KStdAction::selectAll( m_textEdit, TQT_SLOT(selectAll()), ac ); + (void) KStdAction::selectAll( m_textEdit, TQ_SLOT(selectAll()), ac ); // // View Actions // - (void) KStdAction::zoomIn( m_textEdit, TQT_SLOT(zoomIn()), ac ); - (void) KStdAction::zoomOut( m_textEdit, TQT_SLOT(zoomOut()), ac ); + (void) KStdAction::zoomIn( m_textEdit, TQ_SLOT(zoomIn()), ac ); + (void) KStdAction::zoomOut( m_textEdit, TQ_SLOT(zoomOut()), ac ); // // Character Formatting // m_actionBold = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B, ac, "format_bold" ); - connect( m_actionBold, TQT_SIGNAL(toggled(bool)), - m_textEdit, TQT_SLOT(setBold(bool)) ); + connect( m_actionBold, TQ_SIGNAL(toggled(bool)), + m_textEdit, TQ_SLOT(setBold(bool)) ); m_actionItalic = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I, ac, "format_italic" ); - connect( m_actionItalic, TQT_SIGNAL(toggled(bool)), - m_textEdit, TQT_SLOT(setItalic(bool) )); + connect( m_actionItalic, TQ_SIGNAL(toggled(bool)), + m_textEdit, TQ_SLOT(setItalic(bool) )); m_actionUnderline = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U, ac, "format_underline" ); - connect( m_actionUnderline, TQT_SIGNAL(toggled(bool)), - m_textEdit, TQT_SLOT(setUnderline(bool)) ); + connect( m_actionUnderline, TQ_SIGNAL(toggled(bool)), + m_textEdit, TQ_SLOT(setUnderline(bool)) ); (void) new TDEAction( i18n("Text &Color..."), "colorpicker", 0, - this, TQT_SLOT(formatColor()), + this, TQ_SLOT(formatColor()), ac, "format_color" ); // @@ -170,37 +170,37 @@ DefaultEditor::createActions( TDEActionCollection *ac ) // m_actionFont = new TDEFontAction( i18n("&Font"), 0, ac, "format_font" ); - connect( m_actionFont, TQT_SIGNAL(activated(const TQString &)), - m_textEdit, TQT_SLOT(setFamily(const TQString &)) ); + connect( m_actionFont, TQ_SIGNAL(activated(const TQString &)), + m_textEdit, TQ_SLOT(setFamily(const TQString &)) ); m_actionFontSize = new TDEFontSizeAction( i18n("Font &Size"), 0, ac, "format_font_size" ); - connect( m_actionFontSize, TQT_SIGNAL(fontSizeChanged(int)), - m_textEdit, TQT_SLOT(setPointSize(int)) ); + connect( m_actionFontSize, TQ_SIGNAL(fontSizeChanged(int)), + m_textEdit, TQ_SLOT(setPointSize(int)) ); // // Alignment // m_actionAlignLeft = new TDEToggleAction( i18n("Align &Left"), "format-text-direction-ltr", 0, ac, "format_align_left" ); - connect( m_actionAlignLeft, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setAlignLeft(bool)) ); + connect( m_actionAlignLeft, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setAlignLeft(bool)) ); m_actionAlignCenter = new TDEToggleAction( i18n("Align &Center"), "text_center", 0, ac, "format_align_center" ); - connect( m_actionAlignCenter, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setAlignCenter(bool)) ); + connect( m_actionAlignCenter, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setAlignCenter(bool)) ); m_actionAlignRight = new TDEToggleAction( i18n("Align &Right"), "format-text-direction-rtl", 0, ac, "format_align_right" ); - connect( m_actionAlignRight, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setAlignRight(bool)) ); + connect( m_actionAlignRight, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setAlignRight(bool)) ); m_actionAlignJustify = new TDEToggleAction( i18n("&Justify"), "text_block", 0, ac, "format_align_justify" ); - connect( m_actionAlignJustify, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setAlignJustify(bool)) ); + connect( m_actionAlignJustify, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setAlignJustify(bool)) ); m_actionAlignLeft->setExclusiveGroup( "alignment" ); m_actionAlignCenter->setExclusiveGroup( "alignment" ); @@ -210,19 +210,19 @@ DefaultEditor::createActions( TDEActionCollection *ac ) // // Tools // - (void) KStdAction::spelling( this, TQT_SLOT(checkSpelling()), ac ); + (void) KStdAction::spelling( this, TQ_SLOT(checkSpelling()), ac ); // // Setup enable/disable // updateActions(); - connect( m_textEdit, TQT_SIGNAL(currentFontChanged(const TQFont &)), - this, TQT_SLOT( updateFont() ) ); - connect( m_textEdit, TQT_SIGNAL(currentFontChanged(const TQFont &)), - this, TQT_SLOT(updateCharFmt()) ); - connect( m_textEdit, TQT_SIGNAL(cursorPositionChanged(int, int)), - this, TQT_SLOT(updateAligment()) ); + connect( m_textEdit, TQ_SIGNAL(currentFontChanged(const TQFont &)), + this, TQ_SLOT( updateFont() ) ); + connect( m_textEdit, TQ_SIGNAL(currentFontChanged(const TQFont &)), + this, TQ_SLOT(updateCharFmt()) ); + connect( m_textEdit, TQ_SIGNAL(cursorPositionChanged(int, int)), + this, TQ_SLOT(updateAligment()) ); } void diff --git a/libtdepim/komposer/test/test.cpp b/libtdepim/komposer/test/test.cpp index b5dfc63a..acbc9972 100644 --- a/libtdepim/komposer/test/test.cpp +++ b/libtdepim/komposer/test/test.cpp @@ -25,7 +25,7 @@ #include <tdecmdlineargs.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tqlabel.h> @@ -41,7 +41,7 @@ int main(int argc, char **argv) about.addAuthor( "Zack Rusin", 0, "zack@kde.org" ); TDECmdLineArgs::init( argc, argv, &about ); - KUniqueApplication app; + TDEUniqueApplication app; // see if we are starting with session management if ( app.isRestored() ) diff --git a/libtdepim/kpimprefs.cpp b/libtdepim/kpimprefs.cpp index d58ca447..7d7afb96 100644 --- a/libtdepim/kpimprefs.cpp +++ b/libtdepim/kpimprefs.cpp @@ -27,7 +27,7 @@ #include <tqstring.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeconfig.h> #include <tdelocale.h> diff --git a/libtdepim/kpimprefs.h b/libtdepim/kpimprefs.h index b67d2491..fcd39254 100644 --- a/libtdepim/kpimprefs.h +++ b/libtdepim/kpimprefs.h @@ -24,11 +24,11 @@ #include <tqstringlist.h> #include <tdeconfigskeleton.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQString; -class KDE_EXPORT KPimPrefs : public TDEConfigSkeleton +class TDE_EXPORT KPimPrefs : public TDEConfigSkeleton { public: KPimPrefs( const TQString &name = TQString() ); diff --git a/libtdepim/kpimurlrequesterdlg.h b/libtdepim/kpimurlrequesterdlg.h index 8679923d..cf504071 100644 --- a/libtdepim/kpimurlrequesterdlg.h +++ b/libtdepim/kpimurlrequesterdlg.h @@ -20,13 +20,13 @@ #ifndef KPIMURLREQUESTDLG_H_INCLUDED #define KPIMURLREQUESTDLG_H_INCLUDED -#include <kdemacros.h> +#include <tdemacros.h> #include <kurl.h> #include <tqstring.h> class TQWidget; -class KDE_EXPORT KPimURLRequesterDlg +class TDE_EXPORT KPimURLRequesterDlg { public: /** diff --git a/libtdepim/kpixmapregionselectordialog.h b/libtdepim/kpixmapregionselectordialog.h index 2f77ab89..220a00b8 100644 --- a/libtdepim/kpixmapregionselectordialog.h +++ b/libtdepim/kpixmapregionselectordialog.h @@ -25,7 +25,7 @@ #include <kdialogbase.h> #include <libtdepim/kpixmapregionselectorwidget.h> #include <tqimage.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KPIM { @@ -43,7 +43,7 @@ namespace KPIM { * @author Antonio Larrosa <larrosa@kde.org> * @since 3.4 */ -class KDE_EXPORT KPixmapRegionSelectorDialog : public KDialogBase +class TDE_EXPORT KPixmapRegionSelectorDialog : public KDialogBase { public: /** diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp index c83003a5..6c9e09a0 100644 --- a/libtdepim/kpixmapregionselectorwidget.cpp +++ b/libtdepim/kpixmapregionselectorwidget.cpp @@ -144,13 +144,13 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu() popup->insertTitle(i18n("Image Operations")); TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right", - 0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()), - TQT_TQOBJECT(popup), "rotateclockwise"); + 0, this, TQ_SLOT(rotateClockwise()), + popup, "rotateclockwise"); action->plug(popup); action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left", - 0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()), - TQT_TQOBJECT(popup), "rotatecounterclockwise"); + 0, this, TQ_SLOT(rotateCounterclockwise()), + popup, "rotatecounterclockwise"); action->plug(popup); /* @@ -223,7 +223,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) TDEPopupMenu *popup = createPopupMenu( ); popup->exec( mev->globalPos() ); delete popup; - return TRUE; + return true; }; TQCursor cursor; @@ -242,7 +242,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) m_tempFirstClick=mev->pos(); - return TRUE; + return true; } if ( ev->type() == TQEvent::MouseMove ) @@ -281,7 +281,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) m_selectedRegion.moveBy(0,m_originalPixmap.height()-m_selectedRegion.height()-m_selectedRegion.y()); mouseOutside=true; } - if (mouseOutside) { updatePixmap(); return TRUE; }; + if (mouseOutside) { updatePixmap(); return true; }; m_selectedRegion.moveBy( mev->x()-m_tempFirstClick.x(), mev->y()-m_tempFirstClick.y() ); @@ -300,7 +300,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) m_tempFirstClick=mev->pos(); updatePixmap(); } - return TRUE; + return true; } if ( ev->type() == TQEvent::MouseButtonRelease ) @@ -313,11 +313,11 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) m_state=None; TQApplication::restoreOverrideCursor(); - return TRUE; + return true; } TQWidget::eventFilter(obj, ev); - return FALSE; + return false; } TQRect KPixmapRegionSelectorWidget::calcSelectionRectangle( const TQPoint & startPoint, const TQPoint & _endPoint ) diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp index 6c313a98..b910dc33 100644 --- a/libtdepim/kprefsdialog.cpp +++ b/libtdepim/kprefsdialog.cpp @@ -103,7 +103,7 @@ KPrefsWidBool::KPrefsWidBool( TDEConfigSkeleton::ItemBool *item, TQWidget *paren : mItem( item ) { mCheck = new TQCheckBox( item->label(), parent); - connect( mCheck, TQT_SIGNAL( clicked() ), TQT_SIGNAL( changed() ) ); + connect( mCheck, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); if ( !item->whatsThis().isNull() ) { TQWhatsThis::add( mCheck, item->whatsThis() ); } @@ -144,7 +144,7 @@ KPrefsWidInt::KPrefsWidInt( TDEConfigSkeleton::ItemInt *item, if ( !item->maxValue().isNull() ) { mSpin->setMaxValue( item->maxValue().toInt() ); } - connect( mSpin, TQT_SIGNAL( valueChanged( int ) ), TQT_SIGNAL( changed() ) ); + connect( mSpin, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( changed() ) ); mLabel->setBuddy( mSpin ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isEmpty() ) { @@ -187,7 +187,7 @@ KPrefsWidColor::KPrefsWidColor( TDEConfigSkeleton::ItemColor *item, : mItem( item ) { mButton = new KColorButton( parent ); - connect( mButton, TQT_SIGNAL( changed( const TQColor & ) ), TQT_SIGNAL( changed() ) ); + connect( mButton, TQ_SIGNAL( changed( const TQColor & ) ), TQ_SIGNAL( changed() ) ); mLabel = new TQLabel( mButton, mItem->label()+':', parent ); mLabel->setBuddy( mButton ); TQString whatsThis = mItem->whatsThis(); @@ -232,7 +232,7 @@ KPrefsWidFont::KPrefsWidFont( TDEConfigSkeleton::ItemFont *item, mPreview->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); mButton = new TQPushButton( i18n("Choose..."), parent ); - connect( mButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectFont() ) ); + connect( mButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectFont() ) ); TQString whatsThis = mItem->whatsThis(); if (!whatsThis.isNull()) { TQWhatsThis::add(mPreview, whatsThis); @@ -287,7 +287,7 @@ KPrefsWidTime::KPrefsWidTime( TDEConfigSkeleton::ItemDateTime *item, mLabel = new TQLabel( mItem->label()+':', parent ); mTimeEdit = new KTimeEdit( parent ); mLabel->setBuddy( mTimeEdit ); - connect( mTimeEdit, TQT_SIGNAL( timeChanged( TQTime ) ), TQT_SIGNAL( changed() ) ); + connect( mTimeEdit, TQ_SIGNAL( timeChanged( TQTime ) ), TQ_SIGNAL( changed() ) ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isNull() ) { TQWhatsThis::add( mTimeEdit, whatsThis ); @@ -330,7 +330,7 @@ KPrefsWidDuration::KPrefsWidDuration( TDEConfigSkeleton::ItemDateTime *item, mTimeEdit->setDisplay( TQTimeEdit::Hours | TQTimeEdit::Minutes ); mTimeEdit->setRange( TQTime( 0, 1 ), TQTime( 24, 0 ) ); // [1min, 24hr] connect( mTimeEdit, - TQT_SIGNAL( valueChanged( const TQTime & ) ), TQT_SIGNAL( changed() ) ); + TQ_SIGNAL( valueChanged( const TQTime & ) ), TQ_SIGNAL( changed() ) ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isNull() ) { TQWhatsThis::add( mTimeEdit, whatsThis ); @@ -367,7 +367,7 @@ KPrefsWidDate::KPrefsWidDate( TDEConfigSkeleton::ItemDateTime *item, mLabel = new TQLabel( mItem->label()+':', parent ); mDateEdit = new KDateEdit( parent ); mLabel->setBuddy( mDateEdit ); - connect( mDateEdit, TQT_SIGNAL( dateChanged( const TQDate& ) ), TQT_SIGNAL( changed() ) ); + connect( mDateEdit, TQ_SIGNAL( dateChanged( const TQDate& ) ), TQ_SIGNAL( changed() ) ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isNull() ) { TQWhatsThis::add( mDateEdit, whatsThis ); @@ -402,7 +402,7 @@ KPrefsWidRadios::KPrefsWidRadios( TDEConfigSkeleton::ItemEnum *item, : mItem( item ) { mBox = new TQButtonGroup( 1, TQt::Horizontal, mItem->label(), parent ); - connect( mBox, TQT_SIGNAL( clicked( int ) ), TQT_SIGNAL( changed() ) ); + connect( mBox, TQ_SIGNAL( clicked( int ) ), TQ_SIGNAL( changed() ) ); } KPrefsWidRadios::~KPrefsWidRadios() @@ -446,7 +446,7 @@ KPrefsWidCombo::KPrefsWidCombo( TDEConfigSkeleton::ItemEnum *item, TQHBox *hbox = new TQHBox(parent); new TQLabel( mItem->label(), hbox ); mCombo = new TQComboBox( hbox ); - connect( mCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) ); + connect( mCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( changed() ) ); } KPrefsWidCombo::~KPrefsWidCombo() @@ -483,8 +483,8 @@ KPrefsWidString::KPrefsWidString( TDEConfigSkeleton::ItemString *item, mLabel = new TQLabel( mItem->label()+':', parent ); mEdit = new TQLineEdit( parent ); mLabel->setBuddy( mEdit ); - connect( mEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SIGNAL( changed() ) ); + connect( mEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SIGNAL( changed() ) ); mEdit->setEchoMode( echomode ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isNull() ) { @@ -534,8 +534,8 @@ KPrefsWidPath::KPrefsWidPath( TDEConfigSkeleton::ItemPath *item, TQWidget *paren mLabel->setBuddy( mURLRequester ); mURLRequester->setMode( mode ); mURLRequester->setFilter( filter ); - connect( mURLRequester, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SIGNAL( changed() ) ); + connect( mURLRequester, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SIGNAL( changed() ) ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isNull() ) { TQWhatsThis::add( mURLRequester, whatsThis ); @@ -742,8 +742,8 @@ KPrefsDialog::KPrefsDialog( TDEConfigSkeleton *prefs, TQWidget *parent, char *na // TODO: This seems to cause a crash on exit. Investigate later. // mPrefsWids.setAutoDelete(true); -// connect(this,TQT_SIGNAL(defaultClicked()),TQT_SLOT(setDefaults())); - connect(this,TQT_SIGNAL(cancelClicked()),TQT_SLOT(reject())); +// connect(this,TQ_SIGNAL(defaultClicked()),TQ_SLOT(setDefaults())); + connect(this,TQ_SIGNAL(cancelClicked()),TQ_SLOT(reject())); } KPrefsDialog::~KPrefsDialog() @@ -869,7 +869,7 @@ void KPrefsModule::addWid( KPrefsWid *wid ) { KPrefsWidManager::addWid( wid ); - connect( wid, TQT_SIGNAL( changed() ), TQT_SLOT( slotWidChanged() ) ); + connect( wid, TQ_SIGNAL( changed() ), TQ_SLOT( slotWidChanged() ) ); } void KPrefsModule::slotWidChanged() diff --git a/libtdepim/kprefsdialog.h b/libtdepim/kprefsdialog.h index 080d592e..ff85b698 100644 --- a/libtdepim/kprefsdialog.h +++ b/libtdepim/kprefsdialog.h @@ -32,7 +32,7 @@ #include <tdecmodule.h> #include <tdeconfigskeleton.h> #include <tdefile.h> -#include <kdemacros.h> +#include <tdemacros.h> class KColorButton; @@ -55,7 +55,7 @@ class KURLRequester; KPrefsDialog. The control element consists of a set of widgets for handling a certain type of configuration information. */ -class KDE_EXPORT KPrefsWid : public TQObject +class TDE_EXPORT KPrefsWid : public TQObject { TQ_OBJECT @@ -89,7 +89,7 @@ class KDE_EXPORT KPrefsWid : public TQObject This class provides a control element for configuring bool values. It is meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidBool : public KPrefsWid +class TDE_EXPORT KPrefsWidBool : public KPrefsWid { public: /** @@ -123,7 +123,7 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidInt : public KPrefsWid +class TDE_EXPORT KPrefsWidInt : public KPrefsWid { public: /** @@ -164,7 +164,7 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidTime : public KPrefsWid +class TDE_EXPORT KPrefsWidTime : public KPrefsWid { public: /** @@ -201,7 +201,7 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidDuration : public KPrefsWid +class TDE_EXPORT KPrefsWidDuration : public KPrefsWid { public: /** @@ -239,7 +239,7 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidDate : public KPrefsWid +class TDE_EXPORT KPrefsWidDate : public KPrefsWid { public: /** @@ -276,7 +276,7 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidColor : public KPrefsWid +class TDE_EXPORT KPrefsWidColor : public KPrefsWid { TQ_OBJECT @@ -319,7 +319,7 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid This class provides a control element for configuring font values. It is meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidFont : public KPrefsWid +class TDE_EXPORT KPrefsWidFont : public KPrefsWid { TQ_OBJECT @@ -377,7 +377,7 @@ class KDE_EXPORT KPrefsWidFont : public KPrefsWid the radio button. The position of the button is defined by the sequence of @ref addRadio() calls, starting with 0. */ -class KDE_EXPORT KPrefsWidRadios : public KPrefsWid +class TDE_EXPORT KPrefsWidRadios : public KPrefsWid { public: /** @@ -425,7 +425,7 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid The setting is interpreted as an int value, corresponding to the index in the combo box. */ -class KDE_EXPORT KPrefsWidCombo : public KPrefsWid +class TDE_EXPORT KPrefsWidCombo : public KPrefsWid { public: /** @@ -458,7 +458,7 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidString : public KPrefsWid +class TDE_EXPORT KPrefsWidString : public KPrefsWid { public: /** @@ -505,7 +505,7 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidPath : public KPrefsWid +class TDE_EXPORT KPrefsWidPath : public KPrefsWid { public: /** @@ -554,7 +554,7 @@ class KDE_EXPORT KPrefsWidPath : public KPrefsWid transparent way. The user has to add the widgets by the corresponding addWid functions and KPrefsWidManager handles the rest automatically. */ -class KDE_EXPORT KPrefsWidManager +class TDE_EXPORT KPrefsWidManager { public: /** @@ -718,7 +718,7 @@ class KDE_EXPORT KPrefsWidManager default values is handled automatically. Custom widgets have to be handled in the functions @ref usrReadConfig() and @ref usrWriteConfig(). */ -class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager +class TDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager { TQ_OBJECT @@ -772,7 +772,7 @@ class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager }; -class KDE_EXPORT KPrefsModule : public TDECModule, public KPrefsWidManager +class TDE_EXPORT KPrefsModule : public TDECModule, public KPrefsWidManager { TQ_OBJECT diff --git a/libtdepim/kregexp3.h b/libtdepim/kregexp3.h index 909e6bfa..85c94d77 100644 --- a/libtdepim/kregexp3.h +++ b/libtdepim/kregexp3.h @@ -34,7 +34,7 @@ #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> /** @short A TQRegExp (TQt3.x) with a replace() method. @@ -76,14 +76,14 @@ @see TQRegExp */ -class KDE_EXPORT KRegExp3 : public TQRegExp +class TDE_EXPORT KRegExp3 : public TQRegExp { public: KRegExp3() : TQRegExp() {} KRegExp3( const TQString & pattern, - bool caseSensitive = TRUE, - bool wildcard = FALSE ) + bool caseSensitive = true, + bool wildcard = false ) : TQRegExp( pattern, caseSensitive, wildcard ) {} KRegExp3( const TQRegExp & rx ) : TQRegExp( rx ) {} @@ -99,13 +99,13 @@ public: @param start Start position for the search. If @p start is negative, starts @p -(start) positions from the end of @p str. - @param global If @p TRUE, requests to replace all occurrences - of the regexp with @p replacementStr; if @p FALSE, + @param global If @p true, requests to replace all occurrences + of the regexp with @p replacementStr; if @p false, only the first occurrence will be replaced. Equivalent to the /g switch to perl's s/// operator. @return The modified string. */ TQString replace( const TQString & str, const TQString & replacementStr, - int start=0, bool global=TRUE ); + int start=0, bool global=true ); }; diff --git a/libtdepim/kresourceprefs.h b/libtdepim/kresourceprefs.h index 398490a1..46ac397e 100644 --- a/libtdepim/kresourceprefs.h +++ b/libtdepim/kresourceprefs.h @@ -23,7 +23,7 @@ #define KRESOURCEPREFS_H #include <tdeconfigskeleton.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQString; @@ -35,7 +35,7 @@ class TQString; The prefix should be an unique identifier to avoid name clashes and the method has to be called before readConfig(), otherwise the wrong entries are read. */ -class KDE_EXPORT KResourcePrefs : public TDEConfigSkeleton +class TDE_EXPORT KResourcePrefs : public TDEConfigSkeleton { public: KResourcePrefs( const TQString &name = TQString() ); diff --git a/libtdepim/krsqueezedtextlabel.h b/libtdepim/krsqueezedtextlabel.h index 518493c1..35216b85 100644 --- a/libtdepim/krsqueezedtextlabel.h +++ b/libtdepim/krsqueezedtextlabel.h @@ -22,7 +22,7 @@ #define KRSQUEEZEDTEXTLABEL_H #include <tqlabel.h> -#include <kdemacros.h> +#include <tdemacros.h> /** * @short A replacement for TQLabel that squeezes its text @@ -38,7 +38,7 @@ /* * TQLabel */ -class KDE_EXPORT KRSqueezedTextLabel : public TQLabel { +class TDE_EXPORT KRSqueezedTextLabel : public TQLabel { TQ_OBJECT diff --git a/libtdepim/kscoring.cpp b/libtdepim/kscoring.cpp index 0213f082..62f1a21a 100644 --- a/libtdepim/kscoring.cpp +++ b/libtdepim/kscoring.cpp @@ -28,7 +28,7 @@ #include <tqtextview.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <kinputdialog.h> @@ -84,7 +84,7 @@ NotifyDialog::NotifyDialog(TQWidget* p) TQCheckBox *check = new TQCheckBox(i18n("Do not show this message again"),f); check->setChecked(true); topL->addWidget(check); - connect(check,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowAgainToggled(bool))); + connect(check,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotShowAgainToggled(bool))); } void NotifyDialog::slotShowAgainToggled(bool flag) diff --git a/libtdepim/kscoring.h b/libtdepim/kscoring.h index 07ddb178..deb48646 100644 --- a/libtdepim/kscoring.h +++ b/libtdepim/kscoring.h @@ -38,7 +38,7 @@ #include <klineedit.h> #include <knuminput.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQDomNode; class TQDomDocument; @@ -55,13 +55,13 @@ class TQLabel; */ //---------------------------------------------------------------------------- -class KDE_EXPORT ScorableGroup +class TDE_EXPORT ScorableGroup { public: virtual ~ScorableGroup(); }; -class KDE_EXPORT ScorableArticle +class TDE_EXPORT ScorableArticle { public: virtual ~ScorableArticle(); @@ -81,7 +81,7 @@ public: /** Base class for other Action classes. */ -class KDE_EXPORT ActionBase { +class TDE_EXPORT ActionBase { public: ActionBase(); virtual ~ActionBase(); @@ -100,7 +100,7 @@ class KDE_EXPORT ActionBase { enum ActionTypes { SETSCORE, NOTIFY, COLOR, MARKASREAD }; }; -class KDE_EXPORT ActionColor : public ActionBase { +class TDE_EXPORT ActionColor : public ActionBase { public: ActionColor(const TQColor&); ActionColor(const TQString&); @@ -118,7 +118,7 @@ private: TQColor color; }; -class KDE_EXPORT ActionSetScore : public ActionBase { +class TDE_EXPORT ActionSetScore : public ActionBase { public: ActionSetScore(short); ActionSetScore(const ActionSetScore&); @@ -136,7 +136,7 @@ class KDE_EXPORT ActionSetScore : public ActionBase { short val; }; -class KDE_EXPORT ActionNotify : public ActionBase { +class TDE_EXPORT ActionNotify : public ActionBase { public: ActionNotify(const TQString&); ActionNotify(const ActionNotify&); @@ -151,7 +151,7 @@ class KDE_EXPORT ActionNotify : public ActionBase { TQString note; }; -class KDE_EXPORT ActionMarkAsRead : public ActionBase { +class TDE_EXPORT ActionMarkAsRead : public ActionBase { public: ActionMarkAsRead(); ActionMarkAsRead( const ActionMarkAsRead& ); @@ -162,7 +162,7 @@ class KDE_EXPORT ActionMarkAsRead : public ActionBase { virtual ActionMarkAsRead* clone() const; }; -class KDE_EXPORT NotifyCollection +class TDE_EXPORT NotifyCollection { public: NotifyCollection(); @@ -182,7 +182,7 @@ private: //---------------------------------------------------------------------------- -class KDE_EXPORT KScoringExpression +class TDE_EXPORT KScoringExpression { friend class KScoringRule; public: @@ -217,7 +217,7 @@ class KDE_EXPORT KScoringExpression }; //---------------------------------------------------------------------------- -class KDE_EXPORT KScoringRule +class TDE_EXPORT KScoringRule { friend class KScoringManager; public: @@ -280,7 +280,7 @@ private: With the help of this class its very easy for the KScoringManager to temporary drop lists of rules and restore them afterwards */ -class KDE_EXPORT RuleStack +class TDE_EXPORT RuleStack { public: RuleStack(); @@ -300,7 +300,7 @@ private: //---------------------------------------------------------------------------- // Manages the score rules. -class KDE_EXPORT KScoringManager : public TQObject +class TDE_EXPORT KScoringManager : public TQObject { TQ_OBJECT @@ -407,7 +407,7 @@ class KDE_EXPORT KScoringManager : public TQObject //---------------------------------------------------------------------------- -class KDE_EXPORT NotifyDialog : public KDialogBase +class TDE_EXPORT NotifyDialog : public KDialogBase { TQ_OBJECT diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp index 6d8aef90..1a536e82 100644 --- a/libtdepim/kscoringeditor.cpp +++ b/libtdepim/kscoringeditor.cpp @@ -76,7 +76,7 @@ SingleConditionWidget::SingleConditionWidget(KScoringManager *m,TQWidget *p, con matches->insertStringList(KScoringExpression::conditionNames()); TQToolTip::add(matches,i18n("Select the type of match")); firstRow->addWidget(matches,1); - connect( matches, TQT_SIGNAL( activated( int ) ), TQT_SLOT( toggleRegExpButton( int ) ) ); + connect( matches, TQ_SIGNAL( activated( int ) ), TQ_SLOT( toggleRegExpButton( int ) ) ); TQHBoxLayout *secondRow = new TQHBoxLayout( topL ); secondRow->setSpacing( 1 ); expr = new KLineEdit( this ); @@ -86,7 +86,7 @@ SingleConditionWidget::SingleConditionWidget(KScoringManager *m,TQWidget *p, con secondRow->addWidget( expr ); regExpButton = new TQPushButton( i18n("Edit..."), this ); secondRow->addWidget( regExpButton ); - connect( regExpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( showRegExpDialog() ) ); + connect( regExpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( showRegExpDialog() ) ); // occupy at much width as possible setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed)); @@ -251,7 +251,7 @@ SingleActionWidget::SingleActionWidget(KScoringManager *m,TQWidget *p, const cha } } - connect(types,TQT_SIGNAL(activated(int)),stack,TQT_SLOT(raiseWidget(int))); + connect(types,TQ_SIGNAL(activated(int)),stack,TQ_SLOT(raiseWidget(int))); // raise the dummy label types->setCurrentItem(0); @@ -413,7 +413,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n) groupL->addWidget( groupsLabel, 2, 0 ); TQPushButton *groupsBtn = new TQPushButton(i18n("A&dd Group"), groupB); - connect(groupsBtn,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddGroup())); + connect(groupsBtn,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddGroup())); groupL->addWidget( groupsBtn, 3, 0 ); groupsBox = new KComboBox( false, groupB, "groupsBox" ); @@ -428,15 +428,15 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n) expireEdit = new KIntSpinBox(1,99999,1,30,10, groupB, "expireWidget"); //Init suffix slotExpireEditChanged(30); - connect(expireEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotExpireEditChanged(int))); + connect(expireEdit, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotExpireEditChanged(int))); groupL->addWidget( expireEdit, 5, 1 ); expireLabel = new TQLabel(expireEdit, i18n("&Rule is valid for:"), groupB, "expireLabel"); groupL->addWidget( expireLabel, 5, 0 ); expireLabel->setEnabled(false); expireEdit->setEnabled(false); - connect(expireCheck, TQT_SIGNAL(toggled(bool)), expireLabel, TQT_SLOT(setEnabled(bool))); - connect(expireCheck, TQT_SIGNAL(toggled(bool)), expireEdit, TQT_SLOT(setEnabled(bool))); + connect(expireCheck, TQ_SIGNAL(toggled(bool)), expireLabel, TQ_SLOT(setEnabled(bool))); + connect(expireCheck, TQ_SIGNAL(toggled(bool)), expireEdit, TQ_SLOT(setEnabled(bool))); //------------- Conditions --------------------- TQGroupBox *groupConds = new TQGroupBox(i18n("Conditions"), this); @@ -457,7 +457,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n) condEditor = new ConditionEditWidget(manager,groupConds); condL->addMultiCellWidget(condEditor, 2,2, 0,1); - connect(condEditor,TQT_SIGNAL(widgetRemoved()),this,TQT_SLOT(slotShrink())); + connect(condEditor,TQ_SIGNAL(widgetRemoved()),this,TQ_SLOT(slotShrink())); //------------- Actions --------------------- TQGroupBox *groupActions = new TQGroupBox(i18n("Actions"), this); @@ -466,7 +466,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n) actionL->addSpacing(fontMetrics().lineSpacing()-4); actionEditor = new ActionEditWidget(manager,groupActions); actionL->addWidget(actionEditor); - connect(actionEditor,TQT_SIGNAL(widgetRemoved()),this,TQT_SLOT(slotShrink())); + connect(actionEditor,TQ_SIGNAL(widgetRemoved()),this,TQ_SLOT(slotShrink())); topLayout->addStretch(1); @@ -600,13 +600,13 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, TQVBoxLayout *topL = new TQVBoxLayout(this,standalone? 0:5,KDialog::spacingHint()); ruleList = new TDEListBox(this); if (standalone) { - connect(ruleList,TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this,TQT_SLOT(slotEditRule(TQListBoxItem*))); - connect(ruleList,TQT_SIGNAL(returnPressed(TQListBoxItem*)), - this,TQT_SLOT(slotEditRule(TQListBoxItem*))); + connect(ruleList,TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this,TQ_SLOT(slotEditRule(TQListBoxItem*))); + connect(ruleList,TQ_SIGNAL(returnPressed(TQListBoxItem*)), + this,TQ_SLOT(slotEditRule(TQListBoxItem*))); } - connect(ruleList, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotRuleSelected(TQListBoxItem*))); + connect(ruleList, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotRuleSelected(TQListBoxItem*))); topL->addWidget(ruleList); TQHBoxLayout *btnL = new TQHBoxLayout( topL, KDialog::spacingHint() ); @@ -614,12 +614,12 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, mRuleUp->setPixmap( BarIcon( "go-up", TDEIcon::SizeSmall ) ); TQToolTip::add( mRuleUp, i18n("Move rule up") ); btnL->addWidget( mRuleUp ); - connect( mRuleUp, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRuleUp() ) ); + connect( mRuleUp, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRuleUp() ) ); mRuleDown = new TQPushButton( this ); mRuleDown->setPixmap( BarIcon( "go-down", TDEIcon::SizeSmall ) ); TQToolTip::add( mRuleDown, i18n("Move rule down") ); btnL->addWidget( mRuleDown ); - connect( mRuleDown, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRuleDown() ) ); + connect( mRuleDown, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRuleDown() ) ); btnL = new TQHBoxLayout( topL, KDialog::spacingHint() ); editRule=0L; @@ -627,25 +627,25 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, newRule->setPixmap( BarIcon( "document-new", TDEIcon::SizeSmall ) ); TQToolTip::add(newRule,i18n("New rule")), btnL->addWidget(newRule); - connect(newRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewRule())); + connect(newRule, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewRule())); // if we're standalone, we need an additional edit button if (standalone) { editRule = new TQPushButton(this); editRule->setIconSet( BarIconSet("edit", TDEIcon::SizeSmall) ); TQToolTip::add(editRule,i18n("Edit rule")); btnL->addWidget(editRule); - connect(editRule,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotEditRule())); + connect(editRule,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotEditRule())); } delRule = new TQPushButton(this); delRule->setIconSet( BarIconSet( "edit-delete", TDEIcon::SizeSmall ) ); TQToolTip::add(delRule,i18n("Remove rule")); btnL->addWidget(delRule); - connect(delRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelRule())); + connect(delRule, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelRule())); copyRule = new TQPushButton(this); copyRule->setIconSet(BarIconSet("edit-copy", TDEIcon::SizeSmall)); TQToolTip::add(copyRule,i18n("Copy rule")); btnL->addWidget(copyRule); - connect(copyRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCopyRule())); + connect(copyRule, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCopyRule())); // the group filter TQBoxLayout *filterL = new TQVBoxLayout(topL,KDialog::spacingHint()); @@ -654,17 +654,17 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, filterBox->insertItem(i18n("<all groups>")); filterBox->insertStringList(l); filterBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); - connect(filterBox,TQT_SIGNAL(activated(const TQString&)), - this,TQT_SLOT(slotGroupFilter(const TQString&))); + connect(filterBox,TQ_SIGNAL(activated(const TQString&)), + this,TQ_SLOT(slotGroupFilter(const TQString&))); slotGroupFilter(i18n("<all groups>")); TQLabel *lab = new TQLabel(filterBox,i18n("Sho&w only rules for group:"),this); filterL->addWidget(lab); filterL->addWidget(filterBox); - connect(manager,TQT_SIGNAL(changedRules()), - this,TQT_SLOT(updateRuleList())); - connect(manager,TQT_SIGNAL(changedRuleName(const TQString&,const TQString&)), - this,TQT_SLOT(slotRuleNameChanged(const TQString&,const TQString&))); + connect(manager,TQ_SIGNAL(changedRules()), + this,TQ_SLOT(updateRuleList())); + connect(manager,TQ_SIGNAL(changedRuleName(const TQString&,const TQString&)), + this,TQ_SLOT(slotRuleNameChanged(const TQString&,const TQString&))); updateRuleList(); updateButton(); @@ -872,12 +872,12 @@ KScoringEditor::KScoringEditor(KScoringManager* m, hbl->addWidget(ruleLister); ruleEditor = new RuleEditWidget(manager,w); hbl->addWidget(ruleEditor); - connect(ruleLister,TQT_SIGNAL(ruleSelected(const TQString&)), - ruleEditor, TQT_SLOT(slotEditRule(const TQString&))); - connect(ruleLister, TQT_SIGNAL(leavingRule()), - ruleEditor, TQT_SLOT(updateRule())); - connect(ruleEditor, TQT_SIGNAL(shrink()), TQT_SLOT(slotShrink())); - connect(this,TQT_SIGNAL(finished()),TQT_SLOT(slotFinished())); + connect(ruleLister,TQ_SIGNAL(ruleSelected(const TQString&)), + ruleEditor, TQ_SLOT(slotEditRule(const TQString&))); + connect(ruleLister, TQ_SIGNAL(leavingRule()), + ruleEditor, TQ_SLOT(updateRule())); + connect(ruleEditor, TQ_SIGNAL(shrink()), TQ_SLOT(slotShrink())); + connect(this,TQ_SIGNAL(finished()),TQ_SLOT(slotFinished())); ruleLister->slotRuleSelected(0); resize(550, sizeHint().height()); } @@ -909,7 +909,7 @@ void KScoringEditor::setRule(KScoringRule* r) void KScoringEditor::slotShrink() { - TQTimer::singleShot(5, this, TQT_SLOT(slotDoShrink())); + TQTimer::singleShot(5, this, TQ_SLOT(slotDoShrink())); } void KScoringEditor::slotDoShrink() @@ -964,7 +964,7 @@ KScoringEditorWidgetDialog::KScoringEditorWidgetDialog(KScoringManager *m, const TQFrame *f = makeMainWidget(); TQBoxLayout *topL = new TQVBoxLayout(f); ruleEditor = new RuleEditWidget(manager,f); - connect(ruleEditor, TQT_SIGNAL(shrink()), TQT_SLOT(slotShrink())); + connect(ruleEditor, TQ_SIGNAL(shrink()), TQ_SLOT(slotShrink())); topL->addWidget(ruleEditor); ruleEditor->slotEditRule(ruleName); resize(0,0); @@ -987,7 +987,7 @@ void KScoringEditorWidgetDialog::slotOk() void KScoringEditorWidgetDialog::slotShrink() { - TQTimer::singleShot(5, this, TQT_SLOT(slotDoShrink())); + TQTimer::singleShot(5, this, TQ_SLOT(slotDoShrink())); } void KScoringEditorWidgetDialog::slotDoShrink() @@ -1008,8 +1008,8 @@ KScoringEditorWidget::KScoringEditorWidget(KScoringManager *m,TQWidget *p, const TQBoxLayout *topL = new TQVBoxLayout(this); ruleLister = new RuleListWidget(manager,true,this); topL->addWidget(ruleLister); - connect(ruleLister,TQT_SIGNAL(ruleEdited(const TQString&)), - this,TQT_SLOT(slotRuleEdited(const TQString &))); + connect(ruleLister,TQ_SIGNAL(ruleEdited(const TQString&)), + this,TQ_SLOT(slotRuleEdited(const TQString &))); } KScoringEditorWidget::~KScoringEditorWidget() diff --git a/libtdepim/kscoringeditor.h b/libtdepim/kscoringeditor.h index 8df84e17..41faec00 100644 --- a/libtdepim/kscoringeditor.h +++ b/libtdepim/kscoringeditor.h @@ -25,7 +25,7 @@ #include "kwidgetlister.h" -#include <kdemacros.h> +#include <tdemacros.h> class KComboBox; class KLineEdit; @@ -49,7 +49,7 @@ class KColorCombo; /** this widget implements an editor for one condition. It is used in ExpressionEditWidget */ -class KDE_EXPORT SingleConditionWidget : public TQFrame +class TDE_EXPORT SingleConditionWidget : public TQFrame { TQ_OBJECT @@ -131,7 +131,7 @@ private: /** this widget implements the action editor */ -class KDE_EXPORT ActionEditWidget : public KWidgetLister +class TDE_EXPORT ActionEditWidget : public KWidgetLister { TQ_OBJECT @@ -200,7 +200,7 @@ private: /** This widget shows a list of rules with buttons for copy, delete aso. */ -class KDE_EXPORT RuleListWidget : public TQWidget +class TDE_EXPORT RuleListWidget : public TQWidget { TQ_OBJECT @@ -251,7 +251,7 @@ private: TQPushButton *mRuleDown; }; -class KDE_EXPORT KScoringEditor : public KDialogBase +class TDE_EXPORT KScoringEditor : public KDialogBase { TQ_OBJECT @@ -299,7 +299,7 @@ private: TQString ruleName; }; -class KDE_EXPORT KScoringEditorWidget : public TQWidget +class TDE_EXPORT KScoringEditorWidget : public TQWidget { TQ_OBJECT diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp index d72776bc..7bb7179d 100644 --- a/libtdepim/ksubscription.cpp +++ b/libtdepim/ksubscription.cpp @@ -227,7 +227,7 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption, TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", TDEIcon::Small, 0 ) ); filterEdit = new KLineEdit(page); TQLabel *l = new TQLabel(filterEdit,i18n("S&earch:"), page); - connect( clearButton, TQT_SIGNAL( clicked() ), filterEdit, TQT_SLOT( clear() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), filterEdit, TQ_SLOT( clear() ) ); // checkboxes noTreeCB = new TQCheckBox(i18n("Disable &tree view"), page); @@ -323,29 +323,29 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption, filterEdit->setFocus(); // items clicked - connect(groupView, TQT_SIGNAL(clicked(TQListViewItem *)), - this, TQT_SLOT(slotChangeButtonState(TQListViewItem*))); - connect(subView, TQT_SIGNAL(clicked(TQListViewItem *)), - this, TQT_SLOT(slotChangeButtonState(TQListViewItem*))); - connect(unsubView, TQT_SIGNAL(clicked(TQListViewItem *)), - this, TQT_SLOT(slotChangeButtonState(TQListViewItem*))); + connect(groupView, TQ_SIGNAL(clicked(TQListViewItem *)), + this, TQ_SLOT(slotChangeButtonState(TQListViewItem*))); + connect(subView, TQ_SIGNAL(clicked(TQListViewItem *)), + this, TQ_SLOT(slotChangeButtonState(TQListViewItem*))); + connect(unsubView, TQ_SIGNAL(clicked(TQListViewItem *)), + this, TQ_SLOT(slotChangeButtonState(TQListViewItem*))); // connect buttons - connect(arrowBtn1, TQT_SIGNAL(clicked()), TQT_SLOT(slotButton1())); - connect(arrowBtn2, TQT_SIGNAL(clicked()), TQT_SLOT(slotButton2())); - connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotLoadFolders())); + connect(arrowBtn1, TQ_SIGNAL(clicked()), TQ_SLOT(slotButton1())); + connect(arrowBtn2, TQ_SIGNAL(clicked()), TQ_SLOT(slotButton2())); + connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotLoadFolders())); // connect checkboxes - connect(subCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotCBToggled())); - connect(newCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotCBToggled())); - connect(noTreeCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotCBToggled())); + connect(subCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotCBToggled())); + connect(newCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotCBToggled())); + connect(noTreeCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotCBToggled())); // connect textfield - connect(filterEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotFilterTextChanged(const TQString&))); + connect(filterEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotFilterTextChanged(const TQString&))); // update status - connect(this, TQT_SIGNAL(listChanged()), TQT_SLOT(slotUpdateStatusLabel())); + connect(this, TQ_SIGNAL(listChanged()), TQ_SLOT(slotUpdateStatusLabel())); } //----------------------------------------------------------------------------- diff --git a/libtdepim/ksubscription.h b/libtdepim/ksubscription.h index c2d71050..e85571a3 100644 --- a/libtdepim/ksubscription.h +++ b/libtdepim/ksubscription.h @@ -29,7 +29,7 @@ #include <tqcheckbox.h> #include <kdialogbase.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "kfoldertree.h" class KSubscription; @@ -42,7 +42,7 @@ class KAccount; //========================================================================== -class KDE_EXPORT KGroupInfo +class TDE_EXPORT KGroupInfo { public: enum Status { @@ -69,7 +69,7 @@ class KDE_EXPORT KGroupInfo //========================================================================== /** A class representing a single group item (what's that?) */ -class KDE_EXPORT GroupItem : public TQCheckListItem +class TDE_EXPORT GroupItem : public TQCheckListItem { public: GroupItem( TQListView *v, const KGroupInfo &gi, KSubscription* browser, @@ -185,7 +185,7 @@ class KDE_EXPORT GroupItem : public TQCheckListItem * */ -class KDE_EXPORT KSubscription : public KDialogBase +class TDE_EXPORT KSubscription : public KDialogBase { TQ_OBJECT diff --git a/libtdepim/ktimeedit.cpp b/libtdepim/ktimeedit.cpp index 6451c65b..4dd66280 100644 --- a/libtdepim/ktimeedit.cpp +++ b/libtdepim/ktimeedit.cpp @@ -43,7 +43,7 @@ class KOTimeValidator : public TQValidator { public: - KOTimeValidator(TQWidget* parent, const char* name=0) : TQValidator(TQT_TQOBJECT(parent), name) {} + KOTimeValidator(TQWidget* parent, const char* name=0) : TQValidator(parent, name) {} virtual State validate(TQString& str, int& /*cursorPos*/) const { @@ -128,9 +128,9 @@ KTimeEdit::KTimeEdit( TQWidget *parent, TQTime qt, const char *name ) updateText(); setFocusPolicy(TQWidget::StrongFocus); - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(active(int))); - connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(hilit(int))); - connect(this, TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(changedText())); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(active(int))); + connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(hilit(int))); + connect(this, TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(changedText())); } KTimeEdit::~KTimeEdit() diff --git a/libtdepim/ktimeedit.h b/libtdepim/ktimeedit.h index a4dbc754..1cc20084 100644 --- a/libtdepim/ktimeedit.h +++ b/libtdepim/ktimeedit.h @@ -32,7 +32,7 @@ #include <tqcombobox.h> #include <tdeapplication.h> -#include <kdemacros.h> +#include <tdemacros.h> /** This is a class that provides an easy, user friendly way to edit times. @@ -41,7 +41,7 @@ @short Provides a way to edit times in a user-friendly manner. @author Preston Brown, Ian Dawes */ -class KDE_EXPORT KTimeEdit : public TQComboBox +class TDE_EXPORT KTimeEdit : public TQComboBox { TQ_OBJECT diff --git a/libtdepim/kvcarddrag.h b/libtdepim/kvcarddrag.h index 9a9cfda3..1669d795 100644 --- a/libtdepim/kvcarddrag.h +++ b/libtdepim/kvcarddrag.h @@ -27,7 +27,7 @@ #include <tdeabc/addressee.h> #include <tdeabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define -#include <kdemacros.h> +#include <tdemacros.h> class KVCardDragPrivate; @@ -37,7 +37,7 @@ class KVCardDragPrivate; * * See the TQt drag'n'drop documentation. */ -class KDE_EXPORT KVCardDrag : public TQStoredDrag +class TDE_EXPORT KVCardDrag : public TQStoredDrag { TQ_OBJECT diff --git a/libtdepim/kwidgetlister.cpp b/libtdepim/kwidgetlister.cpp index d279c8bc..5ece6d4e 100644 --- a/libtdepim/kwidgetlister.cpp +++ b/libtdepim/kwidgetlister.cpp @@ -46,7 +46,7 @@ KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *parent, const char* name ) : TQWidget( parent, name ) { - mWidgetList.setAutoDelete(TRUE); + mWidgetList.setAutoDelete(true); mMinWidgets = TQMAX( minWidgets, 1 ); mMaxWidgets = TQMAX( maxWidgets, mMinWidgets + 1 ); @@ -71,12 +71,12 @@ KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *parent, mButtonBox->setStretchFactor( mBtnClear, 0 ); //---------- connect everything - connect( mBtnMore, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotMore()) ); - connect( mBtnFewer, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotFewer()) ); - connect( mBtnClear, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClear()) ); + connect( mBtnMore, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotMore()) ); + connect( mBtnFewer, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotFewer()) ); + connect( mBtnClear, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClear()) ); enableControls(); } diff --git a/libtdepim/kwidgetlister.h b/libtdepim/kwidgetlister.h index 4924f684..520e2018 100644 --- a/libtdepim/kwidgetlister.h +++ b/libtdepim/kwidgetlister.h @@ -34,7 +34,7 @@ #include <tqwidget.h> #include <tqptrlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQPushButton; class TQVBoxLayout; @@ -62,7 +62,7 @@ class TQHBox; */ -class KDE_EXPORT KWidgetLister : public TQWidget +class TDE_EXPORT KWidgetLister : public TQWidget { TQ_OBJECT diff --git a/libtdepim/kxface.h b/libtdepim/kxface.h index ce7e98b3..275c6661 100644 --- a/libtdepim/kxface.h +++ b/libtdepim/kxface.h @@ -30,7 +30,7 @@ #include <tqobject.h> #include <setjmp.h> -#include <kdemacros.h> +#include <tdemacros.h> // #define WIDTH 48 // #define HEIGHT WIDTH @@ -519,7 +519,7 @@ class TQString; namespace KPIM { - class KDE_EXPORT KXFace : public TQObject + class TDE_EXPORT KXFace : public TQObject { TQ_OBJECT diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp index 8e478388..ef911bf7 100644 --- a/libtdepim/ldapclient.cpp +++ b/libtdepim/ldapclient.cpp @@ -37,7 +37,7 @@ #include <kdirwatch.h> #include <kmdcodec.h> #include <kprotocolinfo.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include "ldapclient.h" @@ -137,12 +137,12 @@ void LdapClient::startQuery( const TQString& filter ) startParseLDIF(); mActive = true; mJob = TDEIO::get( url, false, false ); - connect( mJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( mJob, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); - connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotDone() ) ); + connect( mJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( mJob, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotDone() ) ); } void LdapClient::cancelQuery() @@ -345,8 +345,8 @@ LdapSearch::LdapSearch() } readConfig(); - connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this, - TQT_SLOT(slotFileChanged(const TQString&))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this, + TQ_SLOT(slotFileChanged(const TQString&))); } void LdapSearch::readWeighForClient( LdapClient *client, TDEConfig *config, int clientNumber ) @@ -394,17 +394,17 @@ void LdapSearch::readConfig() attrs << "cn" << "mail" << "givenname" << "sn" << "objectClass"; ldapClient->setAttrs( attrs ); - connect( ldapClient, TQT_SIGNAL( result( const KPIM::LdapObject& ) ), - this, TQT_SLOT( slotLDAPResult( const KPIM::LdapObject& ) ) ); - connect( ldapClient, TQT_SIGNAL( done() ), - this, TQT_SLOT( slotLDAPDone() ) ); - connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( slotLDAPError( const TQString& ) ) ); + connect( ldapClient, TQ_SIGNAL( result( const KPIM::LdapObject& ) ), + this, TQ_SLOT( slotLDAPResult( const KPIM::LdapObject& ) ) ); + connect( ldapClient, TQ_SIGNAL( done() ), + this, TQ_SLOT( slotLDAPDone() ) ); + connect( ldapClient, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( slotLDAPError( const TQString& ) ) ); mClients.append( ldapClient ); } - connect( &mDataTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDataTimer() ) ); + connect( &mDataTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDataTimer() ) ); } mConfigFile = locateLocal( "config", "kabldaprc" ); KDirWatch::self()->addFile( mConfigFile ); diff --git a/libtdepim/ldapclient.h b/libtdepim/ldapclient.h index a6249f7a..ecfbbd32 100644 --- a/libtdepim/ldapclient.h +++ b/libtdepim/ldapclient.h @@ -35,7 +35,7 @@ #include <tdeabc/ldif.h> #include <tdeconfig.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KPIM { @@ -139,7 +139,7 @@ class LdapObject * We mean it! * */ -class KDE_EXPORT LdapClient : public TQObject +class TDE_EXPORT LdapClient : public TQObject { TQ_OBJECT @@ -243,7 +243,7 @@ typedef TQValueList<LdapResult> LdapResultList; * We mean it! * */ -class KDE_EXPORT LdapSearch : public TQObject +class TDE_EXPORT LdapSearch : public TQObject { TQ_OBJECT diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp index c06da514..57f38862 100644 --- a/libtdepim/ldapsearchdialog.cpp +++ b/libtdepim/ldapsearchdialog.cpp @@ -62,7 +62,7 @@ static TQString join( const KPIM::LdapAttrValue& lst, const TQString& sep ) for ( KPIM::LdapAttrValue::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { if ( alredy ) res += sep; - alredy = TRUE; + alredy = true; res += asUtf8( *it ); } return res; @@ -195,10 +195,10 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) mNumHosts = 0; mIsOK = false; - connect( mRecursiveCheckbox, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotSetScope( bool ) ) ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStartSearch() ) ); + connect( mRecursiveCheckbox, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotSetScope( bool ) ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStartSearch() ) ); setTabOrder(mSearchEdit, mFilterCombo); setTabOrder(mFilterCombo, mSearchButton); @@ -258,7 +258,7 @@ void LDAPSearchDialog::restoreSettings() if ( !pwdBindDN.isEmpty() ) ldapServer.setPwdBindDN( pwdBindDN ); - KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, TQT_TQOBJECT(this), "ldapclient" ); + KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, this, "ldapclient" ); ldapClient->setServer( ldapServer ); TQStringList attrs; @@ -268,12 +268,12 @@ void LDAPSearchDialog::restoreSettings() ldapClient->setAttrs( attrs ); - connect( ldapClient, TQT_SIGNAL( result( const KPIM::LdapObject& ) ), - this, TQT_SLOT( slotAddResult( const KPIM::LdapObject& ) ) ); - connect( ldapClient, TQT_SIGNAL( done() ), - this, TQT_SLOT( slotSearchDone() ) ); - connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( slotError( const TQString& ) ) ); + connect( ldapClient, TQ_SIGNAL( result( const KPIM::LdapObject& ) ), + this, TQ_SLOT( slotAddResult( const KPIM::LdapObject& ) ) ); + connect( ldapClient, TQ_SIGNAL( done() ), + this, TQ_SLOT( slotSearchDone() ) ); + connect( ldapClient, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( slotError( const TQString& ) ) ); mLdapClientList.append( ldapClient ); } @@ -378,10 +378,10 @@ void LDAPSearchDialog::slotStartSearch() TQApplication::setOverrideCursor( TQt::waitCursor ); mSearchButton->setText( i18n( "Stop" ) ); - disconnect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStartSearch() ) ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStopSearch() ) ); + disconnect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStartSearch() ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStopSearch() ) ); bool startsWith = (mSearchType->currentItem() == 1); @@ -410,10 +410,10 @@ void LDAPSearchDialog::slotSearchDone() return; } - disconnect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStopSearch() ) ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStartSearch() ) ); + disconnect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStopSearch() ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStartSearch() ) ); mSearchButton->setText( i18n( "Search" ) ); TQApplication::restoreOverrideCursor(); @@ -459,7 +459,7 @@ TQString LDAPSearchDialog::selectedEMails() const void LDAPSearchDialog::slotHelp() { - kapp->invokeHelp( "ldap-queries" ); + tdeApp->invokeHelp( "ldap-queries" ); } void LDAPSearchDialog::slotUser1() diff --git a/libtdepim/linklocator.cpp b/libtdepim/linklocator.cpp index 1de43268..8092ed85 100644 --- a/libtdepim/linklocator.cpp +++ b/libtdepim/linklocator.cpp @@ -24,7 +24,7 @@ #include "pimemoticons.h" #include <tdeversion.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <kmdcodec.h> #include <kdebug.h> diff --git a/libtdepim/linklocator.h b/libtdepim/linklocator.h index 3fb3330b..d1462837 100644 --- a/libtdepim/linklocator.h +++ b/libtdepim/linklocator.h @@ -26,7 +26,7 @@ #include <tqstring.h> #include <tqmap.h> -#include <kdemacros.h> +#include <tdemacros.h> /** * LinkLocator assists in identifying sections of text that can @@ -38,7 +38,7 @@ * @short Identifies URLs and email addresses embedded in plaintext. * @author Dave Corrie <kde@davecorrie.com> */ -class KDE_EXPORT LinkLocator +class TDE_EXPORT LinkLocator { public: /** diff --git a/libtdepim/maillistdrag.cpp b/libtdepim/maillistdrag.cpp index b269efe0..f8932d12 100644 --- a/libtdepim/maillistdrag.cpp +++ b/libtdepim/maillistdrag.cpp @@ -155,9 +155,9 @@ bool MailListDrag::decode( TQDropEvent* e, MailList& mailList ) if ( payload.size() ) { e->accept(); buffer >> mailList; - return TRUE; + return true; } - return FALSE; + return false; } bool MailListDrag::decode( TQByteArray& payload, MailList& mailList ) @@ -165,9 +165,9 @@ bool MailListDrag::decode( TQByteArray& payload, MailList& mailList ) TQDataStream stream( payload, IO_ReadOnly ); if ( payload.size() ) { stream >> mailList; - return TRUE; + return true; } - return FALSE; + return false; } bool MailListDrag::decode( TQDropEvent* e, TQByteArray &a ) @@ -183,9 +183,9 @@ bool MailListDrag::decode( TQDropEvent* e, TQByteArray &a ) stream << mailDrag.serialNumber(); } buffer.close(); - return TRUE; + return true; } - return FALSE; + return false; } void MailListDrag::setMailList( MailList mailList ) @@ -248,7 +248,7 @@ TQByteArray MailListDrag::encodedData(const char *mimeType) const break; } dlg->progressBar()->setValue(++i); - kapp->eventLoop()->processEvents(TQEventLoop::ExcludeSocketNotifiers); + tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeSocketNotifiers); } delete dlg; diff --git a/libtdepim/maillistdrag.h b/libtdepim/maillistdrag.h index c0a95c8a..496d6fb7 100644 --- a/libtdepim/maillistdrag.h +++ b/libtdepim/maillistdrag.h @@ -27,7 +27,7 @@ #include "tqglobal.h" #include "time.h" -#include <kdemacros.h> +#include <tdemacros.h> /** * TDEPIM classes for drag and drop of mails @@ -44,7 +44,7 @@ namespace KPIM { -class KDE_EXPORT MailSummary +class TDE_EXPORT MailSummary { public: MailSummary( TQ_UINT32 serialNumber, TQString messageId, TQString subject, @@ -83,7 +83,7 @@ private: typedef TQValueList<MailSummary> MailList; // Object for the drag object to call-back for message fulltext -class KDE_EXPORT MailTextSource { +class TDE_EXPORT MailTextSource { public: MailTextSource() {} virtual ~MailTextSource() {} @@ -92,7 +92,7 @@ public: }; // Drag and drop object for mails -class KDE_EXPORT MailListDrag : public TQStoredDrag +class TDE_EXPORT MailListDrag : public TQStoredDrag { public: // Takes ownership of "src" and deletes it when done @@ -111,20 +111,20 @@ public: /* The format for this drag - "x-kmail-drag/message-list" */ static const char* format(); - /* Returns TRUE if the information in e can be decoded into a TQString; - otherwsie returns FALSE */ + /* Returns true if the information in e can be decoded into a TQString; + otherwsie returns false */ static bool canDecode( TQMimeSource* e ); /* Attempts to decode the dropped information; - Returns TRUE if successful; otherwise return false */ + Returns true if successful; otherwise return false */ static bool decode( TQDropEvent* e, MailList& s ); /* Attempts to decode the serialNumbers of the dropped information; - Returns TRUE if successful; otherwise return false */ + Returns true if successful; otherwise return false */ static bool decode( TQDropEvent* e, TQByteArray& a ); /* Attempts to decode the encoded MailList; - Returns TRUE if successful; otherwise return false */ + Returns true if successful; otherwise return false */ static bool decode( TQByteArray& a, MailList& s ); private: diff --git a/libtdepim/pluginloader.h b/libtdepim/pluginloader.h index 1ec8dc6f..5e69c265 100644 --- a/libtdepim/pluginloader.h +++ b/libtdepim/pluginloader.h @@ -76,7 +76,7 @@ namespace KPIM { * **/ template< typename T, typename T_config > - class KDE_EXPORT PluginLoader : public PluginLoaderBase { + class TDE_EXPORT PluginLoader : public PluginLoaderBase { protected: PluginLoader() : PluginLoaderBase() {} @@ -122,7 +122,7 @@ namespace KPIM { #define KPIM_DEFINE_PLUGIN_LOADER( pl, t, mf, p ) \ namespace { /* don't pollute namespaces */ \ - struct KDE_EXPORT pl##Config { \ + struct TDE_EXPORT pl##Config { \ static const char * const mainfunc; \ static const char * const path; \ }; \ diff --git a/libtdepim/pluginloaderbase.cpp b/libtdepim/pluginloaderbase.cpp index 090c2fb7..a899dc67 100644 --- a/libtdepim/pluginloaderbase.cpp +++ b/libtdepim/pluginloaderbase.cpp @@ -21,9 +21,9 @@ #include <pluginloaderbase.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <klibloader.h> #include <tdeglobal.h> #include <kdebug.h> @@ -69,7 +69,7 @@ namespace KPIM { TDEGlobal::dirs()->findAllResources( "data", path, true, true ); for ( TQStringList::const_iterator it = list.begin() ; it != list.end() ; ++it ) { - KSimpleConfig config( *it, true ); + TDESimpleConfig config( *it, true ); if ( config.hasGroup( "Misc" ) && config.hasGroup( "Plugin" ) ) { config.setGroup( "Plugin" ); diff --git a/libtdepim/pluginloaderbase.h b/libtdepim/pluginloaderbase.h index 6edc61be..f1fe3ca9 100644 --- a/libtdepim/pluginloaderbase.h +++ b/libtdepim/pluginloaderbase.h @@ -25,14 +25,14 @@ #include <tqstring.h> #include <tqmap.h> -#include <kdemacros.h> +#include <tdemacros.h> class KLibrary; class TQStringList; namespace KPIM { - class KDE_EXPORT PluginMetaData { + class TDE_EXPORT PluginMetaData { public: PluginMetaData() {} PluginMetaData( const TQString & lib, const TQString & name, @@ -45,7 +45,7 @@ namespace KPIM { mutable bool loaded; }; - class KDE_EXPORT PluginLoaderBase { + class TDE_EXPORT PluginLoaderBase { protected: PluginLoaderBase(); virtual ~PluginLoaderBase(); diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp index d3a37003..e780c297 100644 --- a/libtdepim/progressdialog.cpp +++ b/libtdepim/progressdialog.cpp @@ -75,7 +75,7 @@ TransactionItem* TransactionItemView::addTransactionItem( ProgressItem* item, bo { TransactionItem *ti = new TransactionItem( mBigBox, item, first ); ti->hide(); - TQTimer::singleShot( 1000, ti, TQT_SLOT( show() ) ); + TQTimer::singleShot( 1000, ti, TQ_SLOT( show() ) ); return ti; } @@ -169,8 +169,8 @@ TransactionItem::TransactionItem( TQWidget* parent, if ( item->canBeCanceled() ) { mCancelButton = new TQPushButton( SmallIcon( "cancel" ), TQString(), h ); TQToolTip::add( mCancelButton, i18n("Cancel this operation.") ); - connect ( mCancelButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotItemCanceled() )); + connect ( mCancelButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotItemCanceled() )); } h = new TQHBox( this ); @@ -262,7 +262,7 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c pbClose->setFixedSize( 16, 16 ); pbClose->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "window-close", TDEIcon::Small, 14 ) ); TQToolTip::add( pbClose, i18n( "Hide detailed progress window" ) ); - connect(pbClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose())); + connect(pbClose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose())); TQWidget* spacer = new TQWidget( rightBox ); // don't let the close button take up all the height rightBox->setStretchFactor( spacer, 100 ); */ @@ -272,22 +272,22 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c * appearing and vanishing items. */ ProgressManager *pm = ProgressManager::instance(); - connect ( pm, TQT_SIGNAL( progressItemAdded( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotTransactionAdded( KPIM::ProgressItem* ) ) ); - connect ( pm, TQT_SIGNAL( progressItemCompleted( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotTransactionCompleted( KPIM::ProgressItem* ) ) ); - connect ( pm, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem*, unsigned int ) ), - this, TQT_SLOT( slotTransactionProgress( KPIM::ProgressItem*, unsigned int ) ) ); - connect ( pm, TQT_SIGNAL( progressItemStatus( KPIM::ProgressItem*, const TQString& ) ), - this, TQT_SLOT( slotTransactionStatus( KPIM::ProgressItem*, const TQString& ) ) ); - connect ( pm, TQT_SIGNAL( progressItemLabel( KPIM::ProgressItem*, const TQString& ) ), - this, TQT_SLOT( slotTransactionLabel( KPIM::ProgressItem*, const TQString& ) ) ); - connect ( pm, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), - this, TQT_SLOT( slotTransactionUsesCrypto( KPIM::ProgressItem*, bool ) ) ); - connect ( pm, TQT_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ), - this, TQT_SLOT( slotTransactionUsesBusyIndicator( KPIM::ProgressItem*, bool ) ) ); - connect ( pm, TQT_SIGNAL( showProgressDialog() ), - this, TQT_SLOT( slotShow() ) ); + connect ( pm, TQ_SIGNAL( progressItemAdded( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotTransactionAdded( KPIM::ProgressItem* ) ) ); + connect ( pm, TQ_SIGNAL( progressItemCompleted( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotTransactionCompleted( KPIM::ProgressItem* ) ) ); + connect ( pm, TQ_SIGNAL( progressItemProgress( KPIM::ProgressItem*, unsigned int ) ), + this, TQ_SLOT( slotTransactionProgress( KPIM::ProgressItem*, unsigned int ) ) ); + connect ( pm, TQ_SIGNAL( progressItemStatus( KPIM::ProgressItem*, const TQString& ) ), + this, TQ_SLOT( slotTransactionStatus( KPIM::ProgressItem*, const TQString& ) ) ); + connect ( pm, TQ_SIGNAL( progressItemLabel( KPIM::ProgressItem*, const TQString& ) ), + this, TQ_SLOT( slotTransactionLabel( KPIM::ProgressItem*, const TQString& ) ) ); + connect ( pm, TQ_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), + this, TQ_SLOT( slotTransactionUsesCrypto( KPIM::ProgressItem*, bool ) ) ); + connect ( pm, TQ_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ), + this, TQ_SLOT( slotTransactionUsesBusyIndicator( KPIM::ProgressItem*, bool ) ) ); + connect ( pm, TQ_SIGNAL( showProgressDialog() ), + this, TQ_SLOT( slotShow() ) ); } void ProgressDialog::closeEvent( TQCloseEvent* e ) @@ -319,7 +319,7 @@ void ProgressDialog::slotTransactionAdded( ProgressItem *item ) if ( ti ) mTransactionsToListviewItems.replace( item, ti ); if ( first && mWasLastShown ) - TQTimer::singleShot( 1000, this, TQT_SLOT( slotShow() ) ); + TQTimer::singleShot( 1000, this, TQ_SLOT( slotShow() ) ); } } @@ -330,14 +330,14 @@ void ProgressDialog::slotTransactionCompleted( ProgressItem *item ) TransactionItem *ti = mTransactionsToListviewItems[ item ]; mTransactionsToListviewItems.remove( item ); ti->setItemComplete(); - TQTimer::singleShot( 3000, ti, TQT_SLOT( deleteLater() ) ); + TQTimer::singleShot( 3000, ti, TQ_SLOT( deleteLater() ) ); // see the slot for comments as to why that works - connect ( ti, TQT_SIGNAL( destroyed() ), - mScrollView, TQT_SLOT( slotLayoutFirstItem() ) ); + connect ( ti, TQ_SIGNAL( destroyed() ), + mScrollView, TQ_SLOT( slotLayoutFirstItem() ) ); } // This was the last item, hide. if ( mTransactionsToListviewItems.empty() ) - TQTimer::singleShot( 3000, this, TQT_SLOT( slotHide() ) ); + TQTimer::singleShot( 3000, this, TQ_SLOT( slotHide() ) ); } void ProgressDialog::slotTransactionCanceled( ProgressItem* ) diff --git a/libtdepim/progressdialog.h b/libtdepim/progressdialog.h index 85a82bbd..ad7dd7e8 100644 --- a/libtdepim/progressdialog.h +++ b/libtdepim/progressdialog.h @@ -38,7 +38,7 @@ #include <tqlabel.h> #include <tqvbox.h> #include "overlaywidget.h" -#include <kdemacros.h> +#include <tdemacros.h> class TQProgressBar; class TQScrollView; @@ -115,7 +115,7 @@ protected: ProgressItem* mItem; }; -class KDE_EXPORT ProgressDialog : public OverlayWidget +class TDE_EXPORT ProgressDialog : public OverlayWidget { TQ_OBJECT diff --git a/libtdepim/progressmanager.cpp b/libtdepim/progressmanager.cpp index 37216e94..68e8ac28 100644 --- a/libtdepim/progressmanager.cpp +++ b/libtdepim/progressmanager.cpp @@ -162,22 +162,22 @@ ProgressItem* ProgressManager::createProgressItemImpl( } } // connect all signals - connect ( t, TQT_SIGNAL( progressItemCompleted(KPIM::ProgressItem*) ), - this, TQT_SLOT( slotTransactionCompleted(KPIM::ProgressItem*) ) ); - connect ( t, TQT_SIGNAL( progressItemProgress(KPIM::ProgressItem*, unsigned int) ), - this, TQT_SIGNAL( progressItemProgress(KPIM::ProgressItem*, unsigned int) ) ); - connect ( t, TQT_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ), - this, TQT_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ) ); - connect ( t, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ), - this, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ) ); - connect ( t, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ), - this, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ) ); - connect ( t, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ), - this, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ) ); - connect ( t, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), - this, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ) ); - connect ( t, TQT_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ), - this, TQT_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ) ); + connect ( t, TQ_SIGNAL( progressItemCompleted(KPIM::ProgressItem*) ), + this, TQ_SLOT( slotTransactionCompleted(KPIM::ProgressItem*) ) ); + connect ( t, TQ_SIGNAL( progressItemProgress(KPIM::ProgressItem*, unsigned int) ), + this, TQ_SIGNAL( progressItemProgress(KPIM::ProgressItem*, unsigned int) ) ); + connect ( t, TQ_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ), + this, TQ_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ) ); + connect ( t, TQ_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ), + this, TQ_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ) ); + connect ( t, TQ_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ), + this, TQ_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ) ); + connect ( t, TQ_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ), + this, TQ_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ) ); + connect ( t, TQ_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), + this, TQ_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ) ); + connect ( t, TQ_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ), + this, TQ_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ) ); emit progressItemAdded( t ); } else { diff --git a/libtdepim/progressmanager.h b/libtdepim/progressmanager.h index 59dc7262..17c96c32 100644 --- a/libtdepim/progressmanager.h +++ b/libtdepim/progressmanager.h @@ -28,7 +28,7 @@ #include <tqdict.h> #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KPIM { @@ -36,7 +36,7 @@ class ProgressItem; class ProgressManager; typedef TQMap<ProgressItem*, bool> ProgressItemMap; -class KDE_EXPORT ProgressItem : public TQObject +class TDE_EXPORT ProgressItem : public TQObject { TQ_OBJECT @@ -263,7 +263,7 @@ signals: * items to parents by id. */ -class KDE_EXPORT ProgressManager : public TQObject +class TDE_EXPORT ProgressManager : public TQObject { TQ_OBJECT diff --git a/libtdepim/qutf7codec.cpp b/libtdepim/qutf7codec.cpp index 78d709df..8624f2a1 100644 --- a/libtdepim/qutf7codec.cpp +++ b/libtdepim/qutf7codec.cpp @@ -48,11 +48,11 @@ const char* TQUtf7Codec::mimeName() const { } bool TQUtf7Codec::canEncode( TQChar ) const { - return TRUE; + return true; } bool TQUtf7Codec::canEncode( const TQString & ) const { - return TRUE; + return true; } static uchar base64Set[] = { @@ -91,9 +91,9 @@ int TQUtf7Codec::heuristicContentMatch(const char* chars, int len) const { int stepNo = 0; int i; - bool shifted = FALSE; - bool rightAfterEscape = FALSE; - bool onlyNullBitsSinceLastBoundary = TRUE; + bool shifted = false; + bool rightAfterEscape = false; + bool onlyNullBitsSinceLastBoundary = true; for ( i = 0; i < len ; i++ ) { if ((unsigned char)chars[i] >= 128) // 8bit chars not allowed. break; @@ -101,7 +101,7 @@ int TQUtf7Codec::heuristicContentMatch(const char* chars, int len) const if ( isOfSet(chars[i],base64Set) ) { switch (stepNo) { case 0: - onlyNullBitsSinceLastBoundary = TRUE; + onlyNullBitsSinceLastBoundary = true; break; case 3: onlyNullBitsSinceLastBoundary @@ -117,19 +117,19 @@ int TQUtf7Codec::heuristicContentMatch(const char* chars, int len) const = onlyNullBitsSinceLastBoundary && (chars[i] == 'A'); } stepNo = (stepNo + 1) % 8; - rightAfterEscape = FALSE; + rightAfterEscape = false; } else { if (rightAfterEscape && chars[i] != '-') break; // a '+' must be followed by '-' or a base64 char if (!onlyNullBitsSinceLastBoundary) break; // non-zero bits in the tail of the base64 encoding - shifted = FALSE; + shifted = false; stepNo = 0; } } else { if (chars[i] == '+') { - shifted = TRUE; - rightAfterEscape = TRUE; + shifted = true; + rightAfterEscape = true; } } } @@ -156,7 +156,7 @@ class TQUtf7Decoder : public TQTextDecoder { // of a shifted-sequence. bool rightAfterEscape; public: - TQUtf7Decoder() : uc(0), stepNo(0), shifted(FALSE), rightAfterEscape(FALSE) + TQUtf7Decoder() : uc(0), stepNo(0), shifted(false), rightAfterEscape(false) { } @@ -165,8 +165,8 @@ private: { uc = 0; stepNo = 0; - shifted = FALSE; - rightAfterEscape = FALSE; + shifted = false; + rightAfterEscape = false; } public: @@ -279,7 +279,7 @@ public: // increase the step counter stepNo++; stepNo %= 8; - rightAfterEscape = FALSE; + rightAfterEscape = false; // and look at the next char. continue; } // fi (still) shifted @@ -295,11 +295,11 @@ public: if ( ch == '+' ) { // '+' is the escape char for entering a // shifted sequence: - shifted = TRUE; + shifted = true; stepNo = 0; // also, we're right at the beginning where // special rules apply: - rightAfterEscape = TRUE; + rightAfterEscape = true; } else { // US-ASCII values are directly used result += TQChar(ch); @@ -327,7 +327,7 @@ class TQUtf7Encoder : public TQTextEncoder { public: TQUtf7Encoder(bool encOpt, bool encLwsp) : outbits(0), stepNo(0), - shifted(FALSE), mayContinueShiftedSequence(FALSE) + shifted(false), mayContinueShiftedSequence(false) { for ( int i = 0; i < 16 ; i++) { dontNeedEncodingSet[i] = directSet[i]; @@ -429,13 +429,13 @@ private: } else if (mayContinueShiftedSequence) { // if mayContinue is set, this means the // shifted-sequence needs a lead-out. - mayContinueShiftedSequence = FALSE; + mayContinueShiftedSequence = false; if (isOfSet(ch,base64Set) || ch == '-' ) { *t++ = '-'; } } *t++ = (uchar)ch; - shifted = FALSE; + shifted = false; stepNo = 0; } @@ -494,8 +494,8 @@ public: // 24bits ("-+-") + some from ending the shifted-sequence // with 21,33 bits addToShiftedSequence(t,ch); - mayContinueShiftedSequence = FALSE; - shifted = TRUE; + mayContinueShiftedSequence = false; + shifted = true; } else { // shortcut encoding of '+': *t++ = '+'; @@ -512,15 +512,15 @@ public: stepNo = 0; } addToShiftedSequence(t,ch); - shifted = TRUE; - mayContinueShiftedSequence = FALSE; + shifted = true; + mayContinueShiftedSequence = false; } if ( shifted ) { endShiftedSequence(t); - mayContinueShiftedSequence = TRUE; + mayContinueShiftedSequence = true; }; - shifted = FALSE; + shifted = false; } *t = '\0'; diff --git a/libtdepim/qutf7codec.h b/libtdepim/qutf7codec.h index 01e97494..1df5e7cc 100644 --- a/libtdepim/qutf7codec.h +++ b/libtdepim/qutf7codec.h @@ -27,7 +27,7 @@ #include "tqtextcodec.h" -#include <kdemacros.h> +#include <tdemacros.h> #ifndef TQT_NO_TEXTCODEC @@ -45,7 +45,7 @@ @author Marc Mutz <mutz@kde.org> */ -class KDE_EXPORT TQUtf7Codec : public TQTextCodec { +class TDE_EXPORT TQUtf7Codec : public TQTextCodec { bool encOpt, encLwsp; public: TQUtf7Codec() : TQTextCodec() {} @@ -81,7 +81,7 @@ public: @short A variant of @ref TQUtf7Codec, which protectes certain characters in MIME transport @author Marc Mutz <mutz@kde.org> */ -class KDE_EXPORT TQStrictUtf7Codec : public TQUtf7Codec { +class TDE_EXPORT TQStrictUtf7Codec : public TQUtf7Codec { public: TQStrictUtf7Codec() : TQUtf7Codec() {} diff --git a/libtdepim/qutf7codecplugin.cpp b/libtdepim/qutf7codecplugin.cpp index 7702ed9f..7fd2623b 100644 --- a/libtdepim/qutf7codecplugin.cpp +++ b/libtdepim/qutf7codecplugin.cpp @@ -59,4 +59,4 @@ TQTextCodec * TQUtf7CodecPlugin::createForName( const TQString & name ) { return 0; } -KDE_TQ_EXPORT_PLUGIN( TQUtf7CodecPlugin ); +TDE_EXPORT_PLUGIN( TQUtf7CodecPlugin ); diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h index f9f6a6ce..fb26a4a4 100644 --- a/libtdepim/recentaddresses.h +++ b/libtdepim/recentaddresses.h @@ -35,13 +35,13 @@ #include <kdialogbase.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEConfig; class KEditListBox; namespace TDERecentAddress { -class KDE_EXPORT RecentAddressDialog : public KDialogBase +class TDE_EXPORT RecentAddressDialog : public KDialogBase { public: RecentAddressDialog( TQWidget *parent, const char *name = 0 ); @@ -58,7 +58,7 @@ class KDE_EXPORT RecentAddressDialog : public KDialogBase * @author Carsten Pfeiffer <pfeiffer@kde.org> */ -class KDE_EXPORT RecentAddresses +class TDE_EXPORT RecentAddresses { public: ~RecentAddresses(); diff --git a/libtdepim/resourceabc.h b/libtdepim/resourceabc.h index 0eee0901..6ea28aef 100644 --- a/libtdepim/resourceabc.h +++ b/libtdepim/resourceabc.h @@ -27,7 +27,7 @@ #include <tdeabc/resource.h> #include <tqmap.h> -#include <kdemacros.h> +#include <tdemacros.h> // This is here because it can't go to tdelibs/tdeabc yet, but ultimately // it should probably go there (maybe redesigned to have a real object @@ -41,7 +41,7 @@ namespace KPIM { * handle subresources. */ -class KDE_EXPORT ResourceABC : public TDEABC::Resource +class TDE_EXPORT ResourceABC : public TDEABC::Resource { TQ_OBJECT diff --git a/libtdepim/sendsmsdialog.cpp b/libtdepim/sendsmsdialog.cpp index 2b658112..2f451d3a 100644 --- a/libtdepim/sendsmsdialog.cpp +++ b/libtdepim/sendsmsdialog.cpp @@ -48,10 +48,10 @@ SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, c setButtonText( Ok, i18n( "Send" ) ); - connect( mText, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( updateMessageLength() ) ); - connect( mText, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( updateButtons() ) ); + connect( mText, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( updateMessageLength() ) ); + connect( mText, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( updateButtons() ) ); updateButtons(); diff --git a/libtdepim/sidebarextension.h b/libtdepim/sidebarextension.h index 9abd6ea7..3a6bb014 100644 --- a/libtdepim/sidebarextension.h +++ b/libtdepim/sidebarextension.h @@ -22,7 +22,7 @@ #define SIDEBAREXTENSION_H #include <tqobject.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQWidget; @@ -35,7 +35,7 @@ namespace KParts * Provides a way to export a widget which will be displayed in Kontacts * stackview at the left **/ - class KDE_EXPORT SideBarExtension : public TQObject + class TDE_EXPORT SideBarExtension : public TQObject { TQ_OBJECT diff --git a/libtdepim/spellingfilter.h b/libtdepim/spellingfilter.h index d0a8d884..1046f952 100644 --- a/libtdepim/spellingfilter.h +++ b/libtdepim/spellingfilter.h @@ -27,9 +27,9 @@ #include <tqstringlist.h> #include "linklocator.h" -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT SpellingFilter +class TDE_EXPORT SpellingFilter { public: enum UrlFiltering { DontFilterUrls, FilterUrls }; diff --git a/libtdepim/statusbarprogresswidget.cpp b/libtdepim/statusbarprogresswidget.cpp index e196bcf8..d0cd9d7d 100644 --- a/libtdepim/statusbarprogresswidget.cpp +++ b/libtdepim/statusbarprogresswidget.cpp @@ -98,22 +98,22 @@ StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog mode = None; setMode(); - connect( m_pButton, TQT_SIGNAL( clicked() ), - progressDialog, TQT_SLOT( slotToggleVisibility() ) ); + connect( m_pButton, TQ_SIGNAL( clicked() ), + progressDialog, TQ_SLOT( slotToggleVisibility() ) ); - connect ( ProgressManager::instance(), TQT_SIGNAL( progressItemAdded( KPIM::ProgressItem * ) ), - this, TQT_SLOT( slotProgressItemAdded( KPIM::ProgressItem * ) ) ); - connect ( ProgressManager::instance(), TQT_SIGNAL( progressItemCompleted( KPIM::ProgressItem * ) ), - this, TQT_SLOT( slotProgressItemCompleted( KPIM::ProgressItem * ) ) ); - connect ( ProgressManager::instance(), TQT_SIGNAL(progressItemUsesBusyIndicator(KPIM::ProgressItem*,bool)), - this, TQT_SLOT( updateBusyMode() ) ); + connect ( ProgressManager::instance(), TQ_SIGNAL( progressItemAdded( KPIM::ProgressItem * ) ), + this, TQ_SLOT( slotProgressItemAdded( KPIM::ProgressItem * ) ) ); + connect ( ProgressManager::instance(), TQ_SIGNAL( progressItemCompleted( KPIM::ProgressItem * ) ), + this, TQ_SLOT( slotProgressItemCompleted( KPIM::ProgressItem * ) ) ); + connect ( ProgressManager::instance(), TQ_SIGNAL(progressItemUsesBusyIndicator(KPIM::ProgressItem*,bool)), + this, TQ_SLOT( updateBusyMode() ) ); - connect ( progressDialog, TQT_SIGNAL( visibilityChanged( bool )), - this, TQT_SLOT( slotProgressDialogVisible( bool ) ) ); + connect ( progressDialog, TQ_SIGNAL( visibilityChanged( bool )), + this, TQ_SLOT( slotProgressDialogVisible( bool ) ) ); mDelayTimer = new TQTimer( this ); - connect ( mDelayTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotShowItemDelayed() ) ); + connect ( mDelayTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotShowItemDelayed() ) ); } // There are three cases: no progressitem, one progressitem (connect to it directly), @@ -132,8 +132,8 @@ void StatusbarProgressWidget::updateBusyMode() else { // N items if ( !mBusyTimer ) { mBusyTimer = new TQTimer( this ); - connect( mBusyTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotBusyIndicator() ) ); + connect( mBusyTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotBusyIndicator() ) ); mDelayTimer->start( 1000, true ); } } @@ -153,7 +153,7 @@ void StatusbarProgressWidget::slotProgressItemCompleted( ProgressItem *item ) connectSingleItem(); // if going back to 1 item if ( ProgressManager::instance()->isEmpty() ) { // No item // Done. In 5s the progress-widget will close, then we can clean up the statusbar - TQTimer::singleShot( 5000, this, TQT_SLOT( slotClean() ) ); + TQTimer::singleShot( 5000, this, TQ_SLOT( slotClean() ) ); } else if ( mCurrentItem ) { // Exactly one item delete mBusyTimer; mBusyTimer = 0; @@ -164,14 +164,14 @@ void StatusbarProgressWidget::slotProgressItemCompleted( ProgressItem *item ) void StatusbarProgressWidget::connectSingleItem() { if ( mCurrentItem ) { - disconnect ( mCurrentItem, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem *, unsigned int ) ), - this, TQT_SLOT( slotProgressItemProgress( KPIM::ProgressItem *, unsigned int ) ) ); + disconnect ( mCurrentItem, TQ_SIGNAL( progressItemProgress( KPIM::ProgressItem *, unsigned int ) ), + this, TQ_SLOT( slotProgressItemProgress( KPIM::ProgressItem *, unsigned int ) ) ); mCurrentItem = 0; } mCurrentItem = ProgressManager::instance()->singleItem(); if ( mCurrentItem ) { - connect ( mCurrentItem, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem *, unsigned int ) ), - this, TQT_SLOT( slotProgressItemProgress( KPIM::ProgressItem *, unsigned int ) ) ); + connect ( mCurrentItem, TQ_SIGNAL( progressItemProgress( KPIM::ProgressItem *, unsigned int ) ), + this, TQ_SLOT( slotProgressItemProgress( KPIM::ProgressItem *, unsigned int ) ) ); } } diff --git a/libtdepim/statusbarprogresswidget.h b/libtdepim/statusbarprogresswidget.h index def30fee..e75e3c2e 100644 --- a/libtdepim/statusbarprogresswidget.h +++ b/libtdepim/statusbarprogresswidget.h @@ -36,7 +36,7 @@ * tdeio_littleprogress_dlg (it looks similar) */ -#include <kdemacros.h> +#include <tdemacros.h> class KMMainWidget; class KProgress; @@ -51,7 +51,7 @@ class SSLLabel; class ProgressItem; class ProgressDialog; -class KDE_EXPORT StatusbarProgressWidget : public TQFrame { +class TDE_EXPORT StatusbarProgressWidget : public TQFrame { TQ_OBJECT diff --git a/libtdepim/tdeabcresourcecached.cpp b/libtdepim/tdeabcresourcecached.cpp index 42a06e45..22f13e0e 100644 --- a/libtdepim/tdeabcresourcecached.cpp +++ b/libtdepim/tdeabcresourcecached.cpp @@ -23,7 +23,7 @@ #include <tdeabc/vcardconverter.h> #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "tdeabcresourcecached.h" @@ -36,8 +36,8 @@ ResourceCached::ResourceCached( const TDEConfig *config ) mSavePolicy( SaveDelayed ), mSaveInterval( 10 ), mKABCSaveTimer( 0, "mKABCSaveTimer" ) { - connect( &mKABCReloadTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotKABCReload() ) ); - connect( &mKABCSaveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotKABCSave() ) ); + connect( &mKABCReloadTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotKABCReload() ) ); + connect( &mKABCSaveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotKABCSave() ) ); if (config) this->readConfig(const_cast<TDEConfig *>(config)); diff --git a/libtdepim/tdeabcresourcecached.h b/libtdepim/tdeabcresourcecached.h index 5d3e27a3..7c65add1 100644 --- a/libtdepim/tdeabcresourcecached.h +++ b/libtdepim/tdeabcresourcecached.h @@ -22,7 +22,7 @@ #define TDEABC_RESOURCECACHED_H #include <tdeabc/resource.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tqdatetime.h> #include <tqtimer.h> @@ -31,7 +31,7 @@ namespace TDEABC { -class KDE_EXPORT ResourceCached : public Resource +class TDE_EXPORT ResourceCached : public Resource { TQ_OBJECT diff --git a/libtdepim/tdeconfigpropagator.cpp b/libtdepim/tdeconfigpropagator.cpp index 01ed31ab..f802bdb9 100644 --- a/libtdepim/tdeconfigpropagator.cpp +++ b/libtdepim/tdeconfigpropagator.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tdeconfig.h> #include <tdeconfigskeleton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <tdelocale.h> diff --git a/libtdepim/tdeconfigpropagator.h b/libtdepim/tdeconfigpropagator.h index 94a0bff8..cc9381a5 100644 --- a/libtdepim/tdeconfigpropagator.h +++ b/libtdepim/tdeconfigpropagator.h @@ -26,12 +26,12 @@ #include <tqdom.h> #include <tqptrlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEConfigSkeleton; class TDEConfigSkeletonItem; -class KDE_EXPORT TDEConfigPropagator +class TDE_EXPORT TDEConfigPropagator { public: @@ -55,7 +55,7 @@ class KDE_EXPORT TDEConfigPropagator */ void commit(); - class KDE_EXPORT Condition + class TDE_EXPORT Condition { public: Condition() : isValid( false ) {} @@ -68,7 +68,7 @@ class KDE_EXPORT TDEConfigPropagator bool isValid; }; - class KDE_EXPORT Rule + class TDE_EXPORT Rule { public: typedef TQValueList<Rule> List; @@ -88,7 +88,7 @@ class KDE_EXPORT TDEConfigPropagator bool hideValue; }; - class KDE_EXPORT Change + class TDE_EXPORT Change { public: typedef TQPtrList<Change> List; @@ -108,7 +108,7 @@ class KDE_EXPORT TDEConfigPropagator TQString mTitle; }; - class KDE_EXPORT ChangeConfig : public Change + class TDE_EXPORT ChangeConfig : public Change { public: ChangeConfig(); diff --git a/libtdepim/tdeconfigwizard.cpp b/libtdepim/tdeconfigwizard.cpp index 8c2620d1..026a8dd0 100644 --- a/libtdepim/tdeconfigwizard.cpp +++ b/libtdepim/tdeconfigwizard.cpp @@ -56,10 +56,10 @@ TDEConfigWizard::~TDEConfigWizard() void TDEConfigWizard::init() { - connect( this, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), - TQT_SLOT( slotAboutToShowPage( TQWidget * ) ) ); + connect( this, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ), + TQ_SLOT( slotAboutToShowPage( TQWidget * ) ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( readConfig() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( readConfig() ) ); } void TDEConfigWizard::setPropagator( TDEConfigPropagator *p ) @@ -167,7 +167,7 @@ void TDEConfigWizard::readConfig() "configured by the wizard do not run in parallel to the wizard; " "otherwise, changes done by the wizard could be lost."), i18n("Warning"), i18n("Run Wizard Now"), "warning_running_instances" ); - if ( result != KMessageBox::Continue ) kapp->quit(); + if ( result != KMessageBox::Continue ) tdeApp->quit(); usrReadConfig(); } diff --git a/libtdepim/tdeconfigwizard.h b/libtdepim/tdeconfigwizard.h index 19da572d..4f4ac8b2 100644 --- a/libtdepim/tdeconfigwizard.h +++ b/libtdepim/tdeconfigwizard.h @@ -22,7 +22,7 @@ #define TDECONFIGWIZARD_H #include <tdeconfigpropagator.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <kdialogbase.h> class TQListView; @@ -30,7 +30,7 @@ class TQListView; /** @short Configuration wizard base class */ -class KDE_EXPORT TDEConfigWizard : public KDialogBase +class TDE_EXPORT TDEConfigWizard : public KDialogBase { TQ_OBJECT diff --git a/libtdepim/tdefileio.cpp b/libtdepim/tdefileio.cpp index ec798a72..7e423dc0 100644 --- a/libtdepim/tdefileio.cpp +++ b/libtdepim/tdefileio.cpp @@ -21,7 +21,7 @@ #include <sys/stat.h> #include <sys/types.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KPIM { @@ -33,7 +33,7 @@ static void msgDialog(const TQString &msg) //----------------------------------------------------------------------------- -KDE_EXPORT TQCString kFileToString(const TQString &aFileName, bool aEnsureNL, bool aVerbose) +TDE_EXPORT TQCString kFileToString(const TQString &aFileName, bool aEnsureNL, bool aVerbose) { TQCString result; TQFileInfo info(aFileName); @@ -173,7 +173,7 @@ TQByteArray kFileToBytes(const TQString &aFileName, bool aVerbose) #endif //----------------------------------------------------------------------------- -KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, +TDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, const TQString &aFileName, bool aAskIfExists, bool aBackup, bool aVerbose) { @@ -183,7 +183,7 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, //assert(aFileName!=0); if(aFileName.isEmpty()) - return FALSE; + return false; if (file.exists()) { @@ -194,7 +194,7 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, .arg(aFileName); rc = KMessageBox::warningContinueCancel(0, str, i18n("Save to File"), i18n("&Replace")); - if (rc != KMessageBox::Continue) return FALSE; + if (rc != KMessageBox::Continue) return false; } if (aBackup) { @@ -206,12 +206,12 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, if( !TQDir::current().rename(aFileName, bakName) ) { // failed to rename file - if (!aVerbose) return FALSE; + if (!aVerbose) return false; rc = KMessageBox::warningContinueCancel(0, i18n("Failed to make a backup copy of %1.\nContinue anyway?") .arg(aFileName), i18n("Save to File"), KStdGuiItem::save() ); - if (rc != KMessageBox::Continue) return FALSE; + if (rc != KMessageBox::Continue) return false; } } } @@ -230,7 +230,7 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, default: msgDialog(i18n("Error while writing file:\n%1").arg(aFileName)); } - return FALSE; + return false; } writeLen = file.writeBlock(aBuffer, len); @@ -239,7 +239,7 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, { if (aVerbose) msgDialog(i18n("Could not write to file:\n%1").arg(aFileName)); - return FALSE; + return false; } else if (writeLen < len) { @@ -247,20 +247,20 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, .arg(writeLen).arg(len); if (aVerbose) msgDialog(msg); - return FALSE; + return false; } - return TRUE; + return true; } -KDE_EXPORT bool kCStringToFile(const TQCString& aBuffer, const TQString &aFileName, +TDE_EXPORT bool kCStringToFile(const TQCString& aBuffer, const TQString &aFileName, bool aAskIfExists, bool aBackup, bool aVerbose) { return kBytesToFile(aBuffer, aBuffer.length(), aFileName, aAskIfExists, aBackup, aVerbose); } -KDE_EXPORT bool kByteArrayToFile(const TQByteArray& aBuffer, const TQString &aFileName, +TDE_EXPORT bool kByteArrayToFile(const TQByteArray& aBuffer, const TQString &aFileName, bool aAskIfExists, bool aBackup, bool aVerbose) { return kBytesToFile(aBuffer, aBuffer.size(), aFileName, aAskIfExists, diff --git a/libtdepim/tdefileio.h b/libtdepim/tdefileio.h index f0cd8d8d..02a6f49f 100644 --- a/libtdepim/tdefileio.h +++ b/libtdepim/tdefileio.h @@ -11,7 +11,7 @@ #include <tqcstring.h> #include <tqwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQString; @@ -19,35 +19,35 @@ namespace KPIM { /** Load a file. Returns a pointer to the memory-block that contains * the loaded file. Returns a null string if the file could not be loaded. - * If withDialogs is FALSE no warning dialogs are opened if there are + * If withDialogs is false no warning dialogs are opened if there are * problems. * The string returned is always zero-terminated and therefore one * byte longer than the file itself. - * If ensureNewline is TRUE the string will always have a trailing newline. + * If ensureNewline is true the string will always have a trailing newline. */ TQCString kFileToString(const TQString &fileName, bool ensureNewline=true, - bool withDialogs=true) KDE_EXPORT; + bool withDialogs=true) TDE_EXPORT; // unused //TQByteArray kFileToBytes(const TQString &fileName, bool withDialogs=true); -/** Save a file. If withDialogs is FALSE no warning dialogs are opened if - * there are problems. Returns TRUE on success and FALSE on failure. - * Replaces existing files without warning if askIfExists==FALSE. - * Makes a copy if the file exists to filename~ if createBackup==TRUE. +/** Save a file. If withDialogs is false no warning dialogs are opened if + * there are problems. Returns true on success and false on failure. + * Replaces existing files without warning if askIfExists==false. + * Makes a copy if the file exists to filename~ if createBackup==true. */ bool kBytesToFile(const char* aBuffer, int len, const TQString &aFileName, - bool aAskIfExists, bool aBackup, bool aVerbose) KDE_EXPORT; + bool aAskIfExists, bool aBackup, bool aVerbose) TDE_EXPORT; bool kCStringToFile(const TQCString& buffer, const TQString &fileName, bool askIfExists=false, bool createBackup=true, - bool withDialogs=true) KDE_EXPORT; + bool withDialogs=true) TDE_EXPORT; /** Does not stop at NUL */ -KDE_EXPORT bool kByteArrayToFile(const TQByteArray& buffer, const TQString &fileName, +bool kByteArrayToFile(const TQByteArray& buffer, const TQString &fileName, bool askIfExists=false, bool createBackup=true, - bool withDialogs=true) KDE_EXPORT; + bool withDialogs=true) TDE_EXPORT; /** diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp index 74d7329b..f1e4f941 100644 --- a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp +++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp @@ -24,7 +24,7 @@ #include <kmimetype.h> #include <tqlayout.h> #include <tdeapplication.h> -#include <kdemacros.h> +#include <tdemacros.h> KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name ) : TQWidget( parentWidget, name ), m_part( 0 ) @@ -39,7 +39,7 @@ void KPartsGenericPart::load() return; // not enough info yet // Here it crashes in KSycoca::openDatabase when trying to load the stuff from designer itself // Not sure why - but it's not really needed anyway. - if ( !kapp ) + if ( !tdeApp ) return; TQString mimetype = m_mimetype; if ( mimetype == "auto" ) @@ -48,7 +48,7 @@ void KPartsGenericPart::load() delete m_part; } // "this" is both the parent widget and the parent object - m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0 ); + m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), this, 0, this, 0 ); if ( m_part ) { m_part->openURL( m_url ); m_part->widget()->show(); @@ -103,15 +103,15 @@ bool KPartsWidgetPlugin::isContainer( const TQString & /*key*/ ) const { return false; } -/// Duplicated from tdelibs/tdecore/kdemacros.h.in for those with tdelibs < 3.4 -#ifndef KDE_TQ_EXPORT_PLUGIN -#define KDE_TQ_EXPORT_PLUGIN(PLUGIN) \ - TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \ - TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ +/// Duplicated from tdelibs/tdecore/tdemacros.h.in for those with tdelibs < 3.4 +#ifndef TDE_EXPORT_PLUGIN +#define TDE_EXPORT_PLUGIN(PLUGIN) \ + TQ_EXTERN_C TDE_EXPORT const char* qt_ucm_query_verification_data(); \ + TQ_EXTERN_C TDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ TQ_EXPORT_PLUGIN(PLUGIN) #endif -KDE_TQ_EXPORT_PLUGIN( KPartsWidgetPlugin ) +TDE_EXPORT_PLUGIN( KPartsWidgetPlugin ) #include "tdepartsdesignerplugin.moc" diff --git a/libtdepim/tdepim.widgets b/libtdepim/tdepim.widgets index 512efd15..86a046aa 100644 --- a/libtdepim/tdepim.widgets +++ b/libtdepim/tdepim.widgets @@ -1,6 +1,6 @@ [Global] PluginName=KDEPimWidgets -Includes=kinstance.h +Includes=tdeinstance.h Init=new TDEInstance("tdepimwidgets"); [KPIM::AddresseeLineEdit] diff --git a/libtdepim/tests/test_kregexp.cpp b/libtdepim/tests/test_kregexp.cpp index f02d60b1..19c52fed 100644 --- a/libtdepim/tests/test_kregexp.cpp +++ b/libtdepim/tests/test_kregexp.cpp @@ -1,6 +1,6 @@ #include <kregexp3.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> int main() diff --git a/libtdepim/tests/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp index a87e950c..39c8447d 100644 --- a/libtdepim/tests/testdateedit.cpp +++ b/libtdepim/tests/testdateedit.cpp @@ -39,8 +39,8 @@ DateEdit::DateEdit( TQWidget *parent, const char *name ) KDateEdit *edit = new KDateEdit( this ); layout->addWidget( edit ); - connect( edit, TQT_SIGNAL( dateChanged( const TQDate& ) ), - this, TQT_SLOT( dateChanged( const TQDate& ) ) ); + connect( edit, TQ_SIGNAL( dateChanged( const TQDate& ) ), + this, TQ_SLOT( dateChanged( const TQDate& ) ) ); } void DateEdit::dateChanged( const TQDate &date ) diff --git a/libtdepim/tests/testutf7encoder.cpp b/libtdepim/tests/testutf7encoder.cpp index 46fbd4d8..6c67afb2 100644 --- a/libtdepim/tests/testutf7encoder.cpp +++ b/libtdepim/tests/testutf7encoder.cpp @@ -16,8 +16,8 @@ void main( int argc, char * argv[] ) { << "\"" << argv[1] << "\"\n" << endl; cout << "Encode optional direct set and whitespace:\n" << endl; - codec->setEncodeWhitespace(TRUE); - codec->setEncodeOptionalDirect(TRUE); + codec->setEncodeWhitespace(true); + codec->setEncodeOptionalDirect(true); enc = codec->makeEncoder(); len = arg.length(); @@ -40,8 +40,8 @@ void main( int argc, char * argv[] ) { delete enc; cout << "Encode optional direct set and not whitespace:\n" << endl; - codec->setEncodeWhitespace(FALSE); - codec->setEncodeOptionalDirect(TRUE); + codec->setEncodeWhitespace(false); + codec->setEncodeOptionalDirect(true); enc = codec->makeEncoder(); len = arg.length(); @@ -52,8 +52,8 @@ void main( int argc, char * argv[] ) { cout << "Don't encode optional direct set, but whitespace:\n" << endl; - codec->setEncodeWhitespace(TRUE); - codec->setEncodeOptionalDirect(FALSE); + codec->setEncodeWhitespace(true); + codec->setEncodeOptionalDirect(false); enc = codec->makeEncoder(); len = arg.length(); @@ -64,8 +64,8 @@ void main( int argc, char * argv[] ) { cout << "Encode neither optional direct set, nor whitespace:\n" << endl; - codec->setEncodeWhitespace(FALSE); - codec->setEncodeOptionalDirect(FALSE); + codec->setEncodeWhitespace(false); + codec->setEncodeOptionalDirect(false); enc = codec->makeEncoder(); len = arg.length(); diff --git a/libtdepim/weaver.h b/libtdepim/weaver.h index b949a110..5cffc86f 100644 --- a/libtdepim/weaver.h +++ b/libtdepim/weaver.h @@ -29,7 +29,7 @@ extern "C" #include <tqmutex.h> #include <tqevent.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KPIM { namespace ThreadWeaver { @@ -50,22 +50,22 @@ namespace ThreadWeaver { Use setDebugLevel () to integrate adapt debug () to your platform. */ - KDE_EXPORT extern bool Debug; - KDE_EXPORT extern int DebugLevel; + TDE_EXPORT extern bool Debug; + TDE_EXPORT extern int DebugLevel; - KDE_EXPORT inline void setDebugLevel (bool debug, int level) + TDE_EXPORT inline void setDebugLevel (bool debug, int level) { Debug = debug; DebugLevel = level; } - KDE_EXPORT inline void debug(int severity, const char * cformat, ...) + TDE_EXPORT inline void debug(int severity, const char * cformat, ...) #ifdef __GNUC__ __attribute__ ( (format (printf, 2, 3 ) ) ) #endif ; - KDE_EXPORT inline void debug(int severity, const char * cformat, ...) + TDE_EXPORT inline void debug(int severity, const char * cformat, ...) { if ( Debug == true && ( severity<=DebugLevel || severity == 0) ) { @@ -96,7 +96,7 @@ namespace ThreadWeaver { Note: Do not create and use SPR/APR events, use Job::triggerSPR or Job::triggerAPR to create the requests. */ - class KDE_EXPORT Event : public TQCustomEvent + class TDE_EXPORT Event : public TQCustomEvent { public: enum Action { @@ -160,7 +160,7 @@ namespace ThreadWeaver { Note: When using an APR, you better make sure to receive the signal with some object, otherwise the calling thread will block forever! */ - class KDE_EXPORT Job : public TQObject + class TDE_EXPORT Job : public TQObject { TQ_OBJECT @@ -246,7 +246,7 @@ namespace ThreadWeaver { /** The class Thread is used to represent the worker threads in the weaver's inventory. It is not meant to be overloaded. */ - class KDE_EXPORT Thread : public TQThread + class TDE_EXPORT Thread : public TQThread { public: /** Create a thread. @@ -293,7 +293,7 @@ namespace ThreadWeaver { /** A weaver is the manager of worker threads (Thread objects) to which it assigns jobs from it's queue. */ - class KDE_EXPORT Weaver : public TQObject + class TDE_EXPORT Weaver : public TQObject { TQ_OBJECT diff --git a/libtdepim/weaverextensions.cpp b/libtdepim/weaverextensions.cpp index ad5b144c..01d68ff7 100644 --- a/libtdepim/weaverextensions.cpp +++ b/libtdepim/weaverextensions.cpp @@ -25,14 +25,14 @@ namespace ThreadWeaver { void WeaverExtension::attach (Weaver *w) { - connect (w, TQT_SIGNAL (threadCreated (Thread *) ), - TQT_SLOT (threadCreated (Thread *) ) ); - connect (w, TQT_SIGNAL (threadDestroyed (Thread *) ), - TQT_SLOT (threadDestroyed (Thread *) ) ); - connect (w, TQT_SIGNAL (threadBusy (Thread *) ), - TQT_SLOT (threadBusy (Thread *) ) ); - connect (w, TQT_SIGNAL (threadSuspended (Thread *) ), - TQT_SLOT (threadSuspended (Thread *) ) ); + connect (w, TQ_SIGNAL (threadCreated (Thread *) ), + TQ_SLOT (threadCreated (Thread *) ) ); + connect (w, TQ_SIGNAL (threadDestroyed (Thread *) ), + TQ_SLOT (threadDestroyed (Thread *) ) ); + connect (w, TQ_SIGNAL (threadBusy (Thread *) ), + TQ_SLOT (threadBusy (Thread *) ) ); + connect (w, TQ_SIGNAL (threadSuspended (Thread *) ), + TQ_SLOT (threadSuspended (Thread *) ) ); } WeaverExtension::~WeaverExtension() diff --git a/mimelib/mimelib/msgcmp.h b/mimelib/mimelib/msgcmp.h index c9e6707e..5e5409f9 100644 --- a/mimelib/mimelib/msgcmp.h +++ b/mimelib/mimelib/msgcmp.h @@ -31,7 +31,7 @@ #include <mimelib/string.h> #endif -#if !(defined(__DECCXX) && defined(__linux__)) +#if defined(__linux__) #include <iosfwd> #endif diff --git a/mimelib/mimelib/token.h b/mimelib/mimelib/token.h index 7168ea09..120ba6d4 100644 --- a/mimelib/mimelib/token.h +++ b/mimelib/mimelib/token.h @@ -51,7 +51,7 @@ // classes are fairly simple and efficient. // In addition, polymorphism is not needed to use the tokenizer classes. -#if !(defined(__DECCXX) && defined(__linux__)) +#if defined(__linux__) #include <iosfwd> #endif diff --git a/mimelib/test/INSTALL b/mimelib/test/INSTALL index 822915e3..63e6e41b 100644 --- a/mimelib/test/INSTALL +++ b/mimelib/test/INSTALL @@ -7,7 +7,6 @@ probably a good idea to take a look at that file anyway. There are several makefiles available. Makefile.unx is a makefile for a generic UNIX system. Makefile.vc is a makefile for Visual C++ 4 or 5. -Makefile.bc is a makefile for Borland C++ 5. If you are using the library on a non-UNIX system, such as Windows 3.1 or Macintosh, you will probably need to change msgid.cpp. The function diff --git a/plugins/kmail/bodypartformatter/attendeeselector.cpp b/plugins/kmail/bodypartformatter/attendeeselector.cpp index 08bf9c00..c0c89307 100644 --- a/plugins/kmail/bodypartformatter/attendeeselector.cpp +++ b/plugins/kmail/bodypartformatter/attendeeselector.cpp @@ -38,15 +38,15 @@ AttendeeSelector::AttendeeSelector(TQWidget * parent) layout->setMargin( 0 ); ui->addButton->setGuiItem( KStdGuiItem::add() ); - connect( ui->addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addClicked()) ); + connect( ui->addButton, TQ_SIGNAL(clicked()), TQ_SLOT(addClicked()) ); ui->removeButton->setGuiItem( KStdGuiItem::remove() ); - connect( ui->removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeClicked()) ); + connect( ui->removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeClicked()) ); ui->attendeeEdit->setClickMessage( i18n("Click to add a new attendee") ); - connect( ui->attendeeEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textChanged(const TQString&)) ); - connect( ui->attendeeEdit, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(addClicked()) ); + connect( ui->attendeeEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textChanged(const TQString&)) ); + connect( ui->attendeeEdit, TQ_SIGNAL(returnPressed(const TQString&)), TQ_SLOT(addClicked()) ); - connect( ui->attendeeList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(selectionChanged()) ); + connect( ui->attendeeList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(selectionChanged()) ); } TQStringList AttendeeSelector::attendees() const diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index da28a1f0..a6ea8bc5 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/plugins/kmail/bodypartformatter/text_calendar.cpp @@ -67,7 +67,7 @@ #include <kdebug.h> #include <kdcopservicestarter.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdetempfile.h> #include <kmdcodec.h> @@ -80,7 +80,7 @@ #include <tqdir.h> #include <tqtextstream.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <dcopclient.h> #include <dcopref.h> @@ -381,8 +381,8 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler // [that's not the case when kontact was already running, but korganizer not loaded into it...] static const char* const dcopObjectId = "KOrganizerIface"; TQCString dummy; - if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { - DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper + if ( !tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { + DCOPRef ref( dcopService, dcopService ); // talk to the TDEUniqueApplication or its kontact wrapper if ( switchTo ) { ref.call( "newInstance()" ); // activate korganizer window } @@ -390,7 +390,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler DCOPReply reply = ref.call( "load()" ); if ( reply.isValid() && (bool)reply ) { kdDebug() << "Loaded " << dcopService << " successfully" << endl; - Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); + Q_ASSERT( tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); } else kdWarning() << "Error loading " << dcopService << endl; } @@ -671,13 +671,13 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler { ensureKorganizerRunning( true ); // raise korganizer part in kontact or the korganizer app - kapp->dcopClient()->send( "korganizer", "korganizer", "newInstance()", TQByteArray() ); + tdeApp->dcopClient()->send( "korganizer", "korganizer", "newInstance()", TQByteArray() ); TQByteArray arg; TQDataStream s( arg, IO_WriteOnly ); s << TQString( "kontact_korganizerplugin" ); - kapp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg ); + tdeApp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg ); - KCalendarIface_stub *iface = new KCalendarIface_stub( kapp->dcopClient(), "korganizer", "CalendarIface" ); + KCalendarIface_stub *iface = new KCalendarIface_stub( tdeApp->dcopClient(), "korganizer", "CalendarIface" ); iface->showEventView(); iface->showDate( date ); delete iface; @@ -823,7 +823,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler summary = i18n( "Re: %1" ).arg( summary ); } - TDEApplication::kApplication()->invokeMailer( incidence->organizer().email(), summary ); + tdeApp->invokeMailer( incidence->organizer().email(), summary ); //fall through case KMessageBox::Yes: // means "do not send" if ( saveFile( "Receiver Not Searched", iCal, TQString( "reply" ) ) ) { @@ -968,7 +968,7 @@ class Plugin : public KMail::Interface::BodyPartFormatterPlugin } extern "C" -KDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * +TDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * libkmail_bodypartformatter_text_calendar_create_bodypart_formatter_plugin() { TDEGlobal::locale()->insertCatalogue( "kmail_text_calendar_plugin" ); diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp index c5e1297a..215c83c8 100644 --- a/plugins/kmail/bodypartformatter/text_vcard.cpp +++ b/plugins/kmail/bodypartformatter/text_vcard.cpp @@ -63,7 +63,7 @@ using TDEABC::Addressee; #include "addresseeview.h" using KPIM::AddresseeView; -#include <kdemacros.h> +#include <tdemacros.h> namespace { @@ -71,7 +71,7 @@ namespace { public: Formatter() { // disabled pending resolution of how to share static objects when dlopening libraries - //mKIMProxy = ::KIMProxy::instance( kapp->dcopClient() ); + //mKIMProxy = ::KIMProxy::instance( tdeApp->dcopClient() ); } Result format( BodyPart *bodyPart, KMail::HtmlWriter *writer, KMail::Callback & ) const { @@ -268,7 +268,7 @@ namespace { } extern "C" -KDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * +TDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * libkmail_bodypartformatter_text_vcard_create_bodypart_formatter_plugin() { TDEGlobal::locale()->insertCatalogue( "kmail_text_vcard_plugin" ); return new Plugin(); diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp index 8d4937c7..7a229f03 100644 --- a/plugins/kmail/bodypartformatter/text_xdiff.cpp +++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp @@ -44,7 +44,7 @@ #include <kiconloader.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tqurl.h> diff --git a/tdeabc/frontend/main.cpp b/tdeabc/frontend/main.cpp index 0e941e01..706d94e7 100644 --- a/tdeabc/frontend/main.cpp +++ b/tdeabc/frontend/main.cpp @@ -15,6 +15,6 @@ int main( int argc, char ** argv ) MainWindow *w = new MainWindow; w->show(); - app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); return app.exec(); } diff --git a/tdeabc/frontend/mainWindow.ui b/tdeabc/frontend/mainWindow.ui index 240114a6..4bce4b34 100644 --- a/tdeabc/frontend/mainWindow.ui +++ b/tdeabc/frontend/mainWindow.ui @@ -1365,7 +1365,7 @@ <variable>TQString mCurrentAddress</variable> <variable>TQString mCurrentPhone</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>fileSave()</slot> @@ -1404,6 +1404,6 @@ <slot>addressBookLocked()</slot> <slot>addressBookUnlocked()</slot> <slot>fileOpenStd()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/tdeabc/frontend/mainWindow.ui.h b/tdeabc/frontend/mainWindow.ui.h index 8e678b93..5a32e6cc 100644 --- a/tdeabc/frontend/mainWindow.ui.h +++ b/tdeabc/frontend/mainWindow.ui.h @@ -39,12 +39,12 @@ void MainWindow::init() mEmailListView->header()->hide(); mCategoryListView->header()->hide(); - connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), - TQT_SLOT( addressBookChanged() ) ); - connect( mAddressBook, TQT_SIGNAL( addressBookLocked( AddressBook * ) ), - TQT_SLOT( addressBookLocked() ) ); - connect( mAddressBook, TQT_SIGNAL( addressBookUnlocked( AddressBook * ) ), - TQT_SLOT( addressBookUnlocked() ) ); + connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook * ) ), + TQ_SLOT( addressBookChanged() ) ); + connect( mAddressBook, TQ_SIGNAL( addressBookLocked( AddressBook * ) ), + TQ_SLOT( addressBookLocked() ) ); + connect( mAddressBook, TQ_SIGNAL( addressBookUnlocked( AddressBook * ) ), + TQ_SLOT( addressBookUnlocked() ) ); } void MainWindow::destroy() diff --git a/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp b/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp index d36582ba..f872a13c 100644 --- a/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp +++ b/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp @@ -42,8 +42,8 @@ void KABC2Mutt::run() mAddressBook = TDEABC::StdAddressBook::self( true ); TDEABC::StdAddressBook::setAutomaticSave( false ); - connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - this, TQT_SLOT( loadingFinished() ) ); + connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + this, TQ_SLOT( loadingFinished() ) ); } void KABC2Mutt::loadingFinished() @@ -148,7 +148,7 @@ void KABC2Mutt::loadingFinished() } } - kapp->quit(); + tdeApp->quit(); } static std::ostream & operator<< ( std::ostream &os, const TQString &s ) diff --git a/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp b/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp index 9228e1f4..059c6425 100644 --- a/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp +++ b/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp @@ -21,11 +21,11 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kdebug.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeabc/stdaddressbook.h> #include <libtdepim/distributionlist.h> @@ -38,7 +38,7 @@ static const TDECmdLineOptions options[] = void convertDistributionLists() { - KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) ); + TDESimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) ); const TQMap<TQString, TQString> entryMap = cfg.entryMap( "DistributionLists" ); if ( entryMap.isEmpty() ) // nothing to convert diff --git a/tdefile-plugins/rfc822/tdefile_rfc822.cpp b/tdefile-plugins/rfc822/tdefile_rfc822.cpp index f1b4d6ff..68ff16fa 100644 --- a/tdefile-plugins/rfc822/tdefile_rfc822.cpp +++ b/tdefile-plugins/rfc822/tdefile_rfc822.cpp @@ -20,7 +20,7 @@ #include <config.h> #include "tdefile_rfc822.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <kgenericfactory.h> #include <kstringvalidator.h> @@ -32,11 +32,7 @@ #include <tqfile.h> #include <tqdatetime.h> -#if !defined(__osf__) #include <inttypes.h> -#else -typedef unsigned short uint32_t; -#endif typedef KGenericFactory<KRfc822Plugin> Rfc822Factory; diff --git a/tdefile-plugins/vcf/tdefile_vcf.cpp b/tdefile-plugins/vcf/tdefile_vcf.cpp index c7596279..07524695 100644 --- a/tdefile-plugins/vcf/tdefile_vcf.cpp +++ b/tdefile-plugins/vcf/tdefile_vcf.cpp @@ -21,7 +21,7 @@ #include <config.h> #include "tdefile_vcf.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <kgenericfactory.h> #include <tdeabc/vcardconverter.h> diff --git a/tdeioslave/imap4/CMakeLists.txt b/tdeioslave/imap4/CMakeLists.txt index 041aeffc..b62d61dc 100644 --- a/tdeioslave/imap4/CMakeLists.txt +++ b/tdeioslave/imap4/CMakeLists.txt @@ -41,6 +41,6 @@ tde_add_kpart( tdeio_imap4 imapcommand.cpp imaplist.cpp mailaddress.cpp mimeheader.cpp rfcdecoder.cpp imap4.cpp imapinfo.cpp imapparser.cpp mailheader.cpp mimehdrline.cpp mimeio.cpp - LINK emailfunctions-static kmime-shared tdeio-shared ${SASL_LIBRARY} + LINK kmime-shared tdecore-shared tdeio-shared ${SASL_LIBRARY} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeioslave/imap4/imap4.cpp b/tdeioslave/imap4/imap4.cpp index 449711de..0e325ff9 100644 --- a/tdeioslave/imap4/imap4.cpp +++ b/tdeioslave/imap4/imap4.cpp @@ -92,7 +92,7 @@ extern "C" { #include <kmimetype.h> #include <kmdcodec.h> -#include <kdemacros.h> +#include <tdemacros.h> #define IMAP_PROTOCOL "imap" #define IMAP_SSL_PROTOCOL "imaps" @@ -104,7 +104,7 @@ using namespace TDEIO; extern "C" { void sigalrm_handler (int); - KDE_EXPORT int kdemain (int argc, char **argv); + TDE_EXPORT int kdemain (int argc, char **argv); } int @@ -689,7 +689,7 @@ bool IMAP4Protocol::parseRead(TQByteArray & buffer, ulong len, ulong relay) error (ERR_CONNECTION_BROKEN, myHost); setState(ISTATE_CONNECT); closeConnection(); - return FALSE; + return false; } if (relay > buffer.size()) { @@ -714,7 +714,7 @@ bool IMAP4Protocol::parseRead(TQByteArray & buffer, ulong len, ulong relay) bool IMAP4Protocol::parseReadLine (TQByteArray & buffer, ulong relay) { - if (myHost.isEmpty()) return FALSE; + if (myHost.isEmpty()) return false; while (true) { ssize_t copyLen = 0; @@ -747,7 +747,7 @@ bool IMAP4Protocol::parseReadLine (TQByteArray & buffer, ulong relay) readBufferLen -= copyLen; if (readBufferLen) memmove(readBuffer, &readBuffer[copyLen], readBufferLen); - if (buffer[buffer.size() - 1] == '\n') return TRUE; + if (buffer[buffer.size() - 1] == '\n') return true; } if (!isConnectionValid()) { @@ -755,14 +755,14 @@ bool IMAP4Protocol::parseReadLine (TQByteArray & buffer, ulong relay) error (ERR_CONNECTION_BROKEN, myHost); setState(ISTATE_CONNECT); closeConnection(); - return FALSE; + return false; } if (!waitForResponse( responseTimeout() )) { error(ERR_SERVER_TIMEOUT, myHost); setState(ISTATE_CONNECT); closeConnection(); - return FALSE; + return false; } readBufferLen = read(readBuffer, IMAP_BUFFER - 1); if (readBufferLen == 0) @@ -771,7 +771,7 @@ bool IMAP4Protocol::parseReadLine (TQByteArray & buffer, ulong relay) error (ERR_CONNECTION_BROKEN, myHost); setState(ISTATE_CONNECT); closeConnection(); - return FALSE; + return false; } } } @@ -1238,7 +1238,7 @@ IMAP4Protocol::special (const TQByteArray & aData) KURL src; KURL dest; stream >> src >> dest; - copy(src, dest, 0, FALSE); + copy(src, dest, 0, false); break; } case 'c': @@ -2068,7 +2068,7 @@ bool IMAP4Protocol::makeLogin () return false; } - if (metaData("nologin") == "on") return TRUE; + if (metaData("nologin") == "on") return true; if (myTLS == "on" && !hasCapability(TQString("STARTTLS"))) { diff --git a/tdeioslave/imap4/imap4.h b/tdeioslave/imap4/imap4.h index d264cce9..e57300e4 100644 --- a/tdeioslave/imap4/imap4.h +++ b/tdeioslave/imap4/imap4.h @@ -156,7 +156,7 @@ protected: outputLine (_str.latin1 (), _str.length()); } void doListEntry (const KURL & _url, int stretch, imapCache * cache = NULL, - bool withFlags = FALSE, bool withSubject = FALSE); + bool withFlags = false, bool withSubject = false); /** * Send a list entry (folder) to the application @@ -184,7 +184,7 @@ private: // This method behaves like the above method but takes an already encoded url, // so you don't have to call KURL::url() for every mail. void doListEntry (const TQString & encodedUrl, int stretch, imapCache * cache = NULL, - bool withFlags = FALSE, bool withSubject = FALSE); + bool withFlags = false, bool withSubject = false); TQString myHost, myUser, myPass, myAuth, myTLS; int myPort; diff --git a/tdeioslave/imap4/imapcommand.cpp b/tdeioslave/imap4/imapcommand.cpp index 97d0a91c..9e2badc7 100644 --- a/tdeioslave/imap4/imapcommand.cpp +++ b/tdeioslave/imap4/imapcommand.cpp @@ -49,7 +49,7 @@ #include <tdeprotocolmanager.h> #include <ksock.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/connection.h> #include <tdeio/slaveinterface.h> #include <tdeio/passdlg.h> diff --git a/tdeioslave/imap4/imapparser.cpp b/tdeioslave/imap4/imapparser.cpp index d833b639..bdb733f3 100644 --- a/tdeioslave/imap4/imapparser.cpp +++ b/tdeioslave/imap4/imapparser.cpp @@ -56,8 +56,7 @@ extern "C" { #include <kmdcodec.h> #include <kurl.h> -#include <kasciistricmp.h> -#include <kasciistringtools.h> +#include <tdeglobal.h> #ifdef HAVE_LIBSASL2 static sasl_callback_t callbacks[] = { @@ -541,7 +540,7 @@ imapParser::parseResult (TQByteArray & result, parseString & rest, if (rest[0] == '[') { rest.pos++; - TQCString option = parseOneWordC(rest, TRUE); + TQCString option = parseOneWordC(rest, true); switch (option[0]) { @@ -679,7 +678,7 @@ imapParser::parseResult (TQByteArray & result, parseString & rest, void imapParser::parseCapability (parseString & result) { TQCString temp( result.cstr() ); - imapCapabilities = TQStringList::split ( ' ', KPIM::kAsciiToLower( temp.data() ) ); + imapCapabilities = TQStringList::split ( ' ', kasciitolower( temp.data() ) ); } void imapParser::parseFlags (parseString & result) @@ -1347,7 +1346,7 @@ void imapParser::parseBody (parseString & inWords) TQCString label; inWords.pos++; - specifier = parseOneWordC (inWords, TRUE); + specifier = parseOneWordC (inWords, true); if (inWords[0] == '(') { @@ -1835,7 +1834,7 @@ bool imapParser::parseRead (TQByteArray & buffer, ulong len, ulong relay) Q_UNUSED(relay); tqWarning ("imapParser::parseRead - virtual function not reimplemented - no data read"); - return FALSE; + return false; } bool imapParser::parseReadLine (TQByteArray & buffer, ulong relay) @@ -1844,7 +1843,7 @@ bool imapParser::parseReadLine (TQByteArray & buffer, ulong relay) Q_UNUSED(relay); tqWarning ("imapParser::parseReadLine - virtual function not reimplemented - no data read"); - return FALSE; + return false; } void @@ -1976,11 +1975,11 @@ TQCString imapParser::parseOneWordC (parseString & inWords, bool stopAtBracket, if (len > 0 && inWords[0] == '"') { unsigned int i = 1; - bool quote = FALSE; + bool quote = false; while (i < len && (inWords[i] != '"' || quote)) { if (inWords[i] == '\\') quote = !quote; - else quote = FALSE; + else quote = false; i++; } if (i < len) @@ -2050,7 +2049,7 @@ TQCString imapParser::parseOneWordC (parseString & inWords, bool stopAtBracket, bool imapParser::parseOneNumber (parseString & inWords, ulong & num) { bool valid; - num = parseOneWordC(inWords, TRUE).toULong(&valid); + num = parseOneWordC(inWords, true).toULong(&valid); return valid; } diff --git a/tdeioslave/imap4/imapparser.h b/tdeioslave/imap4/imapparser.h index 623fc8f8..24e4747a 100644 --- a/tdeioslave/imap4/imapparser.h +++ b/tdeioslave/imap4/imapparser.h @@ -382,7 +382,7 @@ public: /** parse one word (maybe quoted) upto next space " ) ] } */ static TQCString parseOneWordC (parseString & inWords, - bool stopAtBracket = FALSE, int *len = 0); + bool stopAtBracket = false, int *len = 0); /** parse one number using parseOneWord */ static bool parseOneNumber (parseString & inWords, ulong & num); diff --git a/tdeioslave/imap4/mimeheader.cpp b/tdeioslave/imap4/mimeheader.cpp index d9d2c7d2..c273e6e6 100644 --- a/tdeioslave/imap4/mimeheader.cpp +++ b/tdeioslave/imap4/mimeheader.cpp @@ -24,7 +24,7 @@ // #include <iostream.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kiconloader.h> #include <kmimetype.h> #include <kmimemagic.h> @@ -730,7 +730,7 @@ mimeHeader::magicSetType (bool aAutoDecode) TQByteArray body; KMimeMagicResult *result; - KMimeMagic::self ()->setFollowLinks (TRUE); // is it necessary ? + KMimeMagic::self ()->setFollowLinks (true); // is it necessary ? if (aAutoDecode) body = bodyDecodedBinary (); diff --git a/tdeioslave/imap4/rfcdecoder.cpp b/tdeioslave/imap4/rfcdecoder.cpp index 36111bf1..a82ebcd2 100644 --- a/tdeioslave/imap4/rfcdecoder.cpp +++ b/tdeioslave/imap4/rfcdecoder.cpp @@ -360,14 +360,14 @@ rfcDecoder::decodeRFC2047String (const TQString & _str, TQString & charset, } beg = pos + 2; end = beg; - valid = TRUE; + valid = true; // parse charset name for (i = 2, pos += 2; i < maxLen && (*pos != '?' && (ispunct (*pos) || isalnum (*pos))); i++) pos++; if (*pos != '?' || i < 4 || i >= maxLen) - valid = FALSE; + valid = false; else { charset = TQCString (beg, i - 1); // -2 + 1 for the zero @@ -385,7 +385,7 @@ rfcDecoder::decodeRFC2047String (const TQString & _str, TQString & charset, if (pos[2] != '?' || (encoding != 'Q' && encoding != 'B' && encoding != 'q' && encoding != 'b')) - valid = FALSE; + valid = false; pos += 3; i += 3; // kdDebug(7116) << "rfcDecoder::decodeRFC2047String - charset " << charset << " - language " << language << " - '" << pos << "'" << endl; @@ -401,7 +401,7 @@ rfcDecoder::decodeRFC2047String (const TQString & _str, TQString & charset, } end = pos + 2; //end now points to the first char after the encoded string if (i >= maxLen || !*pos) - valid = FALSE; + valid = false; } if (valid) { diff --git a/tdeioslave/mbox/mbox.cpp b/tdeioslave/mbox/mbox.cpp index 8f45dcaf..6acf70e6 100644 --- a/tdeioslave/mbox/mbox.cpp +++ b/tdeioslave/mbox/mbox.cpp @@ -27,18 +27,18 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <kurl.h> #include <tdeio/global.h> #include <stdlib.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "mbox.h" -extern "C" { KDE_EXPORT int kdemain(int argc, char* argv[]); } +extern "C" { TDE_EXPORT int kdemain(int argc, char* argv[]); } int kdemain( int argc, char * argv[] ) { diff --git a/tdeioslave/opengroupware/opengroupware.cpp b/tdeioslave/opengroupware/opengroupware.cpp index 882b4c6b..c8c388fc 100644 --- a/tdeioslave/opengroupware/opengroupware.cpp +++ b/tdeioslave/opengroupware/opengroupware.cpp @@ -36,7 +36,7 @@ #include <tdeabc/vcardconverter.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <tdelocale.h> #include <tdetempfile.h> @@ -45,7 +45,7 @@ #include <unistd.h> #include <stdlib.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace TDEABC { @@ -64,7 +64,7 @@ class ResourceMemory : public ResourceCached extern "C" { -KDE_EXPORT int kdemain( int argc, char **argv ); +TDE_EXPORT int kdemain( int argc, char **argv ); } int kdemain( int argc, char **argv ) @@ -194,8 +194,8 @@ void OpenGroupware::getCalendar( const KURL &_url ) // FIXME do progress handling mListEventsJob = TDEIO::davPropFind( url, props, "0", false ); - connect( mListEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotGetCalendarListingResult( TDEIO::Job * ) ) ); + connect( mListEventsJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotGetCalendarListingResult( TDEIO::Job * ) ) ); } void OpenGroupware::getAddressbook( const KURL &url ) diff --git a/tdeioslave/sieve/sieve.cpp b/tdeioslave/sieve/sieve.cpp index 0925b515..7bae1244 100644 --- a/tdeioslave/sieve/sieve.cpp +++ b/tdeioslave/sieve/sieve.cpp @@ -34,7 +34,7 @@ extern "C" { #include "sieve.h" #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <kurl.h> #include <kmdcodec.h> @@ -49,7 +49,7 @@ using std::exit; #include <sys/stat.h> #include <cassert> -#include <kdemacros.h> +#include <tdemacros.h> static const int debugArea = 7122; @@ -80,7 +80,7 @@ static const unsigned int SIEVE_DEFAULT_RECIEVE_BUFFER = 512; using namespace TDEIO; extern "C" { - KDE_EXPORT int kdemain(int argc, char **argv) + TDE_EXPORT int kdemain(int argc, char **argv) { TDEInstance instance("tdeio_sieve" ); diff --git a/tderesources/birthdays/resourcetdeabc.cpp b/tderesources/birthdays/resourcetdeabc.cpp index f5271ac7..0917f6ad 100644 --- a/tderesources/birthdays/resourcetdeabc.cpp +++ b/tderesources/birthdays/resourcetdeabc.cpp @@ -30,7 +30,7 @@ #include <kdebug.h> #include <kurl.h> #include <tdeio/job.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeabc/stdaddressbook.h> #include <tdeabc/locknull.h> @@ -125,7 +125,7 @@ bool ResourceTDEABC::doOpen() kdDebug(5800) << "ResourceTDEABC::doOpen()" << endl; mAddressbook = TDEABC::StdAddressBook::self( true ); - connect( mAddressbook, TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT( reload() ) ); + connect( mAddressbook, TQ_SIGNAL(addressBookChanged(AddressBook*)), TQ_SLOT( reload() ) ); return true; } diff --git a/tderesources/birthdays/resourcetdeabc.h b/tderesources/birthdays/resourcetdeabc.h index 93c15d94..103c404f 100644 --- a/tderesources/birthdays/resourcetdeabc.h +++ b/tderesources/birthdays/resourcetdeabc.h @@ -33,7 +33,7 @@ #include "libkcal/resourcecalendar.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace TDEIO { class FileCopyJob; @@ -45,7 +45,7 @@ namespace KCal { /** Resource providing birthdays and anniversaries as events. */ -class KDE_EXPORT ResourceTDEABC : public ResourceCalendar +class TDE_EXPORT ResourceTDEABC : public ResourceCalendar { TQ_OBJECT @@ -77,7 +77,7 @@ class KDE_EXPORT ResourceTDEABC : public ResourceCalendar TDEABC::Lock *lock(); /** Add Event to calendar. */ - KDE_DEPRECATED bool addEvent(Event *event); + TDE_DEPRECATED bool addEvent(Event *event); bool addEvent( Event *event, const TQString &subresource ); /** deletes an event from this calendar. */ bool deleteEvent(Event *); @@ -109,7 +109,7 @@ class KDE_EXPORT ResourceTDEABC : public ResourceCalendar /** Add a todo to the todolist. */ - KDE_DEPRECATED bool addTodo( Todo *todo ); + TDE_DEPRECATED bool addTodo( Todo *todo ); bool addTodo( Todo *todo, const TQString &subresource ); /** Remove a todo from the todolist. @@ -129,7 +129,7 @@ class KDE_EXPORT ResourceTDEABC : public ResourceCalendar */ Todo::List rawTodosForDate( const TQDate &date ); /** Add a Journal entry to calendar */ - KDE_DEPRECATED bool addJournal( Journal *journal ); + TDE_DEPRECATED bool addJournal( Journal *journal ); bool addJournal( Journal *journal, const TQString &subresource ); /** Remove journal from the calendar. */ diff --git a/tderesources/birthdays/resourcetdeabcconfig.cpp b/tderesources/birthdays/resourcetdeabcconfig.cpp index 0f9b3279..4b3b0a1d 100644 --- a/tderesources/birthdays/resourcetdeabcconfig.cpp +++ b/tderesources/birthdays/resourcetdeabcconfig.cpp @@ -61,13 +61,13 @@ ResourceTDEABCConfig::ResourceTDEABCConfig( TQWidget* parent, const char* name mCategoryView->setEnabled( false ); topLayout->addMultiCellWidget( mCategoryView, 4, 4, 0, 1 ); - connect( mUseCategories, TQT_SIGNAL( toggled( bool ) ), - mCategoryView, TQT_SLOT( setEnabled( bool ) ) ); + connect( mUseCategories, TQ_SIGNAL( toggled( bool ) ), + mCategoryView, TQ_SLOT( setEnabled( bool ) ) ); mAlarmTimeEdit->setDisabled(true); mALabel->setDisabled(true); - connect(mAlarm, TQT_SIGNAL(clicked()), TQT_SLOT(alarmClicked())); + connect(mAlarm, TQ_SIGNAL(clicked()), TQ_SLOT(alarmClicked())); setReadOnly( true ); diff --git a/tderesources/blogging/bloggingcalendaradaptor.cpp b/tderesources/blogging/bloggingcalendaradaptor.cpp index 2ed925a8..9c899e5c 100644 --- a/tderesources/blogging/bloggingcalendaradaptor.cpp +++ b/tderesources/blogging/bloggingcalendaradaptor.cpp @@ -102,17 +102,17 @@ void BloggingCalendarAdaptor::setAPI( KBlog::APIBlog *api ) delete mAPI; mAPI = api; mAuthenticated = false; - connect( api, TQT_SIGNAL( userInfoRetrieved( const TQString &, const TQString &, + connect( api, TQ_SIGNAL( userInfoRetrieved( const TQString &, const TQString &, const TQString & ) ), - TQT_SLOT( slotUserInfoRetrieved( const TQString &, const TQString &, + TQ_SLOT( slotUserInfoRetrieved( const TQString &, const TQString &, const TQString & ) ) ); - connect( api, TQT_SIGNAL( folderInfoRetrieved( const TQString &, const TQString & ) ), - TQT_SLOT( slotFolderInfoRetrieved( const TQString&, const TQString & ) ) ); - connect( api, TQT_SIGNAL( itemOnServer( const KURL & ) ), - TQT_SIGNAL( itemOnServer( const KURL & ) ) ); - connect( api, TQT_SIGNAL( itemDownloaded( KCal::Incidence *, const TQString &, + connect( api, TQ_SIGNAL( folderInfoRetrieved( const TQString &, const TQString & ) ), + TQ_SLOT( slotFolderInfoRetrieved( const TQString&, const TQString & ) ) ); + connect( api, TQ_SIGNAL( itemOnServer( const KURL & ) ), + TQ_SIGNAL( itemOnServer( const KURL & ) ) ); + connect( api, TQ_SIGNAL( itemDownloaded( KCal::Incidence *, const TQString &, const KURL &, const TQString &, const TQString & ) ), - TQT_SLOT( calendarItemDownloaded( KCal::Incidence *, const TQString &, + TQ_SLOT( calendarItemDownloaded( KCal::Incidence *, const TQString &, const KURL &, const TQString &, const TQString & ) ) ); } diff --git a/tderesources/blogging/kcal_resourceblogging.h b/tderesources/blogging/kcal_resourceblogging.h index 2e401d8f..1cbd01f8 100644 --- a/tderesources/blogging/kcal_resourceblogging.h +++ b/tderesources/blogging/kcal_resourceblogging.h @@ -22,7 +22,7 @@ #define KCAL_RESOURCEBLOGGING_H #include <kcal_resourcegroupwarebase.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KBlog { class APIBlog; @@ -33,7 +33,7 @@ namespace KCal { /** This class provides a resource for accessing blogs on a blogging server as journals */ -class KDE_EXPORT ResourceBlogging : public ResourceGroupwareBase +class TDE_EXPORT ResourceBlogging : public ResourceGroupwareBase { TQ_OBJECT diff --git a/tderesources/blogging/kcal_resourcebloggingconfig.h b/tderesources/blogging/kcal_resourcebloggingconfig.h index 7d69f830..ca387006 100644 --- a/tderesources/blogging/kcal_resourcebloggingconfig.h +++ b/tderesources/blogging/kcal_resourcebloggingconfig.h @@ -20,12 +20,12 @@ #ifndef KCAL_RESOURCEBLOGGINGCONFIG_H #define KCAL_RESOURCEBLOGGINGCONFIG_H -#include <kdemacros.h> +#include <tdemacros.h> #include <kcal_resourcegroupwarebaseconfig.h> namespace KCal { -class KDE_EXPORT ResourceBloggingConfig : public ResourceGroupwareBaseConfig +class TDE_EXPORT ResourceBloggingConfig : public ResourceGroupwareBaseConfig { TQ_OBJECT diff --git a/tderesources/caldav/config.cpp b/tderesources/caldav/config.cpp index b83660f8..4a9888ea 100644 --- a/tderesources/caldav/config.cpp +++ b/tderesources/caldav/config.cpp @@ -167,12 +167,12 @@ void ResourceCalDavConfig::setupUI() { mainLayout->addWidget(mRememberPassword, 8, 1); mTasksUrl->setEnabled(mUseSTasks->isChecked()); - connect( mUseSTasks, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotSTasksToggled( bool ) ) ); + connect( mUseSTasks, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotSTasksToggled( bool ) ) ); mJournalsUrl->setEnabled(mUseSJournals->isChecked()); - connect( mUseSJournals, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotSJournalsToggled( bool ) ) ); + connect( mUseSJournals, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotSJournalsToggled( bool ) ) ); // configs TQHBoxLayout* horizontal = new TQHBoxLayout(this); diff --git a/tderesources/caldav/config.h b/tderesources/caldav/config.h index 4dec65f3..23ea20fb 100644 --- a/tderesources/caldav/config.h +++ b/tderesources/caldav/config.h @@ -19,7 +19,7 @@ #include "resource.h" -#include <kdemacros.h> +#include <tdemacros.h> #include <tderesources/configwidget.h> class TQLineEdit; @@ -37,7 +37,7 @@ class CalDavSaveConfig; /** * Configuration widget for CalDAV resource. */ -class KDE_EXPORT ResourceCalDavConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceCalDavConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/caldav/configwidgets.cpp b/tderesources/caldav/configwidgets.cpp index 7e003dcd..9f4f1e11 100644 --- a/tderesources/caldav/configwidgets.cpp +++ b/tderesources/caldav/configwidgets.cpp @@ -103,8 +103,8 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent ) d->mGroup->insert( automaticReloadOnStartup, 1 ); d->mGroup->insert( noAutomaticReload, 0 ); - connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotIntervalToggled( bool ) ) ); + connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotIntervalToggled( bool ) ) ); TQHBox *intervalBox = new TQHBox( groupBox ); //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox ); @@ -179,8 +179,8 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent ) d->mGroup->insert( onExit, 1 ); d->mGroup->insert( intervalRadio, 2 ); - connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotIntervalToggled( bool ) ) ); + connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotIntervalToggled( bool ) ) ); TQHBox *intervalBox = new TQHBox( groupBox ); //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox ); diff --git a/tderesources/caldav/configwidgets.h b/tderesources/caldav/configwidgets.h index 5bee6aa9..07362c01 100644 --- a/tderesources/caldav/configwidgets.h +++ b/tderesources/caldav/configwidgets.h @@ -36,7 +36,7 @@ #define KCALDAV_AUTOWIDGETS_H #include <tqwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KCal { @@ -47,7 +47,7 @@ class ResourceCached; @see ResourceCached */ -class KDE_EXPORT CalDavReloadConfig : public TQWidget +class TDE_EXPORT CalDavReloadConfig : public TQWidget { TQ_OBJECT @@ -74,7 +74,7 @@ class KDE_EXPORT CalDavReloadConfig : public TQWidget @see ResourceCached */ -class KDE_EXPORT CalDavSaveConfig : public TQWidget +class TDE_EXPORT CalDavSaveConfig : public TQWidget { TQ_OBJECT diff --git a/tderesources/caldav/resource.cpp b/tderesources/caldav/resource.cpp index 8fae5c98..9ab685c8 100644 --- a/tderesources/caldav/resource.cpp +++ b/tderesources/caldav/resource.cpp @@ -197,7 +197,7 @@ bool ResourceCalDav::doSave() { clearChanges(); if (mWriteRetryTimer != NULL) { if (mWriteRetryTimer->isActive() == false) { - disconnect( mWriteRetryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doSave()) ); + disconnect( mWriteRetryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doSave()) ); delete mWriteRetryTimer; mWriteRetryTimer = NULL; } @@ -249,8 +249,8 @@ void ResourceCalDav::init() { // creating jobs // TQt4 handles this quite differently, as shown below, // whereas TQt3 needs events (see ::event()) -// connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished())); -// connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished())); +// connect(mLoader, TQ_SIGNAL(finished()), this, TQ_SLOT(loadFinished())); +// connect(mWriter, TQ_SIGNAL(finished()), this, TQ_SLOT(writingFinished())); setType("ResourceCalDav"); } @@ -827,14 +827,14 @@ bool ResourceCalDav::event ( TQEvent * e ) { if (e->type() == 1000) { // Read done loadFinished(); - return TRUE; + return true; } else if (e->type() == 1001) { // Write done writingFinished(); - return TRUE; + return true; } - else return FALSE; + else return false; } void ResourceCalDav::releaseReadLockout() { @@ -850,9 +850,9 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl, if ((mLoader->running() == true) || (mLoadingQueue.isEmpty() == false) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false)) { if (mWriteRetryTimer == NULL) { mWriteRetryTimer = new TQTimer(this); - connect( mWriteRetryTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doSave()) ); + connect( mWriteRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doSave()) ); } - mWriteRetryTimer->start(1000, TRUE); + mWriteRetryTimer->start(1000, true); return false; } @@ -995,7 +995,7 @@ void ResourceCalDav::writingFinished() { } // Give the remote system a few seconds to process the data before we allow any read operations - TQTimer::singleShot( 3000, this, TQT_SLOT(releaseReadLockout()) ); + TQTimer::singleShot( 3000, this, TQ_SLOT(releaseReadLockout()) ); // Writing queue and mWritingQueueReady flag are not shared resources, i.e. only one thread has an access to them. // That's why no mutexes are required. diff --git a/tderesources/caldav/resource.h b/tderesources/caldav/resource.h index 7e4bbdc5..326806b1 100644 --- a/tderesources/caldav/resource.h +++ b/tderesources/caldav/resource.h @@ -26,7 +26,7 @@ #include <tdeabc/locknull.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tdeconfig.h> namespace KCal { @@ -41,7 +41,7 @@ class CalDavWriter; /** * This class provides a resource for accessing calendars via CalDAV protocol. */ -class KDE_EXPORT ResourceCalDav : public ResourceCached +class TDE_EXPORT ResourceCalDav : public ResourceCached { TQ_OBJECT diff --git a/tderesources/carddav/config.h b/tderesources/carddav/config.h index 027dc069..c4c8c659 100644 --- a/tderesources/carddav/config.h +++ b/tderesources/carddav/config.h @@ -18,7 +18,7 @@ #include "resource.h" -#include <kdemacros.h> +#include <tdemacros.h> #include <tderesources/configwidget.h> class TQLineEdit; @@ -36,7 +36,7 @@ class CardDavSaveConfig; /** * Configuration widget for CardDAV resource. */ -class KDE_EXPORT ResourceCardDavConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceCardDavConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/carddav/configwidgets.cpp b/tderesources/carddav/configwidgets.cpp index 3d747513..60fc5ed2 100644 --- a/tderesources/carddav/configwidgets.cpp +++ b/tderesources/carddav/configwidgets.cpp @@ -102,8 +102,8 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent ) d->mGroup->insert( automaticReloadOnStartup, 1 ); d->mGroup->insert( noAutomaticReload, 0 ); - connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotIntervalToggled( bool ) ) ); + connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotIntervalToggled( bool ) ) ); TQHBox *intervalBox = new TQHBox( groupBox ); //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox ); @@ -178,8 +178,8 @@ CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent ) d->mGroup->insert( onExit, 1 ); d->mGroup->insert( intervalRadio, 2 ); - connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotIntervalToggled( bool ) ) ); + connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotIntervalToggled( bool ) ) ); TQHBox *intervalBox = new TQHBox( groupBox ); //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox ); diff --git a/tderesources/carddav/configwidgets.h b/tderesources/carddav/configwidgets.h index 3fcb10f8..f723cda6 100644 --- a/tderesources/carddav/configwidgets.h +++ b/tderesources/carddav/configwidgets.h @@ -35,7 +35,7 @@ #define KCARDDAV_AUTOWIDGETS_H #include <tqwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace TDEABC { @@ -46,7 +46,7 @@ class ResourceCached; @see ResourceCached */ -class KDE_EXPORT CardDavReloadConfig : public TQWidget +class TDE_EXPORT CardDavReloadConfig : public TQWidget { TQ_OBJECT @@ -73,7 +73,7 @@ class KDE_EXPORT CardDavReloadConfig : public TQWidget @see ResourceCached */ -class KDE_EXPORT CardDavSaveConfig : public TQWidget +class TDE_EXPORT CardDavSaveConfig : public TQWidget { TQ_OBJECT diff --git a/tderesources/carddav/resource.cpp b/tderesources/carddav/resource.cpp index 69eb98e4..4bc11df0 100644 --- a/tderesources/carddav/resource.cpp +++ b/tderesources/carddav/resource.cpp @@ -197,7 +197,7 @@ bool ResourceCardDav::doSave() { clearChanges(); if (mWriteRetryTimer != NULL) { if (mWriteRetryTimer->isActive() == false) { - disconnect( mWriteRetryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doSave()) ); + disconnect( mWriteRetryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doSave()) ); delete mWriteRetryTimer; mWriteRetryTimer = NULL; } @@ -256,8 +256,8 @@ void ResourceCardDav::init() { // creating jobs // TQt4 handles this quite differently, as shown below, // whereas TQt3 needs events (see ::event()) -// connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished())); -// connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished())); +// connect(mLoader, TQ_SIGNAL(finished()), this, TQ_SLOT(loadFinished())); +// connect(mWriter, TQ_SIGNAL(finished()), this, TQ_SLOT(writingFinished())); setType("ResourceCardDav"); } @@ -587,14 +587,14 @@ bool ResourceCardDav::event ( TQEvent * e ) { if (e->type() == 1000) { // Read done loadFinished(); - return TRUE; + return true; } else if (e->type() == 1001) { // Write done writingFinished(); - return TRUE; + return true; } - else return FALSE; + else return false; } bool ResourceCardDav::startWriting(const TQString& url) { @@ -609,9 +609,9 @@ bool ResourceCardDav::startWriting(const TQString& url) { if ((mLoader->running() == true) || (mLoadingQueue.isEmpty() == false) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false)) { if (mWriteRetryTimer == NULL) { mWriteRetryTimer = new TQTimer(this); - connect( mWriteRetryTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doSave()) ); + connect( mWriteRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doSave()) ); } - mWriteRetryTimer->start(1000, TRUE); + mWriteRetryTimer->start(1000, true); return false; } diff --git a/tderesources/carddav/resource.h b/tderesources/carddav/resource.h index e255714a..a76754bd 100644 --- a/tderesources/carddav/resource.h +++ b/tderesources/carddav/resource.h @@ -25,7 +25,7 @@ #include <tdeabc/locknull.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tdeconfig.h> namespace TDEABC { @@ -40,7 +40,7 @@ class CardDavWriter; /** * This class provides a resource for accessing calendars via CardDAV protocol. */ -class KDE_EXPORT ResourceCardDav : public ResourceCached +class TDE_EXPORT ResourceCardDav : public ResourceCached { TQ_OBJECT diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.cpp b/tderesources/egroupware/kcal_resourcexmlrpc.cpp index 676770ed..7e63ac42 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpc.cpp +++ b/tderesources/egroupware/kcal_resourcexmlrpc.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tderesources/configwidget.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <kurl.h> #include <libtdepim/kpimprefs.h> @@ -197,8 +197,8 @@ bool ResourceXMLRPC::doOpen() args.insert( "password", mPrefs->password() ); mServer->call( "system.login", TQVariant( args ), - this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); @@ -214,8 +214,8 @@ void ResourceXMLRPC::doClose() args.insert( "kp3", mKp3 ); mServer->call( "system.logout", TQVariant( args ), - this, TQT_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); } @@ -243,8 +243,8 @@ bool ResourceXMLRPC::doLoad() args.insert( "end", TQDateTime( TQDate::currentDate().addDays( 2000 ) ) ); mServer->call( SearchEventsCommand, args, - this, TQT_SLOT( listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); args.clear(); columns.insert( "type", "task" ); @@ -253,16 +253,16 @@ bool ResourceXMLRPC::doLoad() args.insert( "order", "id_parent" ); mServer->call( SearchTodosCommand, args, - this, TQT_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mServer->call( LoadEventCategoriesCommand, TQVariant( TQStringVariantMap() ), - this, TQT_SLOT( loadEventCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loadEventCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mServer->call( LoadTodoCategoriesCommand, TQVariant( false ), - this, TQT_SLOT( loadTodoCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loadTodoCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); return true; } @@ -286,8 +286,8 @@ bool ResourceXMLRPC::doSave() args.insert( "id", idMapper().remoteId( (*evIt)->uid() ).toInt() ); mServer->call( AddEventCommand, TQVariant( args ), - this, TQT_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); counter++; } } @@ -302,8 +302,8 @@ bool ResourceXMLRPC::doSave() args.insert( "id", idMapper().remoteId( (*todoIt)->uid() ).toInt() ); mServer->call( AddTodoCommand, TQVariant( args ), - this, TQT_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); counter++; } } @@ -340,8 +340,8 @@ bool ResourceXMLRPC::addEvent( Event* ev ) writeEvent( ev, args ); args.insert( "id", idMapper().remoteId( ev->uid() ).toInt() ); mServer->call( AddEventCommand, TQVariant( args ), - this, TQT_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mCalendar.deleteIncidence( oldEvent ); mCalendar.addIncidence( ev ); @@ -350,8 +350,8 @@ bool ResourceXMLRPC::addEvent( Event* ev ) } else { // new event writeEvent( ev, args ); mServer->call( AddEventCommand, TQVariant( args ), - this, TQT_SLOT( addEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( addEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( ev->uid() ) ); mCalendar.addEvent( ev ); @@ -369,9 +369,9 @@ bool ResourceXMLRPC::deleteEvent( Event* ev ) return false; mServer->call( DeleteEventCommand, idMapper().remoteId( ev->uid() ).toInt(), - this, TQT_SLOT( deleteEventFinished( const TQValueList<TQVariant>&, + this, TQ_SLOT( deleteEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( ev->uid() ) ); return true; } @@ -420,8 +420,8 @@ bool ResourceXMLRPC::addTodo( Todo *todo ) writeTodo( todo, args ); args.insert( "id", idMapper().remoteId( todo->uid() ).toInt() ); mServer->call( AddTodoCommand, TQVariant( args ), - this, TQT_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mCalendar.deleteIncidence( oldTodo ); mCalendar.addIncidence( todo ); @@ -430,8 +430,8 @@ bool ResourceXMLRPC::addTodo( Todo *todo ) } else { // new todo writeTodo( todo, args ); mServer->call( AddTodoCommand, TQVariant( args ), - this, TQT_SLOT( addTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( addTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( todo->uid() ) ); mCalendar.addTodo( todo ); @@ -449,9 +449,9 @@ bool ResourceXMLRPC::deleteTodo( Todo *todo ) return false; mServer->call( DeleteTodoCommand, idMapper().remoteId( todo->uid() ).toInt(), - this, TQT_SLOT( deleteTodoFinished( const TQValueList<TQVariant>&, + this, TQ_SLOT( deleteTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( todo->uid() ) ); return true; } diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.h b/tderesources/egroupware/kcal_resourcexmlrpc.h index b3eef632..53005dd5 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpc.h +++ b/tderesources/egroupware/kcal_resourcexmlrpc.h @@ -29,7 +29,7 @@ #include <tdeconfig.h> #include <kurl.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "libkcal/calendarlocal.h" #include "libkcal/incidence.h" @@ -50,7 +50,7 @@ class EGroupwarePrefs; /** This class provides access to php/eGroupware calendar via XML-RPC. */ -class KDE_EXPORT ResourceXMLRPC : public ResourceCached +class TDE_EXPORT ResourceXMLRPC : public ResourceCached { TQ_OBJECT diff --git a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h index 0cd619c0..15aded2e 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h @@ -22,7 +22,7 @@ #define RESOURCEXMLRPCCONFIG_H #include <tderesources/configwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> class KIntSpinBox; class KLineEdit; @@ -30,7 +30,7 @@ class KURLRequester; namespace KCal { -class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.cpp b/tderesources/egroupware/knotes_resourcexmlrpc.cpp index 9a477076..80262ed7 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpc.cpp +++ b/tderesources/egroupware/knotes_resourcexmlrpc.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <kurl.h> @@ -123,8 +123,8 @@ bool ResourceXMLRPC::load() args.insert( "password", mPrefs->password() ); mServer->call( "system.login", TQVariant( args ), - this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); @@ -135,8 +135,8 @@ bool ResourceXMLRPC::load() args.insert( "order", "id_parent" ); mServer->call( SearchNotesCommand, args, - this, TQT_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); @@ -163,15 +163,15 @@ bool ResourceXMLRPC::addNote( KCal::Journal *journal ) writeNote( journal, args ); args.insert( "id", mUidMap[ journal->uid() ].toInt() ); mServer->call( AddNoteCommand, TQVariant( args ), - this, TQT_SLOT( updateNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( updateNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mCalendar.addJournal( journal ); added = true; } } else { mServer->call( AddNoteCommand, TQVariant( args ), - this, TQT_SLOT( addNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( addNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( journal->uid() ) ); mCalendar.addJournal( journal ); @@ -189,8 +189,8 @@ bool ResourceXMLRPC::deleteNote( KCal::Journal *journal ) int id = mUidMap[ journal->uid() ].toInt(); mServer->call( DeleteNoteCommand, id, - this, TQT_SLOT( deleteNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( deleteNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( journal->uid() ) ); mSynchronizer->start(); diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.h b/tderesources/egroupware/knotes_resourcexmlrpc.h index e0b19cfc..c52c3925 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpc.h +++ b/tderesources/egroupware/knotes_resourcexmlrpc.h @@ -27,7 +27,7 @@ #include <tdeconfig.h> #include <kurl.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "libkcal/calendarlocal.h" #include "libkcal/journal.h" @@ -46,7 +46,7 @@ class EGroupwarePrefs; /** This class provides access to eGroupware notes via XML-RPC. */ -class KDE_EXPORT ResourceXMLRPC : public ResourceNotes +class TDE_EXPORT ResourceXMLRPC : public ResourceNotes { TQ_OBJECT diff --git a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h index 25557d4f..3693e67c 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h @@ -22,7 +22,7 @@ #define RESOURCEXMLRPCCONFIG_H #include <tderesources/configwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> class KIntSpinBox; class KLineEdit; @@ -30,7 +30,7 @@ class KURLRequester; namespace KNotes { -class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/egroupware/synchronizer.h b/tderesources/egroupware/synchronizer.h index ed9fd135..9e14fd93 100644 --- a/tderesources/egroupware/synchronizer.h +++ b/tderesources/egroupware/synchronizer.h @@ -37,8 +37,8 @@ ... job = TDEIO::file_copy( url, file, -1, true ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); mSynchronizer.start(); // will block here until the slot was called ... diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp index dd791cd8..232eb94f 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp +++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kmdcodec.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <libkcal/freebusyurlstore.h> #include <libtdepim/kpimprefs.h> @@ -159,8 +159,8 @@ bool ResourceXMLRPC::doOpen() args.insert( "password", mPrefs->password() ); mServer->call( "system.login", TQVariant( args ), - this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); @@ -174,8 +174,8 @@ void ResourceXMLRPC::doClose() args.insert( "kp3", mKp3 ); mServer->call( "system.logout", TQVariant( args ), - this, TQT_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); } @@ -205,16 +205,16 @@ bool ResourceXMLRPC::asyncLoad() args.insert( "include_users", "calendar" ); mServer->call( SearchContactsCommand, args, - this, TQT_SLOT( listContactsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( listContactsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mServer->call( LoadCategoriesCommand, TQVariant( false ), - this, TQT_SLOT( loadCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loadCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mServer->call( LoadCustomFieldsCommand, TQVariant( TQValueList<TQVariant>() ), - this, TQT_SLOT( loadCustomFieldsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loadCustomFieldsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); return true; } @@ -253,8 +253,8 @@ void ResourceXMLRPC::addContact( const Addressee& addr ) writeContact( addr, args ); mServer->call( AddContactCommand, args, - this, TQT_SLOT( addContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( addContactFault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( addContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( addContactFault( int, const TQString&, const TQVariant& ) ), TQVariant( addr.uid() ) ); } @@ -270,8 +270,8 @@ void ResourceXMLRPC::updateContact( const Addressee& addr ) args.insert( "id", idMapper().remoteId( addr.uid() ) ); mServer->call( AddContactCommand, args, - this, TQT_SLOT( updateContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( updateContactFault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( updateContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( updateContactFault( int, const TQString&, const TQVariant& ) ), TQVariant( addr.uid() ) ); } @@ -284,8 +284,8 @@ void ResourceXMLRPC::deleteContact( const Addressee& addr ) } mServer->call( DeleteContactCommand, idMapper().remoteId( addr.uid() ), - this, TQT_SLOT( deleteContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( deleteContactFault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( deleteContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( deleteContactFault( int, const TQString&, const TQVariant& ) ), TQVariant( addr.uid() ) ); } diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.h b/tderesources/egroupware/tdeabc_resourcexmlrpc.h index d671912a..c9e318f4 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpc.h +++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.h @@ -22,7 +22,7 @@ #define TDEABC_RESOURCEXMLRPC_H #include <tqmap.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "libtdepim/tdeabcresourcecached.h" @@ -37,7 +37,7 @@ namespace TDEABC { class EGroupwarePrefs; -class KDE_EXPORT ResourceXMLRPC : public ResourceCached +class TDE_EXPORT ResourceXMLRPC : public ResourceCached { TQ_OBJECT diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h index 6208f684..502f0597 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h @@ -22,14 +22,14 @@ #define RESOURCEXMLRPCCONFIG_H #include <tderesources/configwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> class KLineEdit; class KURLRequester; namespace TDEABC { -class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/egroupware/todostatemapper.cpp b/tderesources/egroupware/todostatemapper.cpp index 531b298f..97742559 100644 --- a/tderesources/egroupware/todostatemapper.cpp +++ b/tderesources/egroupware/todostatemapper.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "todostatemapper.h" diff --git a/tderesources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp index 3f4b9aa4..29d5563e 100644 --- a/tderesources/egroupware/xmlrpciface.cpp +++ b/tderesources/egroupware/xmlrpciface.cpp @@ -78,10 +78,10 @@ void Query::call( const TQString &server, const TQString &method, job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" ); job->addMetaData( "ConnectTimeout", "50" ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); m_pendingJobs.append( job ); } @@ -360,9 +360,9 @@ void Server::call( const TQString &method, const TQValueList<TQVariant> &args, kdWarning() << "Cannot execute call to " << method << ": empty server URL" << endl; Query *query = Query::create( id, this ); - connect( query, TQT_SIGNAL( message( const TQValueList<TQVariant> &, const TQVariant& ) ), msgObj, messageSlot ); - connect( query, TQT_SIGNAL( fault( int, const TQString&, const TQVariant& ) ), faultObj, faultSlot ); - connect( query, TQT_SIGNAL( finished( Query* ) ), this, TQT_SLOT( queryFinished( Query* ) ) ); + connect( query, TQ_SIGNAL( message( const TQValueList<TQVariant> &, const TQVariant& ) ), msgObj, messageSlot ); + connect( query, TQ_SIGNAL( fault( int, const TQString&, const TQVariant& ) ), faultObj, faultSlot ); + connect( query, TQ_SIGNAL( finished( Query* ) ), this, TQ_SLOT( queryFinished( Query* ) ) ); mPendingQueries.append( query ); query->call( m_url.url(), method, args, m_userAgent ); diff --git a/tderesources/exchange/dateset.cpp b/tderesources/exchange/dateset.cpp index b2622902..5366b029 100644 --- a/tderesources/exchange/dateset.cpp +++ b/tderesources/exchange/dateset.cpp @@ -239,7 +239,7 @@ void DateSet::print() } // Try and merge range i with range i+1 -// NOT TRUE preconditions: range i starts before range i+1, but MAY end later! +// NOT true preconditions: range i starts before range i+1, but MAY end later! // preconditions: range i starts before or in range i+1 bool DateSet::tryMerge( int i ) { diff --git a/tderesources/exchange/resourceexchange.cpp b/tderesources/exchange/resourceexchange.cpp index ae65f9cd..a2cbbed0 100644 --- a/tderesources/exchange/resourceexchange.cpp +++ b/tderesources/exchange/resourceexchange.cpp @@ -123,18 +123,18 @@ bool ResourceExchange::doOpen() kdDebug() << "ResourceExchange::doOpen()" << endl; mClient = new ExchangeClient( mAccount, mTimeZoneId ); - connect( mClient, TQT_SIGNAL( downloadFinished( int, const TQString & ) ), - TQT_SLOT( slotDownloadFinished( int, const TQString & ) ) ); - connect( mClient, TQT_SIGNAL( event( KCal::Event *, const KURL & ) ), - TQT_SLOT( downloadedEvent( KCal::Event *, const KURL & ) ) ); + connect( mClient, TQ_SIGNAL( downloadFinished( int, const TQString & ) ), + TQ_SLOT( slotDownloadFinished( int, const TQString & ) ) ); + connect( mClient, TQ_SIGNAL( event( KCal::Event *, const KURL & ) ), + TQ_SLOT( downloadedEvent( KCal::Event *, const KURL & ) ) ); #if 0 kdDebug() << "Creating monitor" << endl; TQHostAddress ip; ip.setAddress( mAccount->host() ); mMonitor = new ExchangeMonitor( mAccount, ExchangeMonitor::CallBack, ip ); - connect( mMonitor, TQT_SIGNAL(notify( const TQValueList<long>& , const TQValueList<KURL>& )), this, TQT_SLOT(slotMonitorNotify( const TQValueList<long>& , const TQValueList<KURL>& )) ); - connect( mMonitor, TQT_SIGNAL(error(int , const TQString&)), this, TQT_SLOT(slotMonitorError(int , const TQString&)) ); + connect( mMonitor, TQ_SIGNAL(notify( const TQValueList<long>& , const TQValueList<KURL>& )), this, TQ_SLOT(slotMonitorNotify( const TQValueList<long>& , const TQValueList<KURL>& )) ); + connect( mMonitor, TQ_SIGNAL(error(int , const TQString&)), this, TQ_SLOT(slotMonitorError(int , const TQString&)) ); mMonitor->addWatch( mAccount->calendarURL(), ExchangeMonitor::UpdateNewMember, 1 ); #endif diff --git a/tderesources/exchange/resourceexchange.h b/tderesources/exchange/resourceexchange.h index 23113dad..c944e9d7 100644 --- a/tderesources/exchange/resourceexchange.h +++ b/tderesources/exchange/resourceexchange.h @@ -84,7 +84,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer // void close(); /** Add Event to calendar. */ - KDE_DEPRECATED bool addEvent( Event *event ); + TDE_DEPRECATED bool addEvent( Event *event ); bool addEvent( Event *event, const TQString &subresource ); /** deletes an event from this calendar. */ @@ -121,7 +121,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer /** Add a todo to the todolist. */ - KDE_DEPRECATED bool addTodo( Todo *todo ); + TDE_DEPRECATED bool addTodo( Todo *todo ); bool addTodo( Todo *todo, const TQString &subresource ); /** Remove a todo from the todolist. @@ -142,7 +142,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer Todo::List rawTodosForDate( const TQDate &date ); /** Add a Journal entry to calendar */ - KDE_DEPRECATED bool addJournal( Journal *journal ); + TDE_DEPRECATED bool addJournal( Journal *journal ); bool addJournal( Journal *journal, const TQString &subresource ); /** deletes an event from this calendar. */ virtual bool deleteJournal(Journal *); diff --git a/tderesources/exchange/resourceexchangeconfig.cpp b/tderesources/exchange/resourceexchangeconfig.cpp index 3b3bf14f..5d2de94a 100644 --- a/tderesources/exchange/resourceexchangeconfig.cpp +++ b/tderesources/exchange/resourceexchangeconfig.cpp @@ -24,7 +24,7 @@ #include <tdelocale.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include "exchangeaccount.h" @@ -62,7 +62,7 @@ ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent, const char* n mAutoMailbox = new TQCheckBox( i18n( "Determine mailbox &automatically" ), this ); mainLayout->addMultiCellWidget( mAutoMailbox, 5, 5, 0, 1 ); - connect( mAutoMailbox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAuto(bool)) ); + connect( mAutoMailbox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAuto(bool)) ); mMailboxEdit = new KLineEdit( this ); mainLayout->addWidget( new TQLabel( i18n( "Mailbox URL:" ), this ), 6, 0 ); @@ -70,11 +70,11 @@ ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent, const char* n mTryFindMailbox = new TQPushButton( i18n( "&Find" ), this ); mainLayout->addWidget( mTryFindMailbox, 6, 2 ); - connect( mTryFindMailbox, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFindClicked()) ); + connect( mTryFindMailbox, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFindClicked()) ); label = new TQLabel( i18n( "Cache timeout:" ), this ); mCacheEdit = new KIntNumInput( this ); - connect(mCacheEdit, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(slotCacheEditChanged( int ))); + connect(mCacheEdit, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(slotCacheEditChanged( int ))); mCacheEdit->setMinValue( 0 ); mainLayout->addWidget( label, 7, 0 ); mainLayout->addWidget( mCacheEdit, 7, 1 ); diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.cpp b/tderesources/featureplan/kcal_resourcefeatureplan.cpp index f5c7ee5f..6db45054 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplan.cpp +++ b/tderesources/featureplan/kcal_resourcefeatureplan.cpp @@ -36,7 +36,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tderesources/configwidget.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <kurl.h> #include <libtdepim/kpimprefs.h> diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.h b/tderesources/featureplan/kcal_resourcefeatureplan.h index 7b64e12a..f82da2cf 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplan.h +++ b/tderesources/featureplan/kcal_resourcefeatureplan.h @@ -29,7 +29,7 @@ #include <tdeabc/locknull.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tdeconfig.h> namespace KCal { @@ -37,7 +37,7 @@ namespace KCal { /** This class represents a featureplan (in KDE XML format) */ -class KDE_EXPORT ResourceFeaturePlan : public ResourceCached +class TDE_EXPORT ResourceFeaturePlan : public ResourceCached { TQ_OBJECT diff --git a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h index 23809cea..0bd6d4b9 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h +++ b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h @@ -23,7 +23,7 @@ #define RESOURCEFEATUREPLANCONFIG_H #include <tderesources/configwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> class KLineEdit; class KURLRequester; @@ -31,7 +31,7 @@ class TQCheckBox; namespace KCal { -class KDE_EXPORT ResourceFeaturePlanConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceFeaturePlanConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/groupdav/kcal_resourcegroupdav.h b/tderesources/groupdav/kcal_resourcegroupdav.h index 68aa44a6..7085f327 100644 --- a/tderesources/groupdav/kcal_resourcegroupdav.h +++ b/tderesources/groupdav/kcal_resourcegroupdav.h @@ -31,7 +31,7 @@ namespace KCal { /** This class provides a resource for accessing an GroupDav.org server */ -class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase +class TDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase { TQ_OBJECT diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav.h b/tderesources/groupdav/tdeabc_resourcegroupdav.h index 9057a8d8..496f8e05 100644 --- a/tderesources/groupdav/tdeabc_resourcegroupdav.h +++ b/tderesources/groupdav/tdeabc_resourcegroupdav.h @@ -23,11 +23,11 @@ #define TDEABC_RESOURCEGROUPDAV_H #include "tdeabc_resourcegroupwarebase.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace TDEABC { -class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase +class TDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase { TQ_OBJECT diff --git a/tderesources/groupware/kcal_resourcegroupware.cpp b/tderesources/groupware/kcal_resourcegroupware.cpp index 6200773b..56d61b52 100644 --- a/tderesources/groupware/kcal_resourcegroupware.cpp +++ b/tderesources/groupware/kcal_resourcegroupware.cpp @@ -38,7 +38,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tderesources/configwidget.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <kurl.h> #include <libtdepim/kpimprefs.h> @@ -159,16 +159,16 @@ bool ResourceGroupware::doLoad() mJobData = TQString(); mDownloadJob = KPIM::GroupwareJob::getCalendar( url ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") ); connect( mProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); return true; } diff --git a/tderesources/groupware/kcal_resourcegroupwareconfig.cpp b/tderesources/groupware/kcal_resourcegroupwareconfig.cpp index 305118f1..e851cf3d 100644 --- a/tderesources/groupware/kcal_resourcegroupwareconfig.cpp +++ b/tderesources/groupware/kcal_resourcegroupwareconfig.cpp @@ -26,7 +26,7 @@ #include <tdelocale.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <klineedit.h> #include <libkcal/resourcecachedconfig.h> diff --git a/tderesources/groupware/tdeabc_resourcegroupware.cpp b/tderesources/groupware/tdeabc_resourcegroupware.cpp index e8f0c0a2..b6b25911 100644 --- a/tderesources/groupware/tdeabc_resourcegroupware.cpp +++ b/tderesources/groupware/tdeabc_resourcegroupware.cpp @@ -244,18 +244,18 @@ bool ResourceGroupware::asyncLoad() mJobData = TQString(); mDownloadJob = KPIM::GroupwareJob::getAddressBook( url ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mDownloadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading addressbook") ); connect( mProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); return true; } diff --git a/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp index e171c7e7..74e86600 100644 --- a/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp +++ b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp @@ -106,7 +106,7 @@ ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* parent, const char* mainLayout->addWidget( label, 6, 0 ); mainLayout->addWidget( mAddressBookBox, 6, 1 ); - connect( updateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAddressBookList() ) ); + connect( updateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateAddressBookList() ) ); } void ResourceGroupwareConfig::loadSettings( KRES::Resource *res ) diff --git a/tderesources/groupwise/groupwisesettingswidget.cpp b/tderesources/groupwise/groupwisesettingswidget.cpp index 48de8143..cbff52ac 100644 --- a/tderesources/groupwise/groupwisesettingswidget.cpp +++ b/tderesources/groupwise/groupwisesettingswidget.cpp @@ -27,8 +27,8 @@ GroupWiseSettingsWidget::GroupWiseSettingsWidget( TQWidget * parent ) : GroupWiseSettingsWidgetBase( parent ) { - connect( m_settingsList, TQT_SIGNAL( itemRenamed( TQListViewItem *, int ) ), - this, TQT_SLOT( slotItemRenamed( TQListViewItem *, int ) ) ); + connect( m_settingsList, TQ_SIGNAL( itemRenamed( TQListViewItem *, int ) ), + this, TQ_SLOT( slotItemRenamed( TQListViewItem *, int ) ) ); } void GroupWiseSettingsWidget::slotItemRenamed( TQListViewItem * item, int ) diff --git a/tderesources/groupwise/kcal_resourcegroupwise.cpp b/tderesources/groupwise/kcal_resourcegroupwise.cpp index a8a0727e..b75492e1 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwise.cpp @@ -40,7 +40,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tderesources/configwidget.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <kurl.h> #include <libtdepim/kpimprefs.h> @@ -158,16 +158,16 @@ bool ResourceGroupwise::doLoad() mJobData = TQString(); mDownloadJob = TDEIO::get( url, false, false ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") ); connect( mProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); return true; } diff --git a/tderesources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h index 1bf1a5dc..ea9c846e 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise.h +++ b/tderesources/groupwise/kcal_resourcegroupwise.h @@ -30,7 +30,7 @@ #include <tdeabc/locknull.h> #include <tdeio/job.h> #include <tdeconfig.h> -#include <kdemacros.h> +#include <tdemacros.h> class ngwt__Settings; @@ -41,7 +41,7 @@ class GroupwisePrefsBase; /** This class provides a resource for accessing a Groupwise calendar. */ -class KDE_EXPORT ResourceGroupwise : public ResourceCached +class TDE_EXPORT ResourceGroupwise : public ResourceCached { TQ_OBJECT diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp index 9371ef59..0ef36231 100644 --- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp @@ -28,7 +28,7 @@ #include <tdelistview.h> #include <kdebug.h> #include <kdialogbase.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <klineedit.h> #include <libkcal/resourcecachedconfig.h> @@ -73,7 +73,7 @@ ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char* mainLayout->addMultiCellWidget( mSaveConfig, 6, 6, 0, 1 ); settingsButton->hide(); - // connect( settingsButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotViewUserSettings() ) ); + // connect( settingsButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotViewUserSettings() ) ); } diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h index e982b819..a955b0f3 100644 --- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h @@ -21,7 +21,7 @@ #define KCALRESOURCEGROUPWISECONFIG_H #include <kurlrequester.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tderesources/resource.h> #include <tderesources/configwidget.h> @@ -39,7 +39,7 @@ class ResourceCachedSaveConfig; @see KCalResourceGroupwise */ -class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp index 07342ec4..3ba461b9 100644 --- a/tderesources/groupwise/soap/groupwiseserver.cpp +++ b/tderesources/groupwise/soap/groupwiseserver.cpp @@ -114,7 +114,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *, // kdDebug() << "Creating KSSLSocket()" << endl; m_sock = new KSSLSocket(); m_sock->setTimeout( KProtocolManager::connectTimeout() ); - connect( m_sock, TQT_SIGNAL( sslFailure() ), TQT_SLOT( slotSslError() ) ); + connect( m_sock, TQ_SIGNAL( sslFailure() ), TQ_SLOT( slotSslError() ) ); } else { m_sock = new KExtendedSocket(); } diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp index 2f085cf2..b753249d 100644 --- a/tderesources/groupwise/soap/ksslsocket.cpp +++ b/tderesources/groupwise/soap/ksslsocket.cpp @@ -57,9 +57,9 @@ KSSLSocket::KSSLSocket() : KExtendedSocket() setBlockingMode(false); //Connect internal slots - TQObject::connect( this, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(slotConnected()) ); - TQObject::connect( this, TQT_SIGNAL(closed(int)), this, TQT_SLOT(slotDisconnected()) ); - TQObject::connect( this, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(slotDisconnected())); + TQObject::connect( this, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(slotConnected()) ); + TQObject::connect( this, TQ_SIGNAL(closed(int)), this, TQ_SLOT(slotDisconnected()) ); + TQObject::connect( this, TQ_SIGNAL(connectionFailed(int)), this, TQ_SLOT(slotDisconnected())); } KSSLSocket::~KSSLSocket() diff --git a/tderesources/groupwise/soap/patches/socklen.diff b/tderesources/groupwise/soap/patches/socklen.diff index e6494bc9..8355e1c3 100644 --- a/tderesources/groupwise/soap/patches/socklen.diff +++ b/tderesources/groupwise/soap/patches/socklen.diff @@ -6,7 +6,7 @@ diff -u -3 -p -r1.3 stdsoap2.cpp --- soap/stdsoap2.cpp 3 Dec 2004 17:15:43 -0000 1.3 +++ soap/stdsoap2.cpp 6 Dec 2004 21:27:25 -0000 @@ -3072,7 +3072,7 @@ tcp_connect(struct soap *soap, const cha - #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS) + #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(VXWORKS) int n = sizeof(struct sockaddr_in); #else - size_t n = sizeof(struct sockaddr_in); @@ -15,7 +15,7 @@ diff -u -3 -p -r1.3 stdsoap2.cpp fd_set fds; if (soap->connect_timeout > 0) @@ -3503,7 +3503,10 @@ tcp_accept(struct soap *soap, int s, str - #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS) + #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(VXWORKS) fd = (int)accept((SOAP_SOCKET)s, a, n); #else - fd = (int)accept((SOAP_SOCKET)s, a, (size_t*)n); diff --git a/tderesources/groupwise/soap/stdsoap2.cpp b/tderesources/groupwise/soap/stdsoap2.cpp index e3d42998..95987858 100644 --- a/tderesources/groupwise/soap/stdsoap2.cpp +++ b/tderesources/groupwise/soap/stdsoap2.cpp @@ -2996,7 +2996,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr) strncpy(addrcopy, addr, strlen(addr)+1); iadd = inet_addr(addrcopy); #else -#if defined(_AIXVERSION_431) || defined(__osf__) +#if defined(_AIXVERSION_431) struct hostent_data ht_data; #endif iadd = inet_addr(addr); @@ -3011,7 +3011,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr) #if defined(__GLIBC__) if (gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum) < 0) host = NULL; -#elif defined(_AIXVERSION_431) || defined(__osf__) +#elif defined(_AIXVERSION_431) memset((void*)&ht_data, 0, sizeof(ht_data)); if (gethostbyname_r(addr, &hostent, &ht_data) < 0) { host = NULL; @@ -4243,15 +4243,11 @@ soap_begin_send(struct soap *soap) #ifndef UNDER_CE #ifndef WITH_FASTCGI if (!soap_valid_socket(soap->socket)) /* Set win32 stdout or soap->sendfd to BINARY, e.g. to support DIME */ -#ifdef __BORLANDC__ - setmode((SOAP_SOCKET)soap->sendfd, O_BINARY); -#else _setmode((SOAP_SOCKET)soap->sendfd, _O_BINARY); #endif #endif #endif #endif -#endif if (soap->mode & SOAP_IO) { soap->bufidx = 0; soap->buflen = 0; @@ -10818,14 +10814,10 @@ soap_begin_recv(struct soap *soap) #ifndef UNDER_CE #ifndef WITH_FASTCGI if (!soap_valid_socket(soap->socket)) -#ifdef __BORLANDC__ - setmode((SOAP_SOCKET)soap->recvfd, O_BINARY); -#else _setmode((SOAP_SOCKET)soap->recvfd, _O_BINARY); #endif #endif #endif -#endif #ifdef WITH_ZLIB soap->mode &= ~SOAP_ENC_ZLIB; soap->zlib_in = SOAP_ZLIB_NONE; diff --git a/tderesources/groupwise/soap/stdsoap2.h b/tderesources/groupwise/soap/stdsoap2.h index adb5037b..05fee0bc 100644 --- a/tderesources/groupwise/soap/stdsoap2.h +++ b/tderesources/groupwise/soap/stdsoap2.h @@ -139,14 +139,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com # endif #endif -#ifdef __BORLANDC__ -# ifdef __WIN32__ -# ifndef WIN32 -# define WIN32 -# endif -# endif -#endif - #ifdef __CYGWIN__ # ifndef CYGWIN # define CYGWIN @@ -286,24 +278,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com # define HAVE_WCTOMB # define HAVE_MBTOWC # define HAVE_ISNAN -# elif defined(__osf__) -# define HAVE_STRRCHR -# define HAVE_STRTOD -# define HAVE_SSCANF -# define HAVE_STRTOL -# define HAVE_STRTOUL -# define HAVE_STRTOLL -# define HAVE_STRTOULL -# define HAVE_GETTIMEOFDAY -# define HAVE_SYS_TIMEB_H -# define HAVE_RAND_R -# define HAVE_GMTIME_R -# define HAVE_LOCALTIME_R -# define __USE_STD_IOSTREAM -# define HAVE_WCTOMB -# define HAVE_MBTOWC -# define SOAP_LONG_FORMAT "%ld" -# define SOAP_ULONG_FORMAT "%lu" # elif defined(MAC_CARBON) # define WITH_NOIO # define HAVE_STRRCHR @@ -536,7 +510,7 @@ extern "C" { # define SOAP_SOCKLEN_T SOCKLEN_T #elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__TQNX__) || defined(TQNX) || defined(_AIX) || defined(__NetBSD__) || defined(__DragonFly__) # define SOAP_SOCKLEN_T socklen_t -#elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(__osf__) || defined(VXWORKS) +#elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(VXWORKS) # define SOAP_SOCKLEN_T int #else # define SOAP_SOCKLEN_T size_t @@ -560,9 +534,6 @@ extern "C" { #elif defined(UNDER_CE) # define LONG64 __int64 # define ULONG64 unsigned LONG64 -#elif defined(__BORLANDC__) -# define LONG64 __int64 -# define ULONG64 unsigned LONG64 #endif #if defined(WIN32) diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp index 7c3ed791..04ecc769 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp +++ b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp @@ -288,8 +288,8 @@ bool ResourceGroupwise::asyncLoad() { mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).arg( resourceName() ), TQString(), true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) ); - connect( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + connect( mProgress, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); } if ( addressBooks().isEmpty() ) { @@ -349,15 +349,15 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType ) mJob = TDEIO::get( url, false, false ); // TODO: make the GW jobs call finished if the URL // contains no address book IDs kdDebug() << " Job address: " << mJob << endl; - connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotReadJobData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); + connect( mJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotReadJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); if ( bookType == System ) { - connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( fetchSABResult( TDEIO::Job * ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( fetchSABResult( TDEIO::Job * ) ) ); mSABProgress = KPIM::ProgressManager::instance()->createProgressItem( mProgress, KPIM::ProgressManager::getUniqueID(), i18n( "Fetching System Address Book" ), TQString(), @@ -366,8 +366,8 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType ) } else { - connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( fetchUABResult( TDEIO::Job * ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( fetchUABResult( TDEIO::Job * ) ) ); mUABProgress = KPIM::ProgressManager::instance()->createProgressItem( mProgress, KPIM::ProgressManager::getUniqueID(), i18n( "Fetching User Address Books" ), TQString(), @@ -446,12 +446,12 @@ void ResourceGroupwise::updateSystemAddressBook() mJob = TDEIO::get( url, false, false ); mJob->setInteractive( false ); - connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( updateSABResult( TDEIO::Job * ) ) ); - connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotUpdateJobData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( updateSABResult( TDEIO::Job * ) ) ); + connect( mJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotUpdateJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); return; } diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h index 29b3ed81..c573eaf9 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwise.h +++ b/tderesources/groupwise/tdeabc_resourcegroupwise.h @@ -23,7 +23,7 @@ #include "soap/groupwiseserver.h" #include <tdeabcresourcecached.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <libtdepim/progressmanager.h> @@ -37,7 +37,7 @@ namespace TDEABC { class GroupwisePrefs; -class KDE_EXPORT ResourceGroupwise : public ResourceCached +class TDE_EXPORT ResourceGroupwise : public ResourceCached { friend class ResourceGroupwiseConfig; @@ -143,7 +143,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached /** DATA PROCESSING SLOTS **/ void slotReadJobData( TDEIO::Job *, const TQByteArray & ); void slotUpdateJobData( TDEIO::Job *, const TQByteArray & ); - /** HELPER TQT_SLOT **/ + /** HELPER TQ_SLOT **/ void slotJobPercent( TDEIO::Job *job, unsigned long percent ); void cancelLoad(); diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp index 49016cdd..69dd7a6f 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp @@ -102,7 +102,7 @@ ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char* mainLayout->addWidget( label, 6, 0 ); mainLayout->addWidget( mAddressBookBox, 6, 1 ); - connect( updateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAddressBookList() ) ); + connect( updateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateAddressBookList() ) ); } void ResourceGroupwiseConfig::loadSettings( KRES::Resource *res ) diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h index 2e3ccea4..3ebdb52c 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h @@ -23,7 +23,7 @@ #include "soap/groupwiseserver.h" #include <tderesources/configwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tqmap.h> @@ -36,7 +36,7 @@ namespace TDEABC { class ResourceGroupwise; -class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp index c51fa4e4..47fbb452 100644 --- a/tderesources/groupwise/tdeioslave/groupwise.cpp +++ b/tderesources/groupwise/tdeioslave/groupwise.cpp @@ -33,7 +33,7 @@ #include <tdeabc/addressee.h> #include <tdeabc/vcardconverter.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/global.h> #include <kdebug.h> #include <tdelocale.h> @@ -44,7 +44,7 @@ #include <unistd.h> #include <stdlib.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "groupwise.h" @@ -64,7 +64,7 @@ class ResourceMemory : public ResourceCached } extern "C" { -KDE_EXPORT int kdemain( int argc, char **argv ); +TDE_EXPORT int kdemain( int argc, char **argv ); } int kdemain( int argc, char **argv ) @@ -295,14 +295,14 @@ void Groupwise::getAddressbook( const KURL &url ) GroupwiseServer server( u, user, pass, 0 ); - connect( &server, TQT_SIGNAL( readAddressBookTotalSize( int ) ), - TQT_SLOT( slotReadAddressBookTotalSize( int ) ) ); - connect( &server, TQT_SIGNAL( readAddressBookProcessedSize( int ) ), - TQT_SLOT( slotReadAddressBookProcessedSize( int ) ) ); - connect( &server, TQT_SIGNAL( errorMessage( const TQString &, bool ) ), - TQT_SLOT( slotServerErrorMessage( const TQString &, bool ) ) ); - connect( &server, TQT_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ), - TQT_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) ); + connect( &server, TQ_SIGNAL( readAddressBookTotalSize( int ) ), + TQ_SLOT( slotReadAddressBookTotalSize( int ) ) ); + connect( &server, TQ_SIGNAL( readAddressBookProcessedSize( int ) ), + TQ_SLOT( slotReadAddressBookProcessedSize( int ) ) ); + connect( &server, TQ_SIGNAL( errorMessage( const TQString &, bool ) ), + TQ_SLOT( slotServerErrorMessage( const TQString &, bool ) ) ); + connect( &server, TQ_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ), + TQ_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) ); kdDebug() << "Login" << endl; if ( !server.login() ) { @@ -369,10 +369,10 @@ void Groupwise::updateAddressbook( const KURL &url ) debugMessage( "update IDs: " + ids.join( "," ) ); GroupwiseServer server( u, user, pass, 0 ); - connect( &server, TQT_SIGNAL( errorMessage( const TQString &, bool ) ), - TQT_SLOT( slotServerErrorMessage( const TQString &, bool ) ) ); - connect( &server, TQT_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ), - TQT_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) ); + connect( &server, TQ_SIGNAL( errorMessage( const TQString &, bool ) ), + TQ_SLOT( slotServerErrorMessage( const TQString &, bool ) ) ); + connect( &server, TQ_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ), + TQ_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) ); kdDebug() << " Login" << endl; if ( !server.login() ) { diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp index e68321a8..d19a2576 100644 --- a/tderesources/kolab/kcal/resourcekolab.cpp +++ b/tderesources/kolab/kcal/resourcekolab.cpp @@ -77,8 +77,8 @@ ResourceKolab::ResourceKolab( const TDEConfig *config ) setResourceName( i18n( "Kolab Server" ) ); } setType( "imap" ); - connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotEmitResourceChanged() ) ); + connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotEmitResourceChanged() ) ); } ResourceKolab::~ResourceKolab() @@ -176,7 +176,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource, UIServer_stub uiserver( "tdeio_uiserver", "UIServer" ); int progressId = 0; if ( useProgress ) { - progressId = uiserver.newJob( kapp->dcopClient()->appId(), true ); + progressId = uiserver.newJob( tdeApp->dcopClient()->appId(), true ); uiserver.totalFiles( progressId, count ); uiserver.infoMessage( progressId, labelTxt ); uiserver.transferring( progressId, labelTxt ); @@ -402,7 +402,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre KIncidenceChooser* ch = new KIncidenceChooser(); ch->setIncidence( local ,inc ); if ( KIncidenceChooser::chooseMode == KIncidenceChooser::ask ) { - connect ( this, TQT_SIGNAL( useGlobalMode() ), ch, TQT_SLOT ( useGlobalMode() ) ); + connect ( this, TQ_SIGNAL( useGlobalMode() ), ch, TQ_SLOT ( useGlobalMode() ) ); if ( ch->exec() ) { if ( KIncidenceChooser::chooseMode != KIncidenceChooser::ask ) { emit useGlobalMode() ; @@ -1185,7 +1185,7 @@ void ResourceKolab::setSubresourceActive( const TQString &subresource, bool v ) } mResourceChangedTimer.changeInterval( 100 ); } - TQTimer::singleShot( 0, this, TQT_SLOT(writeConfig()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(writeConfig()) ); } bool ResourceKolab::subresourceWritable( const TQString& subresource ) const diff --git a/tderesources/kolab/kcal/resourcekolab.h b/tderesources/kolab/kcal/resourcekolab.h index a8404cd3..289e894d 100644 --- a/tderesources/kolab/kcal/resourcekolab.h +++ b/tderesources/kolab/kcal/resourcekolab.h @@ -37,7 +37,7 @@ #include <tqtimer.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <libkcal/calendarlocal.h> #include <libkcal/icalformat.h> #include <libkcal/resourcecalendar.h> @@ -47,7 +47,7 @@ namespace KCal { struct TemporarySilencer; -class KDE_EXPORT ResourceKolab : public KCal::ResourceCalendar, +class TDE_EXPORT ResourceKolab : public KCal::ResourceCalendar, public KCal::IncidenceBase::Observer, public Kolab::ResourceKolabBase { @@ -71,7 +71,7 @@ public: void doClose(); // The libkcal functions. See the resource for descriptions - KDE_DEPRECATED bool addEvent( KCal::Event *event ); + TDE_DEPRECATED bool addEvent( KCal::Event *event ); bool addEvent( KCal::Event *event, const TQString &subResource ); bool deleteEvent( KCal::Event * ); KCal::Event* event( const TQString &UniqueStr ); @@ -84,14 +84,14 @@ public: KCal::Event::List rawEvents( const TQDate& start, const TQDate& end, bool inclusive = false ); - KDE_DEPRECATED bool addTodo( KCal::Todo * todo ); + TDE_DEPRECATED bool addTodo( KCal::Todo * todo ); bool addTodo( KCal::Todo *todo, const TQString &subResource ); bool deleteTodo( KCal::Todo * ); KCal::Todo* todo( const TQString &uid ); KCal::Todo::List rawTodos( TodoSortField sortField = TodoSortUnsorted, SortDirection sortDirection = SortDirectionAscending ); KCal::Todo::List rawTodosForDate( const TQDate& date ); - KDE_DEPRECATED bool addJournal( KCal::Journal * ); + TDE_DEPRECATED bool addJournal( KCal::Journal * ); bool addJournal( KCal::Journal *, const TQString &subResource ); bool deleteJournal( KCal::Journal * ); KCal::Journal* journal( const TQString &uid ); diff --git a/tderesources/kolab/knotes/resourcekolab.h b/tderesources/kolab/knotes/resourcekolab.h index 5f1023b4..747c2ea4 100644 --- a/tderesources/kolab/knotes/resourcekolab.h +++ b/tderesources/kolab/knotes/resourcekolab.h @@ -39,7 +39,7 @@ #include <libkcal/calendarlocal.h> #include "../shared/resourcekolabbase.h" #include "../shared/subresource.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace Kolab { @@ -49,7 +49,7 @@ namespace Kolab { * addresses in an IMAP folder in KMail (or other conforming email * clients). */ -class KDE_EXPORT ResourceKolab : public ResourceNotes, +class TDE_EXPORT ResourceKolab : public ResourceNotes, public KCal::IncidenceBase::Observer, public ResourceKolabBase { diff --git a/tderesources/kolab/shared/kmailconnection.cpp b/tderesources/kolab/shared/kmailconnection.cpp index 8011c15d..24d9c25e 100644 --- a/tderesources/kolab/shared/kmailconnection.cpp +++ b/tderesources/kolab/shared/kmailconnection.cpp @@ -55,14 +55,14 @@ KMailConnection::KMailConnection( ResourceKolabBase* resource, mDCOPClient->attach(); mDCOPClient->registerAs( objId, true ); - kapp->dcopClient()->setNotifications( true ); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ), - this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + tdeApp->dcopClient()->setNotifications( true ); + connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ), + this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); } KMailConnection::~KMailConnection() { - kapp->dcopClient()->setNotifications( false ); + tdeApp->dcopClient()->setNotifications( false ); delete mKMailIcalIfaceStub; mKMailIcalIfaceStub = 0; delete mDCOPClient; @@ -78,13 +78,13 @@ bool KMailConnection::connectToKMail() // if we are kmail (and probably kontact as well) ourselves, don't try to start us again // this prevents a DCOP deadlock when launching the kmail while kontact is the IMAP backend // provider (and probably vice versa) - if ( kapp->instanceName() == "kmail" ) { + if ( tdeApp->instanceName() == "kmail" ) { // someone, probably ourselves, already offers the interface, if not stop here - const QCStringList services = kapp->dcopClient()->registeredApplications(); + const QCStringList services = tdeApp->dcopClient()->registeredApplications(); for ( uint i = 0; i < services.count(); ++i ) { if ( services[i].find( "anonymous" ) == 0 ) // querying anonymous-XXXXX deadlocks as well, what are those anyway? continue; - const QCStringList objs = kapp->dcopClient()->remoteObjects( services[i] ); + const QCStringList objs = tdeApp->dcopClient()->remoteObjects( services[i] ); if ( objs.contains( dcopObjectId ) ) { dcopService = services[i]; break; @@ -107,7 +107,7 @@ bool KMailConnection::connectToKMail() } } - mKMailIcalIfaceStub = new KMailICalIface_stub( kapp->dcopClient(), + mKMailIcalIfaceStub = new KMailICalIface_stub( tdeApp->dcopClient(), dcopService, dcopObjectId ); // Attach to the KMail signals diff --git a/tderesources/kolab/shared/resourcekolabbase.cpp b/tderesources/kolab/shared/resourcekolabbase.cpp index ce53bad3..600c1393 100644 --- a/tderesources/kolab/shared/resourcekolabbase.cpp +++ b/tderesources/kolab/shared/resourcekolabbase.cpp @@ -37,7 +37,7 @@ #include <folderselectdialog.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kinputdialog.h> #include <kurl.h> #include <tdetempfile.h> diff --git a/tderesources/kolab/tdeabc/resourcekolab.cpp b/tderesources/kolab/tdeabc/resourcekolab.cpp index 7476212e..4415ce2e 100644 --- a/tderesources/kolab/tdeabc/resourcekolab.cpp +++ b/tderesources/kolab/tdeabc/resourcekolab.cpp @@ -201,7 +201,7 @@ bool TDEABC::ResourceKolab::loadSubResource( const TQString& subResource ) UIServer_stub uiserver( "tdeio_uiserver", "UIServer" ); int progressId = 0; if ( count > 200 ) { - progressId = uiserver.newJob( kapp->dcopClient()->appId(), true ); + progressId = uiserver.newJob( tdeApp->dcopClient()->appId(), true ); uiserver.totalFiles( progressId, count ); uiserver.infoMessage( progressId, i18n( "Loading contacts..." ) ); uiserver.transferring( progressId, "Contacts" ); diff --git a/tderesources/kolab/tdeabc/resourcekolab.h b/tderesources/kolab/tdeabc/resourcekolab.h index 3347a177..dd3dab6b 100644 --- a/tderesources/kolab/tdeabc/resourcekolab.h +++ b/tderesources/kolab/tdeabc/resourcekolab.h @@ -38,7 +38,7 @@ #include "../shared/resourcekolabbase.h" #include "../shared/subresource.h" #include <kmail/kmailicalIface.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace TDEABC { @@ -49,7 +49,7 @@ namespace TDEABC { * addresses in an Kolab folder in KMail (or other conforming email * clients). */ -class KDE_EXPORT ResourceKolab : public KPIM::ResourceABC, +class TDE_EXPORT ResourceKolab : public KPIM::ResourceABC, public Kolab::ResourceKolabBase { TQ_OBJECT diff --git a/tderesources/lib/addressbookadaptor.h b/tderesources/lib/addressbookadaptor.h index 5a754bc6..ef1beb5d 100644 --- a/tderesources/lib/addressbookadaptor.h +++ b/tderesources/lib/addressbookadaptor.h @@ -26,7 +26,7 @@ #include "groupwaredataadaptor.h" #include <tdeabc/addressee.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <kurl.h> namespace TDEABC { @@ -43,7 +43,7 @@ class AddressBookUploadItem : public KPIM::GroupwareUploadItem : KPIM::GroupwareUploadItem( type ) {} }; -class KDE_EXPORT AddressBookAdaptor : public KPIM::GroupwareDataAdaptor +class TDE_EXPORT AddressBookAdaptor : public KPIM::GroupwareDataAdaptor { public: AddressBookAdaptor(); diff --git a/tderesources/lib/calendaradaptor.h b/tderesources/lib/calendaradaptor.h index dc203440..aea6a69e 100644 --- a/tderesources/lib/calendaradaptor.h +++ b/tderesources/lib/calendaradaptor.h @@ -27,7 +27,7 @@ #include <libkcal/incidence.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <kurl.h> namespace KPIM { @@ -49,7 +49,7 @@ class CalendarUploadItem : public KPIM::GroupwareUploadItem }; -class KDE_EXPORT CalendarAdaptor : public KPIM::GroupwareDataAdaptor +class TDE_EXPORT CalendarAdaptor : public KPIM::GroupwareDataAdaptor { TQ_OBJECT diff --git a/tderesources/lib/davaddressbookadaptor.h b/tderesources/lib/davaddressbookadaptor.h index fcb16afa..41a39bf4 100644 --- a/tderesources/lib/davaddressbookadaptor.h +++ b/tderesources/lib/davaddressbookadaptor.h @@ -24,11 +24,11 @@ #include "addressbookadaptor.h" #include "folderlister.h" #include <tqdom.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace TDEABC { -class KDE_EXPORT DavAddressBookAdaptor : public AddressBookAdaptor +class TDE_EXPORT DavAddressBookAdaptor : public AddressBookAdaptor { public: DavAddressBookAdaptor() {} diff --git a/tderesources/lib/davcalendaradaptor.h b/tderesources/lib/davcalendaradaptor.h index ab1c9757..069d6245 100644 --- a/tderesources/lib/davcalendaradaptor.h +++ b/tderesources/lib/davcalendaradaptor.h @@ -24,11 +24,11 @@ #include "calendaradaptor.h" #include "folderlister.h" #include <tqdom.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KCal { -class KDE_EXPORT DavCalendarAdaptor : public CalendarAdaptor +class TDE_EXPORT DavCalendarAdaptor : public CalendarAdaptor { public: DavCalendarAdaptor() {} diff --git a/tderesources/lib/folderconfig.cpp b/tderesources/lib/folderconfig.cpp index bbae1346..facdf13b 100644 --- a/tderesources/lib/folderconfig.cpp +++ b/tderesources/lib/folderconfig.cpp @@ -52,7 +52,7 @@ FolderConfig::FolderConfig( TQWidget *parent ) topLayout->addWidget( topBox ); TQPushButton *button = new TQPushButton( i18n("Update Folder List"), topBox ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SIGNAL( updateFoldersClicked() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SIGNAL( updateFoldersClicked() ) ); mFolderList = new FolderListView( topBox ); @@ -81,7 +81,7 @@ void FolderConfig::setFolderLister( FolderLister *f ) if ( suptypes.contains( FolderLister::Unknown ) ) types << FolderListView::Unknown; mFolderList->setEnabledTypes( types ); - connect( mFolderLister, TQT_SIGNAL( foldersRead() ), TQT_SLOT( updateFolderList() ) ); + connect( mFolderLister, TQ_SIGNAL( foldersRead() ), TQ_SLOT( updateFolderList() ) ); } void FolderConfig::retrieveFolderList( const KURL &url ) diff --git a/tderesources/lib/folderconfig.h b/tderesources/lib/folderconfig.h index 892128a4..1694613c 100644 --- a/tderesources/lib/folderconfig.h +++ b/tderesources/lib/folderconfig.h @@ -24,7 +24,7 @@ #define KPIM_FOLDERCONFIG_H #include <kurl.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tqwidget.h> // class TDEListView; @@ -35,7 +35,7 @@ namespace KPIM { class FolderLister; -class KDE_EXPORT FolderConfig : public TQWidget +class TDE_EXPORT FolderConfig : public TQWidget { TQ_OBJECT diff --git a/tderesources/lib/folderlister.cpp b/tderesources/lib/folderlister.cpp index c12d3ae6..ec40e8cc 100644 --- a/tderesources/lib/folderlister.cpp +++ b/tderesources/lib/folderlister.cpp @@ -216,12 +216,12 @@ void FolderLister::setAdaptor( KPIM::GroupwareDataAdaptor *adaptor ) disconnect( mAdaptor, 0, this, 0 ); } mAdaptor = adaptor; - connect( mAdaptor, TQT_SIGNAL( folderInfoRetrieved( const KURL &, + connect( mAdaptor, TQ_SIGNAL( folderInfoRetrieved( const KURL &, const TQString &, KPIM::FolderLister::ContentType ) ), - this, TQT_SLOT( processFolderResult( const KURL &, const TQString &, + this, TQ_SLOT( processFolderResult( const KURL &, const TQString &, KPIM::FolderLister::ContentType ) ) ); - connect( mAdaptor, TQT_SIGNAL( folderSubitemRetrieved( const KURL &, bool ) ), - this, TQT_SLOT( folderSubitemRetrieved( const KURL &, bool ) ) ); + connect( mAdaptor, TQ_SIGNAL( folderSubitemRetrieved( const KURL &, bool ) ), + this, TQ_SLOT( folderSubitemRetrieved( const KURL &, bool ) ) ); } void FolderLister::folderSubitemRetrieved( const KURL &url, bool isFolder ) @@ -272,8 +272,8 @@ void FolderLister::doRetrieveFolder( const KURL &u ) kdDebug(7000) << "FolderLister::retrieveFolders: adjustedURL=" << url.prettyURL() << endl; - connect( listjob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotListJobResult( TDEIO::Job * ) ) ); + connect( listjob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotListJobResult( TDEIO::Job * ) ) ); } else { // TODO: Indicate a problem to the user! kdWarning() << "Unable to create the folder list job for the url " diff --git a/tderesources/lib/folderlister.h b/tderesources/lib/folderlister.h index 8a5ba529..4f04bf1c 100644 --- a/tderesources/lib/folderlister.h +++ b/tderesources/lib/folderlister.h @@ -26,7 +26,7 @@ // #include "tderesources_groupwareprefs.h" /*#include "groupwareresourcejob.h"*/ #include <kurl.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tqvaluelist.h> #include <tqstring.h> @@ -45,7 +45,7 @@ class GroupwareDataAdaptor; class GroupwarePrefsBase; -class KDE_EXPORT FolderLister : public TQObject +class TDE_EXPORT FolderLister : public TQObject { TQ_OBJECT diff --git a/tderesources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp index d43d77ce..f2427c48 100644 --- a/tderesources/lib/folderlistview.cpp +++ b/tderesources/lib/folderlistview.cpp @@ -43,10 +43,10 @@ FolderListView::FolderListView( TQWidget *parent, const TQValueList<Property> &t { setEnabledTypes( types ); - connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) ); - connect( this, TQT_SIGNAL(spacePressed(TQListViewItem*)), - this, TQT_SLOT(showPopupMenu(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) ); + connect( this, TQ_SIGNAL(spacePressed(TQListViewItem*)), + this, TQ_SLOT(showPopupMenu(TQListViewItem*)) ); } void FolderListView::setEnabledTypes( const TQValueList<Property> &types ) @@ -99,32 +99,32 @@ void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos int id; m.insertTitle( folder.name, 9999 ); - id = m.insertItem( i18n("&Enabled"), this, TQT_SLOT(slotPopupHandler(int)), 0, FolderName ); + id = m.insertItem( i18n("&Enabled"), this, TQ_SLOT(slotPopupHandler(int)), 0, FolderName ); m.setItemChecked( id, i->isOn() ); m.insertSeparator(); if ( ( folder.type & KPIM::FolderLister::Event ) && (mTypes.contains( Event ) ) ) { - id = m.insertItem( i18n("Default for New &Events"), this, TQT_SLOT(slotPopupHandler(int)), 0, Event ); + id = m.insertItem( i18n("Default for New &Events"), this, TQ_SLOT(slotPopupHandler(int)), 0, Event ); m.setItemChecked( id, i->isDefault( Event ) ); } if ( ( folder.type & KPIM::FolderLister::Todo ) && (mTypes.contains( Todo ) ) ) { - id = m.insertItem( i18n("Default for New &Todos"), this, TQT_SLOT(slotPopupHandler(int)), 0, Todo ); + id = m.insertItem( i18n("Default for New &Todos"), this, TQ_SLOT(slotPopupHandler(int)), 0, Todo ); m.setItemChecked( id, i->isDefault( Todo ) ); } if ( ( folder.type & KPIM::FolderLister::Journal ) && (mTypes.contains( Journal ) ) ) { - id = m.insertItem( i18n("Default for New &Journals"), this, TQT_SLOT(slotPopupHandler(int)), 0, Journal ); + id = m.insertItem( i18n("Default for New &Journals"), this, TQ_SLOT(slotPopupHandler(int)), 0, Journal ); m.setItemChecked( id, i->isDefault( Journal ) ); } if ( ( folder.type & KPIM::FolderLister::Contact ) && (mTypes.contains( Contact ) ) ) { - id = m.insertItem( i18n("Default for New &Contacts"), this, TQT_SLOT(slotPopupHandler(int)), 0, Contact ); + id = m.insertItem( i18n("Default for New &Contacts"), this, TQ_SLOT(slotPopupHandler(int)), 0, Contact ); m.setItemChecked( id, i->isDefault( Contact ) ); } if ( ( folder.type == KPIM::FolderLister::All ) && (mTypes.contains( All ) ) ) { - id = m.insertItem( i18n("Default for All New &Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, All ); + id = m.insertItem( i18n("Default for All New &Items"), this, TQ_SLOT(slotPopupHandler(int)), 0, All ); m.setItemChecked( id, i->isDefault( All ) ); } if ( ( folder.type == KPIM::FolderLister::Unknown ) && (mTypes.contains( Unknown ) ) ) { - id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, Unknown ); + id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQ_SLOT(slotPopupHandler(int)), 0, Unknown ); m.setItemChecked( id, i->isDefault( Unknown ) ); } diff --git a/tderesources/lib/folderselectdialog.cpp b/tderesources/lib/folderselectdialog.cpp index ab599153..7ffd3e38 100644 --- a/tderesources/lib/folderselectdialog.cpp +++ b/tderesources/lib/folderselectdialog.cpp @@ -53,10 +53,10 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString& mListBox->ensureCurrentVisible(); layout->addWidget( mListBox, 10 ); - connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); - connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); + connect( mListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); + connect( mListBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); mListBox->setFocus(); diff --git a/tderesources/lib/groupwaredataadaptor.h b/tderesources/lib/groupwaredataadaptor.h index 27807124..51def5c7 100644 --- a/tderesources/lib/groupwaredataadaptor.h +++ b/tderesources/lib/groupwaredataadaptor.h @@ -29,7 +29,7 @@ #include <tqstring.h> #include <libkcal/listbase.h> #include <tqobject.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace TDEIO { @@ -44,7 +44,7 @@ class IdMapper; class GroupwareDataAdaptor; //class GroupwareJob; -class KDE_EXPORT GroupwareUploadItem +class TDE_EXPORT GroupwareUploadItem { public: typedef KCal::ListBase<GroupwareUploadItem> List; @@ -88,7 +88,7 @@ class KDE_EXPORT GroupwareUploadItem }; -class KDE_EXPORT GroupwareDataAdaptor : public TQObject +class TDE_EXPORT GroupwareDataAdaptor : public TQObject { TQ_OBJECT diff --git a/tderesources/lib/groupwaredownloadjob.cpp b/tderesources/lib/groupwaredownloadjob.cpp index 52a01fd4..1381b929 100644 --- a/tderesources/lib/groupwaredownloadjob.cpp +++ b/tderesources/lib/groupwaredownloadjob.cpp @@ -59,21 +59,21 @@ void GroupwareDownloadJob::run() mItemsForDownload.clear(); mCurrentlyOnServer.clear(); - connect( adaptor(), TQT_SIGNAL( itemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ), - TQT_SLOT( slotItemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ) ); - connect( adaptor(), TQT_SIGNAL( itemOnServer( const KURL & ) ), - TQT_SLOT( slotItemOnServer( const KURL & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemDownloaded( const TQString &, const KURL &, const TQString & ) ), - TQT_SLOT( slotItemDownloaded( const TQString &, const KURL &, const TQString & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemDownloadError( const KURL &, const TQString & ) ), - TQT_SLOT( slotItemDownloadError( const KURL &, const TQString & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ), + TQ_SLOT( slotItemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ) ); + connect( adaptor(), TQ_SIGNAL( itemOnServer( const KURL & ) ), + TQ_SLOT( slotItemOnServer( const KURL & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemDownloaded( const TQString &, const KURL &, const TQString & ) ), + TQ_SLOT( slotItemDownloaded( const TQString &, const KURL &, const TQString & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemDownloadError( const KURL &, const TQString & ) ), + TQ_SLOT( slotItemDownloadError( const KURL &, const TQString & ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), adaptor()->downloadProgressMessage() ); connect( mProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); listItems(); } @@ -105,10 +105,10 @@ void GroupwareDownloadJob::listItems() mListItemsData = TQString(); mListEventsJob = adaptor()->createListItemsJob( url ); - connect( mListEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotListItemsResult( TDEIO::Job * ) ) ); - connect( mListEventsJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotListItemsData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mListEventsJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotListItemsResult( TDEIO::Job * ) ) ); + connect( mListEventsJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotListItemsData( TDEIO::Job *, const TQByteArray & ) ) ); } } @@ -187,10 +187,10 @@ void GroupwareDownloadJob::downloadItem() mDownloadJob = adaptor()->createDownloadJob( href, ctype ); } - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotDownloadItemResult( TDEIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotDownloadItemData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotDownloadItemResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotDownloadItemData( TDEIO::Job *, const TQByteArray & ) ) ); } } diff --git a/tderesources/lib/groupwareresourcejob.cpp b/tderesources/lib/groupwareresourcejob.cpp index b7e4b57b..09972b85 100644 --- a/tderesources/lib/groupwareresourcejob.cpp +++ b/tderesources/lib/groupwareresourcejob.cpp @@ -30,7 +30,7 @@ using namespace KPIM; GroupwareJob::GroupwareJob( GroupwareDataAdaptor *adaptor ) : mAdaptor( adaptor ) { - TQTimer::singleShot( 0, this, TQT_SLOT( run() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( run() ) ); } bool GroupwareJob::error() const diff --git a/tderesources/lib/groupwareuploadjob.cpp b/tderesources/lib/groupwareuploadjob.cpp index 51307d83..4c0f1ba2 100644 --- a/tderesources/lib/groupwareuploadjob.cpp +++ b/tderesources/lib/groupwareuploadjob.cpp @@ -52,22 +52,22 @@ void GroupwareUploadJob::run() KPIM::ProgressManager::getUniqueID(), adaptor()->uploadProgressMessage() ); connect( mUploadProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelSave() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelSave() ) ); - connect( adaptor(), TQT_SIGNAL( itemDeletionError( const KURL &, const TQString & ) ), - TQT_SLOT( slotItemDeleteError( const KURL &, const TQString & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemUploadError( const KURL &, const TQString & ) ), - TQT_SLOT( slotItemUploadError( const KURL &, const TQString & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemUploadNewError( const TQString &, const TQString & ) ), - TQT_SLOT( slotItemUploadNewError( const TQString &, const TQString & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemDeletionError( const KURL &, const TQString & ) ), + TQ_SLOT( slotItemDeleteError( const KURL &, const TQString & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemUploadError( const KURL &, const TQString & ) ), + TQ_SLOT( slotItemUploadError( const KURL &, const TQString & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemUploadNewError( const TQString &, const TQString & ) ), + TQ_SLOT( slotItemUploadNewError( const TQString &, const TQString & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemDeleted( const TQString &, const KURL & ) ), - TQT_SLOT( slotItemDeleted( const TQString &, const KURL & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemUploaded( const TQString &, const KURL & ) ), - TQT_SLOT( slotItemUploaded( const TQString &, const KURL & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemUploadedNew( const TQString &, const KURL& ) ), - TQT_SLOT( slotItemUploadedNew( const TQString &, const KURL & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemDeleted( const TQString &, const KURL & ) ), + TQ_SLOT( slotItemDeleted( const TQString &, const KURL & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemUploaded( const TQString &, const KURL & ) ), + TQ_SLOT( slotItemUploaded( const TQString &, const KURL & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemUploadedNew( const TQString &, const KURL& ) ), + TQ_SLOT( slotItemUploadedNew( const TQString &, const KURL & ) ) ); mUploadProgress->setTotalItems( mAddedItems.size() + mChangedItems.size() + @@ -81,7 +81,7 @@ void GroupwareUploadJob::deleteItem() { kdDebug(5800)<<"GroupwareUploadJob::deleteItem()"<<endl; if ( mDeletedItems.isEmpty() ) { - TQTimer::singleShot( 0, this, TQT_SLOT( uploadItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( uploadItem() ) ); } else { kdDebug(7000) << " Deleting " << mDeletedItems.size() << " items from the server " << endl; @@ -102,10 +102,10 @@ kdDebug() << "Not using batch delete " << endl; if ( mDeletionJob ) { mDeletionJobData = TQString(); - connect( mDeletionJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotDeletionJobResult( TDEIO::Job* ) ) ); -// connect( mDeletionJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), -// TQT_SLOT( slotDeletionJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mDeletionJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotDeletionJobResult( TDEIO::Job* ) ) ); +// connect( mDeletionJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), +// TQ_SLOT( slotDeletionJobData( TDEIO::Job *, const TQByteArray & ) ) ); } else { deleteItem(); } @@ -129,7 +129,7 @@ void GroupwareUploadJob::slotDeletionJobResult( TDEIO::Job *job ) adaptor()->interpretRemoveJob( job, mDeletionJobData ); } mDeletionJob = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( deleteItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteItem() ) ); } @@ -138,7 +138,7 @@ void GroupwareUploadJob::uploadItem() { kdDebug(5800)<<"GroupwareUploadJob::uploadItem()"<<endl; if ( mChangedItems.isEmpty() ) { - TQTimer::singleShot( 0, this, TQT_SLOT( uploadNewItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( uploadNewItem() ) ); } else { kdDebug(5800)<<"We still have "<<mChangedItems.count()<<" changed items to upload"<<endl; @@ -159,10 +159,10 @@ kdDebug() << "Not using batch upload " << endl; if ( mUploadJob ) { mUploadJobData = TQString(); - connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotUploadJobResult( TDEIO::Job* ) ) ); - connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotUploadJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotUploadJobResult( TDEIO::Job* ) ) ); + connect( mUploadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotUploadJobData( TDEIO::Job *, const TQByteArray & ) ) ); } else { uploadItem(); } @@ -185,7 +185,7 @@ void GroupwareUploadJob::slotUploadJobResult( TDEIO::Job *job ) adaptor()->interpretUploadJob( job, mUploadJobData ); } mUploadJob = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( uploadItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( uploadItem() ) ); } @@ -217,10 +217,10 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " < if ( mUploadJob ) { mUploadNewJobData = TQString(); - connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotUploadNewJobResult( TDEIO::Job* ) ) ); - connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotUploadNewJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotUploadNewJobResult( TDEIO::Job* ) ) ); + connect( mUploadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotUploadNewJobData( TDEIO::Job *, const TQByteArray & ) ) ); } else { uploadNewItem(); } @@ -246,7 +246,7 @@ void GroupwareUploadJob::slotUploadNewJobResult( TDEIO::Job *job ) adaptor()->interpretUploadNewJob( job, mUploadNewJobData ); } mUploadJob = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( uploadNewItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( uploadNewItem() ) ); } diff --git a/tderesources/lib/kcal_cachesettingsdlg.h b/tderesources/lib/kcal_cachesettingsdlg.h index f9462e5d..13510782 100644 --- a/tderesources/lib/kcal_cachesettingsdlg.h +++ b/tderesources/lib/kcal_cachesettingsdlg.h @@ -23,7 +23,7 @@ #define KCAL_CACHESETTINGSDLG_H #include <kdialogbase.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KRES { @@ -39,7 +39,7 @@ class ResourceCachedSaveConfig; Configuration widget for groupware tdeioslave resource. @see KCalOpenGroupware */ -class KDE_EXPORT CacheSettingsDialog : public KDialogBase +class TDE_EXPORT CacheSettingsDialog : public KDialogBase { TQ_OBJECT diff --git a/tderesources/lib/kcal_resourcegroupwarebase.cpp b/tderesources/lib/kcal_resourcegroupwarebase.cpp index 11eedfe5..1710a11e 100644 --- a/tderesources/lib/kcal_resourcegroupwarebase.cpp +++ b/tderesources/lib/kcal_resourcegroupwarebase.cpp @@ -195,8 +195,8 @@ bool ResourceGroupwareBase::doOpen() return false; } else { mLoginFinished = false; - connect( loginJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotLoginJobResult( TDEIO::Job* ) ) ); + connect( loginJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotLoginJobResult( TDEIO::Job* ) ) ); enter_loop(); return mLoginFinished; } @@ -239,8 +239,8 @@ void ResourceGroupwareBase::doClose() if ( adaptor() && adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResNeedsLogoff ) { TDEIO::Job *logoffJob = adaptor()->createLogoffJob( prefs()->url(), prefs()->user(), prefs()->password() ); - connect( logoffJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotLogoffJobResult( TDEIO::Job* ) ) ); + connect( logoffJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotLogoffJobResult( TDEIO::Job* ) ) ); // TODO: Do we really need to block while waiting for the job to return? enter_loop(); } @@ -276,8 +276,8 @@ bool ResourceGroupwareBase::doLoad() emit resourceChanged( this ); mDownloadJob = createDownloadJob( adaptor() ); - connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), - TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); return true; } @@ -322,8 +322,8 @@ bool ResourceGroupwareBase::doSave() if ( !confirmSave() ) return false; mUploadJob = createUploadJob( adaptor() ); - connect( mUploadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), - TQT_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQ_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) ); Incidence::List inc; Incidence::List::Iterator it; @@ -376,8 +376,8 @@ void ResourceGroupwareBase::slotUploadJobResult( KPIM::GroupwareJob *job ) if ( !mDownloadJob ) { mDownloadJob = createDownloadJob( adaptor() ); - connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), - TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); } else { kdWarning() << k_funcinfo << "Download still in progress. " "Can't happen. (TM)" << endl; diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h index ae4ca579..fcde85aa 100644 --- a/tderesources/lib/kcal_resourcegroupwarebase.h +++ b/tderesources/lib/kcal_resourcegroupwarebase.h @@ -25,7 +25,7 @@ #include <kurl.h> #include <libkcal/resourcecached.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tdeabc/locknull.h> namespace TDEIO { @@ -49,7 +49,7 @@ class CalendarAdaptor; This class provides a resource for accessing a Groupware tdeioslave-based calendar. */ -class KDE_EXPORT ResourceGroupwareBase : public ResourceCached +class TDE_EXPORT ResourceGroupwareBase : public ResourceCached { TQ_OBJECT diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp index 1ca2570a..4f576ed7 100644 --- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp +++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp @@ -68,15 +68,15 @@ ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent, mPasswordEdit->setEchoMode( KLineEdit::Password ); mFolderConfig = new KPIM::FolderConfig( this ); - connect( mFolderConfig, TQT_SIGNAL( updateFoldersClicked() ), - TQT_SLOT( updateFolders() ) ); + connect( mFolderConfig, TQ_SIGNAL( updateFoldersClicked() ), + TQ_SLOT( updateFolders() ) ); mainLayout->addMultiCellWidget( mFolderConfig, 4, 4, 0, 1 ); TQHBox *hBox = new TQHBox( this ); mCacheSettingsButton = new KPushButton( i18n("Configure Cache Settings..."), hBox ); mainLayout->addMultiCellWidget( hBox, 5, 5, 0, 1 ); - connect( mCacheSettingsButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( showCacheSettings() ) ); + connect( mCacheSettingsButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( showCacheSettings() ) ); mCacheDialog = new CacheSettingsDialog( this ); } diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h index db3ddd98..23ffef60 100644 --- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h +++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h @@ -23,7 +23,7 @@ #define KCAL_RESOURCEGROUPWAREBASECONFIG_H #include <tderesources/configwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> class KPushButton; class KLineEdit; @@ -44,7 +44,7 @@ class CacheSettingsDialog; @see KCalOpenGroupware */ -class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp index f4a46990..cf73e03a 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp +++ b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp @@ -177,8 +177,8 @@ bool ResourceGroupwareBase::asyncLoad() loadCache(); mDownloadJob = createDownloadJob( mAdaptor ); - connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), - TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); return true; } @@ -212,8 +212,8 @@ bool ResourceGroupwareBase::asyncSave( Ticket* ) } mUploadJob = createUploadJob( mAdaptor ); - connect( mUploadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), - TQT_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQ_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) ); TDEABC::Addressee::List addr; TDEABC::Addressee::List::Iterator it; diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.h b/tderesources/lib/tdeabc_resourcegroupwarebase.h index bea6ca91..36307699 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebase.h +++ b/tderesources/lib/tdeabc_resourcegroupwarebase.h @@ -24,7 +24,7 @@ #include <kurl.h> #include <tdeabcresourcecached.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEConfig; @@ -40,7 +40,7 @@ namespace TDEABC { class AddressBookAdaptor; -class KDE_EXPORT ResourceGroupwareBase : public ResourceCached +class TDE_EXPORT ResourceGroupwareBase : public ResourceCached { TQ_OBJECT diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp index 69dfb3d8..a80ce9e0 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp +++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp @@ -67,8 +67,8 @@ ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent, con mainLayout->addMultiCellWidget( hline, 3, 3, 0, 1 ); mFolderConfig = new KPIM::FolderConfig( this ); - connect( mFolderConfig, TQT_SIGNAL( updateFoldersClicked() ), - TQT_SLOT( updateFolders() ) ); + connect( mFolderConfig, TQ_SIGNAL( updateFoldersClicked() ), + TQ_SLOT( updateFolders() ) ); mainLayout->addMultiCellWidget( mFolderConfig, 4, 4, 0, 1 ); } diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h index c1ccb689..b7cb3a3e 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h +++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h @@ -23,7 +23,7 @@ #define TDEABC_RESOURCEGROUPWAREBASECONFIG_H #include <tderesources/configwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> class KLineEdit; class KURLRequester; @@ -36,7 +36,7 @@ namespace TDEABC { class ResourceGroupwareBase; -class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/lib/webdavhandler.h b/tderesources/lib/webdavhandler.h index a2de509d..4371ac5b 100644 --- a/tderesources/lib/webdavhandler.h +++ b/tderesources/lib/webdavhandler.h @@ -27,9 +27,9 @@ #include <tqdom.h> #include <tqdatetime.h> #include <kurl.h> -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT WebdavHandler +class TDE_EXPORT WebdavHandler { public: WebdavHandler(); diff --git a/tderesources/newexchange/exchangecalendaradaptor.cpp b/tderesources/newexchange/exchangecalendaradaptor.cpp index 5b51de5e..3b7aa36d 100644 --- a/tderesources/newexchange/exchangecalendaradaptor.cpp +++ b/tderesources/newexchange/exchangecalendaradaptor.cpp @@ -109,7 +109,7 @@ void ExchangeDelete::findUidSingleMaster( TQString const& uid ) TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false ); job->setWindow( mWindow ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFindUidResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotFindUidResult(TDEIO::Job *))); } */ diff --git a/tderesources/newexchange/exchangeconvertercalendar.cpp b/tderesources/newexchange/exchangeconvertercalendar.cpp index e67acdeb..58c31535 100644 --- a/tderesources/newexchange/exchangeconvertercalendar.cpp +++ b/tderesources/newexchange/exchangeconvertercalendar.cpp @@ -314,8 +314,8 @@ void ExchangeDownload::handleRecurrence( TQString uid ) query, false ); TDEIO::Scheduler::scheduleJob( job ); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotMasterResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotMasterResult( TDEIO::Job * ) ) ); } */ diff --git a/tderesources/newexchange/kcal_resourceexchange.h b/tderesources/newexchange/kcal_resourceexchange.h index 886319a4..f2e31341 100644 --- a/tderesources/newexchange/kcal_resourceexchange.h +++ b/tderesources/newexchange/kcal_resourceexchange.h @@ -29,7 +29,7 @@ namespace KCal { /** This class provides a resource for accessing an Exchange server */ -class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase +class TDE_EXPORT ResourceExchange : public ResourceGroupwareBase { TQ_OBJECT diff --git a/tderesources/newexchange/tdeabc_resourceexchange.h b/tderesources/newexchange/tdeabc_resourceexchange.h index 121cdf11..9ed102e2 100644 --- a/tderesources/newexchange/tdeabc_resourceexchange.h +++ b/tderesources/newexchange/tdeabc_resourceexchange.h @@ -25,7 +25,7 @@ namespace TDEABC { -class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase +class TDE_EXPORT ResourceExchange : public ResourceGroupwareBase { TQ_OBJECT diff --git a/tderesources/remote/resourceremote.cpp b/tderesources/remote/resourceremote.cpp index 0a58aefb..4f81329a 100644 --- a/tderesources/remote/resourceremote.cpp +++ b/tderesources/remote/resourceremote.cpp @@ -31,7 +31,7 @@ #include <tdeio/job.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <libkcal/icalformat.h> #include <libkcal/exceptions.h> @@ -197,11 +197,11 @@ bool ResourceRemote::doLoad() mDownloadJob = TDEIO::file_copy( mDownloadUrl, KURL( cacheFile() ), -1, true, false, !mUseProgressManager ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotLoadJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotLoadJobResult( TDEIO::Job * ) ) ); if ( mUseProgressManager ) { - connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) ); + connect( mDownloadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) ); mProgress = KPIM::ProgressManager::createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading Calendar") ); @@ -283,8 +283,8 @@ bool ResourceRemote::doSave() saveCache(); mUploadJob = TDEIO::file_copy( KURL( cacheFile() ), mUploadUrl, -1, true ); - connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotSaveJobResult( TDEIO::Job * ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotSaveJobResult( TDEIO::Job * ) ) ); return true; } diff --git a/tderesources/remote/resourceremote.h b/tderesources/remote/resourceremote.h index 6989169f..58ddd831 100644 --- a/tderesources/remote/resourceremote.h +++ b/tderesources/remote/resourceremote.h @@ -28,7 +28,7 @@ #include <kurl.h> #include <tdeconfig.h> #include <kdirwatch.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <libtdepim/progressmanager.h> @@ -48,7 +48,7 @@ namespace KCal { /** This class provides a calendar stored as a remote file. */ -class KDE_EXPORT ResourceRemote : public ResourceCached +class TDE_EXPORT ResourceRemote : public ResourceCached { TQ_OBJECT diff --git a/tderesources/remote/resourceremoteconfig.cpp b/tderesources/remote/resourceremoteconfig.cpp index 381134b0..ca822f01 100644 --- a/tderesources/remote/resourceremoteconfig.cpp +++ b/tderesources/remote/resourceremoteconfig.cpp @@ -27,7 +27,7 @@ #include <tdelocale.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdialog.h> #include <libkcal/resourcecachedconfig.h> diff --git a/tderesources/remote/resourceremoteconfig.h b/tderesources/remote/resourceremoteconfig.h index 45417795..6359aa99 100644 --- a/tderesources/remote/resourceremoteconfig.h +++ b/tderesources/remote/resourceremoteconfig.h @@ -30,7 +30,7 @@ #include <tderesources/resource.h> #include <tderesources/configwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KCal { @@ -42,7 +42,7 @@ class ResourceCachedSaveConfig; @see ResourceRemote */ -class KDE_EXPORT ResourceRemoteConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceRemoteConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp index ff9158d1..cd341e2d 100644 --- a/tderesources/scalix/kcal/resourcescalix.cpp +++ b/tderesources/scalix/kcal/resourcescalix.cpp @@ -66,8 +66,8 @@ ResourceScalix::ResourceScalix( const TDEConfig *config ) mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ) { setType( "scalix" ); - connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotEmitResourceChanged() ) ); + connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotEmitResourceChanged() ) ); } ResourceScalix::~ResourceScalix() @@ -165,7 +165,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource, UIServer_stub uiserver( "tdeio_uiserver", "UIServer" ); int progressId = 0; if ( useProgress ) { - progressId = uiserver.newJob( kapp->dcopClient()->appId(), true ); + progressId = uiserver.newJob( tdeApp->dcopClient()->appId(), true ); uiserver.totalFiles( progressId, count ); uiserver.infoMessage( progressId, labelTxt ); uiserver.transferring( progressId, labelTxt ); @@ -310,7 +310,7 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subr KIncidenceChooser* ch = new KIncidenceChooser(); ch->setIncidence( local ,inc ); if ( KIncidenceChooser::chooseMode == KIncidenceChooser::ask ) { - connect ( this, TQT_SIGNAL( useGlobalMode() ), ch, TQT_SLOT ( useGlobalMode() ) ); + connect ( this, TQ_SIGNAL( useGlobalMode() ), ch, TQ_SLOT ( useGlobalMode() ) ); if ( ch->exec() ) if ( KIncidenceChooser::chooseMode != KIncidenceChooser::ask ) emit useGlobalMode() ; diff --git a/tderesources/scalix/kcal/resourcescalix.h b/tderesources/scalix/kcal/resourcescalix.h index 5b283534..0890eaf0 100644 --- a/tderesources/scalix/kcal/resourcescalix.h +++ b/tderesources/scalix/kcal/resourcescalix.h @@ -36,7 +36,7 @@ #include <tqtimer.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <libkcal/calendarlocal.h> #include <libkcal/icalformat.h> #include <libkcal/resourcecalendar.h> @@ -46,7 +46,7 @@ namespace KCal { struct TemporarySilencer; -class KDE_EXPORT ResourceScalix : public KCal::ResourceCalendar, +class TDE_EXPORT ResourceScalix : public KCal::ResourceCalendar, public KCal::IncidenceBase::Observer, public Scalix::ResourceScalixBase { diff --git a/tderesources/scalix/knotes/resourcescalix.h b/tderesources/scalix/knotes/resourcescalix.h index bcfa8cf5..592fc0a3 100644 --- a/tderesources/scalix/knotes/resourcescalix.h +++ b/tderesources/scalix/knotes/resourcescalix.h @@ -38,7 +38,7 @@ #include <libkcal/calendarlocal.h> #include "../shared/resourcescalixbase.h" #include "../shared/subresource.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace Scalix { @@ -48,7 +48,7 @@ namespace Scalix { * addresses in an IMAP folder in KMail (or other conforming email * clients). */ -class KDE_EXPORT ResourceScalix : public ResourceNotes, +class TDE_EXPORT ResourceScalix : public ResourceNotes, public KCal::IncidenceBase::Observer, public ResourceScalixBase { diff --git a/tderesources/scalix/scalixadmin/delegatedialog.cpp b/tderesources/scalix/scalixadmin/delegatedialog.cpp index 8674ce70..af843285 100644 --- a/tderesources/scalix/scalixadmin/delegatedialog.cpp +++ b/tderesources/scalix/scalixadmin/delegatedialog.cpp @@ -63,7 +63,7 @@ DelegateDialog::DelegateDialog( TQWidget *parent ) row++; } - connect( emailSelector, TQT_SIGNAL( clicked() ), TQT_SLOT( selectEmail() ) ); + connect( emailSelector, TQ_SIGNAL( clicked() ), TQ_SLOT( selectEmail() ) ); setMainWidget( page ); } diff --git a/tderesources/scalix/scalixadmin/delegatepage.cpp b/tderesources/scalix/scalixadmin/delegatepage.cpp index b4368f7d..b43dac85 100644 --- a/tderesources/scalix/scalixadmin/delegatepage.cpp +++ b/tderesources/scalix/scalixadmin/delegatepage.cpp @@ -53,10 +53,10 @@ DelegatePage::DelegatePage( TQWidget *parent ) mRemoveButton->setEnabled( false ); layout->addWidget( mRemoveButton, 1, 2 ); - connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addDelegate() ) ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editDelegate() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeDelegate() ) ); + connect( mView, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( selectionChanged() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addDelegate() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editDelegate() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeDelegate() ) ); loadAllDelegates(); } @@ -69,7 +69,7 @@ void DelegatePage::loadAllDelegates() { Scalix::GetDelegatesJob *job = Scalix::getDelegates( Settings::self()->globalSlave(), Settings::self()->accountUrl() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( allDelegates( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( allDelegates( TDEIO::Job* ) ) ); } void DelegatePage::addDelegate() @@ -88,7 +88,7 @@ void DelegatePage::addDelegate() Scalix::SetDelegateJob *job = Scalix::setDelegate( Settings::self()->globalSlave(), Settings::self()->accountUrl(), delegate.email(), delegate.rights() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateAdded( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( delegateAdded( TDEIO::Job* ) ) ); } void DelegatePage::editDelegate() @@ -113,7 +113,7 @@ void DelegatePage::editDelegate() Scalix::SetDelegateJob *job = Scalix::setDelegate( Settings::self()->globalSlave(), Settings::self()->accountUrl(), delegate.email(), delegate.rights() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateAdded( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( delegateAdded( TDEIO::Job* ) ) ); } void DelegatePage::removeDelegate() @@ -124,7 +124,7 @@ void DelegatePage::removeDelegate() Scalix::DeleteDelegateJob *job = Scalix::deleteDelegate( Settings::self()->globalSlave(), Settings::self()->accountUrl(), delegate.email() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateRemoved( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( delegateRemoved( TDEIO::Job* ) ) ); } void DelegatePage::allDelegates( TDEIO::Job *job ) diff --git a/tderesources/scalix/scalixadmin/delegateview.cpp b/tderesources/scalix/scalixadmin/delegateview.cpp index 79b8cf33..e999baff 100644 --- a/tderesources/scalix/scalixadmin/delegateview.cpp +++ b/tderesources/scalix/scalixadmin/delegateview.cpp @@ -48,7 +48,7 @@ DelegateView::DelegateView( DelegateManager *manager, TQWidget *parent ) setFullWidth( true ); setAllColumnsShowFocus( true ); - connect( mManager, TQT_SIGNAL( changed() ), TQT_SLOT( delegateChanged() ) ); + connect( mManager, TQ_SIGNAL( changed() ), TQ_SLOT( delegateChanged() ) ); delegateChanged(); } diff --git a/tderesources/scalix/scalixadmin/jobs.cpp b/tderesources/scalix/scalixadmin/jobs.cpp index e07b17ca..d965438d 100644 --- a/tderesources/scalix/scalixadmin/jobs.cpp +++ b/tderesources/scalix/scalixadmin/jobs.cpp @@ -207,8 +207,8 @@ DeleteDelegateJob::DeleteDelegateJob( const KURL& url, const TQByteArray &packed GetDelegatesJob::GetDelegatesJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); } Delegate::List GetDelegatesJob::delegates() const @@ -259,8 +259,8 @@ DeleteOtherUserJob::DeleteOtherUserJob( const KURL& url, const TQByteArray &pack GetOtherUsersJob::GetOtherUsersJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); } TQStringList GetOtherUsersJob::otherUsers() const @@ -281,8 +281,8 @@ SetOutOfOfficeJob::SetOutOfOfficeJob( const KURL& url, const TQByteArray &packed GetOutOfOfficeJob::GetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); } bool GetOutOfOfficeJob::enabled() const diff --git a/tderesources/scalix/scalixadmin/ldapview.cpp b/tderesources/scalix/scalixadmin/ldapview.cpp index 3e6eea04..a58dec2e 100644 --- a/tderesources/scalix/scalixadmin/ldapview.cpp +++ b/tderesources/scalix/scalixadmin/ldapview.cpp @@ -56,10 +56,10 @@ LdapView::LdapView( TQWidget *parent ) attrs << "surname" << "mail"; mClient->setAttrs( attrs ); - connect( mClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ), - this, TQT_SLOT( entryAdded( const TDEABC::LdapObject& ) ) ); - connect( mClient, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( error( const TQString& ) ) ); + connect( mClient, TQ_SIGNAL( result( const TDEABC::LdapObject& ) ), + this, TQ_SLOT( entryAdded( const TDEABC::LdapObject& ) ) ); + connect( mClient, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( error( const TQString& ) ) ); } LdapView::~LdapView() diff --git a/tderesources/scalix/scalixadmin/otheruserpage.cpp b/tderesources/scalix/scalixadmin/otheruserpage.cpp index 3cc220ea..f7594acf 100644 --- a/tderesources/scalix/scalixadmin/otheruserpage.cpp +++ b/tderesources/scalix/scalixadmin/otheruserpage.cpp @@ -52,9 +52,9 @@ OtherUserPage::OtherUserPage( TQWidget *parent ) mDeleteButton->setEnabled( false ); layout->addWidget( mDeleteButton, 1, 1 ); - connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addUser() ) ); - connect( mDeleteButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeUser() ) ); + connect( mView, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( selectionChanged() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addUser() ) ); + connect( mDeleteButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeUser() ) ); loadAllUsers(); } @@ -67,7 +67,7 @@ void OtherUserPage::loadAllUsers() { Scalix::GetOtherUsersJob *job = Scalix::getOtherUsers( Settings::self()->globalSlave(), Settings::self()->accountUrl() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( allUsers( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( allUsers( TDEIO::Job* ) ) ); } void OtherUserPage::addUser() @@ -82,7 +82,7 @@ void OtherUserPage::addUser() Scalix::AddOtherUserJob *job = Scalix::addOtherUser( Settings::self()->globalSlave(), Settings::self()->accountUrl(), email ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( userAdded( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( userAdded( TDEIO::Job* ) ) ); } void OtherUserPage::removeUser() @@ -93,7 +93,7 @@ void OtherUserPage::removeUser() Scalix::DeleteOtherUserJob *job = Scalix::deleteOtherUser( Settings::self()->globalSlave(), Settings::self()->accountUrl(), email ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( userRemoved( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( userRemoved( TDEIO::Job* ) ) ); } void OtherUserPage::allUsers( TDEIO::Job *job ) diff --git a/tderesources/scalix/scalixadmin/otheruserview.cpp b/tderesources/scalix/scalixadmin/otheruserview.cpp index e8aa13bc..be09dc74 100644 --- a/tderesources/scalix/scalixadmin/otheruserview.cpp +++ b/tderesources/scalix/scalixadmin/otheruserview.cpp @@ -45,7 +45,7 @@ OtherUserView::OtherUserView( OtherUserManager *manager, TQWidget *parent ) addColumn( i18n( "Registered Accounts" ) ); setFullWidth( true ); - connect( mManager, TQT_SIGNAL( changed() ), TQT_SLOT( userChanged() ) ); + connect( mManager, TQ_SIGNAL( changed() ), TQ_SLOT( userChanged() ) ); userChanged(); } diff --git a/tderesources/scalix/scalixadmin/outofofficepage.cpp b/tderesources/scalix/scalixadmin/outofofficepage.cpp index 557772d8..343f4f4c 100644 --- a/tderesources/scalix/scalixadmin/outofofficepage.cpp +++ b/tderesources/scalix/scalixadmin/outofofficepage.cpp @@ -55,10 +55,10 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent ) statusChanged(); - connect( mEnabled, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( statusChanged() ) ); - connect( mEnabled, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( changed() ) ); - connect( mSaveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( store() ) ); - connect( mMessage, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( changed() ) ); + connect( mEnabled, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( statusChanged() ) ); + connect( mEnabled, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( changed() ) ); + connect( mSaveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( store() ) ); + connect( mMessage, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( changed() ) ); load(); } @@ -71,7 +71,7 @@ void OutOfOfficePage::load() { Scalix::GetOutOfOfficeJob *job = Scalix::getOutOfOffice( Settings::self()->globalSlave(), Settings::self()->accountUrl() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( loaded( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( loaded( TDEIO::Job* ) ) ); } void OutOfOfficePage::loaded( TDEIO::Job* job ) @@ -98,7 +98,7 @@ void OutOfOfficePage::store() mEnabled->isChecked(), mMessage->text() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( stored( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( stored( TDEIO::Job* ) ) ); mSaveButton->setEnabled( false ); } diff --git a/tderesources/scalix/scalixadmin/passwordpage.cpp b/tderesources/scalix/scalixadmin/passwordpage.cpp index 38262725..f67e4251 100644 --- a/tderesources/scalix/scalixadmin/passwordpage.cpp +++ b/tderesources/scalix/scalixadmin/passwordpage.cpp @@ -62,9 +62,9 @@ PasswordPage::PasswordPage( TQWidget *parent ) layout->setRowSpacing( 3, 1 ); - connect( mPassword, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) ); - connect( mPasswordRetype, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) ); - connect( mButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( buttonClicked() ) ); + connect( mPassword, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( textChanged() ) ); + connect( mPasswordRetype, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( textChanged() ) ); + connect( mButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( buttonClicked() ) ); } void PasswordPage::buttonClicked() @@ -77,7 +77,7 @@ void PasswordPage::buttonClicked() mJob = Scalix::setPassword( Settings::self()->globalSlave(), Settings::self()->accountUrl(), Settings::self()->accountPassword(), mPassword->text() ); - connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( finished( TDEIO::Job* ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( finished( TDEIO::Job* ) ) ); updateState( true ); } else { diff --git a/tderesources/scalix/shared/kmailconnection.cpp b/tderesources/scalix/shared/kmailconnection.cpp index 147b9822..dec929ce 100644 --- a/tderesources/scalix/shared/kmailconnection.cpp +++ b/tderesources/scalix/shared/kmailconnection.cpp @@ -54,14 +54,14 @@ KMailConnection::KMailConnection( ResourceScalixBase* resource, mDCOPClient->attach(); mDCOPClient->registerAs( objId, true ); - kapp->dcopClient()->setNotifications( true ); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ), - this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + tdeApp->dcopClient()->setNotifications( true ); + connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ), + this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); } KMailConnection::~KMailConnection() { - kapp->dcopClient()->setNotifications( false ); + tdeApp->dcopClient()->setNotifications( false ); delete mKMailIcalIfaceStub; mKMailIcalIfaceStub = 0; delete mDCOPClient; @@ -84,7 +84,7 @@ bool KMailConnection::connectToKMail() return false; } - mKMailIcalIfaceStub = new KMailICalIface_stub( kapp->dcopClient(), + mKMailIcalIfaceStub = new KMailICalIface_stub( tdeApp->dcopClient(), dcopService, dcopObjectId ); // Attach to the KMail signals diff --git a/tderesources/scalix/shared/resourcescalixbase.cpp b/tderesources/scalix/shared/resourcescalixbase.cpp index 6108230c..f9b10423 100644 --- a/tderesources/scalix/shared/resourcescalixbase.cpp +++ b/tderesources/scalix/shared/resourcescalixbase.cpp @@ -36,7 +36,7 @@ #include <folderselectdialog.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kinputdialog.h> #include <kurl.h> #include <tdetempfile.h> diff --git a/tderesources/scalix/tdeabc/resourcescalix.cpp b/tderesources/scalix/tdeabc/resourcescalix.cpp index dc953ded..91fe99dd 100644 --- a/tderesources/scalix/tdeabc/resourcescalix.cpp +++ b/tderesources/scalix/tdeabc/resourcescalix.cpp @@ -197,7 +197,7 @@ bool TDEABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource, UIServer_stub uiserver( "tdeio_uiserver", "UIServer" ); int progressId = 0; if ( count > 200 ) { - progressId = uiserver.newJob( kapp->dcopClient()->appId(), true ); + progressId = uiserver.newJob( tdeApp->dcopClient()->appId(), true ); uiserver.totalFiles( progressId, count ); uiserver.infoMessage( progressId, i18n( "Loading contacts..." ) ); uiserver.transferring( progressId, "Contacts" ); diff --git a/tderesources/scalix/tdeabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h index ee3c8af9..c3e8765c 100644 --- a/tderesources/scalix/tdeabc/resourcescalix.h +++ b/tderesources/scalix/tdeabc/resourcescalix.h @@ -39,7 +39,7 @@ #include "../shared/resourcescalixbase.h" #include "../shared/subresource.h" #include <kmail/kmailicalIface.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace TDEABC { @@ -50,7 +50,7 @@ namespace TDEABC { * addresses in an Scalix folder in KMail (or other conforming email * clients). */ -class KDE_EXPORT ResourceScalix : public KPIM::ResourceABC, +class TDE_EXPORT ResourceScalix : public KPIM::ResourceABC, public Scalix::ResourceScalixBase { TQ_OBJECT diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp index 0af6c466..165f4772 100644 --- a/tderesources/scalix/tdeioslave/scalix.cpp +++ b/tderesources/scalix/tdeioslave/scalix.cpp @@ -28,14 +28,14 @@ #include <tdeio/global.h> #include <tdelocale.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <stdlib.h> #include "scalix.h" extern "C" { - KDE_EXPORT int kdemain( int argc, char **argv ); + TDE_EXPORT int kdemain( int argc, char **argv ); } static const TDECmdLineOptions options[] = @@ -116,10 +116,10 @@ void Scalix::retrieveFreeBusy( const KURL &url ) mFreeBusyData = TQString(); TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false ); - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotRetrieveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotRetrieveResult( TDEIO::Job* ) ) ); tqApp->eventLoop()->enterLoop(); } @@ -182,8 +182,8 @@ void Scalix::publishFreeBusy( const KURL &url ) .arg( url.host() ); TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotPublishResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotPublishResult( TDEIO::Job* ) ) ); tqApp->eventLoop()->enterLoop(); } diff --git a/tderesources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp index 4c2ab12c..530c2907 100644 --- a/tderesources/slox/kcalresourceslox.cpp +++ b/tderesources/slox/kcalresourceslox.cpp @@ -33,7 +33,7 @@ #include <tdeio/job.h> #include <tdeio/davjob.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <libtdepim/progressmanager.h> @@ -226,16 +226,16 @@ void KCalResourceSlox::requestEvents() kdDebug() << "REQUEST CALENDAR: \n" << doc.toString( 2 ) << endl; mLoadEventsJob = TDEIO::davPropFind( url, doc, "0", false ); - connect( mLoadEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotLoadEventsResult( TDEIO::Job * ) ) ); - connect( mLoadEventsJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotEventsProgress( TDEIO::Job *, unsigned long ) ) ); + connect( mLoadEventsJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotLoadEventsResult( TDEIO::Job * ) ) ); + connect( mLoadEventsJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotEventsProgress( TDEIO::Job *, unsigned long ) ) ); mLoadEventsProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading events") ); connect( mLoadEventsProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoadEvents() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoadEvents() ) ); mPrefs->setLastEventSync( TQDateTime::currentDateTime() ); } @@ -271,16 +271,16 @@ void KCalResourceSlox::requestTodos() kdDebug() << "REQUEST TASKS: \n" << doc.toString( 2 ) << endl; mLoadTodosJob = TDEIO::davPropFind( url, doc, "0", false ); - connect( mLoadTodosJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotLoadTodosResult( TDEIO::Job * ) ) ); - connect( mLoadTodosJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotTodosProgress( TDEIO::Job *, unsigned long ) ) ); + connect( mLoadTodosJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotLoadTodosResult( TDEIO::Job * ) ) ); + connect( mLoadTodosJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotTodosProgress( TDEIO::Job *, unsigned long ) ) ); mLoadTodosProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading to-dos") ); connect( mLoadTodosProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoadTodos() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoadTodos() ) ); mPrefs->setLastTodoSync( TQDateTime::currentDateTime() ); } @@ -380,16 +380,16 @@ void KCalResourceSlox::uploadIncidences() kdDebug() << "UPLOAD: \n" << doc.toString( 2 ) << endl; mUploadJob = TDEIO::davPropPatch( url, doc, false ); - connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotUploadResult( TDEIO::Job * ) ) ); - connect( mUploadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotUploadProgress( TDEIO::Job *, unsigned long ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotUploadResult( TDEIO::Job * ) ) ); + connect( mUploadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotUploadProgress( TDEIO::Job *, unsigned long ) ) ); mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Uploading incidence") ); connect( mUploadProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelUpload() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelUpload() ) ); } void KCalResourceSlox::createIncidenceAttributes( TQDomDocument &doc, diff --git a/tderesources/slox/kcalresourceslox.h b/tderesources/slox/kcalresourceslox.h index a4a80b3e..83d78769 100644 --- a/tderesources/slox/kcalresourceslox.h +++ b/tderesources/slox/kcalresourceslox.h @@ -31,7 +31,7 @@ #include <kurl.h> #include <tdeconfig.h> #include <kdirwatch.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <libkcal/incidence.h> #include <libkcal/todo.h> @@ -58,7 +58,7 @@ class SloxAccounts; /** This class provides a calendar stored as a remote file. */ -class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase +class TDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase { TQ_OBJECT diff --git a/tderesources/slox/kcalresourcesloxconfig.cpp b/tderesources/slox/kcalresourcesloxconfig.cpp index 83246a03..402d853c 100644 --- a/tderesources/slox/kcalresourcesloxconfig.cpp +++ b/tderesources/slox/kcalresourcesloxconfig.cpp @@ -26,7 +26,7 @@ #include <tdelocale.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <klineedit.h> #include <kpushbutton.h> @@ -72,11 +72,11 @@ KCalResourceSloxConfig::KCalResourceSloxConfig( TQWidget* parent, const char* n mCalButton = new KPushButton( i18n("Calendar Folder..."), this ); mainLayout->addWidget( mCalButton, 5, 0 ); - connect( mCalButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectCalendarFolder() ) ); + connect( mCalButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectCalendarFolder() ) ); mTaskButton = new KPushButton( i18n("Task Folder..."), this ); mainLayout->addWidget( mTaskButton, 5, 1 ); - connect( mTaskButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectTaskFolder() ) ); + connect( mTaskButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectTaskFolder() ) ); mReloadConfig = new KCal::ResourceCachedReloadConfig( this ); mainLayout->addMultiCellWidget( mReloadConfig, 6, 6, 0, 1 ); diff --git a/tderesources/slox/kcalresourcesloxconfig.h b/tderesources/slox/kcalresourcesloxconfig.h index 21670bbb..46da81bd 100644 --- a/tderesources/slox/kcalresourcesloxconfig.h +++ b/tderesources/slox/kcalresourcesloxconfig.h @@ -21,7 +21,7 @@ #define KCALRESOURCESLOXCONFIG_H #include <kurlrequester.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tderesources/resource.h> #include <tderesources/configwidget.h> @@ -42,7 +42,7 @@ class SloxBase; @see KCalResourceSlox */ -class KDE_EXPORT KCalResourceSloxConfig : public KRES::ConfigWidget +class TDE_EXPORT KCalResourceSloxConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/slox/sloxaccounts.cpp b/tderesources/slox/sloxaccounts.cpp index 3afa7019..fdfd1eca 100644 --- a/tderesources/slox/sloxaccounts.cpp +++ b/tderesources/slox/sloxaccounts.cpp @@ -27,7 +27,7 @@ #include <kstaticdeleter.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/job.h> #include <tdeio/davjob.h> #include <kstringhandler.h> @@ -139,8 +139,8 @@ void SloxAccounts::requestAccounts() mDownloadJob = TDEIO::davPropFind( url, doc, "0", false ); } - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void SloxAccounts::slotResult( TDEIO::Job *job ) diff --git a/tderesources/slox/sloxaccounts.h b/tderesources/slox/sloxaccounts.h index 7b5e92a1..64c5a273 100644 --- a/tderesources/slox/sloxaccounts.h +++ b/tderesources/slox/sloxaccounts.h @@ -21,7 +21,7 @@ #define SLOXACCOUNTS_H #include <tdeabc/addressee.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tqobject.h> namespace TDEIO { @@ -30,7 +30,7 @@ class Job; class SloxBase; -class KDE_EXPORT SloxAccounts : public TQObject +class TDE_EXPORT SloxAccounts : public TQObject { TQ_OBJECT diff --git a/tderesources/slox/sloxbase.h b/tderesources/slox/sloxbase.h index dc3c9c53..525f76a3 100644 --- a/tderesources/slox/sloxbase.h +++ b/tderesources/slox/sloxbase.h @@ -21,13 +21,13 @@ #define SLOXUTILS_H #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KRES { class Resource; } -class KDE_EXPORT SloxBase { +class TDE_EXPORT SloxBase { public: enum Field { ObjectId = 0, // system fields diff --git a/tderesources/slox/sloxfolder.h b/tderesources/slox/sloxfolder.h index 06f08003..0bad3dae 100644 --- a/tderesources/slox/sloxfolder.h +++ b/tderesources/slox/sloxfolder.h @@ -21,7 +21,7 @@ #define SLOXFOLDER_H #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEListViewItem; @@ -32,7 +32,7 @@ enum FolderType { Contacts }; -class KDE_EXPORT SloxFolder +class TDE_EXPORT SloxFolder { public: SloxFolder( const TQString &id, const TQString &parentId, const TQString &type, const TQString &name, bool def = false ); diff --git a/tderesources/slox/sloxfolderdialog.cpp b/tderesources/slox/sloxfolderdialog.cpp index 716c2d40..c1f1086e 100644 --- a/tderesources/slox/sloxfolderdialog.cpp +++ b/tderesources/slox/sloxfolderdialog.cpp @@ -37,7 +37,7 @@ SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type, mListView->addColumn( i18n("Folder ID"), 0 ); setMainWidget( mListView ); updateFolderView(); - connect( manager, TQT_SIGNAL( foldersUpdated() ), TQT_SLOT( updateFolderView() ) ); + connect( manager, TQ_SIGNAL( foldersUpdated() ), TQ_SLOT( updateFolderView() ) ); } SloxFolderDialog::~SloxFolderDialog() diff --git a/tderesources/slox/sloxfoldermanager.cpp b/tderesources/slox/sloxfoldermanager.cpp index d7284d3a..4e89d8de 100644 --- a/tderesources/slox/sloxfoldermanager.cpp +++ b/tderesources/slox/sloxfoldermanager.cpp @@ -25,7 +25,7 @@ #include <tdeio/job.h> #include <tdeio/davjob.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "sloxbase.h" #include "sloxfolder.h" @@ -79,8 +79,8 @@ void SloxFolderManager::requestFolders() mDownloadJob = TDEIO::davPropFind( url, doc, "0", false ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void SloxFolderManager::slotResult( TDEIO::Job *job ) diff --git a/tderesources/slox/sloxfoldermanager.h b/tderesources/slox/sloxfoldermanager.h index f61ab471..d0f466aa 100644 --- a/tderesources/slox/sloxfoldermanager.h +++ b/tderesources/slox/sloxfoldermanager.h @@ -25,7 +25,7 @@ #include <kurl.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace TDEIO { class Job; @@ -35,7 +35,7 @@ class DavJob; class SloxBase; class SloxFolder; -class KDE_EXPORT SloxFolderManager : public TQObject +class TDE_EXPORT SloxFolderManager : public TQObject { TQ_OBJECT diff --git a/tderesources/slox/tdeabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp index 5b0b6515..bcd719ba 100644 --- a/tderesources/slox/tdeabcresourceslox.cpp +++ b/tderesources/slox/tdeabcresourceslox.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kmdcodec.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <libtdepim/kpimprefs.h> #include <libtdepim/progressmanager.h> @@ -208,16 +208,16 @@ bool ResourceSlox::asyncLoad() kdDebug() << "REQUEST CONTACTS: \n" << doc.toString( 2 ) << endl; mDownloadJob = TDEIO::davPropFind( url, doc, "0", false ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) ); mDownloadProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading contacts") ); connect( mDownloadProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelDownload() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelDownload() ) ); mPrefs->setLastSync( TQDateTime::currentDateTime() ); @@ -521,16 +521,16 @@ void ResourceSlox::uploadContacts() url.setPass( mPrefs->password() ); mUploadJob = TDEIO::davPropPatch( url, doc, false ); - connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotUploadResult( TDEIO::Job * ) ) ); - connect( mUploadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotUploadResult( TDEIO::Job * ) ) ); + connect( mUploadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) ); mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Uploading contacts") ); connect( mUploadProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelUpload() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelUpload() ) ); } void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop, diff --git a/tderesources/slox/tdeabcresourceslox.h b/tderesources/slox/tdeabcresourceslox.h index 225f8a33..c78a2f6d 100644 --- a/tderesources/slox/tdeabcresourceslox.h +++ b/tderesources/slox/tdeabcresourceslox.h @@ -24,7 +24,7 @@ #include "webdavhandler.h" #include <libtdepim/tdeabcresourcecached.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tdeabc/addressee.h> #include <tqmap.h> @@ -45,7 +45,7 @@ namespace TDEABC { class SloxPrefs; -class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase +class TDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase { TQ_OBJECT diff --git a/tderesources/slox/tdeabcresourcesloxconfig.cpp b/tderesources/slox/tdeabcresourcesloxconfig.cpp index 8ad6701c..36f76238 100644 --- a/tderesources/slox/tdeabcresourcesloxconfig.cpp +++ b/tderesources/slox/tdeabcresourcesloxconfig.cpp @@ -69,7 +69,7 @@ ResourceSloxConfig::ResourceSloxConfig( TQWidget* parent, const char* name ) mFolderButton = new KPushButton( i18n("Select Folder..."), this ); mainLayout->addMultiCellWidget( mFolderButton, 4, 4, 0, 1 ); - connect( mFolderButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectAddressFolder() ) ); + connect( mFolderButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectAddressFolder() ) ); } diff --git a/tderesources/slox/tdeabcresourcesloxconfig.h b/tderesources/slox/tdeabcresourcesloxconfig.h index 46a9a74a..76dd7e54 100644 --- a/tderesources/slox/tdeabcresourcesloxconfig.h +++ b/tderesources/slox/tdeabcresourcesloxconfig.h @@ -21,7 +21,7 @@ #define RESOURCESLOXCONFIG_H #include <tderesources/configwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQCheckBox; class KLineEdit; @@ -32,7 +32,7 @@ class SloxBase; namespace TDEABC { -class KDE_EXPORT ResourceSloxConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceSloxConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/slox/testsloxaccounts.cpp b/tderesources/slox/testsloxaccounts.cpp index 22c44e66..ea7b3da1 100644 --- a/tderesources/slox/testsloxaccounts.cpp +++ b/tderesources/slox/testsloxaccounts.cpp @@ -55,7 +55,7 @@ int main(int argc,char **argv) app.setMainWidget( &button ); button.show(); - TQObject::connect( &button, TQT_SIGNAL( clicked() ), &app, TQT_SLOT( quit() ) ); + TQObject::connect( &button, TQ_SIGNAL( clicked() ), &app, TQ_SLOT( quit() ) ); app.exec(); } diff --git a/tderesources/slox/webdavhandler.h b/tderesources/slox/webdavhandler.h index 6d98fd52..d617325f 100644 --- a/tderesources/slox/webdavhandler.h +++ b/tderesources/slox/webdavhandler.h @@ -25,7 +25,7 @@ #include <tqdatetime.h> #include <tqdom.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tdeabc/addressee.h> namespace KCal { @@ -34,7 +34,7 @@ class Incidence; class SloxBase; -class KDE_EXPORT SloxItem +class TDE_EXPORT SloxItem { public: enum Status { Invalid, Delete, Create, New }; @@ -49,7 +49,7 @@ class KDE_EXPORT SloxItem TQString responseDescription; }; -class KDE_EXPORT WebdavHandler +class TDE_EXPORT WebdavHandler { public: WebdavHandler(); diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.cpp b/tderesources/tvanytime/kcal_resourcetvanytime.cpp index 12161d90..d2fccbb8 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytime.cpp +++ b/tderesources/tvanytime/kcal_resourcetvanytime.cpp @@ -43,7 +43,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tderesources/configwidget.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <tdetempfile.h> #include <ktar.h> @@ -93,8 +93,8 @@ void ResourceTVAnytime::init() //setReadOnly( true ); - connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotEmitResourceChanged() ) ); + connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotEmitResourceChanged() ) ); } TVAnytimePrefsBase *ResourceTVAnytime::prefs() @@ -179,15 +179,15 @@ bool ResourceTVAnytime::doLoad() // TODO: find out if the file to download is fresh. if not, just work with the cache. mDownloadJob = TDEIO::file_copy( url, destination, -1, true ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading program schedule") ); connect( mProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); return true; } diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.h b/tderesources/tvanytime/kcal_resourcetvanytime.h index cea9004b..721e0542 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytime.h +++ b/tderesources/tvanytime/kcal_resourcetvanytime.h @@ -30,7 +30,7 @@ #include <tdeabc/locknull.h> #include <tdeio/job.h> #include <tdeconfig.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "service.h" @@ -48,7 +48,7 @@ class TVAnytimePrefsBase; /** This class provides a resource for accessing a BBC TV and radio schedule as a calendar. */ -class KDE_EXPORT ResourceTVAnytime : public ResourceCached +class TDE_EXPORT ResourceTVAnytime : public ResourceCached { TQ_OBJECT diff --git a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp index 8405e2f0..e298ff20 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp +++ b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp @@ -29,7 +29,7 @@ #include <tdelocale.h> #include <kdebug.h> //#include <kdialogbase.h> -//#include <kstandarddirs.h> +//#include <tdestandarddirs.h> #include <klineedit.h> #include <libkcal/resourcecachedconfig.h> diff --git a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h index 926bc7f3..b4db19cf 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h +++ b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h @@ -21,7 +21,7 @@ #define KCALRESOURCETVANYTIMECONFIG_H #include <kurlrequester.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tderesources/resource.h> #include <tderesources/configwidget.h> @@ -38,7 +38,7 @@ class ResourceCachedSaveConfig; Configuration widget for TVAnytime resource. @see KCal::ResourceTVAnytime */ -class KDE_EXPORT ResourceTVAnytimeConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceTVAnytimeConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/tvanytime/tvanytime.tdevelop b/tderesources/tvanytime/tvanytime.tdevelop deleted file mode 100644 index 479d2f50..00000000 --- a/tderesources/tvanytime/tvanytime.tdevelop +++ /dev/null @@ -1,202 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>Will Stephenson</author> - <email>wstephenson@kde.org</email> - <version>0.1</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>C++</keyword> - <keyword>Code</keyword> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <versioncontrol>kdevsubversion</versioncontrol> - <ignoreparts/> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - </general> - <kdevautoproject> - <general> - <activetarget>libkcal_tvanytime.la</activetarget> - <useconfiguration>debug</useconfiguration> - </general> - <run> - <mainprogram>src/tvanytime</mainprogram> - <directoryradio>executable</directoryradio> - </run> - <configurations> - <optimized> - <builddir>optimized</builddir> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevg77options</f77compiler> - <cxxflags>-O2 -g0</cxxflags> - </optimized> - <debug> - <configargs>--enable-debug=full</configargs> - <builddir>/space/kde/svn/head/build/tdepim/tderesources/tvanytime</builddir> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevg77options</f77compiler> - <cxxflags>-O0 -g3</cxxflags> - <envvars/> - <topsourcedir>/space/kde/svn/head/src/tdepim/tderesources/tvanytime</topsourcedir> - <cppflags/> - <ldflags/> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags/> - <f77flags/> - </debug> - </configurations> - <make> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - <abortonerror>true</abortonerror> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin>unsermake </makebin> - <prio>0</prio> - </make> - </kdevautoproject> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - <hidenonprojectfiles>false</hidenonprojectfiles> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>w3c-dom-level2-html</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>w3c-svg</toc> - <toc>sw</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoreqt_xml> - <toc>qmake User Guide</toc> - </ignoreqt_xml> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs/> - <gdbpath/> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</outputradix> - </display> - </kdevdebugger> - <kdevfilecreate> - <filetypes/> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevdocumentation> - <projectdoc> - <docsystem>Doxygen Documentation Collection</docsystem> - <docurl>tvanytime.tag</docurl> - </projectdoc> - </kdevdocumentation> - <substmap> - <APPNAME>tvanytime</APPNAME> - <APPNAMELC>tvanytime</APPNAMELC> - <APPNAMESC>Bbcschedule</APPNAMESC> - <APPNAMEUC>BBCSCHEDULE</APPNAMEUC> - <AUTHOR>Will Stephenson</AUTHOR> - <EMAIL>wstephenson@kde.org</EMAIL> - <LICENSE>GPL</LICENSE> - <LICENSEFILE>COPYING</LICENSEFILE> - <VERSION>0.1</VERSION> - <YEAR>2005</YEAR> - <dest>/space/kde/head/src/tdepim/tderesources/tvanytime</dest> - </substmap> - <kdevcppsupport> - <references> - <pcs>tdelibs</pcs> - <pcs>project</pcs> - <pcs>libkcal</pcs> - </references> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - <qt> - <used>false</used> - <version>3</version> - <root>/usr/lib/qt3</root> - </qt> - <creategettersetter> - <prefixGet/> - <prefixSet>set</prefixSet> - <prefixVariable>m_,_</prefixVariable> - <parameterName>theValue</parameterName> - <inlineGet>true</inlineGet> - <inlineSet>true</inlineSet> - </creategettersetter> - </kdevcppsupport> - <cppsupportpart> - <filetemplates> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - </filetemplates> - </cppsupportpart> -</tdevelop> diff --git a/translations/desktop_files/KOrn.desktop/es_AR.po b/translations/desktop_files/KOrn.desktop/es_AR.po new file mode 100644 index 00000000..018d636c --- /dev/null +++ b/translations/desktop_files/KOrn.desktop/es_AR.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-12 14:25+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: KOrn.desktop:2 +msgid "Korn" +msgstr "" + +#. GenericName +#: KOrn.desktop:4 +msgid "Mail Alert" +msgstr "" diff --git a/translations/desktop_files/KOrn.desktop/ru.po b/translations/desktop_files/KOrn.desktop/ru.po index 61f878f9..afaa70c0 100644 --- a/translations/desktop_files/KOrn.desktop/ru.po +++ b/translations/desktop_files/KOrn.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 14:25+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-03-29 02:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/korn-korndesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: KOrn.desktop:2 msgid "Korn" -msgstr "" +msgstr "Korn" #. GenericName #: KOrn.desktop:4 diff --git a/translations/desktop_files/akregator-desktops/es_AR.po b/translations/desktop_files/akregator-desktops/es_AR.po new file mode 100644 index 00000000..146bc032 --- /dev/null +++ b/translations/desktop_files/akregator-desktops/es_AR.po @@ -0,0 +1,45 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-07-07 18:17+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: akregator.desktop:2 +msgid "Akregator" +msgstr "" + +#. GenericName +#: akregator.desktop:4 +msgid "RSS Feed Reader" +msgstr "" + +#. Comment +#: akregator.desktop:6 +msgid "An RSS Aggregator for TDE" +msgstr "" + +#. Name +#: akregator_part.desktop:2 +msgid "aKregatorPart" +msgstr "" + +#. Comment +#: akregator_plugin.desktop:2 mk4storage/akregator_mk4storage_plugin.desktop:4 +msgid "Plugin for Akregator" +msgstr "" + +#. Name +#: mk4storage/akregator_mk4storage_plugin.desktop:2 +msgid "Metakit storage backend" +msgstr "" diff --git a/translations/desktop_files/akregator-desktops/ru.po b/translations/desktop_files/akregator-desktops/ru.po index be68077f..b0627687 100644 --- a/translations/desktop_files/akregator-desktops/ru.po +++ b/translations/desktop_files/akregator-desktops/ru.po @@ -1,26 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-07 18:17+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-04-14 11:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/akregator-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: akregator.desktop:2 -#, fuzzy msgid "Akregator" -msgstr "Модуль Akregator" +msgstr "Akregator" #. GenericName #: akregator.desktop:4 @@ -35,7 +36,7 @@ msgstr "Чтение лент новостей RSS" #. Name #: akregator_part.desktop:2 msgid "aKregatorPart" -msgstr "" +msgstr "aKregatorPart" #. Comment #: akregator_plugin.desktop:2 mk4storage/akregator_mk4storage_plugin.desktop:4 diff --git a/translations/desktop_files/akregator-eventsrc/es_AR.po b/translations/desktop_files/akregator-eventsrc/es_AR.po new file mode 100644 index 00000000..a46bde2f --- /dev/null +++ b/translations/desktop_files/akregator-eventsrc/es_AR.po @@ -0,0 +1,40 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-09 04:08+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Comment +#: eventsrc:3 +msgid "Akregator" +msgstr "" + +#. Name +#: eventsrc:6 +msgid "Feed added" +msgstr "" + +#. Comment +#: eventsrc:7 +msgid "A new feed was remotely added to Akregator" +msgstr "" + +#. Name +#: eventsrc:11 +msgid "New Articles" +msgstr "" + +#. Comment +#: eventsrc:12 +msgid "New articles were fetched" +msgstr "" diff --git a/translations/desktop_files/akregator-eventsrc/ru.po b/translations/desktop_files/akregator-eventsrc/ru.po index 2df73715..39fdcc50 100644 --- a/translations/desktop_files/akregator-eventsrc/ru.po +++ b/translations/desktop_files/akregator-eventsrc/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 04:08+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-03-29 02:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/akregator-events/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: eventsrc:3 msgid "Akregator" -msgstr "" +msgstr "Akregator" #. Name #: eventsrc:6 diff --git a/translations/desktop_files/certmanager-desktops/es_AR.po b/translations/desktop_files/certmanager-desktops/es_AR.po new file mode 100644 index 00000000..46d2d454 --- /dev/null +++ b/translations/desktop_files/certmanager-desktops/es_AR.po @@ -0,0 +1,100 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-09 19:10+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: conf/kleopatra_config_appear.desktop:15 +msgid "Appearance" +msgstr "" + +#. Comment +#: conf/kleopatra_config_appear.desktop:17 +msgid "Colors & Fonts Configuration" +msgstr "" + +#. Keywords +#: conf/kleopatra_config_appear.desktop:19 +msgid "color;font; configuration;" +msgstr "" + +#. Name +#: conf/kleopatra_config_dirserv.desktop:15 +msgid "Directory Services" +msgstr "" + +#. Comment +#: conf/kleopatra_config_dirserv.desktop:17 +msgid "Configuration of LDAP directory services" +msgstr "" + +#. Keywords +#: conf/kleopatra_config_dirserv.desktop:19 +msgid "ldap;directory;services;" +msgstr "" + +#. Name +#: conf/kleopatra_config_dnorder.desktop:15 +msgid "DN-Attribute Order" +msgstr "" + +#. Comment +#: conf/kleopatra_config_dnorder.desktop:17 +msgid "Configure the order in which DN attributes are shown" +msgstr "" + +#. Keywords +#: conf/kleopatra_config_dnorder.desktop:19 +msgid "DN;order;RDN;attribute;" +msgstr "" + +#. Name +#: kleopatra.desktop:7 kleopatra_import.desktop:2 +msgid "Kleopatra" +msgstr "" + +#. GenericName +#: kleopatra.desktop:9 +msgid "Certificate Manager and Unified Crypto GUI" +msgstr "" + +#. Name +#: lib/libkleopatrarc.desktop:3 +msgid "Not Validated Key" +msgstr "" + +#. Name +#: lib/libkleopatrarc.desktop:10 +msgid "Expired Key" +msgstr "" + +#. Name +#: lib/libkleopatrarc.desktop:15 +msgid "Revoked Key" +msgstr "" + +#. Name +#: lib/libkleopatrarc.desktop:21 +msgid "Trusted Root Certificate" +msgstr "" + +#. Name +#: lib/libkleopatrarc.desktop:27 +msgid "Not Trusted Root Certificate" +msgstr "" + +#. Name +#: lib/libkleopatrarc.desktop:31 +msgid "Other Keys" +msgstr "" diff --git a/translations/desktop_files/certmanager-desktops/ka.po b/translations/desktop_files/certmanager-desktops/ka.po index f99caeab..a5f930c0 100644 --- a/translations/desktop_files/certmanager-desktops/ka.po +++ b/translations/desktop_files/certmanager-desktops/ka.po @@ -1,65 +1,66 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 19:10+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-12-21 20:12+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kleopatra-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: conf/kleopatra_config_appear.desktop:15 msgid "Appearance" -msgstr "" +msgstr "გარეგნობა" #. Comment #: conf/kleopatra_config_appear.desktop:17 msgid "Colors & Fonts Configuration" -msgstr "" +msgstr "ფერებისა და ფონტების მორგება" #. Keywords #: conf/kleopatra_config_appear.desktop:19 msgid "color;font; configuration;" -msgstr "" +msgstr "ფერი;ფონტი;მორგება;" #. Name #: conf/kleopatra_config_dirserv.desktop:15 msgid "Directory Services" -msgstr "" +msgstr "კატალოგის სერვისები" #. Comment #: conf/kleopatra_config_dirserv.desktop:17 msgid "Configuration of LDAP directory services" -msgstr "" +msgstr "LDAP კატალოგის სერვისების მორგება" #. Keywords #: conf/kleopatra_config_dirserv.desktop:19 msgid "ldap;directory;services;" -msgstr "" +msgstr "ldap;კატალოგი;სერვისები;" #. Name #: conf/kleopatra_config_dnorder.desktop:15 msgid "DN-Attribute Order" -msgstr "" +msgstr "DN-ატრიბუტების მიმდევრობა" #. Comment #: conf/kleopatra_config_dnorder.desktop:17 msgid "Configure the order in which DN attributes are shown" -msgstr "" +msgstr "მორგება მიმდევრობისა, რომლითაც DN ატრიბუტებია ნაჩვენები" #. Keywords #: conf/kleopatra_config_dnorder.desktop:19 msgid "DN;order;RDN;attribute;" -msgstr "" +msgstr "DN;მიმდევრობა;RDN;ატრიბუტი;" #. Name #: kleopatra.desktop:7 kleopatra_import.desktop:2 @@ -69,34 +70,34 @@ msgstr "Kleopatra" #. GenericName #: kleopatra.desktop:9 msgid "Certificate Manager and Unified Crypto GUI" -msgstr "" +msgstr "სერტიფიკატების მმართველი და გაერთიანებული კრიპტოგრაფიის ინტერფეისი" #. Name #: lib/libkleopatrarc.desktop:3 msgid "Not Validated Key" -msgstr "" +msgstr "გადაუმოწმებელი გასაღები" #. Name #: lib/libkleopatrarc.desktop:10 msgid "Expired Key" -msgstr "" +msgstr "ვადაამოწურული გასაღები" #. Name #: lib/libkleopatrarc.desktop:15 msgid "Revoked Key" -msgstr "" +msgstr "გაუქმებული გასაღები" #. Name #: lib/libkleopatrarc.desktop:21 msgid "Trusted Root Certificate" -msgstr "" +msgstr "სანდო ძირითადი სერტიფიკატი" #. Name #: lib/libkleopatrarc.desktop:27 msgid "Not Trusted Root Certificate" -msgstr "" +msgstr "არასანდო ძირითადი სერტიფიკატი" #. Name #: lib/libkleopatrarc.desktop:31 msgid "Other Keys" -msgstr "" +msgstr "სხვა გასაღებები" diff --git a/translations/desktop_files/groupwarewizard.desktop/es_AR.po b/translations/desktop_files/groupwarewizard.desktop/es_AR.po new file mode 100644 index 00000000..5a66aef0 --- /dev/null +++ b/translations/desktop_files/groupwarewizard.desktop/es_AR.po @@ -0,0 +1,20 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-12 15:43+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: groupwarewizard.desktop:2 +msgid "TDE Groupware Wizard" +msgstr "" diff --git a/translations/desktop_files/kaddressbook-desktops/es_AR.po b/translations/desktop_files/kaddressbook-desktops/es_AR.po new file mode 100644 index 00000000..25d52ea2 --- /dev/null +++ b/translations/desktop_files/kaddressbook-desktops/es_AR.po @@ -0,0 +1,373 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-07-07 18:17+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: csv-templates/kaddressbook.desktop:9 +msgid "KAddressBook (KDE 3.1)" +msgstr "" + +#. Name +#: csv-templates/outlook2000.desktop:8 +msgid "Outlook 2000" +msgstr "" + +#. Name +#: csv-templates/yahoo.desktop:9 +msgid "Yahoo! AddressBook" +msgstr "" + +#. Comment +#: dcopaddressbook.desktop:5 +msgid "Address Book with a DCOP interface" +msgstr "" + +#. Name +#: editors/cryptosettings.desktop:7 +msgid "Crypto Preferences" +msgstr "" + +#. Name +#: editors/imaddresseditor.desktop:7 +msgid "Instant Messaging" +msgstr "" + +#. Comment +#: editors/imaddresseditor.desktop:9 +msgid "Instant Messaging Address Editor" +msgstr "" + +#. Name +#: editors/kaddressbookimprotocol.desktop:6 +msgid "KAddressbook Instant Messaging Protocol" +msgstr "" + +#. Name +#: editors/protocols/aimprotocol.desktop:7 +msgid "AIM" +msgstr "" + +#. Comment +#: editors/protocols/aimprotocol.desktop:9 +msgid "AIM Protocol" +msgstr "" + +#. Name +#: editors/protocols/gaduprotocol.desktop:7 +msgid "Gadu-Gadu" +msgstr "" + +#. Comment +#: editors/protocols/gaduprotocol.desktop:9 +msgid "Gadu-Gadu Protocol" +msgstr "" + +#. Name +#: editors/protocols/groupwiseprotocol.desktop:7 +msgid "GroupWise" +msgstr "" + +#. Comment +#: editors/protocols/groupwiseprotocol.desktop:9 +msgid "Novell GroupWise Messenger" +msgstr "" + +#. Name +#: editors/protocols/icqprotocol.desktop:7 +msgid "ICQ" +msgstr "" + +#. Comment +#: editors/protocols/icqprotocol.desktop:9 +msgid "ICQ Protocol" +msgstr "" + +#. Name +#: editors/protocols/ircprotocol.desktop:7 +msgid "IRC" +msgstr "" + +#. Comment +#: editors/protocols/ircprotocol.desktop:9 +msgid "Internet Relay Chat" +msgstr "" + +#. Name +#: editors/protocols/jabberprotocol.desktop:7 +msgid "Jabber" +msgstr "" + +#. Comment +#: editors/protocols/jabberprotocol.desktop:9 +msgid "Jabber Protocol" +msgstr "" + +#. Name +#: editors/protocols/meanwhileprotocol.desktop:7 +msgid "Meanwhile" +msgstr "" + +#. Comment +#: editors/protocols/meanwhileprotocol.desktop:9 +msgid "Meanwhile Protocol" +msgstr "" + +#. Name +#. Comment +#: editors/protocols/msnprotocol.desktop:7 +#: editors/protocols/msnprotocol.desktop:9 +msgid "MSN Messenger" +msgstr "" + +#. Name +#: editors/protocols/skypeprotocol.desktop:7 +msgid "Skype" +msgstr "" + +#. Comment +#: editors/protocols/skypeprotocol.desktop:9 +msgid "Skype Internet Telephony" +msgstr "" + +#. Name +#: editors/protocols/smsprotocol.desktop:7 +msgid "SMS" +msgstr "" + +#. Comment +#: editors/protocols/smsprotocol.desktop:9 +msgid "SMS Protocol" +msgstr "" + +#. Name +#: editors/protocols/yahooprotocol.desktop:7 +msgid "Yahoo" +msgstr "" + +#. Comment +#: editors/protocols/yahooprotocol.desktop:9 +msgid "Yahoo Protocol" +msgstr "" + +#. Name +#: features/distributionlist.desktop:7 +msgid "KAB Distribution List Plugin" +msgstr "" + +#. Comment +#: features/distributionlist.desktop:9 features/distributionlistng.desktop:9 +msgid "Plugin for managing distribution lists" +msgstr "" + +#. Name +#: features/distributionlistng.desktop:7 +msgid "KAB Distribution List Next Generation Plugin" +msgstr "" + +#. Name +#: features/resourceselection.desktop:7 +msgid "Address Book Management Plugin" +msgstr "" + +#. Comment +#: features/resourceselection.desktop:9 +msgid "Plugin for managing address books" +msgstr "" + +#. Comment +#: interfaces/kaddressbook_contacteditorwidget.desktop:5 +msgid "KAddressBook Contact Editor Widget Plugin" +msgstr "" + +#. Comment +#: interfaces/kaddressbook_extension.desktop:5 +msgid "KAddressBook Extension Plugin" +msgstr "" + +#. Comment +#: interfaces/kaddressbook_xxport.desktop:5 +msgid "KAddressBook Import/Export Plugin" +msgstr "" + +#. Name +#: kaddressbook.desktop:2 +msgid "KAddressBook" +msgstr "" + +#. GenericName +#: kaddressbook.desktop:4 +msgid "Address Manager" +msgstr "" + +#. Comment +#: kaddressbook_view.desktop:5 +msgid "KAddressBook View Plugin" +msgstr "" + +#. Name +#: kcmconfigs/kabconfig.desktop:15 +msgid "General" +msgstr "" + +#. Comment +#: kcmconfigs/kabconfig.desktop:17 +msgid "Configure the Address Book" +msgstr "" + +#. Keywords +#: kcmconfigs/kabconfig.desktop:19 +msgid "kaddressbook; configure; settings;" +msgstr "" + +#. Name +#: kcmconfigs/kabcustomfields.desktop:14 +msgid "Custom Pages" +msgstr "" + +#. Comment +#: kcmconfigs/kabcustomfields.desktop:16 +msgid "Configure the Custom Pages" +msgstr "" + +#. Keywords +#: kcmconfigs/kabcustomfields.desktop:18 +msgid "kaddressbook; configure; settings; custom fields;" +msgstr "" + +#. Name +#: kcmconfigs/kabldapconfig.desktop:14 +msgid "LDAP Lookup" +msgstr "" + +#. Comment +#: kcmconfigs/kabldapconfig.desktop:16 +msgid "Configure the Address Book LDAP Settings" +msgstr "" + +#. Keywords +#: kcmconfigs/kabldapconfig.desktop:18 +msgid "kaddressbook; configure; settings; LDAP;" +msgstr "" + +#. Name +#: thumbnailcreator/ldifvcardthumbnail.desktop:8 +msgid "Electronic Business Card Files" +msgstr "" + +#. Name +#: views/cardview.desktop:7 +msgid "Card View" +msgstr "" + +#. Name +#: views/iconview.desktop:7 +msgid "Icon View" +msgstr "" + +#. Name +#: views/tableview.desktop:7 +msgid "Table View" +msgstr "" + +#. Name +#: xxport/bookmark_xxport.desktop:7 +msgid "KAB Bookmark XXPort Plugin" +msgstr "" + +#. Comment +#: xxport/bookmark_xxport.desktop:9 +msgid "Plugin to export the web addresses of the contacts as bookmarks" +msgstr "" + +#. Name +#: xxport/csv_xxport.desktop:7 +msgid "KAB CSV XXPort Plugin" +msgstr "" + +#. Comment +#: xxport/csv_xxport.desktop:9 +msgid "Plugin to import and export contacts in CSV format" +msgstr "" + +#. Name +#: xxport/eudora_xxport.desktop:7 +msgid "KAB Eudora XXPort Plugin" +msgstr "" + +#. Comment +#: xxport/eudora_xxport.desktop:9 +msgid "Plugin to import and export Eudora contacts" +msgstr "" + +#. Name +#: xxport/gnokii_xxport.desktop:7 +msgid "KAB Mobile Phone XXPort Plugin" +msgstr "" + +#. Comment +#: xxport/gnokii_xxport.desktop:9 +msgid "Mobile Phone Plugin to Import and Export Addressbook Entries" +msgstr "" + +#. Name +#: xxport/kde2_xxport.desktop:7 +msgid "KAB KDE2 XXPort Plugin" +msgstr "" + +#. Comment +#: xxport/kde2_xxport.desktop:9 +msgid "Plugin to import the old KDE 2 address book" +msgstr "" + +#. Name +#: xxport/ldif_xxport.desktop:7 +msgid "KAB LDIF XXPort Plugin" +msgstr "" + +#. Comment +#: xxport/ldif_xxport.desktop:9 +msgid "" +"Plugin to import and export contacts in Netscape and Mozilla LDIF format" +msgstr "" + +#. Name +#: xxport/opera_xxport.desktop:7 +msgid "KAB Opera XXPort Plugin" +msgstr "" + +#. Comment +#: xxport/opera_xxport.desktop:9 +msgid "Plugin to import Opera contacts" +msgstr "" + +#. Name +#: xxport/pab_xxport.desktop:7 +msgid "KAB MS Exchange Personal Addressbook XXPort Plugin" +msgstr "" + +#. Comment +#: xxport/pab_xxport.desktop:9 +msgid "Plugin to import MS Exchange Personal Address Books" +msgstr "" + +#. Name +#: xxport/vcard_xxport.desktop:7 +msgid "KAB vCard XXPort Plugin" +msgstr "" + +#. Comment +#: xxport/vcard_xxport.desktop:9 +msgid "Plugin to import and export contacts in vCard format" +msgstr "" diff --git a/translations/desktop_files/kalarm-desktops/es_AR.po b/translations/desktop_files/kalarm-desktops/es_AR.po new file mode 100644 index 00000000..09b3bf0e --- /dev/null +++ b/translations/desktop_files/kalarm-desktops/es_AR.po @@ -0,0 +1,40 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-07-07 18:17+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kalarm.desktop:2 kalarm.tray.desktop:2 +msgid "KAlarm" +msgstr "" + +#. GenericName +#: kalarm.desktop:4 +msgid "Personal Alarm Scheduler" +msgstr "" + +#. Comment +#: kalarm.tray.desktop:4 +msgid "Personal Alarm Scheduler: start as system tray icon" +msgstr "" + +#. Name +#: kalarmd/kalarmd.autostart.desktop:2 kalarmd/kalarmd.desktop:2 +msgid "KAlarm Daemon" +msgstr "" + +#. Comment +#: kalarmd/kalarmd.autostart.desktop:4 +msgid "KAlarm alarm daemon autostart at login" +msgstr "" diff --git a/translations/desktop_files/kalarm-desktops/ru.po b/translations/desktop_files/kalarm-desktops/ru.po index 7e1ced6d..a8c6813e 100644 --- a/translations/desktop_files/kalarm-desktops/ru.po +++ b/translations/desktop_files/kalarm-desktops/ru.po @@ -1,28 +1,28 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # Alexander Golubev <fatzer2@gmail.com>, 2021. +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-07 18:17+0000\n" -"PO-Revision-Date: 2021-01-21 09:11+0000\n" -"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" +"PO-Revision-Date: 2024-03-29 02:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdepim/kalarm-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.4.2\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kalarm.desktop:2 kalarm.tray.desktop:2 -#, fuzzy msgid "KAlarm" -msgstr "Служба уведомлений" +msgstr "KAlarm" #. GenericName #: kalarm.desktop:4 diff --git a/translations/desktop_files/kandy.desktop/es_AR.po b/translations/desktop_files/kandy.desktop/es_AR.po new file mode 100644 index 00000000..d38fa180 --- /dev/null +++ b/translations/desktop_files/kandy.desktop/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-09 19:49+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: src/kandy.desktop:2 +msgid "Kandy" +msgstr "" + +#. GenericName +#: src/kandy.desktop:4 +msgid "Mobile Phone Tool" +msgstr "" + +#. Comment +#: src/kandy.desktop:6 +msgid "Tool for syncing address book data with mobile phones" +msgstr "" diff --git a/translations/desktop_files/kandy.desktop/ru.po b/translations/desktop_files/kandy.desktop/ru.po index 035e0ddd..8d93e948 100644 --- a/translations/desktop_files/kandy.desktop/ru.po +++ b/translations/desktop_files/kandy.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 19:49+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-04-12 16:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kandy-kandydesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: src/kandy.desktop:2 msgid "Kandy" -msgstr "" +msgstr "Kandy" #. GenericName #: src/kandy.desktop:4 diff --git a/translations/desktop_files/karm-desktops/es_AR.po b/translations/desktop_files/karm-desktops/es_AR.po new file mode 100644 index 00000000..44b0e3ac --- /dev/null +++ b/translations/desktop_files/karm-desktops/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-09 19:52+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: karm_part.desktop:2 +msgid "karmPart" +msgstr "" + +#. Name +#: support/karm.desktop:2 +msgid "KArm" +msgstr "" + +#. GenericName +#: support/karm.desktop:4 +msgid "Personal Time Tracker" +msgstr "" diff --git a/translations/desktop_files/karm-desktops/ru.po b/translations/desktop_files/karm-desktops/ru.po index 3f1c5c23..8130180d 100644 --- a/translations/desktop_files/karm-desktops/ru.po +++ b/translations/desktop_files/karm-desktops/ru.po @@ -1,30 +1,32 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 19:52+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-04-12 16:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/karm-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: karm_part.desktop:2 msgid "karmPart" -msgstr "" +msgstr "karmPart" #. Name #: support/karm.desktop:2 msgid "KArm" -msgstr "" +msgstr "KArm" #. GenericName #: support/karm.desktop:4 diff --git a/translations/desktop_files/kmail-desktops/es_AR.po b/translations/desktop_files/kmail-desktops/es_AR.po new file mode 100644 index 00000000..4ee9456f --- /dev/null +++ b/translations/desktop_files/kmail-desktops/es_AR.po @@ -0,0 +1,185 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-09 20:57+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: KMail.desktop:2 kmail_view.desktop:2 +msgid "KMail" +msgstr "" + +#. GenericName +#: KMail.desktop:4 +msgid "Mail Client" +msgstr "" + +#. Name +#: application_octetstream.desktop:2 +msgid "Application Octetstream" +msgstr "" + +#. Comment +#: application_octetstream.desktop:4 +msgid "A bodypart formatter plugin for application/octet-stream" +msgstr "" + +#. Comment +#: dcopimap.desktop:5 dcopmail.desktop:5 +msgid "Mail program with a DCOP interface" +msgstr "" + +#. Name +#: kmail_config_accounts.desktop:14 +msgid "Accounts" +msgstr "" + +#. Comment +#: kmail_config_accounts.desktop:16 +msgid "Setup for Sending and Receiving Messages" +msgstr "" + +#. Keywords +#: kmail_config_accounts.desktop:18 +msgid "kmail;accounts;" +msgstr "" + +#. Name +#: kmail_config_appearance.desktop:14 +msgid "Appearance" +msgstr "" + +#. Comment +#: kmail_config_appearance.desktop:16 +msgid "Customize Visual Appearance" +msgstr "" + +#. Keywords +#: kmail_config_appearance.desktop:18 +msgid "kmail;appearance;" +msgstr "" + +#. Name +#: kmail_config_composer.desktop:14 +msgid "Composer" +msgstr "" + +#. Comment +#: kmail_config_composer.desktop:16 +msgid "Templates & General Behavior" +msgstr "" + +#. Keywords +#: kmail_config_composer.desktop:18 +msgid "kmail;composer;" +msgstr "" + +#. Name +#: kmail_config_identity.desktop:14 +msgid "Identities" +msgstr "" + +#. Comment +#: kmail_config_identity.desktop:16 +msgid "Manage Identities" +msgstr "" + +#. Keywords +#: kmail_config_identity.desktop:18 +msgid "kmail;identity;" +msgstr "" + +#. Name +#: kmail_config_misc.desktop:14 +msgid "Misc" +msgstr "" + +#. Comment +#: kmail_config_misc.desktop:16 +msgid "Settings that don't fit elsewhere" +msgstr "" + +#. Keywords +#: kmail_config_misc.desktop:18 +msgid "kmail;misc;" +msgstr "" + +#. Name +#: kmail_config_security.desktop:14 +msgid "Security" +msgstr "" + +#. Comment +#: kmail_config_security.desktop:16 +msgid "Security & Privacy Settings" +msgstr "" + +#. Keywords +#: kmail_config_security.desktop:18 +msgid "kmail;security;" +msgstr "" + +#. Name +#: konqueror/servicemenus/email.desktop:8 +msgid "Email File" +msgstr "" + +#. Name +#: profiles/profile-default-rc.desktop:2 +msgid "Default" +msgstr "" + +#. Comment +#: profiles/profile-default-rc.desktop:4 +msgid "Standard profile" +msgstr "" + +#. Name +#: profiles/profile-high-contrast-rc.desktop:2 +msgid "High Contrast" +msgstr "" + +#. Comment +#: profiles/profile-high-contrast-rc.desktop:4 +msgid "Increased font sizes for visually impaired users" +msgstr "" + +#. Name +#: profiles/profile-html-rc.desktop:2 +msgid "HTML" +msgstr "" + +#. Comment +#: profiles/profile-html-rc.desktop:4 +msgid "Standard profile with HTML preview enabled - less secure!" +msgstr "" + +#. Name +#: profiles/profile-purist-rc.desktop:2 +msgid "Purist" +msgstr "" + +#. Comment +#: profiles/profile-purist-rc.desktop:4 +msgid "Most features turned off, TDE global settings are used" +msgstr "" + +#. Name +#: profiles/profile-secure-rc.desktop:2 +msgid "Most Secure" +msgstr "" + +#. Comment +#: profiles/profile-secure-rc.desktop:4 +msgid "Sets all necessary options to achieve maximum security" +msgstr "" diff --git a/translations/desktop_files/kmail-desktops/ru.po b/translations/desktop_files/kmail-desktops/ru.po index dc810cd1..388a7738 100644 --- a/translations/desktop_files/kmail-desktops/ru.po +++ b/translations/desktop_files/kmail-desktops/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 20:57+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-04-14 11:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kmail-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: KMail.desktop:2 kmail_view.desktop:2 msgid "KMail" -msgstr "" +msgstr "KMail" #. GenericName #: KMail.desktop:4 @@ -134,7 +136,7 @@ msgstr "kmail;security;безопасность;" #. Name #: konqueror/servicemenus/email.desktop:8 msgid "Email File" -msgstr "" +msgstr "Файл эл. почты" #. Name #: profiles/profile-default-rc.desktop:2 @@ -159,7 +161,7 @@ msgstr "Увеличенные размеры шрифтов для людей #. Name #: profiles/profile-html-rc.desktop:2 msgid "HTML" -msgstr "" +msgstr "HTML" #. Comment #: profiles/profile-html-rc.desktop:4 diff --git a/translations/desktop_files/kmail-eventsrc/es_AR.po b/translations/desktop_files/kmail-eventsrc/es_AR.po new file mode 100644 index 00000000..4568fd75 --- /dev/null +++ b/translations/desktop_files/kmail-eventsrc/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-09 20:57+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Comment +#: eventsrc:3 +msgid "KMail" +msgstr "" + +#. Name +#: eventsrc:6 +msgid "New Mail Arrived" +msgstr "" + +#. Comment +#: eventsrc:7 +msgid "New mail arrived" +msgstr "" diff --git a/translations/desktop_files/kmail-eventsrc/ru.po b/translations/desktop_files/kmail-eventsrc/ru.po index 803ff8c7..4c27e7a1 100644 --- a/translations/desktop_files/kmail-eventsrc/ru.po +++ b/translations/desktop_files/kmail-eventsrc/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 20:57+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-04-12 16:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kmail-events/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: eventsrc:3 msgid "KMail" -msgstr "" +msgstr "KMail" #. Name #: eventsrc:6 diff --git a/translations/desktop_files/kmail-plugins-desktops/es_AR.po b/translations/desktop_files/kmail-plugins-desktops/es_AR.po new file mode 100644 index 00000000..4f635e8a --- /dev/null +++ b/translations/desktop_files/kmail-plugins-desktops/es_AR.po @@ -0,0 +1,37 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-12 14:40+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: bodypartformatter/text_calendar.desktop:2 +#: bodypartformatter/text_vcard.desktop:2 +#: bodypartformatter/text_xdiff.desktop:2 +msgid "Application Octetstream" +msgstr "" + +#. Comment +#: bodypartformatter/text_calendar.desktop:4 +msgid "A bodypart formatter plugin for text/calendar" +msgstr "" + +#. Comment +#: bodypartformatter/text_vcard.desktop:4 +msgid "A bodypart formatter plugin for text/vcard" +msgstr "" + +#. Comment +#: bodypartformatter/text_xdiff.desktop:4 +msgid "A bodypart formatter plugin for text/x-diff" +msgstr "" diff --git a/translations/desktop_files/kmobile-desktops/es_AR.po b/translations/desktop_files/kmobile-desktops/es_AR.po new file mode 100644 index 00000000..c012f721 --- /dev/null +++ b/translations/desktop_files/kmobile-desktops/es_AR.po @@ -0,0 +1,98 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-10 02:25+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: devices/digicam/libkmobile_digicam.desktop:2 +msgid "Digital Camera" +msgstr "" + +#. Comment +#: devices/digicam/libkmobile_digicam.desktop:4 +msgid "This driver supports many digital cameras" +msgstr "" + +#. Name +#: devices/gammu/libkmobile_gammu.desktop:2 +msgid "Mobile Phone or Organizer (gammu)" +msgstr "" + +#. Comment +#: devices/gammu/libkmobile_gammu.desktop:4 +msgid "" +"This driver supports many NOKIA and other mobile phones via the gammu library" +msgstr "" + +#. Name +#: devices/gnokii/libkmobile_gnokii.desktop:2 +msgid "Mobile Phone or Organizer (gnokii)" +msgstr "" + +#. Comment +#: devices/gnokii/libkmobile_gnokii.desktop:4 +msgid "" +"This driver supports many NOKIA and other mobile phones via the gnokii " +"library" +msgstr "" + +#. Name +#: devices/skeleton/libkmobile_skeleton.desktop:2 +msgid "Skeleton Device" +msgstr "" + +#. Comment +#: devices/skeleton/libkmobile_skeleton.desktop:4 +msgid "Mobile Skeleton Device" +msgstr "" + +#. Name +#: kmobile.desktop:8 +msgid "KMobile" +msgstr "" + +#. GenericName +#: kmobile.desktop:10 +msgid "Manage Mobile Devices" +msgstr "" + +#. Comment +#: kmobile.desktop:12 +msgid "A TDE Mobile Devices Manager" +msgstr "" + +#. Name +#: libkmobile.desktop:5 +msgid "TDE Mobile Device Lowlevel Hardware Driver" +msgstr "" + +#. Comment +#: tdeioslave/mimetypes/mobile_addressbook.desktop:2 +msgid "Contacts in Mobile Device" +msgstr "" + +#. Comment +#: tdeioslave/mimetypes/mobile_calendar.desktop:2 +msgid "Calendar in Mobile Device" +msgstr "" + +#. Comment +#: tdeioslave/mimetypes/mobile_device.desktop:2 +msgid "Mobile Device" +msgstr "" + +#. Comment +#: tdeioslave/mimetypes/mobile_notes.desktop:2 +msgid "Notes in Mobile Device" +msgstr "" diff --git a/translations/desktop_files/kmobile-desktops/ru.po b/translations/desktop_files/kmobile-desktops/ru.po index c9fc3f44..1ce98d39 100644 --- a/translations/desktop_files/kmobile-desktops/ru.po +++ b/translations/desktop_files/kmobile-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-10 02:25+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-04-12 16:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kmobile-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: devices/digicam/libkmobile_digicam.desktop:2 @@ -65,9 +67,8 @@ msgstr "Прототип мобильного устройства" #. Name #: kmobile.desktop:8 -#, fuzzy msgid "KMobile" -msgstr "Мобильное устройство" +msgstr "KMobile" #. GenericName #: kmobile.desktop:10 diff --git a/translations/desktop_files/knode-desktops/es_AR.po b/translations/desktop_files/knode-desktops/es_AR.po new file mode 100644 index 00000000..a008cf62 --- /dev/null +++ b/translations/desktop_files/knode-desktops/es_AR.po @@ -0,0 +1,85 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-10 03:42+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: KNode.desktop:12 +msgid "KNode" +msgstr "" + +#. GenericName +#: KNode.desktop:14 +msgid "News Reader" +msgstr "" + +#. Name +#: knode_config_accounts.desktop:14 +msgid "Accounts" +msgstr "" + +#. Comment +#: knode_config_accounts.desktop:16 +msgid "Setup for Newsgroup and Mail Servers" +msgstr "" + +#. Name +#: knode_config_appearance.desktop:14 +msgid "Appearance" +msgstr "" + +#. Comment +#: knode_config_appearance.desktop:16 +msgid "Customize Visual Appearance" +msgstr "" + +#. Name +#: knode_config_cleanup.desktop:14 +msgid "Cleanup" +msgstr "" + +#. Comment +#: knode_config_cleanup.desktop:16 +msgid "Preserving Disk Space" +msgstr "" + +#. Name +#: knode_config_identity.desktop:14 +msgid "Identity" +msgstr "" + +#. Comment +#: knode_config_identity.desktop:16 +msgid "Personal Information" +msgstr "" + +#. Name +#: knode_config_post_news.desktop:14 +msgid "Posting News" +msgstr "" + +#. Name +#: knode_config_privacy.desktop:14 +msgid "Signing/Verifying" +msgstr "" + +#. Comment +#: knode_config_privacy.desktop:16 +msgid "Protect your privacy by signing and verifying postings" +msgstr "" + +#. Name +#: knode_config_read_news.desktop:14 +msgid "Reading News" +msgstr "" diff --git a/translations/desktop_files/knode-desktops/ru.po b/translations/desktop_files/knode-desktops/ru.po index 0f03b81d..ae59a4a5 100644 --- a/translations/desktop_files/knode-desktops/ru.po +++ b/translations/desktop_files/knode-desktops/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-10 03:42+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-04-14 11:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/knode-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: KNode.desktop:12 msgid "KNode" -msgstr "" +msgstr "KNode" #. GenericName #: KNode.desktop:14 diff --git a/translations/desktop_files/knotes-desktops/es_AR.po b/translations/desktop_files/knotes-desktops/es_AR.po new file mode 100644 index 00000000..b60c47b6 --- /dev/null +++ b/translations/desktop_files/knotes-desktops/es_AR.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-10 03:47+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: knotes.desktop:12 +msgid "KNotes" +msgstr "" + +#. GenericName +#: knotes.desktop:14 +msgid "Popup Notes" +msgstr "" + +#. Name +#: knotes_manager.desktop:2 +msgid "Notes" +msgstr "" + +#. Name +#: local.desktop:2 +msgid "Notes in Local File" +msgstr "" diff --git a/translations/desktop_files/knotes-desktops/ru.po b/translations/desktop_files/knotes-desktops/ru.po index 988c8551..62f3149c 100644 --- a/translations/desktop_files/knotes-desktops/ru.po +++ b/translations/desktop_files/knotes-desktops/ru.po @@ -1,26 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-10 03:47+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-04-12 16:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/knotes-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: knotes.desktop:12 -#, fuzzy msgid "KNotes" -msgstr "Заметки" +msgstr "KNotes" #. GenericName #: knotes.desktop:14 diff --git a/translations/desktop_files/konsolekalendar.desktop/es_AR.po b/translations/desktop_files/konsolekalendar.desktop/es_AR.po new file mode 100644 index 00000000..d4b20a74 --- /dev/null +++ b/translations/desktop_files/konsolekalendar.desktop/es_AR.po @@ -0,0 +1,20 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-10 03:49+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: konsolekalendar.desktop:2 +msgid "KonsoleKalendar" +msgstr "" diff --git a/translations/desktop_files/konsolekalendar.desktop/ru.po b/translations/desktop_files/konsolekalendar.desktop/ru.po new file mode 100644 index 00000000..078b41a6 --- /dev/null +++ b/translations/desktop_files/konsolekalendar.desktop/ru.po @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Andrei Stepanov <adem4ik@gmail.com>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-10 03:49+0200\n" +"PO-Revision-Date: 2024-04-05 18:44+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/konsolekalendar-konsolekalendardesktop/ru/>\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" + +#. Name +#: konsolekalendar.desktop:2 +msgid "KonsoleKalendar" +msgstr "KonsoleKalendar" diff --git a/translations/desktop_files/kontact-desktops/es_AR.po b/translations/desktop_files/kontact-desktops/es_AR.po new file mode 100644 index 00000000..1415e0ff --- /dev/null +++ b/translations/desktop_files/kontact-desktops/es_AR.po @@ -0,0 +1,347 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-07-07 18:17+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: interfaces/kontactplugin.desktop:4 +msgid "Kontact Plugin" +msgstr "" + +#. Name +#: plugins/akregator/akregatorplugin.desktop:16 +#: plugins/akregator/akregatorplugin3.2.desktop:15 +msgid "Feeds" +msgstr "" + +#. Comment +#: plugins/akregator/akregatorplugin.desktop:18 +msgid "Feed Reader Component (Akregator Plugin)" +msgstr "" + +#. Comment +#: plugins/akregator/akregatorplugin3.2.desktop:17 +msgid "Akregator Plugin" +msgstr "" + +#. Name +#: plugins/kaddressbook/kaddressbookplugin.desktop:18 src/kontact.setdlg:14 +msgid "Contacts" +msgstr "" + +#. Comment +#: plugins/kaddressbook/kaddressbookplugin.desktop:20 +msgid "Contacts Component (KAdressbook Plugin)" +msgstr "" + +#. Name +#: plugins/karm/karmplugin.desktop:15 +msgid "Timer" +msgstr "" + +#. Comment +#: plugins/karm/karmplugin.desktop:17 +msgid "Time Tracker Component (KArm Plugin)" +msgstr "" + +#. Name +#: plugins/kmail/kcmkmailsummary.desktop:13 +msgid "E-Mail Overview" +msgstr "" + +#. Comment +#: plugins/kmail/kcmkmailsummary.desktop:15 +msgid "E-Mail Summary Setup" +msgstr "" + +#. Keywords +#: plugins/kmail/kcmkmailsummary.desktop:17 +msgid "email; summary; configure; settings;" +msgstr "" + +#. Name +#: plugins/kmail/kmailplugin.desktop:19 src/kontact.setdlg:8 +msgid "E-Mail" +msgstr "" + +#. Comment +#: plugins/kmail/kmailplugin.desktop:21 +msgid "E-Mail Component (KMail Plugin)" +msgstr "" + +#. Name +#: plugins/knode/knodeplugin.desktop:16 +#: plugins/newsticker/newstickerplugin.desktop:17 src/kontact.setdlg:32 +msgid "News" +msgstr "" + +#. Comment +#: plugins/knode/knodeplugin.desktop:18 +msgid "Newsreader Component (KNode Plugin)" +msgstr "" + +#. Name +#: plugins/knotes/knotesplugin.desktop:16 +msgid "Notes" +msgstr "" + +#. Comment +#: plugins/knotes/knotesplugin.desktop:18 +msgid "Notes Component (KNotes Plugin)" +msgstr "" + +#. Name +#: plugins/korganizer/journalplugin.desktop:18 +msgid "Journal" +msgstr "" + +#. Comment +#: plugins/korganizer/journalplugin.desktop:20 +msgid "Journal Component (KOrganizer Plugin)" +msgstr "" + +#. Name +#: plugins/korganizer/kcmkorgsummary.desktop:13 +msgid "Appointment and To-do Overview" +msgstr "" + +#. Comment +#: plugins/korganizer/kcmkorgsummary.desktop:15 +msgid "Appointments and To-dos Summary Setup" +msgstr "" + +#. Keywords +#: plugins/korganizer/kcmkorgsummary.desktop:17 +msgid "calendar; todos; configure; settings;" +msgstr "" + +#. Name +#: plugins/korganizer/korganizerplugin.desktop:18 src/kontact.setdlg:26 +msgid "Calendar" +msgstr "" + +#. Comment +#: plugins/korganizer/korganizerplugin.desktop:20 +msgid "Calendar Component (KOrganizer Plugin)" +msgstr "" + +#. Name +#: plugins/korganizer/todoplugin.desktop:18 +msgid "To-do" +msgstr "" + +#. Comment +#: plugins/korganizer/todoplugin.desktop:20 +msgid "To-do List Component (KOrganizer plugin)" +msgstr "" + +#. Name +#: plugins/kpilot/kpilotplugin.desktop:18 +msgid "Palm" +msgstr "" + +#. Comment +#: plugins/kpilot/kpilotplugin.desktop:20 +msgid "Palm Tools Component (KPilot Plugin)" +msgstr "" + +#. Name +#: plugins/newsticker/kcmkontactknt.desktop:13 src/kontact.setdlg:44 +msgid "News Ticker" +msgstr "" + +#. Comment +#: plugins/newsticker/kcmkontactknt.desktop:15 +msgid "News Ticker Summary Setup" +msgstr "" + +#. Keywords +#: plugins/newsticker/kcmkontactknt.desktop:17 +msgid "news ticker; configure; settings;" +msgstr "" + +#. Comment +#: plugins/newsticker/newstickerplugin.desktop:19 +msgid "Newsticker Component" +msgstr "" + +#. Name +#: plugins/specialdates/kcmsdsummary.desktop:13 +msgid "Special Dates Overview" +msgstr "" + +#. Comment +#: plugins/specialdates/kcmsdsummary.desktop:15 +msgid "Special Dates Summary Setup" +msgstr "" + +#. Keywords +#: plugins/specialdates/kcmsdsummary.desktop:17 +msgid "birthday; anniversary; holiday; configure; settings;" +msgstr "" + +#. Name +#: plugins/specialdates/specialdatesplugin.desktop:16 +msgid "Special Dates" +msgstr "" + +#. Comment +#: plugins/specialdates/specialdatesplugin.desktop:18 +msgid "Special Dates Component" +msgstr "" + +#. Name +#: plugins/summary/kcmkontactsummary.desktop:13 +msgid "Summary View Items" +msgstr "" + +#. Comment +#: plugins/summary/kcmkontactsummary.desktop:15 +msgid "General Configuration of Kontact's Summary View" +msgstr "" + +#. Name +#: plugins/summary/summaryplugin.desktop:14 +msgid "Summary" +msgstr "" + +#. Comment +#: plugins/summary/summaryplugin.desktop:16 +msgid "Summary View Component" +msgstr "" + +#. Name +#: plugins/test/kptestplugin.desktop:13 +msgid "TestPlugin" +msgstr "" + +#. Comment +#: plugins/test/kptestplugin.desktop:15 +msgid "Kontact Test Plugin" +msgstr "" + +#. Name +#: plugins/weather/weatherplugin.desktop:18 +msgid "Weather Service" +msgstr "" + +#. Comment +#: plugins/weather/weatherplugin.desktop:20 +msgid "Kontact Weather Component" +msgstr "" + +#. Name +#: src/Kontact.desktop:6 src/kontactconfig.desktop:15 src/kontactdcop.desktop:2 +msgid "Kontact" +msgstr "" + +#. GenericName +#: src/Kontact.desktop:8 +msgid "Personal Information Manager" +msgstr "" + +#. Comment +#: src/kontactconfig.desktop:17 +msgid "TDE Kontact" +msgstr "" + +#. Keywords +#: src/kontactconfig.desktop:19 +msgid "kontact;" +msgstr "" + +#. Description +#: profiles/KontactDefaults/profile.cfg:2 +msgid "Default KDE Kontact settings" +msgstr "" + +#. Name +#: profiles/KontactDefaults/profile.cfg:4 +msgid "Kontact Style" +msgstr "" + +#. Description +#: profiles/OutlookDefaults/profile.cfg:2 +msgid "Settings resembling MS Outlook" +msgstr "" + +#. Name +#: profiles/OutlookDefaults/profile.cfg:4 +msgid "Outlook Style " +msgstr "" + +#. Name +#: src/kontact.setdlg:2 +msgid "Summary View" +msgstr "" + +#. Comment +#: src/kontact.setdlg:3 +msgid "" +"Configuration of Kontact's <b>Summary View</b>. Some plugins provide " +"<i>Summary View</i> items, choose the ones you would like to list." +msgstr "" + +#. Comment +#: src/kontact.setdlg:9 +msgid "" +"Configuration of Kontact's E-Mail Plugin <b>KMail</b>, includes a <i>Summary " +"View Item</i> and represents a <i>Kontact Component</i>." +msgstr "" + +#. Comment +#: src/kontact.setdlg:15 +msgid "" +"Configuration of Kontact's Adress Book Plugin <b>KAdressbook</b> which " +"represents a <i>Kontact Component</i>." +msgstr "" + +#. Name +#: src/kontact.setdlg:20 +msgid "Special Dates Summary" +msgstr "" + +#. Comment +#: src/kontact.setdlg:21 +msgid "Special Dates Summary Component" +msgstr "" + +#. Comment +#: src/kontact.setdlg:27 +msgid "" +"Configuration of Kontact's Calendar Plugin <b>KOrganizer</b>, includes a " +"<i>Summary View Item</i> and represents a <i>Kontact Component</i>." +msgstr "" + +#. Comment +#: src/kontact.setdlg:33 +msgid "" +"Configuration of Kontact's News Plugin <b>KNode</b> which represents a " +"<i>Kontact Component</i>." +msgstr "" + +#. Name +#: src/kontact.setdlg:38 +msgid "Weather" +msgstr "" + +#. Comment +#: src/kontact.setdlg:39 +msgid "Weather Information Component" +msgstr "" + +#. Comment +#: src/kontact.setdlg:45 +msgid "News Ticker Component" +msgstr "" diff --git a/translations/desktop_files/korganizer-desktops/es_AR.po b/translations/desktop_files/korganizer-desktops/es_AR.po new file mode 100644 index 00000000..a6d6420e --- /dev/null +++ b/translations/desktop_files/korganizer-desktops/es_AR.po @@ -0,0 +1,312 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-11 02:31+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Comment +#: dcopcalendar.desktop:5 +msgid "Organizer with a DCOP interface" +msgstr "" + +#. Comment +#: interfaces/calendar/calendardecoration.desktop:5 +msgid "Calendar Decoration Plugin" +msgstr "" + +#. Comment +#: interfaces/calendar/calendarplugin.desktop:5 +msgid "Calendar Plugin" +msgstr "" + +#. Comment +#: interfaces/korganizer/korganizerpart.desktop:5 +#: interfaces/korganizer/korgprintplugin.desktop:5 +msgid "KOrganizer Part" +msgstr "" + +#. Name +#: korgac/korgac.desktop:2 +msgid "KOrganizer Reminder Client" +msgstr "" + +#. GenericName +#: korgac/korgac.desktop:4 +msgid "KOrganizer Reminder Daemon Client" +msgstr "" + +#. Name +#: korganizer.desktop:4 +msgid "KOrganizer" +msgstr "" + +#. GenericName +#: korganizer.desktop:6 +msgid "Personal Organizer" +msgstr "" + +#. Comment +#: korganizer.desktop:8 +msgid "Calendar and Scheduling Program" +msgstr "" + +#. Name +#: korganizer_configcolors.desktop:14 +msgid "Colors" +msgstr "" + +#. Comment +#: korganizer_configcolors.desktop:16 +msgid "KOrganizer Colors Configuration" +msgstr "" + +#. Keywords +#: korganizer_configcolors.desktop:18 +msgid "korganizer;colors;" +msgstr "" + +#. Name +#: korganizer_configdesignerfields.desktop:14 +msgid "Custom Pages" +msgstr "" + +#. Comment +#: korganizer_configdesignerfields.desktop:16 +msgid "Configure the Custom Pages" +msgstr "" + +#. Keywords +#: korganizer_configdesignerfields.desktop:18 +msgid "korganizer; configure; settings; custom fields;" +msgstr "" + +#. Name +#: korganizer_configfonts.desktop:14 +msgid "Fonts" +msgstr "" + +#. Comment +#: korganizer_configfonts.desktop:16 +msgid "KOrganizer Fonts Configuration" +msgstr "" + +#. Keywords +#: korganizer_configfonts.desktop:18 +msgid "korganizer;fonts;" +msgstr "" + +#. Name +#: korganizer_configfreebusy.desktop:14 +msgid "Free/Busy" +msgstr "" + +#. Comment +#: korganizer_configfreebusy.desktop:16 +msgid "KOrganizer Free/Busy Configuration" +msgstr "" + +#. Keywords +#: korganizer_configfreebusy.desktop:18 +msgid "korganizer;freebusy;scheduling;" +msgstr "" + +#. Name +#: korganizer_configgroupautomation.desktop:14 +msgid "Group Automation" +msgstr "" + +#. Comment +#: korganizer_configgroupautomation.desktop:16 +msgid "KOrganizer Group Automation Configuration" +msgstr "" + +#. Keywords +#: korganizer_configgroupautomation.desktop:18 +msgid "korganizer;group;automation;" +msgstr "" + +#. Name +#: korganizer_configgroupscheduling.desktop:14 +msgid "Group Scheduling" +msgstr "" + +#. Comment +#: korganizer_configgroupscheduling.desktop:16 +msgid "KOrganizer Group Scheduling Configuration" +msgstr "" + +#. Keywords +#: korganizer_configgroupscheduling.desktop:18 +msgid "korganizer;group;scheduling;" +msgstr "" + +#. Name +#: korganizer_configmain.desktop:14 +msgid "Personal" +msgstr "" + +#. Comment +#: korganizer_configmain.desktop:16 +msgid "KOrganizer Main Configuration" +msgstr "" + +#. Keywords +#: korganizer_configmain.desktop:18 +msgid "korganizer;main;personal;" +msgstr "" + +#. Name +#: korganizer_configplugins.desktop:14 +msgid "Plugins" +msgstr "" + +#. Comment +#: korganizer_configplugins.desktop:16 +msgid "KOrganizer Plugin Configuration" +msgstr "" + +#. Keywords +#: korganizer_configplugins.desktop:18 +msgid "korganizer;plugin;module;" +msgstr "" + +#. Name +#: korganizer_configtime.desktop:14 +msgid "Time & Date" +msgstr "" + +#. Comment +#: korganizer_configtime.desktop:16 +msgid "KOrganizer Time Configuration" +msgstr "" + +#. Keywords +#: korganizer_configtime.desktop:18 +msgid "korganizer;time;" +msgstr "" + +#. Name +#: korganizer_configviews.desktop:14 +msgid "Views" +msgstr "" + +#. Comment +#: korganizer_configviews.desktop:16 +msgid "KOrganizer View Configuration" +msgstr "" + +#. Keywords +#: korganizer_configviews.desktop:18 +msgid "korganizer;view;" +msgstr "" + +#. Name +#: plugins/datenums/datenums.desktop:4 +msgid "Date Numbers Plugin for Calendars" +msgstr "" + +#. Comment +#: plugins/datenums/datenums.desktop:6 +msgid "" +"For each day this plugin shows its daynumber of the year at the top of the " +"agenda view. For example, February 1 is day 32 of the year." +msgstr "" + +#. Name +#: plugins/exchange/exchange.desktop:4 +msgid "Microsoft Exchange 2000 Plugin for KOrganizer" +msgstr "" + +#. Comment +#: plugins/exchange/exchange.desktop:6 +msgid "" +"This plugin allows korganizer users to work with Microsoft Exchange 2000 " +"groupware servers." +msgstr "" + +#. Name +#: plugins/hebrew/hebrew.desktop:4 +msgid "Jewish Calendar Plugin" +msgstr "" + +#. Comment +#: plugins/hebrew/hebrew.desktop:6 +msgid "Shows all dates in korganizer also in the Jewish calendar system." +msgstr "" + +#. Name +#: plugins/printing/journal/journalprint.desktop:4 +msgid "Journal Print Style" +msgstr "" + +#. Comment +#: plugins/printing/journal/journalprint.desktop:6 +msgid "This plugin allows you to print out journal entries (diary entries)." +msgstr "" + +#. Name +#: plugins/printing/list/listprint.desktop:4 +msgid "List Print Style" +msgstr "" + +#. Comment +#: plugins/printing/list/listprint.desktop:6 +msgid "This plugin allows you to print out events and to-dos in list form." +msgstr "" + +#. Name +#: plugins/printing/whatsnext/whatsnextprint.desktop:4 +msgid "What's Next Print Style" +msgstr "" + +#. Comment +#: plugins/printing/whatsnext/whatsnextprint.desktop:6 +msgid "" +"This plugin allows you to print out a list of all upcoming events and to-dos." +msgstr "" + +#. Name +#: plugins/printing/year/yearprint.desktop:4 +msgid "Yearly Print Style" +msgstr "" + +#. Comment +#: plugins/printing/year/yearprint.desktop:6 +msgid "This plugin allows you to print out a yearly calendar." +msgstr "" + +#. Name +#: plugins/projectview/projectview.desktop:4 +msgid "Project View Plugin for KOrganizer" +msgstr "" + +#. Comment +#: plugins/projectview/projectview.desktop:6 +msgid "" +"This plugin provides a project planning view for KOrganizer (like the to-do " +"or month views). If you enable this plugin, you can switch to the project " +"view and view your to-do list like in a project planner." +msgstr "" + +#. Name +#: plugins/timespanview/timespanview.desktop:4 +msgid "Timespan View Plugin for KOrganizer" +msgstr "" + +#. Comment +#: plugins/timespanview/timespanview.desktop:6 +msgid "" +"This plugin provides a timespan view for korganizer (like the to-do or month " +"views). If you enable this plugin, you can switch to the timespan view and " +"view your events like in a Gantt diagram." +msgstr "" diff --git a/translations/desktop_files/korganizer-desktops/ka.po b/translations/desktop_files/korganizer-desktops/ka.po index 88bf19a2..d2c40e80 100644 --- a/translations/desktop_files/korganizer-desktops/ka.po +++ b/translations/desktop_files/korganizer-desktops/ka.po @@ -1,221 +1,222 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-11 02:31+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-12-21 20:12+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/korganizer-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: dcopcalendar.desktop:5 msgid "Organizer with a DCOP interface" -msgstr "" +msgstr "ორგანიზატორი DCOP ინტერფეისით" #. Comment #: interfaces/calendar/calendardecoration.desktop:5 msgid "Calendar Decoration Plugin" -msgstr "" +msgstr "კალენდრის დეკორაციის დამატება" #. Comment #: interfaces/calendar/calendarplugin.desktop:5 msgid "Calendar Plugin" -msgstr "" +msgstr "კალენდრის დამატება" #. Comment #: interfaces/korganizer/korganizerpart.desktop:5 #: interfaces/korganizer/korgprintplugin.desktop:5 msgid "KOrganizer Part" -msgstr "" +msgstr "KOrganizer-ის ნაწილი" #. Name #: korgac/korgac.desktop:2 msgid "KOrganizer Reminder Client" -msgstr "" +msgstr "KOrganizer-ის შემხსენებლის კლიენტი" #. GenericName #: korgac/korgac.desktop:4 msgid "KOrganizer Reminder Daemon Client" -msgstr "" +msgstr "KOrganizer-ის შემხსენებლის დომენის კლიენტი" #. Name #: korganizer.desktop:4 msgid "KOrganizer" -msgstr "" +msgstr "KOrganizer" #. GenericName #: korganizer.desktop:6 msgid "Personal Organizer" -msgstr "" +msgstr "პირადი ორგანიზატორი" #. Comment #: korganizer.desktop:8 msgid "Calendar and Scheduling Program" -msgstr "" +msgstr "კალენდრისა და დაგეგმვის პროგრამა" #. Name #: korganizer_configcolors.desktop:14 msgid "Colors" -msgstr "" +msgstr "ფერები" #. Comment #: korganizer_configcolors.desktop:16 msgid "KOrganizer Colors Configuration" -msgstr "" +msgstr "KOrganizer-ის ფერების მორგება" #. Keywords #: korganizer_configcolors.desktop:18 msgid "korganizer;colors;" -msgstr "" +msgstr "korganizer;ფერები;" #. Name #: korganizer_configdesignerfields.desktop:14 msgid "Custom Pages" -msgstr "" +msgstr "მომხმარებლის გვერდები" #. Comment #: korganizer_configdesignerfields.desktop:16 msgid "Configure the Custom Pages" -msgstr "" +msgstr "მომხმარებლის გვერდების მორგება" #. Keywords #: korganizer_configdesignerfields.desktop:18 msgid "korganizer; configure; settings; custom fields;" -msgstr "" +msgstr "korganizer;მორგება;პარამეტრები;მომხმარებლის ველები;" #. Name #: korganizer_configfonts.desktop:14 msgid "Fonts" -msgstr "" +msgstr "ფონტები" #. Comment #: korganizer_configfonts.desktop:16 msgid "KOrganizer Fonts Configuration" -msgstr "" +msgstr "KOrganizer-ის ფონტების მორგება" #. Keywords #: korganizer_configfonts.desktop:18 msgid "korganizer;fonts;" -msgstr "" +msgstr "korganizer;ფონტები;" #. Name #: korganizer_configfreebusy.desktop:14 msgid "Free/Busy" -msgstr "" +msgstr "თავისუფალია/დაკავებულია" #. Comment #: korganizer_configfreebusy.desktop:16 msgid "KOrganizer Free/Busy Configuration" -msgstr "" +msgstr "KOrganizer-ის თავისუფალია/დაკავებულიას მორგება" #. Keywords #: korganizer_configfreebusy.desktop:18 msgid "korganizer;freebusy;scheduling;" -msgstr "" +msgstr "korganizer;თავისუფალიდაკავებული;დაგეგმვა;" #. Name #: korganizer_configgroupautomation.desktop:14 msgid "Group Automation" -msgstr "" +msgstr "ჯგუფის ავტომატიზაცია" #. Comment #: korganizer_configgroupautomation.desktop:16 msgid "KOrganizer Group Automation Configuration" -msgstr "" +msgstr "KOrganizer-ის ჯგუფის ავტომატიზაციის მორგება" #. Keywords #: korganizer_configgroupautomation.desktop:18 msgid "korganizer;group;automation;" -msgstr "" +msgstr "korganizer;ჯგუფი;ავტომატიზაცია;" #. Name #: korganizer_configgroupscheduling.desktop:14 msgid "Group Scheduling" -msgstr "" +msgstr "ჯგუფური დაგეგმვა" #. Comment #: korganizer_configgroupscheduling.desktop:16 msgid "KOrganizer Group Scheduling Configuration" -msgstr "" +msgstr "KOrganizer-ის ჯგუფური დაგეგმვის მორგება" #. Keywords #: korganizer_configgroupscheduling.desktop:18 msgid "korganizer;group;scheduling;" -msgstr "" +msgstr "korganizer;ჯგუფი;დაგეგმვა;" #. Name #: korganizer_configmain.desktop:14 msgid "Personal" -msgstr "" +msgstr "პირადი" #. Comment #: korganizer_configmain.desktop:16 msgid "KOrganizer Main Configuration" -msgstr "" +msgstr "KOrganizer-ის მთავარი კონფიგურაცია" #. Keywords #: korganizer_configmain.desktop:18 msgid "korganizer;main;personal;" -msgstr "" +msgstr "korganizer;მთავარი;პირადი;" #. Name #: korganizer_configplugins.desktop:14 msgid "Plugins" -msgstr "" +msgstr "დამატებები" #. Comment #: korganizer_configplugins.desktop:16 msgid "KOrganizer Plugin Configuration" -msgstr "" +msgstr "KOrganizer-ის დამატებების მორგება" #. Keywords #: korganizer_configplugins.desktop:18 msgid "korganizer;plugin;module;" -msgstr "" +msgstr "korganizer;დამატება;მოდული;" #. Name #: korganizer_configtime.desktop:14 msgid "Time & Date" -msgstr "" +msgstr "დრო და თარიღი" #. Comment #: korganizer_configtime.desktop:16 msgid "KOrganizer Time Configuration" -msgstr "" +msgstr "KOrganizer-ის დროის მორგება" #. Keywords #: korganizer_configtime.desktop:18 msgid "korganizer;time;" -msgstr "" +msgstr "korganizer;დრო;" #. Name #: korganizer_configviews.desktop:14 msgid "Views" -msgstr "" +msgstr "ხედები" #. Comment #: korganizer_configviews.desktop:16 msgid "KOrganizer View Configuration" -msgstr "" +msgstr "KOrganizer-ის ხედების მორგება" #. Keywords #: korganizer_configviews.desktop:18 msgid "korganizer;view;" -msgstr "" +msgstr "korganizer;ხედი;" #. Name #: plugins/datenums/datenums.desktop:4 msgid "Date Numbers Plugin for Calendars" -msgstr "" +msgstr "თარიღის რიცხვების დამატება კალენდრებისთვის" #. Comment #: plugins/datenums/datenums.desktop:6 @@ -223,12 +224,13 @@ msgid "" "For each day this plugin shows its daynumber of the year at the top of the " "agenda view. For example, February 1 is day 32 of the year." msgstr "" +"თითოეული დღისთვის., რომელსაც ეს დამატება აჩვენებს მის დღის ნომერს წელში " +"გეგმის ხედის ზემოდან. მაგალითად, პირველი თებერვალი წლის 32-ე დღეა." #. Name #: plugins/exchange/exchange.desktop:4 -#, fuzzy msgid "Microsoft Exchange 2000 Plugin for KOrganizer" -msgstr "KOrganizer-ის პროექტის ხედის მოდული" +msgstr "Microsoft Exchange 2000-ის დამატება KOrganizer-სთვის" #. Comment #: plugins/exchange/exchange.desktop:6 @@ -236,57 +238,63 @@ msgid "" "This plugin allows korganizer users to work with Microsoft Exchange 2000 " "groupware servers." msgstr "" +"ეს დამატება საშუალებას აძლევს KOrganizer-ის მომხმარებლებს, Microsoft " +"Exchange 2000-ის სერვერებთან იმუშაოს." #. Name #: plugins/hebrew/hebrew.desktop:4 msgid "Jewish Calendar Plugin" -msgstr "" +msgstr "ებრაული კალენდრის დამატება" #. Comment #: plugins/hebrew/hebrew.desktop:6 msgid "Shows all dates in korganizer also in the Jewish calendar system." msgstr "" +"აჩვენებს ყველა თარიღს korganizer-ში, რომელიც, ასევე, ებრაულ კალენდრის " +"სისტემაშია." #. Name #: plugins/printing/journal/journalprint.desktop:4 msgid "Journal Print Style" -msgstr "" +msgstr "ჟურნალის ბეჭდვის სტილი" #. Comment #: plugins/printing/journal/journalprint.desktop:6 msgid "This plugin allows you to print out journal entries (diary entries)." -msgstr "" +msgstr "ეს დამატება საშუალებას გაძლევთ, დაბეჭდოთ ჟურნალის ჩანაწერები." #. Name #: plugins/printing/list/listprint.desktop:4 msgid "List Print Style" -msgstr "" +msgstr "დაბეჭდვის სტილის სია" #. Comment #: plugins/printing/list/listprint.desktop:6 msgid "This plugin allows you to print out events and to-dos in list form." msgstr "" +"ეს დამატება გაძლევთ საშუალებას, დაბეჭდოთ მოვლენები და გეგმები სიის ფორმაში." #. Name #: plugins/printing/whatsnext/whatsnextprint.desktop:4 msgid "What's Next Print Style" -msgstr "" +msgstr "რაა შემდეგის ბეჭდვის სტილი" #. Comment #: plugins/printing/whatsnext/whatsnextprint.desktop:6 msgid "" "This plugin allows you to print out a list of all upcoming events and to-dos." msgstr "" +"ეს დამატება გაძლევთ საშუალებას, დაბეჭდოთ ყველა მომავალი მოვლენა და გეგმა." #. Name #: plugins/printing/year/yearprint.desktop:4 msgid "Yearly Print Style" -msgstr "" +msgstr "წლიური ბეჭდვის სტილი" #. Comment #: plugins/printing/year/yearprint.desktop:6 msgid "This plugin allows you to print out a yearly calendar." -msgstr "" +msgstr "ეს დამატება საშუალებას გაძლევთ, წლიური კალენდარი დაბეჭდოთ." #. Name #: plugins/projectview/projectview.desktop:4 @@ -307,13 +315,11 @@ msgstr "" #. Name #: plugins/timespanview/timespanview.desktop:4 -#, fuzzy msgid "Timespan View Plugin for KOrganizer" msgstr "KOrganizer-ის პროექტის ხედის მოდული" #. Comment #: plugins/timespanview/timespanview.desktop:6 -#, fuzzy msgid "" "This plugin provides a timespan view for korganizer (like the to-do or month " "views). If you enable this plugin, you can switch to the timespan view and " diff --git a/translations/desktop_files/korganizer-desktops/ru.po b/translations/desktop_files/korganizer-desktops/ru.po index 4f1546dc..8c197514 100644 --- a/translations/desktop_files/korganizer-desktops/ru.po +++ b/translations/desktop_files/korganizer-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-11 02:31+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-04-12 16:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/korganizer-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: dcopcalendar.desktop:5 @@ -40,18 +42,17 @@ msgstr "Компонент органайзера" #. Name #: korgac/korgac.desktop:2 msgid "KOrganizer Reminder Client" -msgstr "Уведомления KOrganizer" +msgstr "Клиент напоминаний KOrganizer" #. GenericName #: korgac/korgac.desktop:4 msgid "KOrganizer Reminder Daemon Client" -msgstr "Клиент службы уведомлений KOrganizer" +msgstr "Клиент демона напоминаний KOrganizer" #. Name #: korganizer.desktop:4 -#, fuzzy msgid "KOrganizer" -msgstr "Компонент органайзера" +msgstr "KOrganizer" #. GenericName #: korganizer.desktop:6 diff --git a/translations/desktop_files/ktnef-desktops/es_AR.po b/translations/desktop_files/ktnef-desktops/es_AR.po new file mode 100644 index 00000000..5763fa26 --- /dev/null +++ b/translations/desktop_files/ktnef-desktops/es_AR.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-12 14:28+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: gui/ktnef.desktop:2 +msgid "KTnef" +msgstr "" + +#. GenericName +#: gui/ktnef.desktop:4 +msgid "TNEF File Viewer" +msgstr "" + +#. Comment +#: gui/ktnef.desktop:6 +msgid "A viewer/extractor for TNEF files" +msgstr "" + +#. Comment +#: gui/ms-tnef.desktop:7 +msgid "TNEF File" +msgstr "" diff --git a/translations/desktop_files/ktnef-desktops/ru.po b/translations/desktop_files/ktnef-desktops/ru.po index 893eefa6..cd56b589 100644 --- a/translations/desktop_files/ktnef-desktops/ru.po +++ b/translations/desktop_files/ktnef-desktops/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 14:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-04-12 16:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/ktnef-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: gui/ktnef.desktop:2 msgid "KTnef" -msgstr "" +msgstr "KTnef" #. GenericName #: gui/ktnef.desktop:4 diff --git a/translations/desktop_files/libkcal-desktops/es_AR.po b/translations/desktop_files/libkcal-desktops/es_AR.po new file mode 100644 index 00000000..52bcdecf --- /dev/null +++ b/translations/desktop_files/libkcal-desktops/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-12 14:31+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kcal_manager.desktop:2 +msgid "Calendar" +msgstr "" + +#. Name +#: local.desktop:2 +msgid "Calendar in Local File" +msgstr "" + +#. Name +#: localdir.desktop:2 +msgid "Calendar in Local Directory" +msgstr "" diff --git a/translations/desktop_files/libtdepim-desktops/es_AR.po b/translations/desktop_files/libtdepim-desktops/es_AR.po new file mode 100644 index 00000000..e004845e --- /dev/null +++ b/translations/desktop_files/libtdepim-desktops/es_AR.po @@ -0,0 +1,47 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-12 14:35+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: komposer/core/komposerconfig.desktop:12 +msgid "Komposer" +msgstr "" + +#. Comment +#: komposer/core/komposerconfig.desktop:14 +msgid "TDE Komposer" +msgstr "" + +#. Keywords +#: komposer/core/komposerconfig.desktop:16 +msgid "komposer;" +msgstr "" + +#. Comment +#. Name +#: komposer/core/komposereditor.desktop:6 +#: komposer/plugins/default/defaulteditor.desktop:20 +msgid "Komposer Editor" +msgstr "" + +#. Name +#: komposer/core/komposerplugin.desktop:6 +msgid "Komposer Plugin" +msgstr "" + +#. Comment +#: komposer/plugins/default/defaulteditor.desktop:22 +msgid "Komposer default editor" +msgstr "" diff --git a/translations/desktop_files/libtdepim-desktops/ru.po b/translations/desktop_files/libtdepim-desktops/ru.po index b57a27d4..5a4d0ede 100644 --- a/translations/desktop_files/libtdepim-desktops/ru.po +++ b/translations/desktop_files/libtdepim-desktops/ru.po @@ -1,26 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 14:35+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-04-14 11:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/libtdepim-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: komposer/core/komposerconfig.desktop:12 -#, fuzzy msgid "Komposer" -msgstr "komposer;ноты;" +msgstr "Komposer" #. Comment #: komposer/core/komposerconfig.desktop:14 diff --git a/translations/desktop_files/tdeabc-desktops/es_AR.po b/translations/desktop_files/tdeabc-desktops/es_AR.po new file mode 100644 index 00000000..54669ee7 --- /dev/null +++ b/translations/desktop_files/tdeabc-desktops/es_AR.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-12 15:04+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: tdeabcdistlistupdater/tdeabcdistlistupdater.desktop:2 +msgid "tdeabcdistlistupdater" +msgstr "" + +#. Comment +#: tdeabcdistlistupdater/tdeabcdistlistupdater.desktop:4 +msgid "Tool to update the old distribution lists to the new ones." +msgstr "" diff --git a/translations/desktop_files/tdeabc-desktops/ru.po b/translations/desktop_files/tdeabc-desktops/ru.po new file mode 100644 index 00000000..432ca512 --- /dev/null +++ b/translations/desktop_files/tdeabc-desktops/ru.po @@ -0,0 +1,29 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Andrei Stepanov <adem4ik@gmail.com>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-12 15:04+0200\n" +"PO-Revision-Date: 2024-04-12 16:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/tdeabc-desktop-files/ru/>\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" + +#. Name +#: tdeabcdistlistupdater/tdeabcdistlistupdater.desktop:2 +msgid "tdeabcdistlistupdater" +msgstr "tdeabcdistlistupdater" + +#. Comment +#: tdeabcdistlistupdater/tdeabcdistlistupdater.desktop:4 +msgid "Tool to update the old distribution lists to the new ones." +msgstr "Средство для обновления старых списков рассылки на новые." diff --git a/translations/desktop_files/tdefile-desktops/es_AR.po b/translations/desktop_files/tdefile-desktops/es_AR.po new file mode 100644 index 00000000..5d047adb --- /dev/null +++ b/translations/desktop_files/tdefile-desktops/es_AR.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-12 15:16+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: ics/tdefile_ics.desktop:2 +msgid "ICS information" +msgstr "" + +#. Name +#: palm-databases/tdefile_palm.desktop:2 +msgid "PalmOS Database Info" +msgstr "" + +#. Name +#: rfc822/tdefile_rfc822.desktop:2 +msgid "Email Info" +msgstr "" + +#. Name +#: vcf/tdefile_vcf.desktop:2 +msgid "vCard Info" +msgstr "" diff --git a/translations/desktop_files/tdeioslave-desktops/es_AR.po b/translations/desktop_files/tdeioslave-desktops/es_AR.po new file mode 100644 index 00000000..e33c966d --- /dev/null +++ b/translations/desktop_files/tdeioslave-desktops/es_AR.po @@ -0,0 +1,20 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-12 15:12+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Description +#: sieve/sieve.protocol:15 +msgid "An ioslave for the Sieve mail filtering protocol" +msgstr "" diff --git a/translations/desktop_files/tderesources-desktops/es_AR.po b/translations/desktop_files/tderesources-desktops/es_AR.po new file mode 100644 index 00000000..925d8e99 --- /dev/null +++ b/translations/desktop_files/tderesources-desktops/es_AR.po @@ -0,0 +1,141 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-07-07 18:18+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: birthdays/tdeabc.desktop:2 +msgid "Birthdays From KAddressBook" +msgstr "" + +#. Name +#: blogging/blogging.desktop:2 +msgid "Journals as Blogs on a Server" +msgstr "" + +#. Name +#: caldav/kcal_caldav.desktop:2 +msgid "CalDAV Server (e.g. Google Calendar)" +msgstr "" + +#. Name +#: carddav/tdeabc_carddav.desktop:2 +msgid "CardDAV Server (e.g. Zimbra Contacts)" +msgstr "" + +#. Name +#: egroupware/kcal_xmlrpc.desktop:2 egroupware/knotes_xmlrpc.desktop:2 +#: egroupware/tdeabc_xmlrpc.desktop:2 +msgid "eGroupware Server (via XML-RPC)" +msgstr "" + +#. Name +#: exchange/exchange.desktop:2 +msgid "Exchange 2000 Server" +msgstr "" + +#. Name +#: exchange/exchange_deprecated.desktop:4 +msgid "Exchange 2000 Server (deprecated)" +msgstr "" + +#. Name +#: featureplan/kcal_resourcefeatureplan.desktop:2 +msgid "XML Feature Plan" +msgstr "" + +#. Name +#: groupdav/kcal_groupdav.desktop:2 groupdav/tdeabc_groupdav.desktop:2 +msgid "GroupDAV Server (e.g. OpenGroupware)" +msgstr "" + +#. Name +#: groupware/kcal_groupware.desktop:2 groupware/tdeabc_groupware.desktop:2 +msgid "Groupware Server" +msgstr "" + +#. Name +#: groupwise/kcal_groupwise.desktop:2 groupwise/tdeabc_groupwise.desktop:2 +msgid "Novell GroupWise Server" +msgstr "" + +#. Name +#: kolab/kcal/kolab.desktop:2 +msgid "Calendar on IMAP Server via KMail" +msgstr "" + +#. Name +#: kolab/knotes/kolabresource.desktop:2 +msgid "IMAP Server via KMail" +msgstr "" + +#. Name +#: kolab/tdeabc/kolab.desktop:2 +msgid "Addressbook on IMAP Server via KMail" +msgstr "" + +#. Name +#: newexchange/kcal_newexchange.desktop:2 +msgid "Calendar on an Exchange Server (experimental)" +msgstr "" + +#. Name +#: newexchange/kcal_newexchange_final.desktop:4 +msgid "Calendar on an Exchange Server" +msgstr "" + +#. Name +#: newexchange/tdeabc_newexchange.desktop:2 +msgid "Addressbook on an Exchange Server (experimental)" +msgstr "" + +#. Name +#: newexchange/tdeabc_newexchange_final.desktop:2 +msgid "Addressbook on an Exchange Server" +msgstr "" + +#. Name +#: remote/remote.desktop:2 +msgid "Calendar in Remote File" +msgstr "" + +#. Name +#: scalix/kcal/scalix.desktop:2 +msgid "Calendar on Scalix Server via KMail" +msgstr "" + +#. Name +#: scalix/knotes/scalix.desktop:2 +msgid "Notes on Scalix Server via KMail" +msgstr "" + +#. Name +#: scalix/tdeabc/scalix.desktop:2 +msgid "Addressbook on Scalix Server via KMail" +msgstr "" + +#. Name +#: slox/kcal_ox.desktop:2 slox/tdeabc_ox.desktop:2 +msgid "OpenXchange Server" +msgstr "" + +#. Name +#: slox/kcal_slox.desktop:2 slox/tdeabc_slox.desktop:2 +msgid "SUSE LINUX Openexchange Server" +msgstr "" + +#. Name +#: tvanytime/kcal_tvanytime.desktop:2 +msgid "TV Schedules" +msgstr "" diff --git a/translations/desktop_files/tderesources-desktops/ka.po b/translations/desktop_files/tderesources-desktops/ka.po index b2bfdc4c..b749874f 100644 --- a/translations/desktop_files/tderesources-desktops/ka.po +++ b/translations/desktop_files/tderesources-desktops/ka.po @@ -1,30 +1,31 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-07 18:18+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-12-21 20:12+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/tdepimresources-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: birthdays/tdeabc.desktop:2 msgid "Birthdays From KAddressBook" -msgstr "" +msgstr "დაბადების დღეები KAddressBook-დან" #. Name #: blogging/blogging.desktop:2 msgid "Journals as Blogs on a Server" -msgstr "" +msgstr "ჟურნალები სერვერზე ბლოგების სახით" #. Name #: caldav/kcal_caldav.desktop:2 @@ -40,22 +41,22 @@ msgstr "სერვერი CardDAV (მაგ., Zimbra Contacts)" #: egroupware/kcal_xmlrpc.desktop:2 egroupware/knotes_xmlrpc.desktop:2 #: egroupware/tdeabc_xmlrpc.desktop:2 msgid "eGroupware Server (via XML-RPC)" -msgstr "" +msgstr "eGroupware-ის სერვერი (XML-RPC-ით)" #. Name #: exchange/exchange.desktop:2 msgid "Exchange 2000 Server" -msgstr "" +msgstr "Exchange 2000 Server" #. Name #: exchange/exchange_deprecated.desktop:4 msgid "Exchange 2000 Server (deprecated)" -msgstr "" +msgstr "Exchange 2000 Server (მოძველებული)" #. Name #: featureplan/kcal_resourcefeatureplan.desktop:2 msgid "XML Feature Plan" -msgstr "" +msgstr "XML ფუნქციების სია" #. Name #: groupdav/kcal_groupdav.desktop:2 groupdav/tdeabc_groupdav.desktop:2 @@ -64,9 +65,8 @@ msgstr "სერვერი GroupDAV (მაგ., OpenGroupware)" #. Name #: groupware/kcal_groupware.desktop:2 groupware/tdeabc_groupware.desktop:2 -#, fuzzy msgid "Groupware Server" -msgstr "სერვერი Novell GroupWise" +msgstr "Groupware-ის სერვერი" #. Name #: groupwise/kcal_groupwise.desktop:2 groupwise/tdeabc_groupwise.desktop:2 @@ -76,67 +76,67 @@ msgstr "სერვერი Novell GroupWise" #. Name #: kolab/kcal/kolab.desktop:2 msgid "Calendar on IMAP Server via KMail" -msgstr "" +msgstr "კალენდარი IMAP სერვერზე KMail-ით" #. Name #: kolab/knotes/kolabresource.desktop:2 msgid "IMAP Server via KMail" -msgstr "" +msgstr "IMAP სერვერი KMail-ით" #. Name #: kolab/tdeabc/kolab.desktop:2 msgid "Addressbook on IMAP Server via KMail" -msgstr "" +msgstr "მისამართების წიგნი IMAP-ზე KMail-ით" #. Name #: newexchange/kcal_newexchange.desktop:2 msgid "Calendar on an Exchange Server (experimental)" -msgstr "" +msgstr "კალენდარი Exchange სერვერზე (ექსპერიმენტული)" #. Name #: newexchange/kcal_newexchange_final.desktop:4 msgid "Calendar on an Exchange Server" -msgstr "" +msgstr "კალენდარი Exchange სერვერზე" #. Name #: newexchange/tdeabc_newexchange.desktop:2 msgid "Addressbook on an Exchange Server (experimental)" -msgstr "" +msgstr "მისამართების წიგნი Exchange სერვერზე (ექსპერიმენტული)" #. Name #: newexchange/tdeabc_newexchange_final.desktop:2 msgid "Addressbook on an Exchange Server" -msgstr "" +msgstr "მისამართების წიგნი Exchange სერვერზე" #. Name #: remote/remote.desktop:2 msgid "Calendar in Remote File" -msgstr "" +msgstr "კალენდარი დაშორებულ ფაილში" #. Name #: scalix/kcal/scalix.desktop:2 msgid "Calendar on Scalix Server via KMail" -msgstr "" +msgstr "კალენდარი Scalix-ის სერვერზე KMail-ით" #. Name #: scalix/knotes/scalix.desktop:2 msgid "Notes on Scalix Server via KMail" -msgstr "" +msgstr "შენიშვნები Scalix-ის სერვერზე KMail-ით" #. Name #: scalix/tdeabc/scalix.desktop:2 msgid "Addressbook on Scalix Server via KMail" -msgstr "" +msgstr "მისამართების წიგნი Scalix სერვერზე KMail-ით" #. Name #: slox/kcal_ox.desktop:2 slox/tdeabc_ox.desktop:2 msgid "OpenXchange Server" -msgstr "" +msgstr "openXchange სერვერი" #. Name #: slox/kcal_slox.desktop:2 slox/tdeabc_slox.desktop:2 msgid "SUSE LINUX Openexchange Server" -msgstr "" +msgstr "SUSE LINUX Openexchange Server" #. Name #: tvanytime/kcal_tvanytime.desktop:2 diff --git a/translations/desktop_files/tderesources-desktops/ru.po b/translations/desktop_files/tderesources-desktops/ru.po index 3449000f..43d0909d 100644 --- a/translations/desktop_files/tderesources-desktops/ru.po +++ b/translations/desktop_files/tderesources-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-07 18:18+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-03-29 02:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/tdepimresources-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: birthdays/tdeabc.desktop:2 @@ -55,7 +57,7 @@ msgstr "Сервер Microsoft Exchange 2000 (устаревший)" #. Name #: featureplan/kcal_resourcefeatureplan.desktop:2 msgid "XML Feature Plan" -msgstr "" +msgstr "План функций XML" #. Name #: groupdav/kcal_groupdav.desktop:2 groupdav/tdeabc_groupdav.desktop:2 diff --git a/wizards/egroupwarewizard.h b/wizards/egroupwarewizard.h index bd25dea1..c0e12db2 100644 --- a/wizards/egroupwarewizard.h +++ b/wizards/egroupwarewizard.h @@ -22,12 +22,12 @@ #define EGROUPWAREWIZARD_H #include <tdeconfigwizard.h> -#include <kdemacros.h> +#include <tdemacros.h> class KLineEdit; class TQCheckBox; -class KDE_EXPORT EGroupwareWizard : public TDEConfigWizard +class TDE_EXPORT EGroupwareWizard : public TDEConfigWizard { public: EGroupwareWizard(); diff --git a/wizards/exchangewizard.h b/wizards/exchangewizard.h index 8f4978ed..a6b400a1 100644 --- a/wizards/exchangewizard.h +++ b/wizards/exchangewizard.h @@ -21,13 +21,13 @@ #define EXCHANGEWIZARD_H #include <tdeconfigwizard.h> -#include <kdemacros.h> +#include <tdemacros.h> class KLineEdit; class TQCheckBox; class TQSpinBox; -class KDE_EXPORT ExchangeWizard : public TDEConfigWizard +class TDE_EXPORT ExchangeWizard : public TDEConfigWizard { public: ExchangeWizard(); diff --git a/wizards/groupwarewizard.cpp b/wizards/groupwarewizard.cpp index 1f520ce5..3df995ce 100644 --- a/wizards/groupwarewizard.cpp +++ b/wizards/groupwarewizard.cpp @@ -39,8 +39,8 @@ GroupwareWizard::GroupwareWizard( TQWidget *parent, const char *name ) layout->addWidget( mOverViewPage ); - connect( mOverViewPage, TQT_SIGNAL( cancel() ), - tqApp, TQT_SLOT( quit() ) ); + connect( mOverViewPage, TQ_SIGNAL( cancel() ), + tqApp, TQ_SLOT( quit() ) ); resize( 400, 200 ); } diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp index 6081bb00..f6b019ef 100644 --- a/wizards/groupwisewizard.cpp +++ b/wizards/groupwisewizard.cpp @@ -320,8 +320,8 @@ GroupwiseWizard::GroupwiseWizard() : TDEConfigWizard( new GroupwisePropagator ) topLayout->addWidget( mEmailBox, 0, 0 ); mEmailWidget = new TQWidget( mEmailBox ); - connect( mEmailBox, TQT_SIGNAL( toggled( bool ) ), mEmailWidget, - TQT_SLOT( setEnabled( bool ) ) ); + connect( mEmailBox, TQ_SIGNAL( toggled( bool ) ), mEmailWidget, + TQ_SLOT( setEnabled( bool ) ) ); TQGridLayout *accountLayout= new TQGridLayout( mEmailWidget ); accountLayout->setSpacing( spacingHint() ); @@ -340,8 +340,8 @@ GroupwiseWizard::GroupwiseWizard() : TDEConfigWizard( new GroupwisePropagator ) accountLayout->setRowStretch( 2, 1 ); - connect( this, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), - TQT_SLOT( slotAboutToShowPage( TQWidget * ) ) ); + connect( this, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ), + TQ_SLOT( slotAboutToShowPage( TQWidget * ) ) ); setupRulesPage(); diff --git a/wizards/groupwisewizard.h b/wizards/groupwisewizard.h index f2786805..ecfccb4c 100644 --- a/wizards/groupwisewizard.h +++ b/wizards/groupwisewizard.h @@ -21,14 +21,14 @@ #define GROUPWISEWIZARD_H #include <tdeconfigwizard.h> -#include <kdemacros.h> +#include <tdemacros.h> class KLineEdit; class TQCheckBox; class TQSpinBox; class TQGroupBox; -class KDE_EXPORT GroupwiseWizard : public TDEConfigWizard +class TDE_EXPORT GroupwiseWizard : public TDEConfigWizard { TQ_OBJECT diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp index cc6bb565..b3e9297d 100644 --- a/wizards/kmailchanges.cpp +++ b/wizards/kmailchanges.cpp @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeemailsettings.h> #include <identitymanager.h> #include <identity.h> @@ -179,7 +179,7 @@ void CreateDisconnectedImapAccount::apply() c.setGroup( TQString("Account %1").arg( accountId ) ); int uid; if ( mExistingAccountId < 0 ) { - uid = kapp->random(); + uid = tdeApp->random(); c.writeEntry( "Folder", uid ); } else { uid = c.readNumEntry( "Folder" ); @@ -319,7 +319,7 @@ void CreateOnlineImapAccount::apply() c.writeEntry( "accounts", accCnt+1 ); c.setGroup( TQString("Account %1").arg(accCnt+1) ); - int uid = kapp->random(); + int uid = tdeApp->random(); c.writeEntry( "Folder", uid ); c.writeEntry( "Id", uid ); c.writeEntry( "Type", "imap" ); diff --git a/wizards/kolabwizard.h b/wizards/kolabwizard.h index a0f898a0..1d8cd120 100644 --- a/wizards/kolabwizard.h +++ b/wizards/kolabwizard.h @@ -23,13 +23,13 @@ #define KOLABWIZARD_H #include <tdeconfigwizard.h> -#include <kdemacros.h> +#include <tdemacros.h> class KLineEdit; class TQCheckBox; class TQRadioButton; -class KDE_EXPORT KolabWizard : public TDEConfigWizard +class TDE_EXPORT KolabWizard : public TDEConfigWizard { public: KolabWizard(); diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp index e9f6596a..9e4aba5d 100644 --- a/wizards/overviewpage.cpp +++ b/wizards/overviewpage.cpp @@ -66,7 +66,7 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name ) #ifdef WITH_EGROUPWARE button = new TQPushButton( i18n("eGroupware"), this ); layout->addMultiCellWidget( button, 3, 3, 0, 3 ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardEGroupware() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showWizardEGroupware() ) ); #endif // FIXME: Maybe hyperlinks would be better than buttons. @@ -74,20 +74,20 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name ) #ifdef WITH_KOLAB button = new TQPushButton( i18n("Kolab"), this ); layout->addMultiCellWidget( button, 4, 4, 0, 3 ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardKolab() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showWizardKolab() ) ); #endif #ifdef WITH_SLOX button = new TQPushButton( i18n("SUSE Linux Openexchange (SLOX)"), this ); layout->addMultiCellWidget( button, 5, 5, 0, 3 ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardSlox() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showWizardSlox() ) ); #endif #ifdef WITH_NEWEXCHANGE button = new TQPushButton( i18n("Microsoft Exchange"), this ); button->hide(); // not quite ready yet layout->addMultiCellWidget( button, 6, 6, 0, 3 ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardExchange() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showWizardExchange() ) ); #endif TQFrame *frame = new TQFrame( this ); @@ -97,7 +97,7 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name ) TQPushButton *cancelButton = new KPushButton( KStdGuiItem::close(), this ); layout->addWidget( cancelButton, 8, 3 ); - connect( cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( cancel() ) ); + connect( cancelButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( cancel() ) ); layout->setRowStretch( 7, 1 ); diff --git a/wizards/scalixwizard.h b/wizards/scalixwizard.h index 3b5b5ec3..379cd51d 100644 --- a/wizards/scalixwizard.h +++ b/wizards/scalixwizard.h @@ -23,13 +23,13 @@ #define SCALIXWIZARD_H #include <tdeconfigwizard.h> -#include <kdemacros.h> +#include <tdemacros.h> class KComboBox; class KLineEdit; class TQCheckBox; -class KDE_EXPORT ScalixWizard : public TDEConfigWizard +class TDE_EXPORT ScalixWizard : public TDEConfigWizard { public: ScalixWizard(); diff --git a/wizards/sloxwizard.h b/wizards/sloxwizard.h index ad6ec0d2..3d543e49 100644 --- a/wizards/sloxwizard.h +++ b/wizards/sloxwizard.h @@ -21,12 +21,12 @@ #define SLOXWIZARD_H #include <tdeconfigwizard.h> -#include <kdemacros.h> +#include <tdemacros.h> class KLineEdit; class TQCheckBox; -class KDE_EXPORT SloxWizard : public TDEConfigWizard +class TDE_EXPORT SloxWizard : public TDEConfigWizard { public: SloxWizard(); |
