diff options
Diffstat (limited to 'tdeio')
91 files changed, 1204 insertions, 1204 deletions
diff --git a/tdeio/bookmarks/kbookmarkbar.cpp b/tdeio/bookmarks/kbookmarkbar.cpp index b4d548886..ca4d5d8c0 100644 --- a/tdeio/bookmarks/kbookmarkbar.cpp +++ b/tdeio/bookmarks/kbookmarkbar.cpp @@ -96,8 +96,8 @@ KBookmarkBar::KBookmarkBar( KBookmarkManager* mgr, dptr()->m_actions.setAutoDelete( true ); - connect( mgr, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &) ) ); + connect( mgr, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &) ) ); KBookmarkGroup toolbar = getToolbar(); fillBookmarkBar( toolbar ); @@ -198,8 +198,8 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent) else { TDEAction *action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 ); - connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), - this, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); + connect(action, TQ_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), + this, TQ_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); action->setProperty( "url", bm.url().url() ); action->setProperty( "address", bm.address() ); @@ -227,10 +227,10 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent) KBookmarkMenu *menu = new KBookmarkMenu(CURRENT_MANAGER(), m_pOwner, action->popupMenu(), m_actionCollection, false, addEntriesBookmarkBar, bm.address()); - connect(menu, TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) ), - this, TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) )); - connect(menu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) ), - this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) )); + connect(menu, TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) ), + this, TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) )); + connect(menu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) ), + this, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) )); menu->fillBookmarkMenu(); action->plug(m_toolBar); m_lstSubMenus.append( menu ); diff --git a/tdeio/bookmarks/kbookmarkdombuilder.cpp b/tdeio/bookmarks/kbookmarkdombuilder.cpp index 5c0882d05..2fddaa861 100644 --- a/tdeio/bookmarks/kbookmarkdombuilder.cpp +++ b/tdeio/bookmarks/kbookmarkdombuilder.cpp @@ -36,14 +36,14 @@ KBookmarkDomBuilder::~KBookmarkDomBuilder() { } void KBookmarkDomBuilder::connectImporter(const TQObject *importer) { - connect(importer, TQT_SIGNAL( newBookmark(const TQString &, const TQCString &, const TQString &) ), - TQT_SLOT( newBookmark(const TQString &, const TQCString &, const TQString &) )); - connect(importer, TQT_SIGNAL( newFolder(const TQString &, bool, const TQString &) ), - TQT_SLOT( newFolder(const TQString &, bool, const TQString &) )); - connect(importer, TQT_SIGNAL( newSeparator() ), - TQT_SLOT( newSeparator() ) ); - connect(importer, TQT_SIGNAL( endFolder() ), - TQT_SLOT( endFolder() ) ); + connect(importer, TQ_SIGNAL( newBookmark(const TQString &, const TQCString &, const TQString &) ), + TQ_SLOT( newBookmark(const TQString &, const TQCString &, const TQString &) )); + connect(importer, TQ_SIGNAL( newFolder(const TQString &, bool, const TQString &) ), + TQ_SLOT( newFolder(const TQString &, bool, const TQString &) )); + connect(importer, TQ_SIGNAL( newSeparator() ), + TQ_SLOT( newSeparator() ) ); + connect(importer, TQ_SIGNAL( endFolder() ), + TQ_SLOT( endFolder() ) ); } void KBookmarkDomBuilder::newBookmark( diff --git a/tdeio/bookmarks/kbookmarkimporter.cpp b/tdeio/bookmarks/kbookmarkimporter.cpp index a83e36c78..3eb13a501 100644 --- a/tdeio/bookmarks/kbookmarkimporter.cpp +++ b/tdeio/bookmarks/kbookmarkimporter.cpp @@ -70,14 +70,14 @@ void KXBELBookmarkImporterImpl::visitLeave(const KBookmarkGroup &) void KBookmarkImporterBase::setupSignalForwards(TQObject *src, TQObject *dst) { - connect(src, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ), - dst, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) )); - connect(src, TQT_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ), - dst, TQT_SIGNAL( newFolder( const TQString &, bool, const TQString & ) )); - connect(src, TQT_SIGNAL( newSeparator() ), - dst, TQT_SIGNAL( newSeparator() ) ); - connect(src, TQT_SIGNAL( endFolder() ), - dst, TQT_SIGNAL( endFolder() ) ); + connect(src, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ), + dst, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) )); + connect(src, TQ_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ), + dst, TQ_SIGNAL( newFolder( const TQString &, bool, const TQString & ) )); + connect(src, TQ_SIGNAL( newSeparator() ), + dst, TQ_SIGNAL( newSeparator() ) ); + connect(src, TQ_SIGNAL( endFolder() ), + dst, TQ_SIGNAL( endFolder() ) ); } KBookmarkImporterBase* KBookmarkImporterBase::factory( const TQString &type ) diff --git a/tdeio/bookmarks/kbookmarkmenu.cpp b/tdeio/bookmarks/kbookmarkmenu.cpp index 38816f8dc..070912eb5 100644 --- a/tdeio/bookmarks/kbookmarkmenu.cpp +++ b/tdeio/bookmarks/kbookmarkmenu.cpp @@ -94,9 +94,9 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr, if (m_actionCollection) { m_actionCollection->setHighlightingEnabled(true); - disconnect( m_actionCollection, TQT_SIGNAL( actionHighlighted( TDEAction * ) ), 0, 0 ); - connect( m_actionCollection, TQT_SIGNAL( actionHighlighted( TDEAction * ) ), - this, TQT_SLOT( slotActionHighlighted( TDEAction * ) ) ); + disconnect( m_actionCollection, TQ_SIGNAL( actionHighlighted( TDEAction * ) ), 0, 0 ); + connect( m_actionCollection, TQ_SIGNAL( actionHighlighted( TDEAction * ) ), + this, TQ_SLOT( slotActionHighlighted( TDEAction * ) ) ); } m_bNSBookmark = m_parentAddress.isNull(); @@ -104,20 +104,20 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr, { //kdDebug(7043) << "KBookmarkMenu::KBookmarkMenu " << this << " address : " << m_parentAddress << endl; - connect( _parentMenu, TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( slotAboutToShow() ) ); + connect( _parentMenu, TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( slotAboutToShow() ) ); if ( KBookmarkSettings::self()->m_contextmenu ) { (void) _parentMenu->contextMenu(); - connect( _parentMenu, TQT_SIGNAL( aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ), - this, TQT_SLOT( slotAboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) )); + connect( _parentMenu, TQ_SIGNAL( aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ), + this, TQ_SLOT( slotAboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) )); } if ( m_bIsRoot ) { - connect( m_pManager, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &) ) ); + connect( m_pManager, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &) ) ); } } @@ -254,12 +254,12 @@ void RMB::fillContextMenu( TQPopupMenu* contextMenu, const TQString & address, i // TODO rename these, but, message freeze... umm... // if (bookmark.isGroup()) { - id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQT_SLOT(slotRMBActionInsert(int)) ); + id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQ_SLOT(slotRMBActionInsert(int)) ); contextMenu->setItemParameter( id, val ); /* } else { - id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQT_SLOT(slotRMBActionInsert(int)) ); + id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQ_SLOT(slotRMBActionInsert(int)) ); contextMenu->setItemParameter( id, val ); }*/ } @@ -271,24 +271,24 @@ void RMB::fillContextMenu2( TQPopupMenu* contextMenu, const TQString & address, int id; if (bookmark.isGroup()) { - id = contextMenu->insertItem( i18n( "Open Folder in Bookmark Editor" ), recv, TQT_SLOT(slotRMBActionEditAt(int)) ); + id = contextMenu->insertItem( i18n( "Open Folder in Bookmark Editor" ), recv, TQ_SLOT(slotRMBActionEditAt(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Folder" ), recv, TQT_SLOT(slotRMBActionRemove(int)) ); + id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Folder" ), recv, TQ_SLOT(slotRMBActionRemove(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) ); + id = contextMenu->insertItem( i18n( "Properties" ), recv, TQ_SLOT(slotRMBActionProperties(int)) ); contextMenu->setItemParameter( id, val ); } else { - id = contextMenu->insertItem( i18n( "Copy Link Address" ), recv, TQT_SLOT(slotRMBActionCopyLocation(int)) ); + id = contextMenu->insertItem( i18n( "Copy Link Address" ), recv, TQ_SLOT(slotRMBActionCopyLocation(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Bookmark" ), recv, TQT_SLOT(slotRMBActionRemove(int)) ); + id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Bookmark" ), recv, TQ_SLOT(slotRMBActionRemove(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) ); + id = contextMenu->insertItem( i18n( "Properties" ), recv, TQ_SLOT(slotRMBActionProperties(int)) ); contextMenu->setItemParameter( id, val ); } } @@ -487,7 +487,7 @@ void KBookmarkMenu::addAddBookmarksList() "bookmarks_list_add", 0, this, - TQT_SLOT( slotAddBookmarksList() ), + TQ_SLOT( slotAddBookmarksList() ), m_actionCollection, m_bIsRoot ? "add_bookmarks_list" : 0 ); paAddBookmarksList->setToolTip( i18n( "Add a folder of bookmarks for all open tabs." ) ); @@ -507,7 +507,7 @@ void KBookmarkMenu::addAddBookmark() "bookmark_add", m_bIsRoot && m_bAddShortcuts ? TDEStdAccel::addBookmark() : TDEShortcut(), this, - TQT_SLOT( slotAddBookmark() ), + TQ_SLOT( slotAddBookmark() ), m_actionCollection, m_bIsRoot ? "add_bookmark" : 0 ); paAddBookmarks->setToolTip( i18n( "Add a bookmark for the current document" ) ); @@ -521,7 +521,7 @@ void KBookmarkMenu::addEditBookmarks() if (!kapp->authorizeTDEAction("bookmarks")) return; - TDEAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQT_SLOT( slotEditBookmarks() ), + TDEAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQ_SLOT( slotEditBookmarks() ), m_actionCollection, "edit_bookmarks" ); m_paEditBookmarks->plug( m_parentMenu ); m_paEditBookmarks->setToolTip( i18n( "Edit your bookmark collection in a separate window" ) ); @@ -542,7 +542,7 @@ void KBookmarkMenu::addNewFolder() "folder-new", //"folder", 0, this, - TQT_SLOT( slotNewFolder() ), + TQ_SLOT( slotNewFolder() ), m_actionCollection ); paNewFolder->setToolTip( i18n( "Create a new bookmark folder in this menu" ) ); @@ -607,11 +607,11 @@ void KBookmarkMenu::fillBookmarkMenu() new KBookmarkMenu( m_pManager, m_pOwner, actionMenu->popupMenu(), m_actionCollection, false, m_bAddBookmark, TQString::null ); - connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), - this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); + connect( subMenu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), + this, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); m_lstSubMenus.append(subMenu); - connect(actionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), subMenu, TQT_SLOT(slotNSLoad())); + connect(actionMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), subMenu, TQ_SLOT(slotNSLoad())); } } @@ -637,8 +637,8 @@ void KBookmarkMenu::fillBookmarkMenu() { //kdDebug(7043) << "Creating URL bookmark menu item for " << bm.text() << endl; TDEAction * action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 ); - connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), - this, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); + connect(action, TQ_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), + this, TQ_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); action->setProperty( "url", bm.url().url() ); action->setProperty( "address", bm.address() ); @@ -664,10 +664,10 @@ void KBookmarkMenu::fillBookmarkMenu() m_bAddBookmark, bm.address() ); - connect(subMenu, TQT_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) ), - this, TQT_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) )); - connect(subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), - this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); + connect(subMenu, TQ_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) ), + this, TQ_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) )); + connect(subMenu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), + this, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); m_lstSubMenus.append( subMenu ); } } @@ -767,7 +767,7 @@ KExtendedBookmarkOwner* KBookmarkMenu::extOwner() void KBookmarkMenu::slotNSLoad() { // only fill menu once - m_parentMenu->disconnect(TQT_SIGNAL(aboutToShow())); + m_parentMenu->disconnect(TQ_SIGNAL(aboutToShow())); // not NSImporter, but kept old name for BC reasons KBookmarkMenuNSImporter importer( m_pManager, this, m_actionCollection ); @@ -846,10 +846,10 @@ KBookmarkEditDialog::KBookmarkEditDialog(const TQString& title, const TQString& if ( editType == InsertionMode ) { m_folderTree = KBookmarkFolderTree::createTree( m_mgr, m_main, name, m_address ); - connect( m_folderTree, TQT_SIGNAL( doubleClicked(TQListViewItem*) ), - this, TQT_SLOT( slotDoubleClicked(TQListViewItem*) ) ); + connect( m_folderTree, TQ_SIGNAL( doubleClicked(TQListViewItem*) ), + this, TQ_SLOT( slotDoubleClicked(TQListViewItem*) ) ); vbox->addWidget( m_folderTree ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotUser1() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotUser1() ) ); } } @@ -1043,12 +1043,12 @@ void KBookmarkMenuNSImporter::openBookmarks( const TQString &location, const TQS void KBookmarkMenuNSImporter::connectToImporter(const TQObject &importer) { - connect( &importer, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ), - TQT_SLOT( newBookmark( const TQString &, const TQCString &, const TQString & ) ) ); - connect( &importer, TQT_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ), - TQT_SLOT( newFolder( const TQString &, bool, const TQString & ) ) ); - connect( &importer, TQT_SIGNAL( newSeparator() ), TQT_SLOT( newSeparator() ) ); - connect( &importer, TQT_SIGNAL( endFolder() ), TQT_SLOT( endFolder() ) ); + connect( &importer, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ), + TQ_SLOT( newBookmark( const TQString &, const TQCString &, const TQString & ) ) ); + connect( &importer, TQ_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ), + TQ_SLOT( newFolder( const TQString &, bool, const TQString & ) ) ); + connect( &importer, TQ_SIGNAL( newSeparator() ), TQ_SLOT( newSeparator() ) ); + connect( &importer, TQ_SIGNAL( endFolder() ), TQ_SLOT( endFolder() ) ); } void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCString & url, const TQString & ) @@ -1056,8 +1056,8 @@ void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCStrin TQString _text = KStringHandler::csqueeze(text); _text.replace( '&', "&&" ); TDEAction * action = new KBookmarkAction(_text, "text-html", 0, 0, "", m_actionCollection, 0); - connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), - m_menu, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); + connect(action, TQ_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), + m_menu, TQ_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); action->setProperty( "url", url ); action->setToolTip( url ); action->plug( mstack.top()->m_parentMenu ); @@ -1074,8 +1074,8 @@ void KBookmarkMenuNSImporter::newFolder( const TQString & text, bool, const TQSt KBookmarkMenu *subMenu = new KBookmarkMenu( m_pManager, m_menu->m_pOwner, actionMenu->popupMenu(), m_actionCollection, false, m_menu->m_bAddBookmark, TQString::null ); - connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), - m_menu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); + connect( subMenu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), + m_menu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); mstack.top()->m_lstSubMenus.append( subMenu ); mstack.push(subMenu); diff --git a/tdeio/httpfilter/httpfilter.cpp b/tdeio/httpfilter/httpfilter.cpp index 0f6a45790..a2ed52f43 100644 --- a/tdeio/httpfilter/httpfilter.cpp +++ b/tdeio/httpfilter/httpfilter.cpp @@ -37,8 +37,8 @@ void HTTPFilterBase::chain(HTTPFilterBase *previous) { last = previous; - connect(last, TQT_SIGNAL(output(const TQByteArray &)), - this, TQT_SLOT(slotInput(const TQByteArray &))); + connect(last, TQ_SIGNAL(output(const TQByteArray &)), + this, TQ_SLOT(slotInput(const TQByteArray &))); } HTTPFilterChain::HTTPFilterChain() @@ -55,14 +55,14 @@ HTTPFilterChain::addFilter(HTTPFilterBase *filter) } else { - disconnect(last, TQT_SIGNAL(output(const TQByteArray &)), 0, 0); + disconnect(last, TQ_SIGNAL(output(const TQByteArray &)), 0, 0); filter->chain(last); } last = filter; - connect(filter, TQT_SIGNAL(output(const TQByteArray &)), - this, TQT_SIGNAL(output(const TQByteArray &))); - connect(filter, TQT_SIGNAL(error(int, const TQString &)), - this, TQT_SIGNAL(error(int, const TQString &))); + connect(filter, TQ_SIGNAL(output(const TQByteArray &)), + this, TQ_SIGNAL(output(const TQByteArray &))); + connect(filter, TQ_SIGNAL(error(int, const TQString &)), + this, TQ_SIGNAL(error(int, const TQString &))); } void diff --git a/tdeio/kpasswdserver/kpasswdserver.cpp b/tdeio/kpasswdserver/kpasswdserver.cpp index 075843259..f9340368a 100644 --- a/tdeio/kpasswdserver/kpasswdserver.cpp +++ b/tdeio/kpasswdserver/kpasswdserver.cpp @@ -76,8 +76,8 @@ KPasswdServer::KPasswdServer(const TQCString &name) m_authPending.setAutoDelete(true); m_seqNr = 0; m_wallet = 0; - connect(this, TQT_SIGNAL(windowUnregistered(long)), - this, TQT_SLOT(removeAuthForWindowId(long))); + connect(this, TQ_SIGNAL(windowUnregistered(long)), + this, TQ_SLOT(removeAuthForWindowId(long))); } KPasswdServer::~KPasswdServer() @@ -279,7 +279,7 @@ KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windo m_authPending.append(request); if (m_authPending.count() == 1) - TQTimer::singleShot(0, this, TQT_SLOT(processRequest())); + TQTimer::singleShot(0, this, TQ_SLOT(processRequest())); return info; } @@ -493,7 +493,7 @@ KPasswdServer::processRequest() } if (m_authPending.count()) - TQTimer::singleShot(0, this, TQT_SLOT(processRequest())); + TQTimer::singleShot(0, this, TQ_SLOT(processRequest())); } diff --git a/tdeio/kssl/ksslcertdlg.cpp b/tdeio/kssl/ksslcertdlg.cpp index 7431d4c0a..6f0d7b5a0 100644 --- a/tdeio/kssl/ksslcertdlg.cpp +++ b/tdeio/kssl/ksslcertdlg.cpp @@ -74,11 +74,11 @@ KSSLCertDlg::KSSLCertDlg(TQWidget *parent, const char *name, bool modal) _ok = new KPushButton(i18n("Send certificate"), this); h->addWidget(_ok); - connect(_ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotSend())); + connect(_ok, TQ_SIGNAL(clicked()), TQ_SLOT(slotSend())); d->p_pb_dontsend = new KPushButton(i18n("Do not send a certificate"), this); h->addWidget(d->p_pb_dontsend); - connect(d->p_pb_dontsend, TQT_SIGNAL(clicked()), TQT_SLOT(slotDont())); + connect(d->p_pb_dontsend, TQ_SIGNAL(clicked()), TQ_SLOT(slotDont())); #ifndef TQT_NO_WIDGET_TOPEXTRA setCaption(i18n("TDE SSL Certificate Dialog")); diff --git a/tdeio/kssl/ksslinfodlg.cpp b/tdeio/kssl/ksslinfodlg.cpp index 9ed7742a7..6d4683d95 100644 --- a/tdeio/kssl/ksslinfodlg.cpp +++ b/tdeio/kssl/ksslinfodlg.cpp @@ -107,12 +107,12 @@ KSSLInfoDlg::KSSLInfoDlg(bool secureConnection, TQWidget *parent, const char *na if (KSSL::doesSSLWork()) { button = new KPushButton(KGuiItem(i18n("C&ryptography Configuration..."),"configure"), this); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(launchConfig())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(launchConfig())); buttonLayout->addWidget( button ); } button = new KPushButton(KStdGuiItem::close(), this); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(close())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(close())); buttonLayout->addWidget( button ); button->setFocus(); @@ -188,7 +188,7 @@ void KSSLInfoDlg::setup(KSSLCertificate *cert, layout->addWidget(new TQLabel(i18n("Chain:"), this), 0, 0); d->_chain = new KComboBox(this); layout->addMultiCellWidget(d->_chain, 1, 1, 0, 1); - connect(d->_chain, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChain(int))); + connect(d->_chain, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChain(int))); d->_chain->clear(); @@ -444,7 +444,7 @@ void KSSLCertBox::setValues(TQString certName, TQWidget *mailCatcher) { label->setAlignment(TQt::AlignLeft | TQt::AlignTop); if (mailCatcher) { KURLLabel *mail = new KURLLabel(tmp, tmp, _frame); - connect(mail, TQT_SIGNAL(leftClickedURL(const TQString &)), mailCatcher, TQT_SLOT(mailClicked(const TQString &))); + connect(mail, TQ_SIGNAL(leftClickedURL(const TQString &)), mailCatcher, TQ_SLOT(mailClicked(const TQString &))); } else { label = new TQLabel(tmp, _frame); label->setTextFormat(TQt::PlainText); diff --git a/tdeio/kssl/ksslkeygen.cpp b/tdeio/kssl/ksslkeygen.cpp index 86fe4717d..aad837d7d 100644 --- a/tdeio/kssl/ksslkeygen.cpp +++ b/tdeio/kssl/ksslkeygen.cpp @@ -51,9 +51,9 @@ KSSLKeyGen::KSSLKeyGen(TQWidget *parent, const char *name, bool modal) setHelpEnabled(page1, false); setHelpEnabled(page2, false); setFinishEnabled(page2, false); - connect(page2->_password1, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPassChanged())); - connect(page2->_password2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPassChanged())); - connect(finishButton(), TQT_SIGNAL(clicked()), TQT_SLOT(slotGenerate())); + connect(page2->_password1, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPassChanged())); + connect(page2->_password2, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPassChanged())); + connect(finishButton(), TQ_SIGNAL(clicked()), TQ_SLOT(slotGenerate())); #else // tell him he doesn't have SSL #endif diff --git a/tdeio/misc/kpac/discovery.cpp b/tdeio/misc/kpac/discovery.cpp index e076a083e..9e3cafd19 100644 --- a/tdeio/misc/kpac/discovery.cpp +++ b/tdeio/misc/kpac/discovery.cpp @@ -53,12 +53,12 @@ namespace KPAC : Downloader( parent ), m_helper( new KProcIO ) { - connect( m_helper, TQT_SIGNAL( readReady( KProcIO* ) ), TQT_SLOT( helperOutput() ) ); - connect( m_helper, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( failed() ) ); + connect( m_helper, TQ_SIGNAL( readReady( KProcIO* ) ), TQ_SLOT( helperOutput() ) ); + connect( m_helper, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( failed() ) ); *m_helper << "kpac_dhcp_helper"; if ( !m_helper->start() ) - TQTimer::singleShot( 0, this, TQT_SLOT( failed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( failed() ) ); } bool Discovery::initHostName() diff --git a/tdeio/misc/kpac/downloader.cpp b/tdeio/misc/kpac/downloader.cpp index 298d660dc..30857df0c 100644 --- a/tdeio/misc/kpac/downloader.cpp +++ b/tdeio/misc/kpac/downloader.cpp @@ -44,9 +44,9 @@ namespace KPAC m_scriptURL = url; TDEIO::TransferJob* job = TDEIO::get( url, false, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( result( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( result( TDEIO::Job* ) ) ); } void Downloader::failed() diff --git a/tdeio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp index 695d06858..c1140af1b 100644 --- a/tdeio/misc/kpac/proxyscout.cpp +++ b/tdeio/misc/kpac/proxyscout.cpp @@ -105,8 +105,8 @@ namespace KPAC default: return false; } - connect( m_downloader, TQT_SIGNAL( result( bool ) ), - TQT_SLOT( downloadResult( bool ) ) ); + connect( m_downloader, TQ_SIGNAL( result( bool ) ), + TQ_SLOT( downloadResult( bool ) ) ); return true; } diff --git a/tdeio/misc/tdesendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp index bf3099094..d1e8ae483 100644 --- a/tdeio/misc/tdesendbugmail/main.cpp +++ b/tdeio/misc/tdesendbugmail/main.cpp @@ -122,8 +122,8 @@ int main(int argc, char **argv) { SMTP *sm = new SMTP; BugMailer bm(sm); - TQObject::connect(sm, TQT_SIGNAL(messageSent()), &bm, TQT_SLOT(slotSend())); - TQObject::connect(sm, TQT_SIGNAL(error(int)), &bm, TQT_SLOT(slotError(int))); + TQObject::connect(sm, TQ_SIGNAL(messageSent()), &bm, TQ_SLOT(slotSend())); + TQObject::connect(sm, TQ_SIGNAL(error(int)), &bm, TQ_SLOT(slotError(int))); sm->setServerHost(server); sm->setPort(25); sm->setSenderAddress(fromaddr); diff --git a/tdeio/misc/tdesendbugmail/smtp.cpp b/tdeio/misc/tdesendbugmail/smtp.cpp index 470f24050..ae507e76a 100644 --- a/tdeio/misc/tdesendbugmail/smtp.cpp +++ b/tdeio/misc/tdesendbugmail/smtp.cpp @@ -38,12 +38,12 @@ SMTP::SMTP(char *serverhost, unsigned short int port, int timeout) kdDebug() << "SMTP object created" << endl; - connect(&connectTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(connectTimerTick())); - connect(&timeOutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(connectTimedOut())); - connect(&interactTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(interactTimedOut())); + connect(&connectTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(connectTimerTick())); + connect(&timeOutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(connectTimedOut())); + connect(&interactTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(interactTimedOut())); // some sendmail will give 'duplicate helo' error, quick fix for now - connect(this, TQT_SIGNAL(messageSent()), TQT_SLOT(closeConnection())); + connect(this, TQ_SIGNAL(messageSent()), TQ_SLOT(closeConnection())); } SMTP::~SMTP() @@ -175,8 +175,8 @@ void SMTP::connectTimerTick(void) state = INIT; serverState = NONE; - connect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *))); - connect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *))); + connect(sock, TQ_SIGNAL(readEvent(TDESocket *)), this, TQ_SLOT(socketRead(TDESocket *))); + connect(sock, TQ_SIGNAL(closeEvent(TDESocket *)), this, TQ_SLOT(socketClose(TDESocket *))); // sock->enableRead(true); timeOutTimer.stop(); kdDebug() << "connected" << endl; @@ -233,8 +233,8 @@ void SMTP::socketRead(TDESocket *socket) void SMTP::socketClose(TDESocket *socket) { timeOutTimer.stop(); - disconnect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *))); - disconnect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *))); + disconnect(sock, TQ_SIGNAL(readEvent(TDESocket *)), this, TQ_SLOT(socketRead(TDESocket *))); + disconnect(sock, TQ_SIGNAL(closeEvent(TDESocket *)), this, TQ_SLOT(socketClose(TDESocket *))); socket->enableRead(false); kdDebug() << "connection terminated" << endl; connected = false; diff --git a/tdeio/misc/tdewalletd/ktimeout.cpp b/tdeio/misc/tdewalletd/ktimeout.cpp index c431ecf69..25108bdc5 100644 --- a/tdeio/misc/tdewalletd/ktimeout.cpp +++ b/tdeio/misc/tdewalletd/ktimeout.cpp @@ -52,7 +52,7 @@ void KTimeout::addTimer(int id, int timeout) { } TQTimer *t = new TQTimer; - connect(t, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); + connect(t, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout())); t->start(timeout); _timers.insert(id, t); } diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp index 0aaec0f9a..5b7840fd0 100644 --- a/tdeio/misc/tdewalletd/tdewalletd.cpp +++ b/tdeio/misc/tdewalletd/tdewalletd.cpp @@ -92,17 +92,17 @@ TDEWalletD::TDEWalletD(const TQCString &name) _timeouts = new KTimeout(17); _closeIdle = false; _idleTime = 0; - connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int))); + connect(_timeouts, TQ_SIGNAL(timedOut(int)), this, TQ_SLOT(timedOut(int))); reconfigure(); TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet"); connect(TDEApplication::dcopClient(), - TQT_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SIGNAL(applicationRemoved(const TQCString&)), this, - TQT_SLOT(slotAppUnregistered(const TQCString&))); + TQ_SLOT(slotAppUnregistered(const TQCString&))); _dw = new KDirWatch(this, "TDEWallet Directory Watcher"); _dw->addDir(TDEGlobal::dirs()->saveLocation("tdewallet")); _dw->startScan(true); - connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty())); + connect(_dw, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(emitWalletListDirty())); } @@ -229,7 +229,7 @@ void TDEWalletD::openAsynchronous(const TQString& wallet, const TQCString& retur DCOPRef(appid, returnObject).send("walletOpenResult", 0); - TQTimer::singleShot(0, this, TQT_SLOT(processTransactions())); + TQTimer::singleShot(0, this, TQ_SLOT(processTransactions())); checkActiveDialog(); } @@ -266,7 +266,7 @@ int TDEWalletD::open(const TQString& wallet, uint wId) { xact->wId = wId; xact->tType = TDEWalletTransaction::Open; xact->modal = true; // mark dialogs as modal, the app has blocking wait - TQTimer::singleShot(0, this, TQT_SLOT(processTransactions())); + TQTimer::singleShot(0, this, TQ_SLOT(processTransactions())); checkActiveDialog(); return 0; // process later } @@ -386,7 +386,7 @@ int TDEWalletD::tryOpen(const TQString& wallet, const TQCString& password) _tryOpenBlocked.start (30 * 1000, true /*single shot*/); if (++_failed > 5) { _failed = 0; - TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures())); + TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures())); } rc = -1; @@ -627,7 +627,7 @@ void TDEWalletD::changePassword(const TQString& wallet, uint wId) { _transactions.append(xact); - TQTimer::singleShot(0, this, TQT_SLOT(processTransactions())); + TQTimer::singleShot(0, this, TQ_SLOT(processTransactions())); checkActiveDialog(); } @@ -801,7 +801,7 @@ bool TDEWalletD::isOpen(int handle) { if (rc == 0 && ++_failed > 5) { _failed = 0; - TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures())); + TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures())); } else if (rc != 0) { _failed = 0; } @@ -1229,7 +1229,7 @@ TDEWallet::Backend *TDEWalletD::getWallet(const TQCString& appid, int handle) { if (++_failed > 5) { _failed = 0; - TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures())); + TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures())); } return 0L; diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp index a6ed43f03..e8309ea4c 100644 --- a/tdeio/misc/uiserver.cpp +++ b/tdeio/misc/uiserver.cpp @@ -94,11 +94,11 @@ class UIServerSystemTray:public KSystemTray :KSystemTray(uis) { TDEPopupMenu* pop= contextMenu(); - pop->insertItem(i18n("Settings..."), uis, TQT_SLOT(slotConfigure())); - pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon())); + pop->insertItem(i18n("Settings..."), uis, TQ_SLOT(slotConfigure())); + pop->insertItem(i18n("Remove"), uis, TQ_SLOT(slotRemoveSystemTrayIcon())); setPixmap(loadIcon("document-save")); //actionCollection()->action("file_quit")->setEnabled(true); - KStdAction::quit(uis, TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit(uis, TQ_SLOT(slotQuit()), actionCollection()); } }; @@ -193,8 +193,8 @@ ProgressItem::ProgressItem( ListProgress* view, TQListViewItem *after, TQCString // create dialog, but don't show it defaultProgress = new TDEIO::DefaultProgress( false ); defaultProgress->setOnlyClean( true ); - connect ( defaultProgress, TQT_SIGNAL( stopped() ), this, TQT_SLOT( slotCanceled() ) ); - connect ( &m_showTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(slotShowDefaultProgress()) ); + connect ( defaultProgress, TQ_SIGNAL( stopped() ), this, TQ_SLOT( slotCanceled() ) ); + connect ( &m_showTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT(slotShowDefaultProgress()) ); if ( showDefault ) { m_showTimer.start( 500, true ); @@ -478,7 +478,7 @@ ListProgress::ListProgress (TQWidget *parent, const char *name) //used for squeezing the text in local file name and url m_squeezer=new KSqueezedTextLabel(this); m_squeezer->hide(); - connect(header(),TQT_SIGNAL(sizeChange(int,int,int)),this,TQT_SLOT(columnWidthChanged(int))); + connect(header(),TQ_SIGNAL(sizeChange(int,int,int)),this,TQ_SLOT(columnWidthChanged(int))); } @@ -595,11 +595,11 @@ UIServer::UIServer() // setup toolbar toolBar()->insertButton("edit-delete", TOOL_CANCEL, - TQT_SIGNAL(clicked()), this, - TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel")); + TQ_SIGNAL(clicked()), this, + TQ_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel")); toolBar()->insertButton("configure", TOOL_CONFIGURE, - TQT_SIGNAL(clicked()), this, - TQT_SLOT(slotConfigure()), true, i18n("Settings...")); + TQ_SIGNAL(clicked()), this, + TQ_SLOT(slotConfigure()), true, i18n("Settings...")); toolBar()->setBarPos( TDEToolBar::Left ); @@ -614,18 +614,18 @@ UIServer::UIServer() setCentralWidget( listProgress ); - connect( listProgress, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelection() ) ); - connect( listProgress, TQT_SIGNAL( executed( TQListViewItem* ) ), - TQT_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) ); - connect( listProgress, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)), - TQT_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&))); + connect( listProgress, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelection() ) ); + connect( listProgress, TQ_SIGNAL( executed( TQListViewItem* ) ), + TQ_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) ); + connect( listProgress, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)), + TQ_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&))); // setup animation timer updateTimer = new TQTimer( this ); - connect( updateTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( slotUpdate() ) ); + connect( updateTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( slotUpdate() ) ); m_bUpdateNewJob=false; setCaption(i18n("Progress Dialog")); @@ -675,10 +675,10 @@ void UIServer::slotShowContextMenu(TDEListView*, TQListViewItem* item, const TQP if (m_contextMenu==0) { m_contextMenu=new TQPopupMenu(this); - m_idCancelItem = m_contextMenu->insertItem(i18n("Cancel Job"), this, TQT_SLOT(slotCancelCurrent())); -// m_contextMenu->insertItem(i18n("Toggle Progress"), this, TQT_SLOT(slotToggleDefaultProgress())); + m_idCancelItem = m_contextMenu->insertItem(i18n("Cancel Job"), this, TQ_SLOT(slotCancelCurrent())); +// m_contextMenu->insertItem(i18n("Toggle Progress"), this, TQ_SLOT(slotToggleDefaultProgress())); m_contextMenu->insertSeparator(); - m_contextMenu->insertItem(i18n("Settings..."), this, TQT_SLOT(slotConfigure())); + m_contextMenu->insertItem(i18n("Settings..."), this, TQ_SLOT(slotConfigure())); } if ( item ) item->setSelected( true ); @@ -707,9 +707,9 @@ void UIServer::slotConfigure() if (m_configDialog==0) { m_configDialog=new ProgressConfigDialog(0); -// connect(m_configDialog,TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancelConfig())); - connect(m_configDialog,TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotApplyConfig())); - connect(m_configDialog,TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotApplyConfig())); +// connect(m_configDialog,TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotCancelConfig())); + connect(m_configDialog,TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotApplyConfig())); + connect(m_configDialog,TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotApplyConfig())); } m_configDialog->m_showSystemTrayCb->setChecked(m_showSystemTray); m_configDialog->m_keepOpenCb->setChecked(m_keepListOpen); @@ -760,8 +760,8 @@ int UIServer::newJob( TQCString observerAppId, bool showProgress ) bool show = !m_bShowList && showProgress; ProgressItem *item = new ProgressItem( listProgress, it.current(), observerAppId, s_jobId, show ); - connect( item, TQT_SIGNAL( jobCanceled( ProgressItem* ) ), - TQT_SLOT( slotJobCanceled( ProgressItem* ) ) ); + connect( item, TQ_SIGNAL( jobCanceled( ProgressItem* ) ), + TQ_SLOT( slotJobCanceled( ProgressItem* ) ) ); if ( m_bShowList && !updateTimer->isActive() ) updateTimer->start( 1000 ); diff --git a/tdeio/tdefile/kacleditwidget.cpp b/tdeio/tdefile/kacleditwidget.cpp index 0bf668a97..dec306643 100644 --- a/tdeio/tdefile/kacleditwidget.cpp +++ b/tdeio/tdefile/kacleditwidget.cpp @@ -74,16 +74,16 @@ KACLEditWidget::KACLEditWidget( TQWidget *parent, const char *name ) TQHBox *hbox = new TQHBox( parent ); hbox->setSpacing( KDialog::spacingHint() ); m_listView = new KACLListView( hbox, "acl_listview" ); - connect( m_listView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotUpdateButtons() ) ); + connect( m_listView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotUpdateButtons() ) ); TQVBox *vbox = new TQVBox( hbox ); vbox->setSpacing( KDialog::spacingHint() ); m_AddBtn = new TQPushButton( i18n( "Add Entry..." ), vbox, "add_entry_button" ); - connect( m_AddBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotAddEntry() ) ); + connect( m_AddBtn, TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( slotAddEntry() ) ); m_EditBtn = new TQPushButton( i18n( "Edit Entry..." ), vbox, "edit_entry_button" ); - connect( m_EditBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotEditEntry() ) ); + connect( m_EditBtn, TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( slotEditEntry() ) ); m_DelBtn = new TQPushButton( i18n( "Delete Entry" ), vbox, "delete_entry_button" ); - connect( m_DelBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotRemoveEntry() ) ); + connect( m_DelBtn, TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( slotRemoveEntry() ) ); TQWidget *spacer = new TQWidget( vbox ); spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); slotUpdateButtons(); @@ -409,10 +409,10 @@ EditACLEntryDialog::EditACLEntryDialog( KACLListView *listView, KACLListViewItem if ( allowDefaults ) { m_defaultCB = new TQCheckBox( i18n("Default for new files in this folder"), page, "defaultCB" ); mainLayout->addWidget( m_defaultCB ); - connect( m_defaultCB, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUpdateAllowedUsersAndGroups() ) ); - connect( m_defaultCB, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUpdateAllowedTypes() ) ); + connect( m_defaultCB, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUpdateAllowedUsersAndGroups() ) ); + connect( m_defaultCB, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUpdateAllowedTypes() ) ); } @@ -431,8 +431,8 @@ EditACLEntryDialog::EditACLEntryDialog( KACLListView *listView, KACLListViewItem TQRadioButton *namedGroupType = new TQRadioButton( i18n("Named Group"), m_buttonGroup, "namedGroupType" ); m_buttonGroup->insert( namedGroupType, KACLListView::NamedGroup ); - connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotSelectionChanged( int ) ) ); + connect( m_buttonGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotSelectionChanged( int ) ) ); m_widgetStack = new TQWidgetStack( page ); mainLayout->addWidget( m_widgetStack ); diff --git a/tdeio/tdefile/kcombiview.cpp b/tdeio/tdefile/kcombiview.cpp index 23c78b53d..da685daa9 100644 --- a/tdeio/tdefile/kcombiview.cpp +++ b/tdeio/tdefile/kcombiview.cpp @@ -56,8 +56,8 @@ KCombiView::KCombiView( TQWidget *parent, const char *name) left->setAcceptDrops(false); left->installEventFilter( this ); - connect( sig, TQT_SIGNAL( sortingChanged( TQDir::SortSpec ) ), - TQT_SLOT( slotSortingChanged( TQDir::SortSpec ) )); + connect( sig, TQ_SIGNAL( sortingChanged( TQDir::SortSpec ) ), + TQ_SLOT( slotSortingChanged( TQDir::SortSpec ) )); } KCombiView::~KCombiView() diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp index 802acf739..fd6eca83d 100644 --- a/tdeio/tdefile/kcustommenueditor.cpp +++ b/tdeio/tdefile/kcustommenueditor.cpp @@ -95,12 +95,12 @@ KCustomMenuEditor::KCustomMenuEditor(TQWidget *parent) m_listView->setFullWidth(true); m_listView->setSorting(-1); KButtonBox *buttonBox = new KButtonBox(page, TQt::Vertical); - buttonBox->addButton(i18n("New..."), this, TQT_SLOT(slotNewItem())); - d->pbRemove=buttonBox->addButton(i18n("Remove"), this, TQT_SLOT(slotRemoveItem())); - d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), this, TQT_SLOT(slotMoveUp())); - d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), this, TQT_SLOT(slotMoveDown())); + buttonBox->addButton(i18n("New..."), this, TQ_SLOT(slotNewItem())); + d->pbRemove=buttonBox->addButton(i18n("Remove"), this, TQ_SLOT(slotRemoveItem())); + d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), this, TQ_SLOT(slotMoveUp())); + d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), this, TQ_SLOT(slotMoveDown())); buttonBox->layout(); - connect( m_listView, TQT_SIGNAL( selectionChanged () ), this, TQT_SLOT( refreshButton() ) ); + connect( m_listView, TQ_SIGNAL( selectionChanged () ), this, TQ_SLOT( refreshButton() ) ); refreshButton(); } diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp index cae383742..ab8e64d92 100644 --- a/tdeio/tdefile/kdirselectdialog.cpp +++ b/tdeio/tdefile/kdirselectdialog.cpp @@ -99,8 +99,8 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, TQHBoxLayout *hlay = new TQHBoxLayout( page, 0, spacingHint() ); m_mainLayout = new TQVBoxLayout(); d->speedBar = new KFileSpeedBar( page, "speedbar" ); - connect( d->speedBar, TQT_SIGNAL( activated( const KURL& )), - TQT_SLOT( setCurrentURL( const KURL& )) ); + connect( d->speedBar, TQ_SIGNAL( activated( const KURL& )), + TQ_SLOT( setCurrentURL( const KURL& )) ); hlay->addWidget( d->speedBar, 0 ); hlay->addLayout( m_mainLayout, 1 ); @@ -118,15 +118,15 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, d->urlCombo->setCompletionObject( comp, true ); d->urlCombo->setAutoDeleteCompletionObject( true ); d->urlCombo->setDuplicatesEnabled( false ); - connect( d->urlCombo, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotComboTextChanged( const TQString& ) )); + connect( d->urlCombo, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotComboTextChanged( const TQString& ) )); m_contextMenu = new TQPopupMenu( this ); - TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, this, TQT_SLOT( slotMkdir() ), this); + TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, this, TQ_SLOT( slotMkdir() ), this); newFolder->plug(m_contextMenu); m_contextMenu->insertSeparator(); m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, this, - TQT_SLOT( slotShowHiddenFoldersToggled() ), this); + TQ_SLOT( slotShowHiddenFoldersToggled() ), this); m_showHiddenFolders->plug(m_contextMenu); d->startURL = KFileDialog::getStartURL( startDir, d->recentDirClass ); @@ -151,15 +151,15 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, m_mainLayout->addWidget( m_treeView, 1 ); m_mainLayout->addWidget( d->urlCombo, 0 ); - connect( m_treeView, TQT_SIGNAL( currentChanged( TQListViewItem * )), - TQT_SLOT( slotCurrentChanged() )); - connect( m_treeView, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & )), - TQT_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ))); + connect( m_treeView, TQ_SIGNAL( currentChanged( TQListViewItem * )), + TQ_SLOT( slotCurrentChanged() )); + connect( m_treeView, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & )), + TQ_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ))); - connect( d->urlCombo, TQT_SIGNAL( activated( const TQString& )), - TQT_SLOT( slotURLActivated( const TQString& ))); - connect( d->urlCombo, TQT_SIGNAL( returnPressed( const TQString& )), - TQT_SLOT( slotURLActivated( const TQString& ))); + connect( d->urlCombo, TQ_SIGNAL( activated( const TQString& )), + TQ_SLOT( slotURLActivated( const TQString& ))); + connect( d->urlCombo, TQ_SIGNAL( returnPressed( const TQString& )), + TQ_SLOT( slotURLActivated( const TQString& ))); setCurrentURL( d->startURL ); } @@ -194,10 +194,10 @@ void KDirSelectDialog::setCurrentURL( const KURL& url ) d->branch = createBranch( root ); } - d->branch->disconnect( TQT_SIGNAL( populateFinished( KFileTreeViewItem * )), - this, TQT_SLOT( slotNextDirToList( KFileTreeViewItem *))); - connect( d->branch, TQT_SIGNAL( populateFinished( KFileTreeViewItem * )), - TQT_SLOT( slotNextDirToList( KFileTreeViewItem * ) )); + d->branch->disconnect( TQ_SIGNAL( populateFinished( KFileTreeViewItem * )), + this, TQ_SLOT( slotNextDirToList( KFileTreeViewItem *))); + connect( d->branch, TQ_SIGNAL( populateFinished( KFileTreeViewItem * )), + TQ_SLOT( slotNextDirToList( KFileTreeViewItem * ) )); KURL dirToList = root; d->dirsToList.clear(); @@ -260,8 +260,8 @@ void KDirSelectDialog::slotNextDirToList( KFileTreeViewItem *item ) openNextDir( item ); else { - d->branch->disconnect( TQT_SIGNAL( populateFinished( KFileTreeViewItem * )), - this, TQT_SLOT( slotNextDirToList( KFileTreeViewItem *))); + d->branch->disconnect( TQ_SIGNAL( populateFinished( KFileTreeViewItem * )), + this, TQ_SLOT( slotNextDirToList( KFileTreeViewItem *))); view()->setCurrentItem( item ); item->setSelected( true ); } diff --git a/tdeio/tdefile/kdirsize.cpp b/tdeio/tdefile/kdirsize.cpp index b2d48b4bf..40d0b5d13 100644 --- a/tdeio/tdefile/kdirsize.cpp +++ b/tdeio/tdefile/kdirsize.cpp @@ -35,7 +35,7 @@ KDirSize::KDirSize( const KURL & directory ) KDirSize::KDirSize( const KFileItemList & lstItems ) : TDEIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L), m_lstItems(lstItems) { - TQTimer::singleShot( 0, this, TQT_SLOT(processList()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(processList()) ); } void KDirSize::processList() @@ -70,9 +70,9 @@ void KDirSize::processList() void KDirSize::startNextJob( const KURL & url ) { TDEIO::ListJob * listJob = TDEIO::listRecursive( url, false /* no GUI */ ); - connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *, + connect( listJob, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( slotEntries( TDEIO::Job*, + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob( listJob ); } diff --git a/tdeio/tdefile/kdiskfreesp.cpp b/tdeio/tdefile/kdiskfreesp.cpp index 1552e01d2..e29060312 100644 --- a/tdeio/tdefile/kdiskfreesp.cpp +++ b/tdeio/tdefile/kdiskfreesp.cpp @@ -48,10 +48,10 @@ KDiskFreeSp::KDiskFreeSp(TQObject *parent, const char *name) { dfProc = new TDEProcess(); TQ_CHECK_PTR(dfProc); dfProc->setEnvironment("LANGUAGE", "C"); - connect( dfProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), - this, TQT_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) ); - connect(dfProc,TQT_SIGNAL(processExited(TDEProcess *) ), - this, TQT_SLOT(dfDone() ) ); + connect( dfProc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), + this, TQ_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) ); + connect(dfProc,TQ_SIGNAL(processExited(TDEProcess *) ), + this, TQ_SLOT(dfDone() ) ); readingDFStdErrOut=false; } diff --git a/tdeio/tdefile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp index 15090b237..de3401947 100644 --- a/tdeio/tdefile/kicondialog.cpp +++ b/tdeio/tdefile/kicondialog.cpp @@ -93,9 +93,9 @@ TDEIconCanvas::TDEIconCanvas(TQWidget *parent, const char *name) { d = new TDEIconCanvasPrivate; mpTimer = new TQTimer(this); - connect(mpTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotLoadFiles())); - connect(this, TQT_SIGNAL(currentChanged(TQIconViewItem *)), - TQT_SLOT(slotCurrentChanged(TQIconViewItem *))); + connect(mpTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotLoadFiles())); + connect(this, TQ_SIGNAL(currentChanged(TQIconViewItem *)), + TQ_SLOT(slotCurrentChanged(TQIconViewItem *))); setGridX(80); setWordWrapIconText(false); setShowToolTips(true); @@ -271,12 +271,12 @@ void TDEIconDialog::init() bgroup->layout()->setSpacing(KDialog::spacingHint()); bgroup->layout()->setMargin(KDialog::marginHint()); top->addWidget(bgroup); - connect(bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotButtonClicked(int))); + connect(bgroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotButtonClicked(int))); TQGridLayout *grid = new TQGridLayout(bgroup->layout(), 3, 2); mpRb1 = new TQRadioButton(i18n("S&ystem icons:"), bgroup); grid->addWidget(mpRb1, 1, 0); mpCombo = new TQComboBox(bgroup); - connect(mpCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContext(int))); + connect(mpCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContext(int))); grid->addWidget(mpCombo, 1, 1); mpRb2 = new TQRadioButton(i18n("O&ther icons:"), bgroup); grid->addWidget(mpRb2, 2, 0); @@ -303,7 +303,7 @@ void TDEIconDialog::init() // signals and slots connections - connect(clearSearch, TQT_SIGNAL(clicked()), d->searchLine, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(clicked()), d->searchLine, TQ_SLOT(clear())); TQString wtstr = i18n("Search interactively for icon names (e.g. folder)."); TQWhatsThis::add(searchLabel, wtstr); @@ -311,20 +311,20 @@ void TDEIconDialog::init() mpCanvas = new TDEIconCanvas(main); - connect(mpCanvas, TQT_SIGNAL(executed(TQIconViewItem *)), TQT_SLOT(slotAcceptIcons())); - connect(mpCanvas, TQT_SIGNAL(returnPressed(TQIconViewItem *)), TQT_SLOT(slotAcceptIcons())); + connect(mpCanvas, TQ_SIGNAL(executed(TQIconViewItem *)), TQ_SLOT(slotAcceptIcons())); + connect(mpCanvas, TQ_SIGNAL(returnPressed(TQIconViewItem *)), TQ_SLOT(slotAcceptIcons())); mpCanvas->setMinimumSize(400, 125); top->addWidget(mpCanvas); d->searchLine->setIconView(mpCanvas); mpProgress = new KProgress(main); top->addWidget(mpProgress); - connect(mpCanvas, TQT_SIGNAL(startLoading(int)), TQT_SLOT(slotStartLoading(int))); - connect(mpCanvas, TQT_SIGNAL(progress(int)), TQT_SLOT(slotProgress(int))); - connect(mpCanvas, TQT_SIGNAL(finished()), TQT_SLOT(slotFinished())); + connect(mpCanvas, TQ_SIGNAL(startLoading(int)), TQ_SLOT(slotStartLoading(int))); + connect(mpCanvas, TQ_SIGNAL(progress(int)), TQ_SLOT(slotProgress(int))); + connect(mpCanvas, TQ_SIGNAL(finished()), TQ_SLOT(slotFinished())); // When pressing Ok or Cancel, stop loading icons - connect(this, TQT_SIGNAL(hidden()), mpCanvas, TQT_SLOT(stopLoading())); + connect(this, TQ_SIGNAL(hidden()), mpCanvas, TQ_SLOT(stopLoading())); static const char* const context_text[] = { I18N_NOOP( "Actions" ), @@ -678,7 +678,7 @@ void TDEIconButton::init( TDEIconLoader *loader ) mpLoader = loader; mpDialog = 0L; - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotChangeIcon())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotChangeIcon())); } TDEIconButton::~TDEIconButton() @@ -722,7 +722,7 @@ void TDEIconButton::setIcon(const TQString& icon) if (!mpDialog) { mpDialog = new TDEIconDialog(mpLoader, this); - connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&))); + connect(mpDialog, TQ_SIGNAL(newIconName(const TQString&)), TQ_SLOT(newIconName(const TQString&))); } if ( mbUser ) @@ -740,7 +740,7 @@ void TDEIconButton::slotChangeIcon() if (!mpDialog) { mpDialog = new TDEIconDialog(mpLoader, this); - connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&))); + connect(mpDialog, TQ_SIGNAL(newIconName(const TQString&)), TQ_SLOT(newIconName(const TQString&))); } mpDialog->setup( mGroup, mContext, d->m_bStrictIconSize, d->iconSize, mbUser ); diff --git a/tdeio/tdefile/kimagefilepreview.cpp b/tdeio/tdefile/kimagefilepreview.cpp index a1aa22454..140b2fded 100644 --- a/tdeio/tdefile/kimagefilepreview.cpp +++ b/tdeio/tdefile/kimagefilepreview.cpp @@ -53,14 +53,14 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent ) autoPreview = new TQCheckBox( i18n("&Automatic preview"), this ); autoPreview->setChecked( autoMode ); hb->addWidget( autoPreview ); - connect( autoPreview, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) ); + connect( autoPreview, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleAuto(bool)) ); previewButton = new KPushButton( SmallIconSet("thumbnail"), i18n("&Preview"), this ); hb->addWidget( previewButton ); - connect( previewButton, TQT_SIGNAL(clicked()), TQT_SLOT(showPreview()) ); + connect( previewButton, TQ_SIGNAL(clicked()), TQ_SLOT(showPreview()) ); timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(showPreview()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(showPreview()) ); setSupportedMimeTypes( TDEIO::PreviewJob::supportedMimeTypes() ); } @@ -109,14 +109,14 @@ void KImageFilePreview::showPreview( const KURL &url, bool force ) if ( force ) // explicitly requested previews shall always be generated! m_job->setIgnoreMaximumSize( true ); - connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )), - this, TQT_SLOT( slotResult( TDEIO::Job * ))); - connect( m_job, TQT_SIGNAL( gotPreview( const KFileItem*, + connect( m_job, TQ_SIGNAL( result( TDEIO::Job * )), + this, TQ_SLOT( slotResult( TDEIO::Job * ))); + connect( m_job, TQ_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), - TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); + TQ_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); - connect( m_job, TQT_SIGNAL( failed( const KFileItem* )), - this, TQT_SLOT( slotFailed( const KFileItem* ) )); + connect( m_job, TQ_SIGNAL( failed( const KFileItem* )), + this, TQ_SLOT( slotFailed( const KFileItem* ) )); } } } diff --git a/tdeio/tdefile/kmetaprops.cpp b/tdeio/tdefile/kmetaprops.cpp index e511d5b61..88dff7415 100644 --- a/tdeio/tdefile/kmetaprops.cpp +++ b/tdeio/tdefile/kmetaprops.cpp @@ -184,7 +184,7 @@ void KFileMetaPropsPlugin::createLayout() if (!val) kdDebug(7033) << "didn't get a validator for " << *git << "/" << (*iit).key() << endl; w = new KFileMetaInfoWidget(*iit, val, groupBox); d->m_editWidgets.append( w ); - connect(w, TQT_SIGNAL(valueChanged(const TQVariant&)), this, TQT_SIGNAL(changed())); + connect(w, TQ_SIGNAL(valueChanged(const TQVariant&)), this, TQ_SIGNAL(changed())); } // and then the read only items @@ -203,7 +203,7 @@ void KFileMetaPropsPlugin::createLayout() /* d->m_add = new TQPushButton(i18n("&Add"), topframe); d->m_add->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); - connect(d->m_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdd())); + connect(d->m_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAdd())); tmp->addWidget(d->m_add); // if nothing can be added, deactivate it diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp index 330a19b30..b4f4d9c7d 100644 --- a/tdeio/tdefile/knotifydialog.cpp +++ b/tdeio/tdefile/knotifydialog.cpp @@ -170,8 +170,8 @@ KNotifyDialog::KNotifyDialog( TQWidget *parent, const char *name, bool modal, if ( aboutData ) addApplicationEvents( aboutData->appName() ); - connect( this, TQT_SIGNAL( okClicked() ), m_notifyWidget, TQT_SLOT( save() )); - connect( this, TQT_SIGNAL( applyClicked() ), m_notifyWidget, TQT_SLOT( save() )); + connect( this, TQ_SIGNAL( okClicked() ), m_notifyWidget, TQ_SLOT( save() )); + connect( this, TQ_SIGNAL( applyClicked() ), m_notifyWidget, TQ_SLOT( save() )); } KNotifyDialog::~KNotifyDialog() @@ -264,47 +264,47 @@ KNotifyWidget::KNotifyWidget( TQWidget *parent, const char *name, d->toolTip = new KNotifyToolTip( header ); m_playButton->setIconSet( SmallIconSet( "media-playback-start" ) ); - connect( m_playButton, TQT_SIGNAL( clicked() ), TQT_SLOT( playSound() )); - - connect( m_listview, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), - TQT_SLOT( slotEventChanged( TQListViewItem * ) )); - connect( m_listview, TQT_SIGNAL(clicked( TQListViewItem *, const TQPoint&, int)), - TQT_SLOT( slotItemClicked( TQListViewItem *, const TQPoint&, int ))); - - connect( m_playSound, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( soundToggled( bool )) ); - connect( m_logToFile, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( loggingToggled( bool )) ); - connect( m_execute, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( executeToggled( bool )) ); - connect( m_messageBox, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( messageBoxChanged() ) ); - connect( m_passivePopup, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( messageBoxChanged() ) ); - connect( m_stderr, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( stderrToggled( bool ) ) ); - connect( m_taskbar, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( taskbarToggled( bool ) ) ); - - connect( m_soundPath, TQT_SIGNAL( textChanged( const TQString& )), - TQT_SLOT( soundFileChanged( const TQString& ))); - connect( m_logfilePath, TQT_SIGNAL( textChanged( const TQString& )), - TQT_SLOT( logfileChanged( const TQString& ) )); - connect( m_executePath, TQT_SIGNAL( textChanged( const TQString& )), - TQT_SLOT( commandlineChanged( const TQString& ) )); - - connect( m_soundPath, TQT_SIGNAL( openFileDialog( KURLRequester * )), - TQT_SLOT( openSoundDialog( KURLRequester * ))); - connect( m_logfilePath, TQT_SIGNAL( openFileDialog( KURLRequester * )), - TQT_SLOT( openLogDialog( KURLRequester * ))); - connect( m_executePath, TQT_SIGNAL( openFileDialog( KURLRequester * )), - TQT_SLOT( openExecDialog( KURLRequester * ))); - - connect( m_extension, TQT_SIGNAL( clicked() ), - TQT_SLOT( toggleAdvanced()) ); - - connect( m_buttonEnable, TQT_SIGNAL( clicked() ), TQT_SLOT( enableAll() )); - connect( m_buttonDisable, TQT_SIGNAL( clicked() ), TQT_SLOT( enableAll() )); + connect( m_playButton, TQ_SIGNAL( clicked() ), TQ_SLOT( playSound() )); + + connect( m_listview, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), + TQ_SLOT( slotEventChanged( TQListViewItem * ) )); + connect( m_listview, TQ_SIGNAL(clicked( TQListViewItem *, const TQPoint&, int)), + TQ_SLOT( slotItemClicked( TQListViewItem *, const TQPoint&, int ))); + + connect( m_playSound, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( soundToggled( bool )) ); + connect( m_logToFile, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( loggingToggled( bool )) ); + connect( m_execute, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( executeToggled( bool )) ); + connect( m_messageBox, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( messageBoxChanged() ) ); + connect( m_passivePopup, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( messageBoxChanged() ) ); + connect( m_stderr, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( stderrToggled( bool ) ) ); + connect( m_taskbar, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( taskbarToggled( bool ) ) ); + + connect( m_soundPath, TQ_SIGNAL( textChanged( const TQString& )), + TQ_SLOT( soundFileChanged( const TQString& ))); + connect( m_logfilePath, TQ_SIGNAL( textChanged( const TQString& )), + TQ_SLOT( logfileChanged( const TQString& ) )); + connect( m_executePath, TQ_SIGNAL( textChanged( const TQString& )), + TQ_SLOT( commandlineChanged( const TQString& ) )); + + connect( m_soundPath, TQ_SIGNAL( openFileDialog( KURLRequester * )), + TQ_SLOT( openSoundDialog( KURLRequester * ))); + connect( m_logfilePath, TQ_SIGNAL( openFileDialog( KURLRequester * )), + TQ_SLOT( openLogDialog( KURLRequester * ))); + connect( m_executePath, TQ_SIGNAL( openFileDialog( KURLRequester * )), + TQ_SLOT( openExecDialog( KURLRequester * ))); + + connect( m_extension, TQ_SIGNAL( clicked() ), + TQ_SLOT( toggleAdvanced()) ); + + connect( m_buttonEnable, TQ_SIGNAL( clicked() ), TQ_SLOT( enableAll() )); + connect( m_buttonDisable, TQ_SIGNAL( clicked() ), TQ_SLOT( enableAll() )); TQString whatsThis = i18n("<qt>You may use the following macros<br>" "in the commandline:<br>" @@ -851,8 +851,8 @@ Event * KNotifyWidget::currentEvent() void KNotifyWidget::openSoundDialog( KURLRequester *requester ) { // only need to init this once - requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )), - this, TQT_SLOT( openSoundDialog( KURLRequester * ))); + requester->disconnect( TQ_SIGNAL( openFileDialog( KURLRequester * )), + this, TQ_SLOT( openSoundDialog( KURLRequester * ))); KFileDialog *fileDialog = requester->fileDialog(); fileDialog->setCaption( i18n("Select Sound File") ); @@ -887,8 +887,8 @@ void KNotifyWidget::openSoundDialog( KURLRequester *requester ) void KNotifyWidget::openLogDialog( KURLRequester *requester ) { // only need to init this once - requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )), - this, TQT_SLOT( openLogDialog( KURLRequester * ))); + requester->disconnect( TQ_SIGNAL( openFileDialog( KURLRequester * )), + this, TQ_SLOT( openLogDialog( KURLRequester * ))); KFileDialog *fileDialog = requester->fileDialog(); fileDialog->setCaption( i18n("Select Log File") ); @@ -900,8 +900,8 @@ void KNotifyWidget::openLogDialog( KURLRequester *requester ) void KNotifyWidget::openExecDialog( KURLRequester *requester ) { // only need to init this once - requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )), - this, TQT_SLOT( openExecDialog( KURLRequester * ))); + requester->disconnect( TQ_SIGNAL( openFileDialog( KURLRequester * )), + this, TQ_SLOT( openExecDialog( KURLRequester * ))); KFileDialog *fileDialog = requester->fileDialog(); diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp index 8124db5e5..527f53b51 100644 --- a/tdeio/tdefile/kopenwith.cpp +++ b/tdeio/tdefile/kopenwith.cpp @@ -157,10 +157,10 @@ TDEApplicationTree::TDEApplicationTree( TQWidget *parent ) addDesktopGroup( TQString::null ); cleanupTree(); - connect( this, TQT_SIGNAL( currentChanged(TQListViewItem*) ), - TQT_SLOT( slotItemHighlighted(TQListViewItem*) ) ); - connect( this, TQT_SIGNAL( selectionChanged(TQListViewItem*) ), - TQT_SLOT( slotSelectionChanged(TQListViewItem*) ) ); + connect( this, TQ_SIGNAL( currentChanged(TQListViewItem*) ), + TQ_SLOT( slotItemHighlighted(TQListViewItem*) ) ); + connect( this, TQ_SIGNAL( selectionChanged(TQListViewItem*) ), + TQ_SLOT( slotSelectionChanged(TQListViewItem*) ) ); } // ---------------------------------------------------------------------- @@ -404,7 +404,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) TQToolButton *clearButton = new TQToolButton( this ); clearButton->setIconSet( BarIcon( "locationbar_erase" ) ); clearButton->setFixedSize( clearButton->sizeHint() ); - connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClear() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotClear() ) ); TQToolTip::add( clearButton, i18n( "Clear input field" ) ); hbox->addWidget( clearButton ); @@ -455,23 +455,23 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) edit->comboBox()->setAutoDeleteCompletionObject( true ); } - connect ( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOK()) ); - connect ( edit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged()) ); + connect ( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotOK()) ); + connect ( edit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotTextChanged()) ); m_pTree = new TDEApplicationTree( this ); topLayout->addWidget(m_pTree); - connect( m_pTree, TQT_SIGNAL( selected( const TQString&, const TQString&, const TQString& ) ), - TQT_SLOT( slotSelected( const TQString&, const TQString&, const TQString& ) ) ); - connect( m_pTree, TQT_SIGNAL( highlighted( const TQString&, const TQString&, const TQString& ) ), - TQT_SLOT( slotHighlighted( const TQString&, const TQString&, const TQString& ) ) ); - connect( m_pTree, TQT_SIGNAL( doubleClicked(TQListViewItem*) ), - TQT_SLOT( slotDbClick() ) ); + connect( m_pTree, TQ_SIGNAL( selected( const TQString&, const TQString&, const TQString& ) ), + TQ_SLOT( slotSelected( const TQString&, const TQString&, const TQString& ) ) ); + connect( m_pTree, TQ_SIGNAL( highlighted( const TQString&, const TQString&, const TQString& ) ), + TQ_SLOT( slotHighlighted( const TQString&, const TQString&, const TQString& ) ) ); + connect( m_pTree, TQ_SIGNAL( doubleClicked(TQListViewItem*) ), + TQ_SLOT( slotDbClick() ) ); terminal = new TQCheckBox( i18n("Run in &terminal"), this ); if (bReadOnly) terminal->hide(); - connect(terminal, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTerminalToggled(bool))); + connect(terminal, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTerminalToggled(bool))); topLayout->addWidget(terminal); @@ -509,10 +509,10 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) d->ok = b->addButton( KStdGuiItem::ok() ); d->ok->setDefault( true ); - connect( d->ok, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOK() ) ); + connect( d->ok, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOK() ) ); TQPushButton* cancel = b->addButton( KStdGuiItem::cancel() ); - connect( cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) ); + connect( cancel, TQ_SIGNAL( clicked() ), TQ_SLOT( reject() ) ); b->layout(); topLayout->addWidget( b ); diff --git a/tdeio/tdefile/kpreviewprops.cpp b/tdeio/tdefile/kpreviewprops.cpp index 069746fac..d5288e822 100644 --- a/tdeio/tdefile/kpreviewprops.cpp +++ b/tdeio/tdefile/kpreviewprops.cpp @@ -54,7 +54,7 @@ void KPreviewPropsPlugin::createLayout() preview = new KFileMetaPreview(topframe); tmp->addWidget(preview) ; - connect( properties, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), TQT_SLOT( aboutToShowPage( TQWidget* ) ) ); + connect( properties, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ), TQ_SLOT( aboutToShowPage( TQWidget* ) ) ); } KPreviewPropsPlugin::~KPreviewPropsPlugin() @@ -82,7 +82,7 @@ void KPreviewPropsPlugin::aboutToShowPage( TQWidget* widget ) if ( widget != preview->parent() ) return; - disconnect( properties, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQT_SLOT( aboutToShowPage( TQWidget* ) ) ); + disconnect( properties, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQ_SLOT( aboutToShowPage( TQWidget* ) ) ); preview->showPreview(properties->item()->url()); } diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp index c4be31d02..e226996e3 100644 --- a/tdeio/tdefile/kpropertiesdialog.cpp +++ b/tdeio/tdefile/kpropertiesdialog.cpp @@ -372,8 +372,8 @@ KPropertiesDialog::~KPropertiesDialog() void KPropertiesDialog::insertPlugin (KPropsDlgPlugin* plugin) { - connect (plugin, TQT_SIGNAL (changed ()), - plugin, TQT_SLOT (setDirty ())); + connect (plugin, TQ_SIGNAL (changed ()), + plugin, TQ_SLOT (setDirty ())); m_pageList.append (plugin); } @@ -890,8 +890,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) } iconButton->setIcon(iconStr); iconArea = iconButton; - connect( iconButton, TQT_SIGNAL( iconChanged(TQString) ), - this, TQT_SLOT( slotIconChanged() ) ); + connect( iconButton, TQ_SIGNAL( iconChanged(TQString) ), + this, TQ_SLOT( slotIconChanged() ) ); } else { TQLabel *iconLabel = new TQLabel( d->m_frame ); int bsize = 66 + 2 * iconLabel->style().pixelMetric(TQStyle::PM_ButtonMargin); @@ -935,8 +935,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) d->m_lined->setSelection(0, lastDot); } - connect( d->m_lined, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( nameFileChanged(const TQString & ) ) ); + connect( d->m_lined, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( nameFileChanged(const TQString & ) ) ); } grid->addWidget(nameArea, curRow++, 2); @@ -969,7 +969,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) else TQToolTip::add(button, i18n("Edit file type")); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFileType() )); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFileType() )); if (!kapp->authorizeTDEAction("editfiletype")) button->hide(); @@ -1024,8 +1024,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) // buttons m_sizeDetermineButton = new TQPushButton( i18n("Calculate"), d->m_frame ); m_sizeStopButton = new TQPushButton( i18n("Stop"), d->m_frame ); - connect( m_sizeDetermineButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSizeDetermine() ) ); - connect( m_sizeStopButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSizeStop() ) ); + connect( m_sizeDetermineButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSizeDetermine() ) ); + connect( m_sizeStopButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSizeStop() ) ); sizelay->addWidget(m_sizeDetermineButton, 0); sizelay->addWidget(m_sizeStopButton, 0); sizelay->addStretch(10); // so that the buttons don't grow horizontally @@ -1110,9 +1110,9 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addWidget( d->m_freeSpaceLabel, curRow++, 2 ); KDiskFreeSp * job = new KDiskFreeSp; - connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, + connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ), - this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, + this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ) ); job->readDF( mountPoint ); } @@ -1274,11 +1274,11 @@ void KFilePropsPlugin::slotSizeDetermine() kdDebug(250) << " URL=" << properties->item()->url().url() << endl; d->dirSizeJob = KDirSize::dirSizeJob( properties->items() ); d->dirSizeUpdateTimer = new TQTimer(this); - connect( d->dirSizeUpdateTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( slotDirSizeUpdate() ) ); + connect( d->dirSizeUpdateTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( slotDirSizeUpdate() ) ); d->dirSizeUpdateTimer->start(500); - connect( d->dirSizeJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotDirSizeFinished( TDEIO::Job * ) ) ); + connect( d->dirSizeJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotDirSizeFinished( TDEIO::Job * ) ) ); m_sizeStopButton->setEnabled(true); m_sizeDetermineButton->setEnabled(false); @@ -1291,9 +1291,9 @@ void KFilePropsPlugin::slotSizeDetermine() TQString mountPoint = TDEIO::findPathMountPoint( url.path() ); KDiskFreeSp * job = new KDiskFreeSp; - connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, + connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ), - this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, + this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ) ); job->readDF( mountPoint ); } @@ -1379,10 +1379,10 @@ void KFilePropsPlugin::applyChanges() job = TDEIO::copy( oldurl, properties->kurl() ); } - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL &, const KURL & ) ), - TQT_SLOT( slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotCopyFinished( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( renamed( TDEIO::Job *, const KURL &, const KURL & ) ), + TQ_SLOT( slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ) ) ); // wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -1698,7 +1698,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr l = d->ownerPermCombo = new TQComboBox(gb); lbl->setBuddy(l); gl->addWidget(l, 1, 1); - connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() )); + connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() )); TQWhatsThis::add(l, i18n("Specifies the actions that the owner is allowed to do.")); lbl = new TQLabel( i18n("Gro&up:"), gb); @@ -1706,7 +1706,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr l = d->groupPermCombo = new TQComboBox(gb); lbl->setBuddy(l); gl->addWidget(l, 2, 1); - connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() )); + connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() )); TQWhatsThis::add(l, i18n("Specifies the actions that the members of the group are allowed to do.")); lbl = new TQLabel( i18n("O&thers:"), gb); @@ -1714,7 +1714,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr l = d->othersPermCombo = new TQComboBox(gb); lbl->setBuddy(l); gl->addWidget(l, 3, 1); - connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() )); + connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() )); TQWhatsThis::add(l, i18n("Specifies the actions that all users, who are neither " "owner nor in the group, are allowed to do.")); @@ -1723,7 +1723,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr i18n("Only own&er can rename and delete folder content") : i18n("Is &executable"), gb ); - connect( d->extraCheckbox, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( changed() ) ); + connect( d->extraCheckbox, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( changed() ) ); gl->addWidget(l, 4, 1); TQWhatsThis::add(l, hasDir ? i18n("Enable this option to allow only the folder's owner to " "delete or rename the contained files and folders. Other " @@ -1738,7 +1738,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr pbAdvancedPerm = new TQPushButton(i18n("A&dvanced Permissions"), gb); gl->addMultiCellWidget(pbAdvancedPerm, 6, 6, 0, 1, TQt::AlignRight); - connect(pbAdvancedPerm, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowAdvancedPermissions() )); + connect(pbAdvancedPerm, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotShowAdvancedPermissions() )); } else d->extraCheckbox = 0; @@ -1781,8 +1781,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr TDEGlobalSettings::CompletionNone); usrEdit->setText(strOwner); gl->addWidget(usrEdit, 1, 1); - connect( usrEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); + connect( usrEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); } else { @@ -1863,8 +1863,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr grpEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto); grpEdit->setText(strGroup); gl->addWidget(grpEdit, 2, 1); - connect( grpEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); + connect( grpEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); } else if ((groupList.count() > 1) && isMyFile && isLocal) { @@ -1872,8 +1872,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr grpCombo->insertStringList(groupList); grpCombo->setCurrentItem(groupList.findIndex(strGroup)); gl->addWidget(grpCombo, 2, 1); - connect( grpCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SIGNAL( changed() ) ); + connect( grpCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SIGNAL( changed() ) ); } else { @@ -1887,7 +1887,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr if ( hasDir && !isLink && !isTrash ) { d->cbRecursive = new TQCheckBox( i18n("Apply changes to all subfolders and their contents"), d->m_frame ); - connect( d->cbRecursive, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( changed() ) ); + connect( d->cbRecursive, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( changed() ) ); box->addWidget( d->cbRecursive ); } @@ -2553,8 +2553,8 @@ void KFilePermissionsPropsPlugin::applyChanges() if ( defaultACLChange && d->fileSystemSupportsACLs ) job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotChmodResult( TDEIO::Job * ) ) ); // Wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -2569,8 +2569,8 @@ void KFilePermissionsPropsPlugin::applyChanges() if ( defaultACLChange && d->fileSystemSupportsACLs ) job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotChmodResult( TDEIO::Job * ) ) ); // Wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -2641,8 +2641,8 @@ KURLPropsPlugin::KURLPropsPlugin( KPropertiesDialog *_props ) URLEdit->setURL( URLStr ); } - connect( URLEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); + connect( URLEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); layout->addStretch (1); } @@ -2798,14 +2798,14 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl else cbAutoEmbed->setNoChange(); - connect( patternEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( mimeEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( cbAutoEmbed, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); + connect( patternEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( mimeEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( cbAutoEmbed, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); } KBindingPropsPlugin::~KBindingPropsPlugin() @@ -2924,8 +2924,8 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP device = new TQComboBox( true, d->m_frame, "ComboBox_device" ); device->insertStringList( devices ); layout->addWidget(device, 0, 1); - connect( device, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotActivated( int ) ) ); + connect( device, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotActivated( int ) ) ); readonly = new TQCheckBox( d->m_frame, "CheckBox_readonly" ); readonly->setText( i18n("Read only") ); @@ -3018,17 +3018,17 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP unmounted->setIcon( unmountedStr ); - connect( device, TQT_SIGNAL( activated( int ) ), - this, TQT_SIGNAL( changed() ) ); - connect( device, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( readonly, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( unmounted, TQT_SIGNAL( iconChanged( TQString ) ), - this, TQT_SIGNAL( changed() ) ); + connect( device, TQ_SIGNAL( activated( int ) ), + this, TQ_SIGNAL( changed() ) ); + connect( device, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( readonly, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( unmounted, TQ_SIGNAL( iconChanged( TQString ) ), + this, TQ_SIGNAL( changed() ) ); - connect( device, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotDeviceChanged() ) ); + connect( device, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotDeviceChanged() ) ); processLockouts(); } @@ -3065,9 +3065,9 @@ void KDevicePropsPlugin::updateInfo() if ( !mountpoint->text().isEmpty() ) { KDiskFreeSp * job = new KDiskFreeSp; - connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, + connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ), - this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, + this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ) ); job->readDF( mountpoint->text() ); @@ -3187,16 +3187,16 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props ) w->pathEdit->setMode(KFile::Directory | KFile::LocalOnly); w->pathEdit->lineEdit()->setAcceptDrops(false); - connect( w->nameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - connect( w->genNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - connect( w->commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - connect( w->commandEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - connect( w->pathEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); + connect( w->nameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + connect( w->genNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + connect( w->commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + connect( w->commandEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + connect( w->pathEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); - connect( w->browseButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowseExec() ) ); - connect( w->addFiletypeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddFiletype() ) ); - connect( w->delFiletypeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDelFiletype() ) ); - connect( w->advancedButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdvanced() ) ); + connect( w->browseButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBrowseExec() ) ); + connect( w->addFiletypeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddFiletype() ) ); + connect( w->delFiletypeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelFiletype() ) ); + connect( w->advancedButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdvanced() ) ); // now populate the page TQString path = _props->kurl().path(); @@ -3313,10 +3313,10 @@ void KDesktopPropsPlugin::slotAddFiletype() mw->listView->setFullWidth(true); mw->listView->setMinimumSize(500,400); - connect(mw->listView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectMimetype())); - connect(mw->listView, TQT_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), - &dlg, TQT_SLOT( slotOk())); + connect(mw->listView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectMimetype())); + connect(mw->listView, TQ_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), + &dlg, TQ_SLOT( slotOk())); TQMap<TQString,TQListViewItem*> majorMap; TQListViewItem *majorGroup; @@ -3577,22 +3577,22 @@ void KDesktopPropsPlugin::slotAdvanced() delete kcom; } - connect( w->terminalEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->terminalCloseCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->terminalCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->suidCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->suidEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->startupInfoCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->systrayCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->dcopCombo, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SIGNAL( changed() ) ); + connect( w->terminalEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->terminalCloseCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->terminalCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->suidCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->suidEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->startupInfoCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->systrayCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->dcopCombo, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SIGNAL( changed() ) ); if ( dlg.exec() == TQDialog::Accepted ) { @@ -3851,27 +3851,27 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) delete kcom; } - connect( swallowExecEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( swallowTitleEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( execEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( terminalEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); + connect( swallowExecEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( swallowTitleEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( execEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( terminalEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); if (d->nocloseonexitCheck) - connect( d->nocloseonexitCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( terminalCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( suidCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( suidEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - - connect( execBrowse, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowseExec() ) ); - connect( terminalCheck, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableCheckedEdit() ) ); - connect( suidCheck, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableSuidEdit() ) ); + connect( d->nocloseonexitCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( terminalCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( suidCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( suidEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + + connect( execBrowse, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBrowseExec() ) ); + connect( terminalCheck, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableCheckedEdit() ) ); + connect( suidCheck, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableSuidEdit() ) ); } @@ -3988,15 +3988,15 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props addExtensionButton->setIconSet( iconSet ); pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); addExtensionButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - connect( addExtensionButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotAddExtension() ) ); + connect( addExtensionButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotAddExtension() ) ); delExtensionButton = new TQPushButton( TQString::null, d->m_frame ); iconSet = SmallIconSet( "forward" ); delExtensionButton->setIconSet( iconSet ); delExtensionButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - connect( delExtensionButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotDelExtension() ) ); + connect( delExtensionButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotDelExtension() ) ); TQLabel *l; @@ -4092,26 +4092,26 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props updateButton(); - connect( extensionsList, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SLOT( updateButton() ) ); - connect( availableExtensionsList, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SLOT( updateButton() ) ); + connect( extensionsList, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SLOT( updateButton() ) ); + connect( availableExtensionsList, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SLOT( updateButton() ) ); - connect( addExtensionButton, TQT_SIGNAL( clicked() ), - this, TQT_SIGNAL( changed() ) ); - connect( delExtensionButton, TQT_SIGNAL( clicked() ), - this, TQT_SIGNAL( changed() ) ); + connect( addExtensionButton, TQ_SIGNAL( clicked() ), + this, TQ_SIGNAL( changed() ) ); + connect( delExtensionButton, TQ_SIGNAL( clicked() ), + this, TQ_SIGNAL( changed() ) ); if ( nameEdit ) - connect( nameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( genNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( availableExtensionsList, TQT_SIGNAL( selected( int ) ), - this, TQT_SIGNAL( changed() ) ); - connect( extensionsList, TQT_SIGNAL( selected( int ) ), - this, TQT_SIGNAL( changed() ) ); + connect( nameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( genNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( availableExtensionsList, TQ_SIGNAL( selected( int ) ), + this, TQ_SIGNAL( changed() ) ); + connect( extensionsList, TQ_SIGNAL( selected( int ) ), + this, TQ_SIGNAL( changed() ) ); } TDEApplicationPropsPlugin::~TDEApplicationPropsPlugin() diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp index d893faf4f..fa6d8ea47 100644 --- a/tdeio/tdefile/kurlbar.cpp +++ b/tdeio/tdefile/kurlbar.cpp @@ -412,15 +412,15 @@ void KURLBar::setListBox( KURLBarListBox *view ) paletteChange( palette() ); m_listBox->setFocusPolicy( TQWidget::TabFocus ); - connect( m_listBox, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), - TQT_SLOT( slotSelected( int, TQListBoxItem * ))); - connect( m_listBox, TQT_SIGNAL( dropped( TQDropEvent * )), - this, TQT_SLOT( slotDropped( TQDropEvent * ))); - connect( m_listBox, TQT_SIGNAL( contextMenuRequested( TQListBoxItem *, + connect( m_listBox, TQ_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), + TQ_SLOT( slotSelected( int, TQListBoxItem * ))); + connect( m_listBox, TQ_SIGNAL( dropped( TQDropEvent * )), + this, TQ_SLOT( slotDropped( TQDropEvent * ))); + connect( m_listBox, TQ_SIGNAL( contextMenuRequested( TQListBoxItem *, const TQPoint& )), - TQT_SLOT( slotContextMenuRequested( TQListBoxItem *, const TQPoint& ))); - connect( m_listBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), - TQT_SLOT( slotSelected( TQListBoxItem * ) )); + TQ_SLOT( slotContextMenuRequested( TQListBoxItem *, const TQPoint& ))); + connect( m_listBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), + TQ_SLOT( slotSelected( TQListBoxItem * ) )); } void KURLBar::setIconSize( int size ) @@ -985,7 +985,7 @@ KURLBarItemDialog::KURLBarItemDialog( bool allowGlobal, const KURL& url, } else m_appLocal = 0L; - connect(m_urlEdit->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(urlChanged(const TQString & ))); + connect(m_urlEdit->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(urlChanged(const TQString & ))); m_edit->setFocus(); setMainWidget( box ); } diff --git a/tdeio/tdefile/kurlcombobox.cpp b/tdeio/tdefile/kurlcombobox.cpp index 66fe8efb8..f19dbe961 100644 --- a/tdeio/tdefile/kurlcombobox.cpp +++ b/tdeio/tdefile/kurlcombobox.cpp @@ -74,7 +74,7 @@ void KURLComboBox::init( Mode mode ) opendirPix = SmallIcon(TQString::fromLatin1("folder_open")); - connect( this, TQT_SIGNAL( activated( int )), TQT_SLOT( slotActivated( int ))); + connect( this, TQ_SIGNAL( activated( int )), TQ_SLOT( slotActivated( int ))); } diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp index a28512c13..aa88c34b7 100644 --- a/tdeio/tdefile/kurlrequester.cpp +++ b/tdeio/tdefile/kurlrequester.cpp @@ -116,12 +116,12 @@ public: else sender = edit; - connect( sender, TQT_SIGNAL( textChanged( const TQString& )), - receiver, TQT_SIGNAL( textChanged( const TQString& ))); - connect( sender, TQT_SIGNAL( returnPressed() ), - receiver, TQT_SIGNAL( returnPressed() )); - connect( sender, TQT_SIGNAL( returnPressed( const TQString& ) ), - receiver, TQT_SIGNAL( returnPressed( const TQString& ) )); + connect( sender, TQ_SIGNAL( textChanged( const TQString& )), + receiver, TQ_SIGNAL( textChanged( const TQString& ))); + connect( sender, TQ_SIGNAL( returnPressed() ), + receiver, TQ_SIGNAL( returnPressed() )); + connect( sender, TQ_SIGNAL( returnPressed( const TQString& ) ), + receiver, TQ_SIGNAL( returnPressed( const TQString& ) )); } void setCompletionObject( TDECompletion *comp ) { @@ -212,7 +212,7 @@ void KURLRequester::init() myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); TQToolTip::add(myButton, i18n("Open file dialog")); - connect( myButton, TQT_SIGNAL( pressed() ), TQT_SLOT( slotUpdateURL() )); + connect( myButton, TQ_SIGNAL( pressed() ), TQ_SLOT( slotUpdateURL() )); setSpacing( KDialog::spacingHint() ); @@ -221,13 +221,13 @@ void KURLRequester::init() setFocusProxy( widget ); d->connectSignals( this ); - connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpenDialog() )); + connect( myButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenDialog() )); myCompletion = new KURLCompletion(); d->setCompletionObject( myCompletion ); TDEAccel *accel = new TDEAccel( this ); - accel->insert( TDEStdAccel::Open, this, TQT_SLOT( slotOpenDialog() )); + accel->insert( TDEStdAccel::Open, this, TQ_SLOT( slotOpenDialog() )); accel->readSettings(); } diff --git a/tdeio/tdefile/kurlrequesterdlg.cpp b/tdeio/tdefile/kurlrequesterdlg.cpp index 9f2ea9d46..a5ad1f07d 100644 --- a/tdeio/tdefile/kurlrequesterdlg.cpp +++ b/tdeio/tdefile/kurlrequesterdlg.cpp @@ -70,8 +70,8 @@ void KURLRequesterDlg::initDialog(const TQString &text,const TQString &urlName) urlRequester_->setMinimumWidth( urlRequester_->sizeHint().width() * 3 ); topLayout->addWidget( urlRequester_ ); urlRequester_->setFocus(); - connect( urlRequester_->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotTextChanged(const TQString&)) ); + connect( urlRequester_->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotTextChanged(const TQString&)) ); bool state = !urlName.isEmpty(); enableButtonOK( state ); enableButton( KDialogBase::User1, state ); @@ -80,7 +80,7 @@ void KURLRequesterDlg::initDialog(const TQString &text,const TQString &urlName) KFile::ExistingOnly ); urlRequester_->setMode( mode ); */ - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotClear() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotClear() ) ); } void KURLRequesterDlg::slotTextChanged(const TQString & text) diff --git a/tdeio/tdefile/tdediroperator.cpp b/tdeio/tdefile/tdediroperator.cpp index 8d9a27962..9bf947f20 100644 --- a/tdeio/tdefile/tdediroperator.cpp +++ b/tdeio/tdefile/tdediroperator.cpp @@ -124,16 +124,16 @@ KDirOperator::KDirOperator(const KURL& _url, setDirLister( new KDirLister( true ) ); - connect(&myCompletion, TQT_SIGNAL(match(const TQString&)), - TQT_SLOT(slotCompletionMatch(const TQString&))); + connect(&myCompletion, TQ_SIGNAL(match(const TQString&)), + TQ_SLOT(slotCompletionMatch(const TQString&))); progress = new KProgress(this, "progress"); progress->adjustSize(); progress->move(2, height() - progress->height() -2); d->progressDelayTimer = new TQTimer( this, "progress delay timer" ); - connect( d->progressDelayTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( slotShowProgress() )); + connect( d->progressDelayTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( slotShowProgress() )); myCompleteListDirty = false; @@ -192,10 +192,10 @@ void KDirOperator::insertViewDependentActions() { if (viewActionCollection) { - disconnect( viewActionCollection, TQT_SIGNAL( inserted( TDEAction * )), - this, TQT_SLOT( slotViewActionAdded( TDEAction * ))); - disconnect( viewActionCollection, TQT_SIGNAL( removed( TDEAction * )), - this, TQT_SLOT( slotViewActionRemoved( TDEAction * ))); + disconnect( viewActionCollection, TQ_SIGNAL( inserted( TDEAction * )), + this, TQ_SLOT( slotViewActionAdded( TDEAction * ))); + disconnect( viewActionCollection, TQ_SIGNAL( removed( TDEAction * )), + this, TQ_SLOT( slotViewActionRemoved( TDEAction * ))); } viewActionMenu->popupMenu()->clear(); @@ -237,10 +237,10 @@ void KDirOperator::insertViewDependentActions() } } - connect( viewActionCollection, TQT_SIGNAL( inserted( TDEAction * )), - TQT_SLOT( slotViewActionAdded( TDEAction * ))); - connect( viewActionCollection, TQT_SIGNAL( removed( TDEAction * )), - TQT_SLOT( slotViewActionRemoved( TDEAction * ))); + connect( viewActionCollection, TQ_SIGNAL( inserted( TDEAction * )), + TQ_SLOT( slotViewActionAdded( TDEAction * ))); + connect( viewActionCollection, TQ_SIGNAL( removed( TDEAction * )), + TQ_SLOT( slotViewActionRemoved( TDEAction * ))); } } @@ -1050,18 +1050,18 @@ void KDirOperator::connectView(KFileView *view) viewActionCollection = 0L; KFileViewSignaler *sig = view->signaler(); - connect(sig, TQT_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ) ), - this, TQT_SLOT( activatedMenu(const KFileItem *, const TQPoint& ))); - connect(sig, TQT_SIGNAL( dirActivated(const KFileItem *) ), - this, TQT_SLOT( selectDir(const KFileItem*) ) ); - connect(sig, TQT_SIGNAL( fileSelected(const KFileItem *) ), - this, TQT_SLOT( selectFile(const KFileItem*) ) ); - connect(sig, TQT_SIGNAL( fileHighlighted(const KFileItem *) ), - this, TQT_SLOT( highlightFile(const KFileItem*) )); - connect(sig, TQT_SIGNAL( sortingChanged( TQDir::SortSpec ) ), - this, TQT_SLOT( slotViewSortingChanged( TQDir::SortSpec ))); - connect(sig, TQT_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ), - this, TQT_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&)) ); + connect(sig, TQ_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ) ), + this, TQ_SLOT( activatedMenu(const KFileItem *, const TQPoint& ))); + connect(sig, TQ_SIGNAL( dirActivated(const KFileItem *) ), + this, TQ_SLOT( selectDir(const KFileItem*) ) ); + connect(sig, TQ_SIGNAL( fileSelected(const KFileItem *) ), + this, TQ_SLOT( selectFile(const KFileItem*) ) ); + connect(sig, TQ_SIGNAL( fileHighlighted(const KFileItem *) ), + this, TQ_SLOT( highlightFile(const KFileItem*) )); + connect(sig, TQ_SIGNAL( sortingChanged( TQDir::SortSpec ) ), + this, TQ_SLOT( slotViewSortingChanged( TQDir::SortSpec ))); + connect(sig, TQ_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ), + this, TQ_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&)) ); if ( reverseAction->isChecked() != m_fileView->isReversed() ) slotSortReversed(); @@ -1124,20 +1124,20 @@ void KDirOperator::setDirLister( KDirLister *lister ) dir->setMainWindow (mainWidget); kdDebug (tdefile_area) << "mainWidget=" << mainWidget << endl; - connect( dir, TQT_SIGNAL( percent( int )), - TQT_SLOT( slotProgress( int ) )); - connect( dir, TQT_SIGNAL(started( const KURL& )), TQT_SLOT(slotStarted())); - connect( dir, TQT_SIGNAL(newItems(const KFileItemList &)), - TQT_SLOT(insertNewFiles(const KFileItemList &))); - connect( dir, TQT_SIGNAL(completed()), TQT_SLOT(slotIOFinished())); - connect( dir, TQT_SIGNAL(canceled()), TQT_SLOT(slotCanceled())); - connect( dir, TQT_SIGNAL(deleteItem(KFileItem *)), - TQT_SLOT(itemDeleted(KFileItem *))); - connect( dir, TQT_SIGNAL(redirection( const KURL& )), - TQT_SLOT( slotRedirected( const KURL& ))); - connect( dir, TQT_SIGNAL( clear() ), TQT_SLOT( slotClearView() )); - connect( dir, TQT_SIGNAL( refreshItems( const KFileItemList& ) ), - TQT_SLOT( slotRefreshItems( const KFileItemList& ) ) ); + connect( dir, TQ_SIGNAL( percent( int )), + TQ_SLOT( slotProgress( int ) )); + connect( dir, TQ_SIGNAL(started( const KURL& )), TQ_SLOT(slotStarted())); + connect( dir, TQ_SIGNAL(newItems(const KFileItemList &)), + TQ_SLOT(insertNewFiles(const KFileItemList &))); + connect( dir, TQ_SIGNAL(completed()), TQ_SLOT(slotIOFinished())); + connect( dir, TQ_SIGNAL(canceled()), TQ_SLOT(slotCanceled())); + connect( dir, TQ_SIGNAL(deleteItem(KFileItem *)), + TQ_SLOT(itemDeleted(KFileItem *))); + connect( dir, TQ_SIGNAL(redirection( const KURL& )), + TQ_SLOT( slotRedirected( const KURL& ))); + connect( dir, TQ_SIGNAL( clear() ), TQ_SLOT( slotClearView() )); + connect( dir, TQ_SIGNAL( refreshItems( const KFileItemList& ) ), + TQ_SLOT( slotRefreshItems( const KFileItemList& ) ) ); } void KDirOperator::insertNewFiles(const KFileItemList &newone) @@ -1163,7 +1163,7 @@ void KDirOperator::insertNewFiles(const KFileItemList &newone) ++it; } - TQTimer::singleShot(200, this, TQT_SLOT(resetCursor())); + TQTimer::singleShot(200, this, TQ_SLOT(resetCursor())); } void KDirOperator::selectDir(const KFileItem *item) @@ -1256,23 +1256,23 @@ void KDirOperator::setupActions() myActionCollection = new TDEActionCollection( topLevelWidget(), this, "KDirOperator::myActionCollection" ); actionMenu = new TDEActionMenu( i18n("Menu"), myActionCollection, "popupMenu" ); - upAction = KStdAction::up( this, TQT_SLOT( cdUp() ), myActionCollection, "up" ); + upAction = KStdAction::up( this, TQ_SLOT( cdUp() ), myActionCollection, "up" ); upAction->setText( i18n("Parent Folder") ); - backAction = KStdAction::back( this, TQT_SLOT( back() ), myActionCollection, "back" ); - forwardAction = KStdAction::forward( this, TQT_SLOT(forward()), myActionCollection, "forward" ); - homeAction = KStdAction::home( this, TQT_SLOT( home() ), myActionCollection, "home" ); + backAction = KStdAction::back( this, TQ_SLOT( back() ), myActionCollection, "back" ); + forwardAction = KStdAction::forward( this, TQ_SLOT(forward()), myActionCollection, "forward" ); + homeAction = KStdAction::home( this, TQ_SLOT( home() ), myActionCollection, "home" ); homeAction->setText(i18n("Home Folder")); - reloadAction = KStdAction::redisplay( this, TQT_SLOT(rereadDir()), myActionCollection, "reload" ); + reloadAction = KStdAction::redisplay( this, TQ_SLOT(rereadDir()), myActionCollection, "reload" ); actionSeparator = new TDEActionSeparator( myActionCollection, "separator" ); d->viewActionSeparator = new TDEActionSeparator( myActionCollection, "viewActionSeparator" ); mkdirAction = new TDEAction( i18n("New Folder..."), 0, - this, TQT_SLOT( mkdir() ), myActionCollection, "mkdir" ); + this, TQ_SLOT( mkdir() ), myActionCollection, "mkdir" ); TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" ); - connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + connect( trash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQ_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) ); new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, this, - TQT_SLOT( deleteSelected() ), myActionCollection, "delete" ); + TQ_SLOT( deleteSelected() ), myActionCollection, "delete" ); mkdirAction->setIcon( TQString::fromLatin1("folder-new") ); reloadAction->setText( i18n("Reload") ); reloadAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Reload )); @@ -1281,16 +1281,16 @@ void KDirOperator::setupActions() // the sort menu actions sortActionMenu = new TDEActionMenu( i18n("Sorting"), myActionCollection, "sorting menu"); byNameAction = new TDERadioAction( i18n("By Name"), 0, - this, TQT_SLOT( slotSortByName() ), + this, TQ_SLOT( slotSortByName() ), myActionCollection, "by name" ); byDateAction = new TDERadioAction( i18n("By Date"), 0, - this, TQT_SLOT( slotSortByDate() ), + this, TQ_SLOT( slotSortByDate() ), myActionCollection, "by date" ); bySizeAction = new TDERadioAction( i18n("By Size"), 0, - this, TQT_SLOT( slotSortBySize() ), + this, TQ_SLOT( slotSortBySize() ), myActionCollection, "by size" ); reverseAction = new TDEToggleAction( i18n("Reverse"), 0, - this, TQT_SLOT( slotSortReversed() ), + this, TQ_SLOT( slotSortReversed() ), myActionCollection, "reversed" ); TQString sortGroup = TQString::fromLatin1("sort"); @@ -1304,17 +1304,17 @@ void KDirOperator::setupActions() caseInsensitiveAction = new TDEToggleAction(i18n("Case Insensitive"), 0, myActionCollection, "case insensitive" ); - connect( dirsFirstAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotToggleDirsFirst() )); - connect( caseInsensitiveAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotToggleIgnoreCase() )); + connect( dirsFirstAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotToggleDirsFirst() )); + connect( caseInsensitiveAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotToggleIgnoreCase() )); // the view menu actions viewActionMenu = new TDEActionMenu( i18n("&View"), myActionCollection, "view menu" ); - connect( viewActionMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( insertViewDependentActions() )); + connect( viewActionMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( insertViewDependentActions() )); shortAction = new TDERadioAction( i18n("Short View"), "view_multicolumn", TDEShortcut(), myActionCollection, "short view" ); @@ -1326,30 +1326,30 @@ void KDirOperator::setupActions() // showHiddenAction->setCheckedState( i18n("Hide Hidden Files") ); separateDirsAction = new TDEToggleAction( i18n("Separate Folders"), TDEShortcut(), this, - TQT_SLOT(slotSeparateDirs()), + TQ_SLOT(slotSeparateDirs()), myActionCollection, "separate dirs" ); TDEToggleAction *previewAction = new TDEToggleAction(i18n("Show Preview"), "thumbnail", TDEShortcut(), myActionCollection, "preview" ); previewAction->setCheckedState(i18n("Hide Preview")); - connect( previewAction, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( togglePreview( bool ))); + connect( previewAction, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( togglePreview( bool ))); TQString viewGroup = TQString::fromLatin1("view"); shortAction->setExclusiveGroup( viewGroup ); detailedAction->setExclusiveGroup( viewGroup ); - connect( shortAction, TQT_SIGNAL( activated() ), - TQT_SLOT( slotSimpleView() )); - connect( detailedAction, TQT_SIGNAL( activated() ), - TQT_SLOT( slotDetailedView() )); - connect( showHiddenAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotToggleHidden( bool ) )); + connect( shortAction, TQ_SIGNAL( activated() ), + TQ_SLOT( slotSimpleView() )); + connect( detailedAction, TQ_SIGNAL( activated() ), + TQ_SLOT( slotDetailedView() )); + connect( showHiddenAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotToggleHidden( bool ) )); new TDEAction( i18n("Properties"), TDEShortcut(ALT+Key_Return), this, - TQT_SLOT(slotProperties()), myActionCollection, "properties" ); + TQ_SLOT(slotProperties()), myActionCollection, "properties" ); } void KDirOperator::setupMenu() diff --git a/tdeio/tdefile/tdediroperator.h b/tdeio/tdefile/tdediroperator.h index 74abdd585..89b1a1709 100644 --- a/tdeio/tdefile/tdediroperator.h +++ b/tdeio/tdefile/tdediroperator.h @@ -72,14 +72,14 @@ namespace TDEIO { * \code * KDirOperator *op = new KDirOperator( KURL( "file:/home/gis" ), this ); * // some signals you might be interested in - * connect(op, TQT_SIGNAL(urlEntered(const KURL&)), - * TQT_SLOT(urlEntered(const KURL&))); - * connect(op, TQT_SIGNAL(fileHighlighted(const KFileItem *)), - * TQT_SLOT(fileHighlighted(const KFileItem *))); - * connect(op, TQT_SIGNAL(fileSelected(const KFileItem *)), - * TQT_SLOT(fileSelected(const KFileItem *))); - * connect(op, TQT_SIGNAL(finishedLoading()), - * TQT_SLOT(slotLoadingFinished())); + * connect(op, TQ_SIGNAL(urlEntered(const KURL&)), + * TQ_SLOT(urlEntered(const KURL&))); + * connect(op, TQ_SIGNAL(fileHighlighted(const KFileItem *)), + * TQ_SLOT(fileHighlighted(const KFileItem *))); + * connect(op, TQ_SIGNAL(fileSelected(const KFileItem *)), + * TQ_SLOT(fileSelected(const KFileItem *))); + * connect(op, TQ_SIGNAL(finishedLoading()), + * TQ_SLOT(slotLoadingFinished())); * * op->readConfig( TDEGlobal::config(), "Your KDiroperator ConfigGroup" ); * op->setView(KFile::Default); diff --git a/tdeio/tdefile/tdefiledetailview.cpp b/tdeio/tdefile/tdefiledetailview.cpp index 724d20218..321684ac7 100644 --- a/tdeio/tdefile/tdefiledetailview.cpp +++ b/tdeio/tdefile/tdefiledetailview.cpp @@ -72,21 +72,21 @@ KFileDetailView::KFileDetailView(TQWidget *parent, const char *name) setAllColumnsShowFocus( true ); setDragEnabled(true); - connect( header(), TQT_SIGNAL( clicked(int)), - TQT_SLOT(slotSortingChanged(int) )); + connect( header(), TQ_SIGNAL( clicked(int)), + TQ_SLOT(slotSortingChanged(int) )); - connect( this, TQT_SIGNAL( returnPressed(TQListViewItem *) ), - TQT_SLOT( slotActivate( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( returnPressed(TQListViewItem *) ), + TQ_SLOT( slotActivate( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( clicked(TQListViewItem *, const TQPoint&, int)), - TQT_SLOT( selected( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint&, int)), - TQT_SLOT( slotActivate( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( clicked(TQListViewItem *, const TQPoint&, int)), + TQ_SLOT( selected( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint&, int)), + TQ_SLOT( slotActivate( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *, + connect( this, TQ_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT( slotActivateMenu( TQListViewItem *, const TQPoint& ))); + this, TQ_SLOT( slotActivateMenu( TQListViewItem *, const TQPoint& ))); KFile::SelectionMode sm = KFileView::selectionMode(); switch ( sm ) { @@ -107,15 +107,15 @@ KFileDetailView::KFileDetailView(TQWidget *parent, const char *name) // for highlighting if ( sm == KFile::Multi || sm == KFile::Extended ) - connect( this, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); else - connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - TQT_SLOT( highlighted( TQListViewItem * ) )); + connect( this, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + TQ_SLOT( highlighted( TQListViewItem * ) )); // DND - connect( &(d->autoOpenTimer), TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoOpen() )); + connect( &(d->autoOpenTimer), TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoOpen() )); setSorting( sorting() ); @@ -253,8 +253,8 @@ void KFileDetailView::highlighted( TQListViewItem *item ) void KFileDetailView::setSelectionMode( KFile::SelectionMode sm ) { - disconnect( this, TQT_SIGNAL( selectionChanged() )); - disconnect( this, TQT_SIGNAL( selectionChanged( TQListViewItem * ) )); + disconnect( this, TQ_SIGNAL( selectionChanged() )); + disconnect( this, TQ_SIGNAL( selectionChanged( TQListViewItem * ) )); KFileView::setSelectionMode( sm ); @@ -275,11 +275,11 @@ void KFileDetailView::setSelectionMode( KFile::SelectionMode sm ) } if ( sm == KFile::Multi || sm == KFile::Extended ) - connect( this, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); else - connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem * )), - TQT_SLOT( highlighted( TQListViewItem * ))); + connect( this, TQ_SIGNAL( selectionChanged( TQListViewItem * )), + TQ_SLOT( highlighted( TQListViewItem * ))); } bool KFileDetailView::isSelected( const KFileItem *i ) const diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp index 1b12e8a5b..e5cb4c3e4 100644 --- a/tdeio/tdefile/tdefiledialog.cpp +++ b/tdeio/tdefile/tdefiledialog.cpp @@ -561,8 +561,8 @@ void KFileDialog::slotOk() job->setWindow (topLevelWidget()); TDEIO::Scheduler::scheduleJob( job ); d->statJobs.append( job ); - 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; } @@ -570,7 +570,7 @@ void KFileDialog::slotOk() job = TDEIO::stat(d->url,!d->url.isLocalFile()); job->setWindow (topLevelWidget()); d->statJobs.append( job ); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotStatResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotStatResult(TDEIO::Job*))); } @@ -770,11 +770,11 @@ void KFileDialog::setLocationText( const TQString& text ) // setCurrentItem() will cause textChanged() being emitted, // so slotLocationChanged() will be called. Make sure we don't clear // the KDirOperator's view-selection in there - disconnect( locationEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotLocationChanged( const TQString& ) ) ); + disconnect( locationEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotLocationChanged( const TQString& ) ) ); locationEdit->setCurrentItem( 0 ); - connect( locationEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotLocationChanged( const TQString& )) ); + connect( locationEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotLocationChanged( const TQString& )) ); locationEdit->setEditText( text ); // don't change selection when user has clicked on an item @@ -827,8 +827,8 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge d->okButton = new KPushButton( KStdGuiItem::ok(), d->mainWidget ); d->okButton->setDefault( true ); d->cancelButton = new KPushButton(KStdGuiItem::cancel(), d->mainWidget); - connect( d->okButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOk() )); - connect( d->cancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCancel() )); + connect( d->okButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOk() )); + connect( d->cancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCancel() )); d->customWidget = widget; d->autoSelectExtCheckBox = 0; // delayed loading d->autoSelectExtChecked = false; @@ -896,14 +896,14 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge ops = new KDirOperator(d->url, d->mainWidget, "KFileDialog::ops"); ops->setOnlyDoubleClickSelectsFiles( true ); - connect(ops, TQT_SIGNAL(urlEntered(const KURL&)), - TQT_SLOT(urlEntered(const KURL&))); - connect(ops, TQT_SIGNAL(fileHighlighted(const KFileItem *)), - TQT_SLOT(fileHighlighted(const KFileItem *))); - connect(ops, TQT_SIGNAL(fileSelected(const KFileItem *)), - TQT_SLOT(fileSelected(const KFileItem *))); - connect(ops, TQT_SIGNAL(finishedLoading()), - TQT_SLOT(slotLoadingFinished())); + connect(ops, TQ_SIGNAL(urlEntered(const KURL&)), + TQ_SLOT(urlEntered(const KURL&))); + connect(ops, TQ_SIGNAL(fileHighlighted(const KFileItem *)), + TQ_SLOT(fileHighlighted(const KFileItem *))); + connect(ops, TQ_SIGNAL(fileSelected(const KFileItem *)), + TQ_SLOT(fileSelected(const KFileItem *))); + connect(ops, TQ_SIGNAL(finishedLoading()), + TQ_SLOT(slotLoadingFinished())); ops->setupMenu(KDirOperator::SortActions | KDirOperator::FileActions | @@ -928,14 +928,14 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge TDEToggleAction *showSidebarAction = new TDEToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar"); showSidebarAction->setCheckedState(i18n("Hide Quick Access Navigation Panel")); - connect( showSidebarAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( toggleSpeedbar( bool )) ); + connect( showSidebarAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( toggleSpeedbar( bool )) ); TDEToggleAction *showBookmarksAction = new TDEToggleAction(i18n("Show Bookmarks"), 0, coll, "toggleBookmarks"); showBookmarksAction->setCheckedState(i18n("Hide Bookmarks")); - connect( showBookmarksAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( toggleBookmarks( bool )) ); + connect( showBookmarksAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( toggleBookmarks( bool )) ); TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", this, "extra menu" ); menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. " @@ -963,8 +963,8 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge menu->insert( coll->action( "separate dirs" )); menu->setDelayed( false ); - connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - ops, TQT_SLOT( updateSelectionDependentActions() )); + connect( menu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + ops, TQ_SLOT( updateSelectionDependentActions() )); menu->plug( toolbar ); //Insert a separator. @@ -984,12 +984,12 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge d->pathCombo->setCompletionObject( pathCompletionObj ); d->pathCombo->setAutoDeleteCompletionObject( true ); - connect( d->pathCombo, TQT_SIGNAL( urlActivated( const KURL& )), - this, TQT_SLOT( enterURL( const KURL& ) )); - connect( d->pathCombo, TQT_SIGNAL( returnPressed( const TQString& )), - this, TQT_SLOT( enterURL( const TQString& ) )); - connect( d->pathCombo, TQT_SIGNAL( activated( const TQString& )), - this, TQT_SLOT( enterURL( const TQString& ) )); + connect( d->pathCombo, TQ_SIGNAL( urlActivated( const KURL& )), + this, TQ_SLOT( enterURL( const KURL& ) )); + connect( d->pathCombo, TQ_SIGNAL( returnPressed( const TQString& )), + this, TQ_SLOT( enterURL( const TQString& ) )); + connect( d->pathCombo, TQ_SIGNAL( activated( const TQString& )), + this, TQ_SLOT( enterURL( const TQString& ) )); TQString whatsThisText; @@ -998,8 +998,8 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge locationEdit = new KURLComboBox(KURLComboBox::Files, true, d->mainWidget, "LocationEdit"); locationEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); - connect( locationEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotLocationChanged( const TQString& )) ); + connect( locationEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotLocationChanged( const TQString& )) ); updateLocationWhatsThis (); d->locationLabel->setBuddy(locationEdit); @@ -1011,13 +1011,13 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge fileCompletionObj->setDir( dir ); locationEdit->setCompletionObject( fileCompletionObj ); locationEdit->setAutoDeleteCompletionObject( true ); - connect( fileCompletionObj, TQT_SIGNAL( match( const TQString& ) ), - TQT_SLOT( fileCompletion( const TQString& )) ); + connect( fileCompletionObj, TQ_SIGNAL( match( const TQString& ) ), + TQ_SLOT( fileCompletion( const TQString& )) ); - connect( locationEdit, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( slotOk())); - connect(locationEdit, TQT_SIGNAL( activated( const TQString& )), - this, TQT_SLOT( locationActivated( const TQString& ) )); + connect( locationEdit, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( slotOk())); + connect(locationEdit, TQ_SIGNAL( activated( const TQString& )), + this, TQ_SLOT( locationActivated( const TQString& ) )); // the Filter label/edit whatsThisText = i18n("<qt>This is the filter to apply to the file list. " @@ -1034,12 +1034,12 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge TQWhatsThis::add(filterWidget, whatsThisText); setFilter(filter); d->filterLabel->setBuddy(filterWidget); - connect(filterWidget, TQT_SIGNAL(filterChanged()), TQT_SLOT(slotFilterChanged())); + connect(filterWidget, TQ_SIGNAL(filterChanged()), TQ_SLOT(slotFilterChanged())); // the Automatically Select Extension checkbox // (the text, visibility etc. is set in updateAutoSelectExtension(), which is called by readConfig()) d->autoSelectExtCheckBox = new TQCheckBox (d->mainWidget); - connect(d->autoSelectExtCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotAutoSelectExtClicked())); + connect(d->autoSelectExtCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotAutoSelectExtClicked())); initGUI(); // activate GM @@ -1056,8 +1056,8 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge void KFileDialog::initSpeedbar() { d->urlBar = new KFileSpeedBar( d->mainWidget, "url bar" ); - connect( d->urlBar, TQT_SIGNAL( activated( const KURL& )), - TQT_SLOT( enterURL( const KURL& )) ); + connect( d->urlBar, TQ_SIGNAL( activated( const KURL& )), + TQ_SLOT( enterURL( const KURL& )) ); // need to set the current url of the urlbar manually (not via urlEntered() // here, because the initial url of KDirOperator might be the same as the @@ -2263,8 +2263,8 @@ void KFileDialog::toggleBookmarks(bool show) } d->bookmarkHandler = new KFileBookmarkHandler( this ); - connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), - TQT_SLOT( enterURL( const TQString& ))); + connect( d->bookmarkHandler, TQ_SIGNAL( openURL( const TQString& )), + TQ_SLOT( enterURL( const TQString& ))); toolbar->insertButton(TQString::fromLatin1("bookmark"), (int)HOTLIST_BUTTON, true, diff --git a/tdeio/tdefile/tdefiledialog.h b/tdeio/tdefile/tdefiledialog.h index a8b622fd5..9807893d0 100644 --- a/tdeio/tdefile/tdefiledialog.h +++ b/tdeio/tdefile/tdefiledialog.h @@ -713,7 +713,7 @@ public: * items into it, e.g.: * \code * yourAction = new TDEAction( i18n("Your Action"), 0, - * this, TQT_SLOT( yourSlot() ), + * this, TQ_SLOT( yourSlot() ), * this, "action name" ); * yourAction->plug( tdefileDialog->toolBar() ); * \endcode diff --git a/tdeio/tdefile/tdefilefiltercombo.cpp b/tdeio/tdefile/tdefilefiltercombo.cpp index ba7621c89..de4d45518 100644 --- a/tdeio/tdefile/tdefilefiltercombo.cpp +++ b/tdeio/tdefile/tdefilefiltercombo.cpp @@ -49,9 +49,9 @@ KFileFilterCombo::KFileFilterCombo( TQWidget *parent, const char *name) { setTrapReturnKey( true ); setInsertionPolicy(NoInsertion); - connect( this, TQT_SIGNAL( activated( int )), this, TQT_SIGNAL( filterChanged() )); - connect( this, TQT_SIGNAL( returnPressed() ), this, TQT_SIGNAL( filterChanged() )); - connect( this, TQT_SIGNAL( filterChanged() ), TQT_SLOT( slotFilterChanged() )); + connect( this, TQ_SIGNAL( activated( int )), this, TQ_SIGNAL( filterChanged() )); + connect( this, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( filterChanged() )); + connect( this, TQ_SIGNAL( filterChanged() ), TQ_SLOT( slotFilterChanged() )); m_allTypes = false; } diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp index 01e14b014..65d33912b 100644 --- a/tdeio/tdefile/tdefileiconview.cpp +++ b/tdeio/tdefile/tdefileiconview.cpp @@ -60,12 +60,12 @@ public: noArrangement = false; ignoreMaximumSize = false; smallColumns = new TDERadioAction( i18n("Small Icons"), 0, parent, - TQT_SLOT( slotSmallColumns() ), + TQ_SLOT( slotSmallColumns() ), parent->actionCollection(), "small columns" ); largeRows = new TDERadioAction( i18n("Large Icons"), 0, parent, - TQT_SLOT( slotLargeRows() ), + TQ_SLOT( slotLargeRows() ), parent->actionCollection(), "large rows" ); @@ -75,22 +75,22 @@ public: previews = new TDEToggleAction( i18n("Thumbnail Previews"), 0, parent->actionCollection(), "show previews" ); - zoomIn = KStdAction::zoomIn( parent, TQT_SLOT( zoomIn() ), + zoomIn = KStdAction::zoomIn( parent, TQ_SLOT( zoomIn() ), parent->actionCollection(), "zoomIn" ); - zoomOut = KStdAction::zoomOut( parent, TQT_SLOT( zoomOut() ), + zoomOut = KStdAction::zoomOut( parent, TQ_SLOT( zoomOut() ), parent->actionCollection(), "zoomOut" ); previews->setGroup("previews"); zoomIn->setGroup("previews"); zoomOut->setGroup("previews"); - connect( previews, TQT_SIGNAL( toggled( bool )), - parent, TQT_SLOT( slotPreviewsToggled( bool ))); + connect( previews, TQ_SIGNAL( toggled( bool )), + parent, TQ_SLOT( slotPreviewsToggled( bool ))); - connect( &previewTimer, TQT_SIGNAL( timeout() ), - parent, TQT_SLOT( showPreviews() )); - connect( &autoOpenTimer, TQT_SIGNAL( timeout() ), - parent, TQT_SLOT( slotAutoOpen() )); + connect( &previewTimer, TQ_SIGNAL( timeout() ), + parent, TQ_SLOT( showPreviews() )); + connect( &autoOpenTimer, TQ_SIGNAL( timeout() ), + parent, TQ_SLOT( slotAutoOpen() )); } ~KFileIconViewPrivate() { @@ -133,21 +133,21 @@ KFileIconView::KFileIconView(TQWidget *parent, const char *name) slotSmallColumns(); d->smallColumns->setChecked( true ); - connect( this, TQT_SIGNAL( returnPressed(TQIconViewItem *) ), - TQT_SLOT( slotActivate( TQIconViewItem *) ) ); + connect( this, TQ_SIGNAL( returnPressed(TQIconViewItem *) ), + TQ_SLOT( slotActivate( TQIconViewItem *) ) ); // we want single click _and_ double click (as convenience) - connect( this, TQT_SIGNAL( clicked(TQIconViewItem *, const TQPoint&) ), - TQT_SLOT( selected( TQIconViewItem *) ) ); - connect( this, TQT_SIGNAL( doubleClicked(TQIconViewItem *, const TQPoint&) ), - TQT_SLOT( slotActivate( TQIconViewItem *) ) ); - - connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ), - TQT_SLOT( showToolTip( TQIconViewItem * ) ) ); - connect( this, TQT_SIGNAL( onViewport() ), - TQT_SLOT( removeToolTip() ) ); - connect( this, TQT_SIGNAL( contextMenuRequested(TQIconViewItem*,const TQPoint&)), - TQT_SLOT( slotActivateMenu( TQIconViewItem*, const TQPoint& ) ) ); + connect( this, TQ_SIGNAL( clicked(TQIconViewItem *, const TQPoint&) ), + TQ_SLOT( selected( TQIconViewItem *) ) ); + connect( this, TQ_SIGNAL( doubleClicked(TQIconViewItem *, const TQPoint&) ), + TQ_SLOT( slotActivate( TQIconViewItem *) ) ); + + connect( this, TQ_SIGNAL( onItem( TQIconViewItem * ) ), + TQ_SLOT( showToolTip( TQIconViewItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), + TQ_SLOT( removeToolTip() ) ); + connect( this, TQ_SIGNAL( contextMenuRequested(TQIconViewItem*,const TQPoint&)), + TQ_SLOT( slotActivateMenu( TQIconViewItem*, const TQPoint& ) ) ); KFile::SelectionMode sm = KFileView::selectionMode(); switch ( sm ) { @@ -167,11 +167,11 @@ KFileIconView::KFileIconView(TQWidget *parent, const char *name) } if ( sm == KFile::Multi || sm == KFile::Extended ) - connect( this, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); else - connect( this, TQT_SIGNAL( selectionChanged( TQIconViewItem * )), - TQT_SLOT( highlighted( TQIconViewItem * ))); + connect( this, TQ_SIGNAL( selectionChanged( TQIconViewItem * )), + TQ_SLOT( highlighted( TQIconViewItem * ))); viewport()->installEventFilter( this ); @@ -398,8 +398,8 @@ void KFileIconView::highlighted( TQIconViewItem *item ) void KFileIconView::setSelectionMode( KFile::SelectionMode sm ) { - disconnect( TQT_SIGNAL( selectionChanged() ), this ); - disconnect( TQT_SIGNAL( selectionChanged( TQIconViewItem * )), this ); + disconnect( TQ_SIGNAL( selectionChanged() ), this ); + disconnect( TQ_SIGNAL( selectionChanged( TQIconViewItem * )), this ); KFileView::setSelectionMode( sm ); switch ( KFileView::selectionMode() ) { @@ -419,11 +419,11 @@ void KFileIconView::setSelectionMode( KFile::SelectionMode sm ) } if ( sm == KFile::Multi || sm == KFile::Extended ) - connect( this, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); else - connect( this, TQT_SIGNAL( selectionChanged( TQIconViewItem * )), - TQT_SLOT( highlighted( TQIconViewItem * ))); + connect( this, TQ_SIGNAL( selectionChanged( TQIconViewItem * )), + TQ_SLOT( highlighted( TQIconViewItem * ))); } bool KFileIconView::isSelected( const KFileItem *i ) const @@ -593,12 +593,12 @@ void KFileIconView::showPreviews() d->job = TDEIO::filePreview(*items(), d->previewIconSize,d->previewIconSize); d->job->setIgnoreMaximumSize(d->ignoreMaximumSize); - connect( d->job, TQT_SIGNAL( result( TDEIO::Job * )), - this, TQT_SLOT( slotPreviewResult( TDEIO::Job * ))); - connect( d->job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), - TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); -// connect( d->job, TQT_SIGNAL( failed( const KFileItem* )), -// this, TQT_SLOT( slotFailed( const KFileItem* ) )); + connect( d->job, TQ_SIGNAL( result( TDEIO::Job * )), + this, TQ_SLOT( slotPreviewResult( TDEIO::Job * ))); + connect( d->job, TQ_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), + TQ_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); +// connect( d->job, TQ_SIGNAL( failed( const KFileItem* )), +// this, TQ_SLOT( slotFailed( const KFileItem* ) )); } void KFileIconView::slotPreviewResult( TDEIO::Job *job ) diff --git a/tdeio/tdefile/tdefilemetainfowidget.cpp b/tdeio/tdefile/tdefilemetainfowidget.cpp index 9727716c3..f271b4541 100644 --- a/tdeio/tdefile/tdefilemetainfowidget.cpp +++ b/tdeio/tdefile/tdefilemetainfowidget.cpp @@ -185,7 +185,7 @@ TQWidget* KFileMetaInfoWidget::makeBoolWidget() { TQCheckBox* cb = new TQCheckBox(this, "metainfo bool widget"); cb->setChecked(m_item.value().toBool()); - connect(cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged(bool))); + connect(cb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged(bool))); return cb; } @@ -209,7 +209,7 @@ TQWidget* KFileMetaInfoWidget::makeIntWidget() if (m_item.type() == TQVariant::UInt) sb->setMinValue(TQMAX(sb->minValue(), 0)); - connect(sb, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int))); + connect(sb, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged(int))); return sb; } @@ -229,7 +229,7 @@ TQWidget* KFileMetaInfoWidget::makeDoubleWidget() reparentValidator(dni, m_validator); } - connect(dni, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotChanged(double))); + connect(dni, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotChanged(double))); return dni; } @@ -242,7 +242,7 @@ TQWidget* KFileMetaInfoWidget::makeStringWidget() (m_validator); b->insertStringList(val->stringList()); b->setCurrentText(m_item.value().toString()); - connect(b, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotComboChanged(const TQString &))); + connect(b, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotComboChanged(const TQString &))); b->setValidator(val); reparentValidator(b, val); return b; @@ -251,8 +251,8 @@ TQWidget* KFileMetaInfoWidget::makeStringWidget() if ( m_item.attributes() & KFileMimeTypeInfo::MultiLine ) { KEdit *edit = new KEdit( this ); edit->setText( m_item.value().toString() ); - connect( edit, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotMultiLineEditChanged() )); + connect( edit, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotMultiLineEditChanged() )); // can't use a validator with a TQTextEdit, but we may need to delete it if ( m_validator ) reparentValidator( edit, m_validator ); @@ -265,16 +265,16 @@ TQWidget* KFileMetaInfoWidget::makeStringWidget() e->setValidator(m_validator); reparentValidator(e, m_validator); } - connect(e, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotLineEditChanged(const TQString&))); + connect(e, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotLineEditChanged(const TQString&))); return e; } TQWidget* KFileMetaInfoWidget::makeDateWidget() { TQWidget *e = new TQDateEdit(m_item.value().toDate(), this); - connect(e, TQT_SIGNAL(valueChanged(const TQDate&)), - this, TQT_SLOT(slotDateChanged(const TQDate&))); + connect(e, TQ_SIGNAL(valueChanged(const TQDate&)), + this, TQ_SLOT(slotDateChanged(const TQDate&))); return e; } diff --git a/tdeio/tdefile/tdefilepreview.cpp b/tdeio/tdefile/tdefilepreview.cpp index acec61475..36fc81eb5 100644 --- a/tdeio/tdefile/tdefilepreview.cpp +++ b/tdeio/tdefile/tdefilepreview.cpp @@ -95,8 +95,8 @@ void KFilePreview::setFileView( KFileView *view ) view->setSorting( sorting() ); left = view; - connect( left->signaler(), TQT_SIGNAL( fileHighlighted(const KFileItem*) ), - TQT_SLOT( slotHighlighted( const KFileItem * ))); + connect( left->signaler(), TQ_SIGNAL( fileHighlighted(const KFileItem*) ), + TQ_SLOT( slotHighlighted( const KFileItem * ))); // Why copy the actions? --ellis, 13 Jan 02. //for ( uint i = 0; i < view->actionCollection()->count(); i++ ) @@ -110,10 +110,10 @@ void KFilePreview::setPreviewWidget(const TQWidget *w, const KURL &) left->setOnlyDoubleClickSelectsFiles( onlyDoubleClickSelectsFiles() ); if (w) { - connect(this, TQT_SIGNAL( showPreview(const KURL &) ), - w, TQT_SLOT( showPreview(const KURL &) )); - connect( this, TQT_SIGNAL( clearPreview() ), - w, TQT_SLOT( clearPreview() )); + connect(this, TQ_SIGNAL( showPreview(const KURL &) ), + w, TQ_SLOT( showPreview(const KURL &) )); + connect( this, TQ_SIGNAL( clearPreview() ), + w, TQ_SLOT( clearPreview() )); } else { preview->hide(); diff --git a/tdeio/tdefile/tdefilesharedlg.cpp b/tdeio/tdefile/tdefilesharedlg.cpp index 8c18a582a..326e2d21e 100644 --- a/tdeio/tdefile/tdefilesharedlg.cpp +++ b/tdeio/tdefile/tdefilesharedlg.cpp @@ -152,17 +152,17 @@ void KFileSharePropsPlugin::init() TQButtonGroup *rbGroup = new TQButtonGroup( m_widget ); rbGroup->hide(); m_rbUnShare = new TQRadioButton( i18n("Not shared"), m_widget ); - connect( m_rbUnShare, TQT_SIGNAL( toggled(bool) ), TQT_SIGNAL( changed() ) ); + connect( m_rbUnShare, TQ_SIGNAL( toggled(bool) ), TQ_SIGNAL( changed() ) ); vbox->addWidget( m_rbUnShare, 0 ); rbGroup->insert( m_rbUnShare ); m_rbShare = new TQRadioButton( i18n("Shared - read only for others"), m_widget ); - connect( m_rbShare, TQT_SIGNAL( toggled(bool) ), TQT_SIGNAL( changed() ) ); + connect( m_rbShare, TQ_SIGNAL( toggled(bool) ), TQ_SIGNAL( changed() ) ); vbox->addWidget( m_rbShare, 0 ); rbGroup->insert( m_rbShare ); m_rbSharerw = new TQRadioButton( i18n("Shared - writeable for others"), m_widget ); - connect( m_rbSharerw, TQT_SIGNAL( toggled(bool) ), TQT_SIGNAL( changed() ) ); + connect( m_rbSharerw, TQ_SIGNAL( toggled(bool) ), TQ_SIGNAL( changed() ) ); vbox->addWidget( m_rbSharerw, 0 ); rbGroup->insert( m_rbSharerw ); @@ -193,7 +193,7 @@ void KFileSharePropsPlugin::init() label->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::WordBreak ); vbox->addWidget( label, 0 ); m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget ); - connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) ); + connect( m_pbConfig, TQ_SIGNAL( clicked() ), TQ_SLOT( slotConfigureFileSharing() ) ); vbox->addWidget( m_pbConfig, 0, TQt::AlignHCenter ); vbox->addStretch( 10 ); @@ -220,7 +220,7 @@ void KFileSharePropsPlugin::init() TQHBoxLayout* hBox = new TQHBoxLayout( (TQWidget *)0L ); vbox->addLayout( hBox, 0 ); m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget ); - connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) ); + connect( m_pbConfig, TQ_SIGNAL( clicked() ), TQ_SLOT( slotConfigureFileSharing() ) ); hBox->addWidget( m_pbConfig, 0, TQt::AlignHCenter ); vbox->addStretch( 10 ); // align items on top break; @@ -244,8 +244,8 @@ void KFileSharePropsPlugin::slotConfigureFileSharing() d->m_configProc = 0; return; } - connect(d->m_configProc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotConfigureFileSharingDone())); + connect(d->m_configProc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotConfigureFileSharingDone())); m_pbConfig->setEnabled(false); } diff --git a/tdeio/tdefile/tdefiletreebranch.cpp b/tdeio/tdefile/tdefiletreebranch.cpp index b55c3ffb2..70e7d7c40 100644 --- a/tdeio/tdefile/tdefiletreebranch.cpp +++ b/tdeio/tdefile/tdefiletreebranch.cpp @@ -64,32 +64,32 @@ KFileTreeBranch::KFileTreeBranch( KFileTreeView *parent, const KURL& url, setShowingDotFiles( showHidden ); - connect( this, TQT_SIGNAL( refreshItems(const KFileItemList&)), - this, TQT_SLOT ( slotRefreshItems( const KFileItemList& ))); + connect( this, TQ_SIGNAL( refreshItems(const KFileItemList&)), + this, TQ_SLOT ( slotRefreshItems( const KFileItemList& ))); - connect( this, TQT_SIGNAL( newItems(const KFileItemList&)), - this, TQT_SLOT ( addItems( const KFileItemList& ))); + connect( this, TQ_SIGNAL( newItems(const KFileItemList&)), + this, TQ_SLOT ( addItems( const KFileItemList& ))); - connect( this, TQT_SIGNAL( completed(const KURL& )), - this, TQT_SLOT(slCompleted(const KURL&))); + connect( this, TQ_SIGNAL( completed(const KURL& )), + this, TQ_SLOT(slCompleted(const KURL&))); - connect( this, TQT_SIGNAL( started( const KURL& )), - this, TQT_SLOT( slotListerStarted( const KURL& ))); + connect( this, TQ_SIGNAL( started( const KURL& )), + this, TQ_SLOT( slotListerStarted( const KURL& ))); - connect( this, TQT_SIGNAL( deleteItem( KFileItem* )), - this, TQT_SLOT( slotDeleteItem( KFileItem* ))); + connect( this, TQ_SIGNAL( deleteItem( KFileItem* )), + this, TQ_SLOT( slotDeleteItem( KFileItem* ))); - connect( this, TQT_SIGNAL( canceled(const KURL&) ), - this, TQT_SLOT( slotCanceled(const KURL&) )); + connect( this, TQ_SIGNAL( canceled(const KURL&) ), + this, TQ_SLOT( slotCanceled(const KURL&) )); - connect( this, TQT_SIGNAL( clear()), - this, TQT_SLOT( slotDirlisterClear())); + connect( this, TQ_SIGNAL( clear()), + this, TQ_SLOT( slotDirlisterClear())); - connect( this, TQT_SIGNAL( clear(const KURL&)), - this, TQT_SLOT( slotDirlisterClearURL(const KURL&))); + connect( this, TQ_SIGNAL( clear(const KURL&)), + this, TQ_SLOT( slotDirlisterClearURL(const KURL&))); - connect( this, TQT_SIGNAL( redirection( const KURL& , const KURL& ) ), - this, TQT_SLOT( slotRedirect( const KURL&, const KURL& ))); + connect( this, TQ_SIGNAL( redirection( const KURL& , const KURL& ) ), + this, TQ_SLOT( slotRedirect( const KURL&, const KURL& ))); m_openChildrenURLs.append( url ); } diff --git a/tdeio/tdefile/tdefiletreeview.cpp b/tdeio/tdefile/tdefiletreeview.cpp index 2710d4c08..e9c87f5b6 100644 --- a/tdeio/tdefile/tdefiletreeview.cpp +++ b/tdeio/tdefile/tdefiletreeview.cpp @@ -48,32 +48,32 @@ KFileTreeView::KFileTreeView( TQWidget *parent, const char *name ) setSelectionModeExt( TDEListView::Single ); m_animationTimer = new TQTimer( this ); - connect( m_animationTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAnimation() ) ); + connect( m_animationTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAnimation() ) ); m_currentBeforeDropItem = 0; m_dropItem = 0; m_autoOpenTimer = new TQTimer( this ); - connect( m_autoOpenTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoOpenFolder() ) ); + connect( m_autoOpenTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoOpenFolder() ) ); /* The executed-Slot only opens a path, while the expanded-Slot populates it */ - connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ), - this, TQT_SLOT( slotExecuted( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( expanded ( TQListViewItem *) ), - this, TQT_SLOT( slotExpanded( TQListViewItem *) )); - connect( this, TQT_SIGNAL( collapsed( TQListViewItem *) ), - this, TQT_SLOT( slotCollapsed( TQListViewItem* ))); + connect( this, TQ_SIGNAL( executed( TQListViewItem * ) ), + this, TQ_SLOT( slotExecuted( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( expanded ( TQListViewItem *) ), + this, TQ_SLOT( slotExpanded( TQListViewItem *) )); + connect( this, TQ_SIGNAL( collapsed( TQListViewItem *) ), + this, TQ_SLOT( slotCollapsed( TQListViewItem* ))); /* connections from the konqtree widget */ - connect( this, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); - connect( this, TQT_SIGNAL( onItem( TQListViewItem * )), - this, TQT_SLOT( slotOnItem( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), - this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); + connect( this, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); + connect( this, TQ_SIGNAL( onItem( TQListViewItem * )), + this, TQ_SLOT( slotOnItem( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), + this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); m_bDrag = false; @@ -375,12 +375,12 @@ KFileTreeBranch* KFileTreeView::addBranch( const KURL &path, const TQString& nam KFileTreeBranch *KFileTreeView::addBranch(KFileTreeBranch *newBranch) { - connect( newBranch, TQT_SIGNAL(populateFinished( KFileTreeViewItem* )), - this, TQT_SLOT( slotPopulateFinished( KFileTreeViewItem* ))); + connect( newBranch, TQ_SIGNAL(populateFinished( KFileTreeViewItem* )), + this, TQ_SLOT( slotPopulateFinished( KFileTreeViewItem* ))); - connect( newBranch, TQT_SIGNAL( newTreeViewItems( KFileTreeBranch*, + connect( newBranch, TQ_SIGNAL( newTreeViewItems( KFileTreeBranch*, const KFileTreeViewItemList& )), - this, TQT_SLOT( slotNewTreeViewItems( KFileTreeBranch*, + this, TQ_SLOT( slotNewTreeViewItems( KFileTreeBranch*, const KFileTreeViewItemList& ))); m_branches.append( newBranch ); diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp index f171975d8..aa82344c1 100644 --- a/tdeio/tdefile/tdefileview.cpp +++ b/tdeio/tdefile/tdefileview.cpp @@ -90,20 +90,20 @@ KFileView::~KFileView() void KFileView::setParentView(KFileView *parent) { if ( parent ) { // pass all signals right to our parent - TQObject::connect(sig, TQT_SIGNAL( activatedMenu(const KFileItem *, + TQObject::connect(sig, TQ_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ) ), - parent->sig, TQT_SIGNAL( activatedMenu(const KFileItem *, + parent->sig, TQ_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ))); - TQObject::connect(sig, TQT_SIGNAL( dirActivated(const KFileItem *)), - parent->sig, TQT_SIGNAL( dirActivated(const KFileItem*))); - TQObject::connect(sig, TQT_SIGNAL( fileSelected(const KFileItem *)), - parent->sig, TQT_SIGNAL( fileSelected(const KFileItem*))); - TQObject::connect(sig, TQT_SIGNAL( fileHighlighted(const KFileItem *) ), - parent->sig,TQT_SIGNAL(fileHighlighted(const KFileItem*))); - TQObject::connect(sig, TQT_SIGNAL( sortingChanged( TQDir::SortSpec ) ), - parent->sig, TQT_SIGNAL(sortingChanged( TQDir::SortSpec))); - TQObject::connect(sig, TQT_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ), - parent->sig, TQT_SIGNAL(dropped(const KFileItem *, TQDropEvent*, const KURL::List&))); + TQObject::connect(sig, TQ_SIGNAL( dirActivated(const KFileItem *)), + parent->sig, TQ_SIGNAL( dirActivated(const KFileItem*))); + TQObject::connect(sig, TQ_SIGNAL( fileSelected(const KFileItem *)), + parent->sig, TQ_SIGNAL( fileSelected(const KFileItem*))); + TQObject::connect(sig, TQ_SIGNAL( fileHighlighted(const KFileItem *) ), + parent->sig,TQ_SIGNAL(fileHighlighted(const KFileItem*))); + TQObject::connect(sig, TQ_SIGNAL( sortingChanged( TQDir::SortSpec ) ), + parent->sig, TQ_SIGNAL(sortingChanged( TQDir::SortSpec))); + TQObject::connect(sig, TQ_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ), + parent->sig, TQ_SIGNAL(dropped(const KFileItem *, TQDropEvent*, const KURL::List&))); } } diff --git a/tdeio/tdefile/tests/kfdtest.cpp b/tdeio/tdefile/tests/kfdtest.cpp index ce7127d9e..9239d5f4d 100644 --- a/tdeio/tdefile/tests/kfdtest.cpp +++ b/tdeio/tdefile/tests/kfdtest.cpp @@ -10,7 +10,7 @@ KFDTest::KFDTest( const TQString& startDir, TQObject *parent, const char *name ) : TQObject( parent, name ), m_startDir( startDir ) { - TQTimer::singleShot( 1000, this, TQT_SLOT( doit() )); + TQTimer::singleShot( 1000, this, TQ_SLOT( doit() )); } void KFDTest::doit() diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp index da031eac2..1f3f2e67d 100644 --- a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp +++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp @@ -45,14 +45,14 @@ testFrame::testFrame():TDEMainWindow(0,"Test FileTreeView"), /* Connect to see the status bar */ KStatusBar* sta = statusBar(); - connect( treeView, TQT_SIGNAL( onItem( const TQString& )), - sta, TQT_SLOT( message( const TQString& ))); + connect( treeView, TQ_SIGNAL( onItem( const TQString& )), + sta, TQ_SLOT( message( const TQString& ))); - connect( treeView, TQT_SIGNAL( dropped( TQWidget*, TQDropEvent*, KURL::List& )), - this, TQT_SLOT( urlsDropped( TQWidget*, TQDropEvent*, KURL::List& ))); + connect( treeView, TQ_SIGNAL( dropped( TQWidget*, TQDropEvent*, KURL::List& )), + this, TQ_SLOT( urlsDropped( TQWidget*, TQDropEvent*, KURL::List& ))); - connect( treeView, TQT_SIGNAL( dropped( KURL::List&, KURL& )), this, - TQT_SLOT( copyURLs( KURL::List&, KURL& ))); + connect( treeView, TQ_SIGNAL( dropped( KURL::List&, KURL& )), this, + TQ_SLOT( copyURLs( KURL::List&, KURL& ))); treeView->addColumn( "File" ); treeView->addColumn( "ChildCount" ); @@ -77,10 +77,10 @@ void testFrame::showPath( const KURL &url ) if( dirOnlyMode ) treeView->setDirOnlyMode( nb, true ); nb->setOpenPixmap( pixOpen ); - connect( nb, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), - this, TQT_SLOT(slotPopulateFinished(KFileTreeViewItem*))); - connect( nb, TQT_SIGNAL( directoryChildCount( KFileTreeViewItem *, int )), - this, TQT_SLOT( slotSetChildCount( KFileTreeViewItem*, int ))); + connect( nb, TQ_SIGNAL(populateFinished(KFileTreeViewItem*)), + this, TQ_SLOT(slotPopulateFinished(KFileTreeViewItem*))); + connect( nb, TQ_SIGNAL( directoryChildCount( KFileTreeViewItem *, int )), + this, TQ_SLOT( slotSetChildCount( KFileTreeViewItem*, int ))); // nb->setChildRecurse(false ); nb->setOpen(true); diff --git a/tdeio/tdeio/chmodjob.cpp b/tdeio/tdeio/chmodjob.cpp index 24a5c247d..54d4aeab1 100644 --- a/tdeio/tdeio/chmodjob.cpp +++ b/tdeio/tdeio/chmodjob.cpp @@ -48,7 +48,7 @@ ChmodJob::ChmodJob( const KFileItemList& lstItems, int permissions, int mask, m_newOwner( newOwner ), m_newGroup( newGroup ), m_recursive( recursive ), m_lstItems( lstItems ) { - TQTimer::singleShot( 0, this, TQT_SLOT(processList()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(processList()) ); } void ChmodJob::processList() @@ -77,9 +77,9 @@ void ChmodJob::processList() { //kdDebug(7007) << "ChmodJob::processList dir -> listing" << endl; TDEIO::ListJob * listJob = TDEIO::listRecursive( item->url(), false /* no GUI */ ); - connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *, + connect( listJob, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( slotEntries( TDEIO::Job*, + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob( listJob ); return; // we'll come back later, when this one's finished diff --git a/tdeio/tdeio/connection.cpp b/tdeio/tdeio/connection.cpp index 5ae0f5685..8b21e3a0c 100644 --- a/tdeio/tdeio/connection.cpp +++ b/tdeio/tdeio/connection.cpp @@ -143,7 +143,7 @@ void Connection::init(TDESocket *sock) if ( m_suspended ) { suspend(); } - TQObject::connect(notifier, TQT_SIGNAL(activated(int)), receiver, member); + TQObject::connect(notifier, TQ_SIGNAL(activated(int)), receiver, member); } dequeue(); } @@ -159,7 +159,7 @@ void Connection::init(int _fd_in, int fd_out) if ( m_suspended ) { suspend(); } - TQObject::connect(notifier, TQT_SIGNAL(activated(int)), receiver, member); + TQObject::connect(notifier, TQ_SIGNAL(activated(int)), receiver, member); } dequeue(); } @@ -175,7 +175,7 @@ void Connection::connect(TQObject *_receiver, const char *_member) notifier = new TQSocketNotifier(fd_in, TQSocketNotifier::Read); if ( m_suspended ) suspend(); - TQObject::connect(notifier, TQT_SIGNAL(activated(int)), receiver, member); + TQObject::connect(notifier, TQ_SIGNAL(activated(int)), receiver, member); } } diff --git a/tdeio/tdeio/dataslave.cpp b/tdeio/tdeio/dataslave.cpp index 41a76efd1..46c230f06 100644 --- a/tdeio/tdeio/dataslave.cpp +++ b/tdeio/tdeio/dataslave.cpp @@ -62,7 +62,7 @@ DataSlave::DataSlave() : //kdDebug() << this << k_funcinfo << endl; _suspended = false; timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(dispatchNext())); + connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(dispatchNext())); } DataSlave::~DataSlave() { diff --git a/tdeio/tdeio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp index 77b1fc996..063d3e1c8 100644 --- a/tdeio/tdeio/defaultprogress.cpp +++ b/tdeio/tdeio/defaultprogress.cpp @@ -147,7 +147,7 @@ void DefaultProgress::init() topLayout->addWidget( line ); d->keepOpen = new TQCheckBox( i18n("&Keep this window open after transfer is complete"), this); - connect( d->keepOpen, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotKeepOpenToggled(bool) ) ); + connect( d->keepOpen, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotKeepOpenToggled(bool) ) ); topLayout->addWidget(d->keepOpen); d->keepOpen->hide(); @@ -155,20 +155,20 @@ void DefaultProgress::init() topLayout->addLayout(hBox); d->openFile = new KPushButton( i18n("Open &File"), this ); - connect( d->openFile, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenFile() ) ); + connect( d->openFile, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenFile() ) ); hBox->addWidget( d->openFile ); d->openFile->setEnabled(false); d->openFile->hide(); d->openLocation = new KPushButton( i18n("Open &Destination"), this ); - connect( d->openLocation, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenLocation() ) ); + connect( d->openLocation, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenLocation() ) ); hBox->addWidget( d->openLocation ); d->openLocation->hide(); hBox->addStretch(1); d->cancelClose = new KPushButton( KStdGuiItem::cancel(), this ); - connect( d->cancelClose, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStop() ) ); + connect( d->cancelClose, TQ_SIGNAL( clicked() ), TQ_SLOT( slotStop() ) ); hBox->addWidget( d->cancelClose ); resize( sizeHint() ); diff --git a/tdeio/tdeio/forwardingslavebase.cpp b/tdeio/tdeio/forwardingslavebase.cpp index c4e4daa0c..66ab1202d 100644 --- a/tdeio/tdeio/forwardingslavebase.cpp +++ b/tdeio/tdeio/forwardingslavebase.cpp @@ -318,52 +318,52 @@ void ForwardingSlaveBase::connectJob(TDEIO::Job *job) kdDebug() << it.key() << " = " << it.data() << endl; #endif - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotResult(TDEIO::Job *) ) ); - connect( job, TQT_SIGNAL( warning(TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotWarning(TDEIO::Job *, const TQString &) ) ); - connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotInfoMessage(TDEIO::Job *, const TQString &) ) ); - connect( job, TQT_SIGNAL( totalSize(TDEIO::Job *, TDEIO::filesize_t) ), - this, TQT_SLOT( slotTotalSize(TDEIO::Job *, TDEIO::filesize_t) ) ); - connect( job, TQT_SIGNAL( processedSize(TDEIO::Job *, TDEIO::filesize_t) ), - this, TQT_SLOT( slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t) ) ); - connect( job, TQT_SIGNAL( speed(TDEIO::Job *, unsigned long) ), - this, TQT_SLOT( slotSpeed(TDEIO::Job *, unsigned long) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotResult(TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( warning(TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotWarning(TDEIO::Job *, const TQString &) ) ); + connect( job, TQ_SIGNAL( infoMessage(TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotInfoMessage(TDEIO::Job *, const TQString &) ) ); + connect( job, TQ_SIGNAL( totalSize(TDEIO::Job *, TDEIO::filesize_t) ), + this, TQ_SLOT( slotTotalSize(TDEIO::Job *, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( processedSize(TDEIO::Job *, TDEIO::filesize_t) ), + this, TQ_SLOT( slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( speed(TDEIO::Job *, unsigned long) ), + this, TQ_SLOT( slotSpeed(TDEIO::Job *, unsigned long) ) ); } void ForwardingSlaveBase::connectSimpleJob(TDEIO::SimpleJob *job) { connectJob(job); - connect( job, TQT_SIGNAL( redirection(TDEIO::Job *, const KURL &) ), - this, TQT_SLOT( slotRedirection(TDEIO::Job *, const KURL &) ) ); + connect( job, TQ_SIGNAL( redirection(TDEIO::Job *, const KURL &) ), + this, TQ_SLOT( slotRedirection(TDEIO::Job *, const KURL &) ) ); } void ForwardingSlaveBase::connectListJob(TDEIO::ListJob *job) { connectSimpleJob(job); - connect( job, TQT_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList &) ), - this, TQT_SLOT( slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &) ) ); + connect( job, TQ_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList &) ), + this, TQ_SLOT( slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &) ) ); } void ForwardingSlaveBase::connectTransferJob(TDEIO::TransferJob *job) { connectSimpleJob(job); - connect( job, TQT_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ), - this, TQT_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) ); - connect( job, TQT_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ), - this, TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray &) ) ); - connect( job, TQT_SIGNAL( mimetype(TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ) ); - connect( job, TQT_SIGNAL( canResume(TDEIO::Job *, TDEIO::filesize_t) ), - this, TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ), + this, TQ_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) ); + connect( job, TQ_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ), + this, TQ_SLOT( slotDataReq(TDEIO::Job *, TQByteArray &) ) ); + connect( job, TQ_SIGNAL( mimetype(TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ) ); + connect( job, TQ_SIGNAL( canResume(TDEIO::Job *, TDEIO::filesize_t) ), + this, TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t) ) ); } void ForwardingSlaveBase::connectLocalURLJob(TDEIO::LocalURLJob *job) { connectJob(job); - connect( job, TQT_SIGNAL( localURL(TDEIO::LocalURLJob *, const KURL&, bool) ), - this, TQT_SLOT( slotLocalURL(TDEIO::LocalURLJob *, const KURL&, bool) ) ); + connect( job, TQ_SIGNAL( localURL(TDEIO::LocalURLJob *, const KURL&, bool) ), + this, TQ_SLOT( slotLocalURL(TDEIO::LocalURLJob *, const KURL&, bool) ) ); } ////////////////////////////////////////////////////////////////////////////// diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp index 8bbbebc03..3418da6bc 100644 --- a/tdeio/tdeio/job.cpp +++ b/tdeio/tdeio/job.cpp @@ -137,16 +137,16 @@ Job::Job(bool showProgressInfo) : TQObject(__getJobRoot(), "job"), m_error(0), m addMetaData("progress-id", TQString::number(m_progressId)); //kdDebug(7007) << "Created job " << this << " with progress info -- m_progressId=" << m_progressId << endl; // Connect global progress info signals - connect( this, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString & ) ), - Observer::self(), TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString & ) ) ); - connect( this, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), - Observer::self(), TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( this, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), - Observer::self(), TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( this, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString & ) ), + Observer::self(), TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString & ) ) ); + connect( this, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + Observer::self(), TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( this, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + Observer::self(), TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( this, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); } // Don't exit while this job is running if (kapp) @@ -185,15 +185,15 @@ void Job::addSubjob(Job *job, bool inheritMetaData) //kdDebug(7007) << "addSubjob(" << job << ") this = " << this << endl; subjobs.append(job); - connect( job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotResult(TDEIO::Job*)) ); // Forward information from that subjob. - connect( job, TQT_SIGNAL(speed( TDEIO::Job*, unsigned long )), - TQT_SLOT(slotSpeed(TDEIO::Job*, unsigned long)) ); + connect( job, TQ_SIGNAL(speed( TDEIO::Job*, unsigned long )), + TQ_SLOT(slotSpeed(TDEIO::Job*, unsigned long)) ); - connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )), - TQT_SLOT(slotInfoMessage(TDEIO::Job*, const TQString &)) ); + connect( job, TQ_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )), + TQ_SLOT(slotInfoMessage(TDEIO::Job*, const TQString &)) ); if (inheritMetaData) job->mergeMetaData(m_outgoingMetaData); @@ -240,7 +240,7 @@ void Job::emitSpeed( unsigned long bytes_per_second ) if ( !m_speedTimer ) { m_speedTimer = new TQTimer(); - connect( m_speedTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotSpeedTimeout() ) ); + connect( m_speedTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotSpeedTimeout() ) ); } emit speed( this, bytes_per_second ); m_speedTimer->start( 5000 ); // 5 seconds interval should be enough @@ -478,7 +478,7 @@ SimpleJob::SimpleJob(const KURL& url, int command, const TQByteArray &packedArgs kdDebug() << "ERR_MALFORMED_URL" << endl; m_error = ERR_MALFORMED_URL; m_errorText = m_url.url(); - TQTimer::singleShot(0, this, TQT_SLOT(slotFinished()) ); + TQTimer::singleShot(0, this, TQ_SLOT(slotFinished()) ); return; } } @@ -524,38 +524,38 @@ void SimpleJob::start(Slave *slave) { m_slave = slave; - connect( m_slave, TQT_SIGNAL( error( int , const TQString & ) ), - TQT_SLOT( slotError( int , const TQString & ) ) ); + connect( m_slave, TQ_SIGNAL( error( int , const TQString & ) ), + TQ_SLOT( slotError( int , const TQString & ) ) ); - connect( m_slave, TQT_SIGNAL( warning( const TQString & ) ), - TQT_SLOT( slotWarning( const TQString & ) ) ); + connect( m_slave, TQ_SIGNAL( warning( const TQString & ) ), + TQ_SLOT( slotWarning( const TQString & ) ) ); - connect( m_slave, TQT_SIGNAL( infoMessage( const TQString & ) ), - TQT_SLOT( slotInfoMessage( const TQString & ) ) ); + connect( m_slave, TQ_SIGNAL( infoMessage( const TQString & ) ), + TQ_SLOT( slotInfoMessage( const TQString & ) ) ); - connect( m_slave, TQT_SIGNAL( connected() ), - TQT_SLOT( slotConnected() ) ); + connect( m_slave, TQ_SIGNAL( connected() ), + TQ_SLOT( slotConnected() ) ); - connect( m_slave, TQT_SIGNAL( finished() ), - TQT_SLOT( slotFinished() ) ); + connect( m_slave, TQ_SIGNAL( finished() ), + TQ_SLOT( slotFinished() ) ); if ((extraFlags() & EF_TransferJobDataSent) == 0) { - connect( m_slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); + connect( m_slave, TQ_SIGNAL( totalSize( TDEIO::filesize_t ) ), + TQ_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); - connect( m_slave, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ), - TQT_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) ); + connect( m_slave, TQ_SIGNAL( processedSize( TDEIO::filesize_t ) ), + TQ_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) ); - connect( m_slave, TQT_SIGNAL( speed( unsigned long ) ), - TQT_SLOT( slotSpeed( unsigned long ) ) ); + connect( m_slave, TQ_SIGNAL( speed( unsigned long ) ), + TQ_SLOT( slotSpeed( unsigned long ) ) ); } - connect( slave, TQT_SIGNAL( needProgressId() ), - TQT_SLOT( slotNeedProgressId() ) ); + connect( slave, TQ_SIGNAL( needProgressId() ), + TQ_SLOT( slotNeedProgressId() ) ); - connect( slave, TQT_SIGNAL(metaData( const TDEIO::MetaData& ) ), - TQT_SLOT( slotMetaData( const TDEIO::MetaData& ) ) ); + connect( slave, TQ_SIGNAL(metaData( const TDEIO::MetaData& ) ), + TQ_SLOT( slotMetaData( const TDEIO::MetaData& ) ) ); if (m_window) { @@ -726,8 +726,8 @@ MkdirJob::MkdirJob( const KURL& url, int command, void MkdirJob::start(Slave *slave) { - connect( slave, TQT_SIGNAL( redirection(const KURL &) ), - TQT_SLOT( slotRedirection(const KURL &) ) ); + connect( slave, TQ_SIGNAL( redirection(const KURL &) ), + TQ_SLOT( slotRedirection(const KURL &) ) ); SimpleJob::start(slave); } @@ -847,8 +847,8 @@ LocalURLJob::LocalURLJob( const KURL& url, int command, void LocalURLJob::start(Slave *slave) { - connect( slave, TQT_SIGNAL( localURL(const KURL &, bool) ), - TQT_SLOT( slotLocalURL(const KURL &, bool) ) ); + connect( slave, TQ_SIGNAL( localURL(const KURL &, bool) ), + TQ_SLOT( slotLocalURL(const KURL &, bool) ) ); SimpleJob::start(slave); } @@ -888,10 +888,10 @@ void StatJob::start(Slave *slave) m_outgoingMetaData.replace( "statSide", m_bSource ? "source" : "dest" ); m_outgoingMetaData.replace( "details", TQString::number(m_details) ); - connect( slave, TQT_SIGNAL( statEntry( const TDEIO::UDSEntry& ) ), - TQT_SLOT( slotStatEntry( const TDEIO::UDSEntry & ) ) ); - connect( slave, TQT_SIGNAL( redirection(const KURL &) ), - TQT_SLOT( slotRedirection(const KURL &) ) ); + connect( slave, TQ_SIGNAL( statEntry( const TDEIO::UDSEntry& ) ), + TQ_SLOT( slotStatEntry( const TDEIO::UDSEntry & ) ) ); + connect( slave, TQ_SIGNAL( redirection(const KURL &) ), + TQ_SLOT( slotRedirection(const KURL &) ) ); SimpleJob::start(slave); } @@ -1193,26 +1193,26 @@ void TransferJob::resume() void TransferJob::start(Slave *slave) { assert(slave); - connect( slave, TQT_SIGNAL( data( const TQByteArray & ) ), - TQT_SLOT( slotData( const TQByteArray & ) ) ); + connect( slave, TQ_SIGNAL( data( const TQByteArray & ) ), + TQ_SLOT( slotData( const TQByteArray & ) ) ); - connect( slave, TQT_SIGNAL( dataReq() ), - TQT_SLOT( slotDataReq() ) ); + connect( slave, TQ_SIGNAL( dataReq() ), + TQ_SLOT( slotDataReq() ) ); - connect( slave, TQT_SIGNAL( redirection(const KURL &) ), - TQT_SLOT( slotRedirection(const KURL &) ) ); + connect( slave, TQ_SIGNAL( redirection(const KURL &) ), + TQ_SLOT( slotRedirection(const KURL &) ) ); - connect( slave, TQT_SIGNAL(mimeType( const TQString& ) ), - TQT_SLOT( slotMimetype( const TQString& ) ) ); + connect( slave, TQ_SIGNAL(mimeType( const TQString& ) ), + TQ_SLOT( slotMimetype( const TQString& ) ) ); - connect( slave, TQT_SIGNAL(errorPage() ), - TQT_SLOT( slotErrorPage() ) ); + connect( slave, TQ_SIGNAL(errorPage() ), + TQ_SLOT( slotErrorPage() ) ); - connect( slave, TQT_SIGNAL( needSubURLData() ), - TQT_SLOT( slotNeedSubURLData() ) ); + connect( slave, TQ_SIGNAL( needSubURLData() ), + TQ_SLOT( slotNeedSubURLData() ) ); - connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ), - TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); + connect( slave, TQ_SIGNAL(canResume( TDEIO::filesize_t ) ), + TQ_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); if (slave->suspended()) { @@ -1231,8 +1231,8 @@ void TransferJob::slotNeedSubURLData() // Job needs data from subURL. m_subJob = TDEIO::get( m_subUrl, false, false); suspend(); // Put job on hold until we have some data. - connect(m_subJob, TQT_SIGNAL( data(TDEIO::Job*,const TQByteArray &)), - TQT_SLOT( slotSubURLData(TDEIO::Job*,const TQByteArray &))); + connect(m_subJob, TQ_SIGNAL( data(TDEIO::Job*,const TQByteArray &)), + TQ_SLOT( slotSubURLData(TDEIO::Job*,const TQByteArray &))); addSubjob(m_subJob); } @@ -1425,7 +1425,7 @@ TransferJob *TDEIO::http_post( const KURL& url, const TQByteArray &postData, boo packedArgs, postData, showProgressInfo ); if (redirection) - TQTimer::singleShot(0, job, TQT_SLOT(slotPostRedirection()) ); + TQTimer::singleShot(0, job, TQ_SLOT(slotPostRedirection()) ); return job; } @@ -1458,10 +1458,10 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command, : TransferJob( url, command, packedArgs, _staticData, showProgressInfo ), m_uploadOffset( 0 ) { - connect( this, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotStoredData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( this, TQT_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ), - TQT_SLOT( slotStoredDataReq( TDEIO::Job *, TQByteArray & ) ) ); + connect( this, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotStoredData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( this, TQ_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ), + TQ_SLOT( slotStoredDataReq( TDEIO::Job *, TQByteArray & ) ) ); } void StoredTransferJob::setData( const TQByteArray& arr ) @@ -1589,8 +1589,8 @@ DirectCopyJob::DirectCopyJob( const KURL& url, int command, void DirectCopyJob::start( Slave* slave ) { - connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ), - TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); + connect( slave, TQ_SIGNAL(canResume( TDEIO::filesize_t ) ), + TQ_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); SimpleJob::start(slave); } @@ -1637,7 +1637,7 @@ FileCopyJob::FileCopyJob( const KURL& src, const KURL& dest, int permissions, d->m_delJob = 0; d->m_sourceSize = (TDEIO::filesize_t) -1; d->m_modificationTime = static_cast<time_t>( -1 ); - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } void FileCopyJob::slotStart() @@ -1731,8 +1731,8 @@ void FileCopyJob::startCopyJob(const KURL &slave_url) m_copyJob = new DirectCopyJob(slave_url, CMD_COPY, packedArgs, false); addSubjob( m_copyJob ); connectSubjob( m_copyJob ); - connect( m_copyJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), - TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); + connect( m_copyJob, TQ_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), + TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); } void FileCopyJob::startRenameJob(const KURL &slave_url) @@ -1745,14 +1745,14 @@ void FileCopyJob::startRenameJob(const KURL &slave_url) void FileCopyJob::connectSubjob( SimpleJob * job ) { - connect( job, TQT_SIGNAL(totalSize( TDEIO::Job*, TDEIO::filesize_t )), - this, TQT_SLOT( slotTotalSize(TDEIO::Job*, TDEIO::filesize_t)) ); + connect( job, TQ_SIGNAL(totalSize( TDEIO::Job*, TDEIO::filesize_t )), + this, TQ_SLOT( slotTotalSize(TDEIO::Job*, TDEIO::filesize_t)) ); - connect( job, TQT_SIGNAL(processedSize( TDEIO::Job*, TDEIO::filesize_t )), - this, TQT_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t)) ); + connect( job, TQ_SIGNAL(processedSize( TDEIO::Job*, TDEIO::filesize_t )), + this, TQ_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t)) ); - connect( job, TQT_SIGNAL(percent( TDEIO::Job*, unsigned long )), - this, TQT_SLOT( slotPercent(TDEIO::Job*, unsigned long)) ); + connect( job, TQ_SIGNAL(percent( TDEIO::Job*, unsigned long )), + this, TQ_SLOT( slotPercent(TDEIO::Job*, unsigned long)) ); } @@ -1800,10 +1800,10 @@ void FileCopyJob::startDataPump() // The first thing the put job will tell us is whether we can // resume or not (this is always emitted) - connect( m_putJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), - TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); - connect( m_putJob, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray&)), - TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray&))); + connect( m_putJob, TQ_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), + TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); + connect( m_putJob, TQ_SIGNAL(dataReq(TDEIO::Job *, TQByteArray&)), + TQ_SLOT( slotDataReq(TDEIO::Job *, TQByteArray&))); addSubjob( m_putJob ); } @@ -1862,8 +1862,8 @@ void FileCopyJob::slotCanResume( TDEIO::Job* job, TDEIO::filesize_t offset ) m_getJob->addMetaData( "resume", TDEIO::number(offset) ); // Might or might not get emitted - connect( m_getJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), - TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); + connect( m_getJob, TQ_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), + TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); } m_putJob->slave()->setOffset( offset ); @@ -1872,10 +1872,10 @@ void FileCopyJob::slotCanResume( TDEIO::Job* job, TDEIO::filesize_t offset ) connectSubjob( m_getJob ); // Progress info depends on get m_getJob->resume(); // Order a beer - connect( m_getJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), - TQT_SLOT( slotData(TDEIO::Job*,const TQByteArray&)) ); - connect( m_getJob, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&) ), - TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); + connect( m_getJob, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), + TQ_SLOT( slotData(TDEIO::Job*,const TQByteArray&)) ); + connect( m_getJob, TQ_SIGNAL(mimetype(TDEIO::Job*,const TQString&) ), + TQ_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); } else // copyjob { @@ -2104,9 +2104,9 @@ void ListJob::slotListEntries( const TDEIO::UDSEntryList& list ) prefix + filename + "/", includeHidden); Scheduler::scheduleJob(job); - connect(job, TQT_SIGNAL(entries( TDEIO::Job *, + connect(job, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( gotEntries( TDEIO::Job*, + TQ_SLOT( gotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob(job); } @@ -2239,15 +2239,15 @@ void ListJob::start(Slave *slave) { m_error = ERR_ACCESS_DENIED; m_errorText = m_url.url(); - TQTimer::singleShot(0, this, TQT_SLOT(slotFinished()) ); + TQTimer::singleShot(0, this, TQ_SLOT(slotFinished()) ); return; } - connect( slave, TQT_SIGNAL( listEntries( const TDEIO::UDSEntryList& )), - TQT_SLOT( slotListEntries( const TDEIO::UDSEntryList& ))); - connect( slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); - connect( slave, TQT_SIGNAL( redirection(const KURL &) ), - TQT_SLOT( slotRedirection(const KURL &) ) ); + connect( slave, TQ_SIGNAL( listEntries( const TDEIO::UDSEntryList& )), + TQ_SLOT( slotListEntries( const TDEIO::UDSEntryList& ))); + connect( slave, TQ_SIGNAL( totalSize( TDEIO::filesize_t ) ), + TQ_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); + connect( slave, TQ_SIGNAL( redirection(const KURL &) ), + TQ_SLOT( slotRedirection(const KURL &) ) ); SimpleJob::start(slave); } @@ -2290,13 +2290,13 @@ CopyJob::CopyJob( const KURL::List& src, const KURL& dest, CopyMode mode, bool a d->m_globalDestinationState = destinationState; if ( showProgressInfo ) { - connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); } - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); /** States: STATE_STATING for the dest @@ -2327,7 +2327,7 @@ void CopyJob::slotStart() */ m_reportTimer = new TQTimer(this); - connect(m_reportTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotReport())); + connect(m_reportTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotReport())); m_reportTimer->start(REPORT_TIMEOUT,false); // Stat the dest @@ -2841,9 +2841,9 @@ void CopyJob::startListing( const KURL & src ) d->m_bURLDirty = true; ListJob * newjob = listRecursive( src, false ); newjob->setUnrestricted(true); - connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *, + connect(newjob, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( slotEntries( TDEIO::Job*, + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob( newjob ); } @@ -3548,10 +3548,10 @@ void CopyJob::copyNextFile() d->m_bURLDirty = true; } addSubjob(newjob); - connect( newjob, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), - this, TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( newjob, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), - this, TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( newjob, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + this, TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( newjob, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + this, TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); } else { @@ -4031,29 +4031,29 @@ DeleteJob::DeleteJob( const KURL::List& src, bool /*shred*/, bool showProgressIn { if ( showProgressInfo ) { - connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); // See slotReport - /*connect( this, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), - m_observer, TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); + /*connect( this, TQ_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), + m_observer, TQ_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), - m_observer, TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), + m_observer, TQ_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), - m_observer, TQT_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );*/ + connect( this, TQ_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), + m_observer, TQ_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );*/ m_reportTimer=new TQTimer(this); - connect(m_reportTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotReport())); + connect(m_reportTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotReport())); //this will update the report dialog with 5 Hz, I think this is fast enough, aleXXX m_reportTimer->start(REPORT_TIMEOUT,false); } - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } void DeleteJob::slotStart() @@ -4379,9 +4379,9 @@ void DeleteJob::slotResult( Job *job ) ListJob *newjob = listRecursive( url, false ); newjob->setUnrestricted(true); // No KIOSK restrictions Scheduler::scheduleJob(newjob); - connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *, + connect(newjob, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( slotEntries( TDEIO::Job*, + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob(newjob); } else { diff --git a/tdeio/tdeio/jobclasses.h b/tdeio/tdeio/jobclasses.h index b1da73bf1..d83668f5b 100644 --- a/tdeio/tdeio/jobclasses.h +++ b/tdeio/tdeio/jobclasses.h @@ -50,8 +50,8 @@ namespace TDEIO { * * \code * TDEIO::Job * job = TDEIO::someoperation( some parameters ); - * 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 * ) ) ); * \endcode * (other connects, specific to the job) * diff --git a/tdeio/tdeio/kautomount.cpp b/tdeio/tdeio/kautomount.cpp index c6fa72371..313c8e47b 100644 --- a/tdeio/tdeio/kautomount.cpp +++ b/tdeio/tdeio/kautomount.cpp @@ -39,7 +39,7 @@ KAutoMount::KAutoMount( bool _readonly, const TQString& _format, const TQString& m_bShowFilemanagerWindow = _show_filemanager_window; TDEIO::Job* job = TDEIO::mount( _readonly, _format.ascii(), _device, _mountpoint ); - 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 * ) ) ); } void KAutoMount::slotResult( TDEIO::Job * job ) @@ -81,7 +81,7 @@ KAutoUnmount::KAutoUnmount( const TQString & _mountpoint, const TQString & _desk : m_desktopFile( _desktopFile ), m_mountpoint( _mountpoint ) { TDEIO::Job * job = TDEIO::unmount( m_mountpoint ); - 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 * ) ) ); } void KAutoUnmount::slotResult( TDEIO::Job * job ) diff --git a/tdeio/tdeio/kdatatool.cpp b/tdeio/tdeio/kdatatool.cpp index 5ec790aa7..8d67808df 100644 --- a/tdeio/tdeio/kdatatool.cpp +++ b/tdeio/tdeio/kdatatool.cpp @@ -251,7 +251,7 @@ TQPtrList<TDEAction> KDataToolAction::dataToolActionList( const TQValueList<KDat { //kdDebug() << "creating action " << *uit << " " << *cit << endl; KDataToolAction * action = new KDataToolAction( *uit, *entry, *cit ); - connect( action, TQT_SIGNAL( toolActivated( const KDataToolInfo &, const TQString & ) ), + connect( action, TQ_SIGNAL( toolActivated( const KDataToolInfo &, const TQString & ) ), receiver, slot ); actionList.append( action ); } diff --git a/tdeio/tdeio/kdirlister.cpp b/tdeio/tdeio/kdirlister.cpp index a0c31578f..31a705fa2 100644 --- a/tdeio/tdeio/kdirlister.cpp +++ b/tdeio/tdeio/kdirlister.cpp @@ -63,12 +63,12 @@ KDirListerCache::KDirListerCache( int maxCount ) urlsCurrentlyHeld.setAutoDelete( true ); pendingUpdates.setAutoDelete( true ); - connect( kdirwatch, TQT_SIGNAL( dirty( const KURL& ) ), - this, TQT_SLOT( slotFileDirty( const KURL& ) ) ); - connect( kdirwatch, TQT_SIGNAL( created( const TQString& ) ), - this, TQT_SLOT( slotFileCreated( const TQString& ) ) ); - connect( kdirwatch, TQT_SIGNAL( deleted( const TQString& ) ), - this, TQT_SLOT( slotFileDeleted( const TQString& ) ) ); + connect( kdirwatch, TQ_SIGNAL( dirty( const KURL& ) ), + this, TQ_SLOT( slotFileDirty( const KURL& ) ) ); + connect( kdirwatch, TQ_SIGNAL( created( const TQString& ) ), + this, TQ_SLOT( slotFileCreated( const TQString& ) ) ); + connect( kdirwatch, TQ_SIGNAL( deleted( const TQString& ) ), + this, TQ_SLOT( slotFileDeleted( const TQString& ) ) ); } KDirListerCache::~KDirListerCache() @@ -243,12 +243,12 @@ bool KDirListerCache::listDir( KDirLister *lister, const KURL& _u, job->setWindow( lister->d->window ); } - connect( job, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ), - this, TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( redirection( TDEIO::Job *, const KURL & ) ), - this, TQT_SLOT( slotRedirection( TDEIO::Job *, const KURL & ) ) ); + connect( job, TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ), + this, TQ_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( redirection( TDEIO::Job *, const KURL & ) ), + this, TQ_SLOT( slotRedirection( TDEIO::Job *, const KURL & ) ) ); emit lister->started( _url ); @@ -608,10 +608,10 @@ void KDirListerCache::updateDirectory( const KURL& _dir ) job = TDEIO::listDir( _dir, false /* no default GUI */ ); jobs.insert( job, TQValueList<TDEIO::UDSEntry>() ); - connect( job, TQT_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), - this, TQT_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); - connect( job, TQT_SIGNAL(result( TDEIO::Job * )), - this, TQT_SLOT(slotUpdateResult( TDEIO::Job * )) ); + connect( job, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), + this, TQ_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * )), + this, TQ_SLOT(slotUpdateResult( TDEIO::Job * )) ); kdDebug(7004) << k_funcinfo << "update started in " << _dir << endl; @@ -925,7 +925,7 @@ void KDirListerCache::slotFileDirty( const KURL& _url ) { // Nice hack to save memory: use the qt object name to store the filename TQTimer *timer = new TQTimer( this, _url.path().utf8() ); - connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFileDirtyDelayed()) ); + connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotFileDirtyDelayed()) ); pendingUpdates.insert( _url.path(), timer ); timer->start( 500, true ); } @@ -1357,10 +1357,10 @@ void KDirListerCache::slotRedirection( TDEIO::Job *j, const KURL& url ) // make the job an update job job->disconnect( this ); - connect( job, TQT_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), - this, TQT_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); - connect( job, TQT_SIGNAL(result( TDEIO::Job * )), - this, TQT_SLOT(slotUpdateResult( TDEIO::Job * )) ); + connect( job, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), + this, TQ_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * )), + this, TQ_SLOT(slotUpdateResult( TDEIO::Job * )) ); // FIXME: autoUpdate-Counts!! @@ -1953,8 +1953,8 @@ bool KDirLister::openURL( const KURL& _url, bool _keep, bool _reload ) d->openURL_url[localURLJob] = _url; d->openURL_keep[localURLJob] = _keep; d->openURL_reload[localURLJob] = _reload; - connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQT_SLOT(slotOpenURLGotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool))); - connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed())); + connect(localURLJob, TQ_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQ_SLOT(slotOpenURLGotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool))); + connect(localURLJob, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotLocalURLKIODestroyed())); } return true; } @@ -2641,16 +2641,16 @@ void KDirLister::jobStarted( TDEIO::ListJob *job ) void KDirLister::connectJob( TDEIO::ListJob *job ) { - connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job *, const TQString& )), - this, TQT_SLOT(slotInfoMessage( TDEIO::Job *, const TQString& )) ); - connect( job, TQT_SIGNAL(percent( TDEIO::Job *, unsigned long )), - this, TQT_SLOT(slotPercent( TDEIO::Job *, unsigned long )) ); - connect( job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t )), - this, TQT_SLOT(slotTotalSize( TDEIO::Job *, TDEIO::filesize_t )) ); - connect( job, TQT_SIGNAL(processedSize( TDEIO::Job *, TDEIO::filesize_t )), - this, TQT_SLOT(slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t )) ); - connect( job, TQT_SIGNAL(speed( TDEIO::Job *, unsigned long )), - this, TQT_SLOT(slotSpeed( TDEIO::Job *, unsigned long )) ); + connect( job, TQ_SIGNAL(infoMessage( TDEIO::Job *, const TQString& )), + this, TQ_SLOT(slotInfoMessage( TDEIO::Job *, const TQString& )) ); + connect( job, TQ_SIGNAL(percent( TDEIO::Job *, unsigned long )), + this, TQ_SLOT(slotPercent( TDEIO::Job *, unsigned long )) ); + connect( job, TQ_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t )), + this, TQ_SLOT(slotTotalSize( TDEIO::Job *, TDEIO::filesize_t )) ); + connect( job, TQ_SIGNAL(processedSize( TDEIO::Job *, TDEIO::filesize_t )), + this, TQ_SLOT(slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t )) ); + connect( job, TQ_SIGNAL(speed( TDEIO::Job *, unsigned long )), + this, TQ_SLOT(slotSpeed( TDEIO::Job *, unsigned long )) ); } void KDirLister::emitCompleted( const KURL& _url ) diff --git a/tdeio/tdeio/kdirwatch.cpp b/tdeio/tdeio/kdirwatch.cpp index c87558e1d..680b18cab 100644 --- a/tdeio/tdeio/kdirwatch.cpp +++ b/tdeio/tdeio/kdirwatch.cpp @@ -226,7 +226,7 @@ KDirWatchPrivate::KDirWatchPrivate() : rescan_timer(0, "KDirWatchPrivate::rescan_timer") { timer = new TQTimer(this, "KDirWatchPrivate::timer"); - connect (timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan())); + connect (timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan())); freq = 3600000; // 1 hour as upper bound statEntries = 0; delayRemove = false; @@ -240,7 +240,7 @@ KDirWatchPrivate::KDirWatchPrivate() // used for FAM and DNOTIFY rescan_all = false; - connect(&rescan_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan())); + connect(&rescan_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan())); #ifdef HAVE_FAM // It's possible that FAM server can't be started @@ -249,8 +249,8 @@ KDirWatchPrivate::KDirWatchPrivate() use_fam=true; sn = new TQSocketNotifier( FAMCONNECTION_GETFD(&fc), TQSocketNotifier::Read, this); - connect( sn, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(famEventReceived()) ); + connect( sn, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(famEventReceived()) ); } else { kdDebug(7001) << "Can't use FAM (fam daemon not running?)" << endl; @@ -286,7 +286,7 @@ KDirWatchPrivate::KDirWatchPrivate() fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC); mSn = new TQSocketNotifier( m_inotify_fd, TQSocketNotifier::Read, this ); - connect( mSn, TQT_SIGNAL(activated( int )), this, TQT_SLOT( slotActivated() ) ); + connect( mSn, TQ_SIGNAL(activated( int )), this, TQ_SLOT( slotActivated() ) ); } #endif @@ -320,7 +320,7 @@ KDirWatchPrivate::KDirWatchPrivate() fcntl(mPipe[0], F_SETFL, O_NONBLOCK | fcntl(mPipe[0], F_GETFL)); fcntl(mPipe[1], F_SETFL, O_NONBLOCK | fcntl(mPipe[1], F_GETFL)); mSn = new TQSocketNotifier( mPipe[0], TQSocketNotifier::Read, this); - connect(mSn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated())); + connect(mSn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated())); // Install the signal handler only once if ( dnotify_signal == 0 ) { @@ -1420,7 +1420,7 @@ void KDirWatchPrivate::slotRescan() timer->start(freq); } - TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed())); } bool KDirWatchPrivate::isNoisyFile( const char * filename ) @@ -1469,7 +1469,7 @@ void KDirWatchPrivate::famEventReceived() checkFAMEvent(&fe); } - TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed())); } void KDirWatchPrivate::checkFAMEvent(FAMEvent* fe) diff --git a/tdeio/tdeio/kmimetypechooser.cpp b/tdeio/tdeio/kmimetypechooser.cpp index 758cd4940..b8bbf9679 100644 --- a/tdeio/tdeio/kmimetypechooser.cpp +++ b/tdeio/tdeio/kmimetypechooser.cpp @@ -93,12 +93,12 @@ KMimeTypeChooser::KMimeTypeChooser( const TQString &text, ((TQBoxLayout*)btns->layout())->addStretch(1); d->btnEditMimeType = new TQPushButton( i18n("&Edit..."), btns ); - connect( d->btnEditMimeType, TQT_SIGNAL(clicked()), this, TQT_SLOT(editMimeType()) ); + connect( d->btnEditMimeType, TQ_SIGNAL(clicked()), this, TQ_SLOT(editMimeType()) ); d->btnEditMimeType->setEnabled( false ); - connect( d->lvMimeTypes, TQT_SIGNAL( doubleClicked ( TQListViewItem * )), - this, TQT_SLOT( editMimeType())); - connect( d->lvMimeTypes, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListViewItem*)) ); + connect( d->lvMimeTypes, TQ_SIGNAL( doubleClicked ( TQListViewItem * )), + this, TQ_SLOT( editMimeType())); + connect( d->lvMimeTypes, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListViewItem*)) ); TQWhatsThis::add( d->btnEditMimeType, i18n( "Click this button to display the familiar TDE mime type editor.") ); @@ -193,8 +193,8 @@ void KMimeTypeChooser::editMimeType() return; TQString mt = (d->lvMimeTypes->currentItem()->parent())->text( 0 ) + "/" + (d->lvMimeTypes->currentItem())->text( 0 ); // thanks to libkonq/konq_operations.cpp - connect( KSycoca::self(), TQT_SIGNAL(databaseChanged()), - this, TQT_SLOT(slotSycocaDatabaseChanged()) ); + connect( KSycoca::self(), TQ_SIGNAL(databaseChanged()), + this, TQ_SLOT(slotSycocaDatabaseChanged()) ); TQString keditfiletype = TQString::fromLatin1("keditfiletype"); KRun::runCommand( keditfiletype + " --parent " + TQString::number( (ulong)topLevelWidget()->winId()) diff --git a/tdeio/tdeio/kmimetyperesolver.h b/tdeio/tdeio/kmimetyperesolver.h index b36d1ffb2..b0a6d7f9e 100644 --- a/tdeio/tdeio/kmimetyperesolver.h +++ b/tdeio/tdeio/kmimetyperesolver.h @@ -56,12 +56,12 @@ public: : m_resolver( resolver ), m_timer( new TQTimer( this ) ) { - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotProcessMimeIcons() )); + connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotProcessMimeIcons() )); - connect( view->horizontalScrollBar(), TQT_SIGNAL( sliderMoved(int) ), - TQT_SLOT( slotAdjust() ) ); - connect( view->verticalScrollBar(), TQT_SIGNAL( sliderMoved(int) ), - TQT_SLOT( slotAdjust() ) ); + connect( view->horizontalScrollBar(), TQ_SIGNAL( sliderMoved(int) ), + TQ_SLOT( slotAdjust() ) ); + connect( view->verticalScrollBar(), TQ_SIGNAL( sliderMoved(int) ), + TQ_SLOT( slotAdjust() ) ); view->viewport()->installEventFilter( this ); } diff --git a/tdeio/tdeio/knfsshare.cpp b/tdeio/tdeio/knfsshare.cpp index b4a3d903a..b72a94318 100644 --- a/tdeio/tdeio/knfsshare.cpp +++ b/tdeio/tdeio/knfsshare.cpp @@ -162,8 +162,8 @@ KNFSShare::KNFSShare() { d = new KNFSSharePrivate(); if (TQFile::exists(d->exportsFile)) { KDirWatch::self()->addFile(d->exportsFile); - connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString&))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString&))); } } diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp index ca08c9d85..909594c1e 100644 --- a/tdeio/tdeio/krun.cpp +++ b/tdeio/tdeio/krun.cpp @@ -918,7 +918,7 @@ void KRun::init ( const KURL& url, TQWidget* window, const TQCString& asn, mode_ // loop and do initialization afterwards. // Reason: We must complete the constructor before we do anything else. m_bInit = true; - connect( &m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimeout() ) ); + connect( &m_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimeout() ) ); m_timer.start( 0, true ); kdDebug(7010) << " new KRun " << this << " " << url.prettyURL() << " timer=" << &m_timer << endl; @@ -1109,8 +1109,8 @@ void KRun::init() // It may be a directory or a file, let's stat TDEIO::StatJob *job = TDEIO::stat( m_strURL, true, 0 /* no details */, m_bProgressInfo ); job->setWindow (d->m_window); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotStatResult( TDEIO::Job * ) ) ); m_job = job; kdDebug(7010) << " Job " << job << " is about stating " << m_strURL.url() << endl; } @@ -1158,10 +1158,10 @@ void KRun::scanFile() TDEIO::TransferJob *job = TDEIO::get( m_strURL, false /*reload*/, m_bProgressInfo ); job->setWindow (d->m_window); - connect(job, TQT_SIGNAL( result(TDEIO::Job *)), - this, TQT_SLOT( slotScanFinished(TDEIO::Job *))); - connect(job, TQT_SIGNAL( mimetype(TDEIO::Job *, const TQString &)), - this, TQT_SLOT( slotScanMimeType(TDEIO::Job *, const TQString &))); + connect(job, TQ_SIGNAL( result(TDEIO::Job *)), + this, TQ_SLOT( slotScanFinished(TDEIO::Job *))); + connect(job, TQ_SIGNAL( mimetype(TDEIO::Job *, const TQString &)), + this, TQ_SLOT( slotScanMimeType(TDEIO::Job *, const TQString &))); m_job = job; kdDebug(7010) << " Job " << job << " is about getting from " << m_strURL.url() << endl; } @@ -1341,8 +1341,8 @@ void KRun::foundMimeType( const TQString& type ) // (For instance a tar.gz is a directory contained inside a file) // It may be a directory or a file, let's stat TDEIO::StatJob *job = TDEIO::stat( m_strURL, m_bProgressInfo ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotStatResult( TDEIO::Job * ) ) ); m_job = job; return; @@ -1485,8 +1485,8 @@ TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName ) binName( _binName ) { TQObject::connect( - process_, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); + process_, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); process_->start(); if ( !process_->pid() ) @@ -1501,8 +1501,8 @@ TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName, co id_( id ) { TQObject::connect( - process_, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); + process_, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); process_->start(); if ( !process_->pid() ) diff --git a/tdeio/tdeio/ksambashare.cpp b/tdeio/tdeio/ksambashare.cpp index 608594ee5..d209812dd 100644 --- a/tdeio/tdeio/ksambashare.cpp +++ b/tdeio/tdeio/ksambashare.cpp @@ -181,8 +181,8 @@ KSambaShare::KSambaShare() { if (TQFile::exists(d->smbConf)) { KDirWatch::self()->addFile(d->smbConf); KDirWatch::self()->addFile(FILESHARECONF); - connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString&))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString&))); } } diff --git a/tdeio/tdeio/kscan.h b/tdeio/tdeio/kscan.h index eb9ab9116..cfc70e08a 100644 --- a/tdeio/tdeio/kscan.h +++ b/tdeio/tdeio/kscan.h @@ -43,8 +43,8 @@ class TQImage; * if ( !m_scanDialog ) // no scanning support installed? * return; * - * connect( m_scanDialog, TQT_SIGNAL( finalImage( const TQImage&, int )), - * TQT_SLOT( slotScanned( const TQImage&, int ) )); + * connect( m_scanDialog, TQ_SIGNAL( finalImage( const TQImage&, int )), + * TQ_SLOT( slotScanned( const TQImage&, int ) )); * } * * if ( m_scanDialog->setup() ) // only if scanner configured/available diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp index 3f431cb2c..74df1a6b1 100644 --- a/tdeio/tdeio/kservice.cpp +++ b/tdeio/tdeio/kservice.cpp @@ -927,7 +927,7 @@ void KService::rebuildKSycoca(TQWidget *parent) DCOPClient *client = kapp->dcopClient(); int result = client->callAsync("kded", "tdebuildsycoca", "recreate()", - data, &dlg, TQT_SLOT(slotFinished())); + data, &dlg, TQ_SLOT(slotFinished())); if (result) { @@ -939,7 +939,7 @@ KServiceProgressDialog::KServiceProgressDialog(TQWidget *parent, const char *nam const TQString &caption, const TQString &text) : KProgressDialog(parent, name, caption, text, true) { - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProgress())); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotProgress())); progressBar()->setTotalSteps(20); m_timeStep = 700; m_timer.start(m_timeStep); @@ -968,7 +968,7 @@ KServiceProgressDialog::slotFinished() { progressBar()->setProgress(20); m_timer.stop(); - TQTimer::singleShot(1000, this, TQT_SLOT(close())); + TQTimer::singleShot(1000, this, TQ_SLOT(close())); } #include "kservice_p.moc" diff --git a/tdeio/tdeio/kurlcompletion.cpp b/tdeio/tdeio/kurlcompletion.cpp index f7d095ced..1bbac7cfe 100644 --- a/tdeio/tdeio/kurlcompletion.cpp +++ b/tdeio/tdeio/kurlcompletion.cpp @@ -1333,12 +1333,12 @@ void KURLCompletion::slotIOFinished( TDEIO::Job * job ) assert( d->list_job ); connect( d->list_job, - TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotIOFinished(TDEIO::Job*)) ); + TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotIOFinished(TDEIO::Job*)) ); connect( d->list_job, - TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)) ); + TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)) ); delete kurl; } diff --git a/tdeio/tdeio/metainfojob.cpp b/tdeio/tdeio/metainfojob.cpp index 4f0721492..e00c262c8 100644 --- a/tdeio/tdeio/metainfojob.cpp +++ b/tdeio/tdeio/metainfojob.cpp @@ -61,7 +61,7 @@ MetaInfoJob::MetaInfoJob(const KFileItemList &items, bool deleteItems) // Return to event loop first, determineNextFile() might delete this; // (no idea what that means, it comes from previewjob) - TQTimer::singleShot(0, this, TQT_SLOT(start())); + TQTimer::singleShot(0, this, TQ_SLOT(start())); } MetaInfoJob::~MetaInfoJob() @@ -130,8 +130,8 @@ void MetaInfoJob::getMetaInfo() TDEIO::TransferJob* job = TDEIO::get(URL, false, false); addSubjob(job); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotMetaInfo(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotMetaInfo(TDEIO::Job *, const TQByteArray &))); job->addMetaData("mimeType", d->currentItem->current()->mimetype()); } diff --git a/tdeio/tdeio/netaccess.cpp b/tdeio/tdeio/netaccess.cpp index 05aec6743..da141e3ae 100644 --- a/tdeio/tdeio/netaccess.cpp +++ b/tdeio/tdeio/netaccess.cpp @@ -316,8 +316,8 @@ bool NetAccess::filecopyInternal(const KURL& src, const KURL& target, int permis ? TDEIO::file_move( src, target, permissions, overwrite, resume ) : TDEIO::file_copy( src, target, permissions, overwrite, resume ); job->setWindow (window); - 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 *) ) ); enter_loop(); return bJobOK; @@ -332,8 +332,8 @@ bool NetAccess::dircopyInternal(const KURL::List& src, const KURL& target, ? TDEIO::move( src, target ) : TDEIO::copy( src, target ); job->setWindow (window); - 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 *) ) ); enter_loop(); return bJobOK; @@ -347,8 +347,8 @@ bool NetAccess::statInternal( const KURL & url, int details, bool source, job->setWindow (window); job->setDetails( details ); job->setSide( source ); - 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 *) ) ); enter_loop(); return bJobOK; } @@ -358,8 +358,8 @@ KURL NetAccess::localURLInternal( const KURL & url, TQWidget* window ) m_localURL = url; TDEIO::LocalURLJob* job = TDEIO::localURL(url); job->setWindow (window); - connect(job, TQT_SIGNAL( localURL(TDEIO::Job*, const KURL&, bool) ), - this, TQT_SLOT( slotLocalURL(TDEIO::Job*, const KURL&, bool) )); + connect(job, TQ_SIGNAL( localURL(TDEIO::Job*, const KURL&, bool) ), + this, TQ_SLOT( slotLocalURL(TDEIO::Job*, const KURL&, bool) )); enter_loop(); return m_localURL; } @@ -369,8 +369,8 @@ bool NetAccess::delInternal( const KURL & url, TQWidget* window ) bJobOK = true; // success unless further error occurs TDEIO::Job * job = TDEIO::del( url ); job->setWindow (window); - 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 *) ) ); enter_loop(); return bJobOK; } @@ -381,8 +381,8 @@ bool NetAccess::mkdirInternal( const KURL & url, int permissions, bJobOK = true; // success unless further error occurs TDEIO::Job * job = TDEIO::mkdir( url, permissions ); job->setWindow (window); - 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 *) ) ); enter_loop(); return bJobOK; } @@ -393,10 +393,10 @@ TQString NetAccess::mimetypeInternal( const KURL & url, TQWidget* window ) m_mimetype = TQString::fromLatin1("unknown"); TDEIO::Job * job = TDEIO::mimetype( url ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); - connect( job, TQT_SIGNAL( mimetype (TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotMimetype (TDEIO::Job *, const TQString &) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( mimetype (TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotMimetype (TDEIO::Job *, const TQString &) ) ); enter_loop(); return m_mimetype; } @@ -437,8 +437,8 @@ TQString NetAccess::fish_executeInternal(const KURL & url, const TQString comman TDEIO::Job * job = TDEIO::special( tempPathUrl, packedArgs, true ); job->setWindow( window ); - 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 *) ) ); enter_loop(); // since the TDEIO::special does not provide feedback we need to download the result @@ -482,21 +482,21 @@ bool NetAccess::synchronousRunInternal( Job* job, TQWidget* window, TQByteArray* } } - 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 *) ) ); TQMetaObject *meta = job->metaObject(); static const char dataSignal[] = "data(TDEIO::Job*,const " "TQByteArray" "&)"; if ( meta->findSignal( dataSignal ) != -1 ) { - connect( job, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), - this, TQT_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), + this, TQ_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) ); } static const char redirSignal[] = "redirection(TDEIO::Job*,const KURL&)"; if ( meta->findSignal( redirSignal ) != -1 ) { - connect( job, TQT_SIGNAL(redirection(TDEIO::Job*,const KURL&)), - this, TQT_SLOT(slotRedirection(TDEIO::Job*, const KURL&)) ); + connect( job, TQ_SIGNAL(redirection(TDEIO::Job*,const KURL&)), + this, TQ_SLOT(slotRedirection(TDEIO::Job*, const KURL&)) ); } enter_loop(); diff --git a/tdeio/tdeio/passdlg.cpp b/tdeio/tdeio/passdlg.cpp index c0109f3cf..63c13ff22 100644 --- a/tdeio/tdeio/passdlg.cpp +++ b/tdeio/tdeio/passdlg.cpp @@ -148,13 +148,13 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, d->keepCheckBox->setFixedSize( d->keepCheckBox->sizeHint() ); d->keep = cfg->readBoolEntry("Keep", false ); d->keepCheckBox->setChecked( d->keep ); - connect(d->keepCheckBox, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotKeep( bool ))); + connect(d->keepCheckBox, TQ_SIGNAL(toggled( bool )), TQ_SLOT(slotKeep( bool ))); d->layout->addWidget( hbox, 8, 2 ); } // Configure necessary key-bindings and connect necessar slots and signals - connect( d->userEdit, TQT_SIGNAL(returnPressed()), d->passEdit, TQT_SLOT(setFocus()) ); - connect( d->passEdit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOk()) ); + connect( d->userEdit, TQ_SIGNAL(returnPressed()), d->passEdit, TQ_SLOT(setFocus()) ); + connect( d->passEdit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotOk()) ); if ( !user.isEmpty() ) { @@ -315,8 +315,8 @@ void PasswordDialog::setKnownLogins( const TQMap<TQString, TQString>& knownLogin d->userEditCombo->insertStringList( knownLogins.keys() ); d->userEditCombo->setFocus(); - connect( d->userEditCombo, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( slotActivated( const TQString& ) ) ); + connect( d->userEditCombo, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( slotActivated( const TQString& ) ) ); } void PasswordDialog::slotActivated( const TQString& userName ) diff --git a/tdeio/tdeio/pastedialog.cpp b/tdeio/tdeio/pastedialog.cpp index d95cc7e88..61fb12c48 100644 --- a/tdeio/tdeio/pastedialog.cpp +++ b/tdeio/tdeio/pastedialog.cpp @@ -53,17 +53,17 @@ TDEIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label, layout->addStretch(); - //connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - // TQT_SLOT( slotEditTextChanged( const TQString & ) ) ); - //connect( this, TQT_SIGNAL( user1Clicked() ), m_lineEdit, TQT_SLOT( clear() ) ); + //connect( m_lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + // TQ_SLOT( slotEditTextChanged( const TQString & ) ) ); + //connect( this, TQ_SIGNAL( user1Clicked() ), m_lineEdit, TQ_SLOT( clear() ) ); //slotEditTextChanged( value ); setMinimumWidth( 350 ); m_clipboardChanged = false; if ( clipboard ) - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( slotClipboardDataChanged() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( slotClipboardDataChanged() ) ); } void TDEIO::PasteDialog::slotClipboardDataChanged() diff --git a/tdeio/tdeio/previewjob.cpp b/tdeio/tdeio/previewjob.cpp index 38ee74ac2..d1820a69e 100644 --- a/tdeio/tdeio/previewjob.cpp +++ b/tdeio/tdeio/previewjob.cpp @@ -139,7 +139,7 @@ PreviewJob::PreviewJob( const KFileItemList &items, int width, int height, d->ignoreMaximumSize = false; // Return to event loop first, determineNextFile() might delete this; - connect(&d->startPreviewTimer, TQT_SIGNAL(timeout()), TQT_SLOT(startPreview()) ); + connect(&d->startPreviewTimer, TQ_SIGNAL(timeout()), TQ_SLOT(startPreview()) ); d->startPreviewTimer.start(0, true); } @@ -450,7 +450,7 @@ void PreviewJob::createThumbnail( TQString pixPath ) thumbURL.setPath(pixPath); TDEIO::TransferJob *job = TDEIO::get(thumbURL, false, false); addSubjob(job); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQ_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &))); bool save = d->bSave && d->currentItem.plugin->property("CacheThumbnail").toBool(); job->addMetaData("mimeType", d->currentItem.item->mimetype()); job->addMetaData("width", TQString().setNum(save ? d->cacheWidth : d->width)); diff --git a/tdeio/tdeio/progressbase.cpp b/tdeio/tdeio/progressbase.cpp index 146f4182e..608213c6a 100644 --- a/tdeio/tdeio/progressbase.cpp +++ b/tdeio/tdeio/progressbase.cpp @@ -37,14 +37,14 @@ ProgressBase::ProgressBase( TQWidget *parent ) void ProgressBase::setJob( TDEIO::Job *job ) { // first connect all slots - connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); - connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( canceled( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); // then assign job m_pJob = job; @@ -54,37 +54,37 @@ void ProgressBase::setJob( TDEIO::Job *job ) void ProgressBase::setJob( TDEIO::CopyJob *job ) { // first connect all slots - connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), - TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( copying( TDEIO::Job*, const KURL& , const KURL& ) ), - TQT_SLOT( slotCopying( TDEIO::Job*, const KURL&, const KURL& ) ) ); - connect( job, TQT_SIGNAL( moving( TDEIO::Job*, const KURL& , const KURL& ) ), - TQT_SLOT( slotMoving( TDEIO::Job*, const KURL&, const KURL& ) ) ); - connect( job, TQT_SIGNAL( creatingDir( TDEIO::Job*, const KURL& ) ), - TQT_SLOT( slotCreatingDir( TDEIO::Job*, const KURL& ) ) ); - - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); - - connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( copying( TDEIO::Job*, const KURL& , const KURL& ) ), + TQ_SLOT( slotCopying( TDEIO::Job*, const KURL&, const KURL& ) ) ); + connect( job, TQ_SIGNAL( moving( TDEIO::Job*, const KURL& , const KURL& ) ), + TQ_SLOT( slotMoving( TDEIO::Job*, const KURL&, const KURL& ) ) ); + connect( job, TQ_SIGNAL( creatingDir( TDEIO::Job*, const KURL& ) ), + TQ_SLOT( slotCreatingDir( TDEIO::Job*, const KURL& ) ) ); + + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); + + connect( job, TQ_SIGNAL( canceled( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); // then assign job m_pJob = job; @@ -94,33 +94,33 @@ void ProgressBase::setJob( TDEIO::CopyJob *job ) void ProgressBase::setJob( TDEIO::DeleteJob *job ) { // first connect all slots - connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), - TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), - TQT_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) ); - - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); - - connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), + TQ_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) ); + + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); + + connect( job, TQ_SIGNAL( canceled( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); // then assign job m_pJob = job; diff --git a/tdeio/tdeio/renamedlg.cpp b/tdeio/tdeio/renamedlg.cpp index c41c94a00..37e8ba385 100644 --- a/tdeio/tdeio/renamedlg.cpp +++ b/tdeio/tdeio/renamedlg.cpp @@ -113,42 +113,42 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, setCaption( _caption ); d->bCancel = new KPushButton( KStdGuiItem::cancel(), this ); - connect(d->bCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(b0Pressed())); + connect(d->bCancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(b0Pressed())); if ( ! (_mode & M_NORENAME ) ) { d->bRename = new TQPushButton( i18n( "&Rename" ), this ); d->bRename->setEnabled(false); d->bSuggestNewName = new TQPushButton( i18n( "Suggest New &Name" ), this ); - connect(d->bSuggestNewName, TQT_SIGNAL(clicked()), this, TQT_SLOT(b8Pressed())); - connect(d->bRename, TQT_SIGNAL(clicked()), this, TQT_SLOT(b1Pressed())); + connect(d->bSuggestNewName, TQ_SIGNAL(clicked()), this, TQ_SLOT(b8Pressed())); + connect(d->bRename, TQ_SIGNAL(clicked()), this, TQ_SLOT(b1Pressed())); } if ( ( _mode & M_MULTI ) && ( _mode & M_SKIP ) ) { d->bSkip = new TQPushButton( i18n( "&Skip" ), this ); - connect(d->bSkip, TQT_SIGNAL(clicked()), this, TQT_SLOT(b2Pressed())); + connect(d->bSkip, TQ_SIGNAL(clicked()), this, TQ_SLOT(b2Pressed())); d->bAutoSkip = new TQPushButton( i18n( "&Auto Skip" ), this ); - connect(d->bAutoSkip, TQT_SIGNAL(clicked()), this, TQT_SLOT(b3Pressed())); + connect(d->bAutoSkip, TQ_SIGNAL(clicked()), this, TQ_SLOT(b3Pressed())); } if ( _mode & M_OVERWRITE ) { d->bOverwrite = new TQPushButton( i18n( "&Overwrite" ), this ); - connect(d->bOverwrite, TQT_SIGNAL(clicked()), this, TQT_SLOT(b4Pressed())); + connect(d->bOverwrite, TQ_SIGNAL(clicked()), this, TQ_SLOT(b4Pressed())); if ( _mode & M_MULTI ) { d->bOverwriteAll = new TQPushButton( i18n( "O&verwrite All" ), this ); - connect(d->bOverwriteAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(b5Pressed())); + connect(d->bOverwriteAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(b5Pressed())); } } if ( _mode & M_RESUME ) { d->bResume = new TQPushButton( i18n( "&Resume" ), this ); - connect(d->bResume, TQT_SIGNAL(clicked()), this, TQT_SLOT(b6Pressed())); + connect(d->bResume, TQ_SIGNAL(clicked()), this, TQ_SLOT(b6Pressed())); if ( _mode & M_MULTI ) { d->bResumeAll = new TQPushButton( i18n( "R&esume All" ), this ); - connect(d->bResumeAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(b7Pressed())); + connect(d->bResumeAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(b7Pressed())); } } @@ -325,8 +325,8 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, TQString fileName = d->dest.fileName(); d->m_pLineEdit->setText( TDEIO::decodeFileName( fileName ) ); if ( d->bRename || d->bOverwrite ) - connect(d->m_pLineEdit, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(enableRenameButton(const TQString &))); + connect(d->m_pLineEdit, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(enableRenameButton(const TQString &))); if ( d->bSuggestNewName ) { layout2->addWidget( d->bSuggestNewName ); diff --git a/tdeio/tdeio/scheduler.cpp b/tdeio/tdeio/scheduler.cpp index 77e6eed99..30c2d8375 100644 --- a/tdeio/tdeio/scheduler.cpp +++ b/tdeio/tdeio/scheduler.cpp @@ -139,9 +139,9 @@ Scheduler::Scheduler() extraJobData = new ExtraJobData; sessionData = new SessionData; slaveConfig = SlaveConfig::self(); - connect(&slaveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(startStep())); - connect(&coSlaveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotScheduleCoSlave())); - connect(&cleanupTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCleanIdleSlaves())); + connect(&slaveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(startStep())); + connect(&coSlaveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotScheduleCoSlave())); + connect(&cleanupTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCleanIdleSlaves())); busy = false; } @@ -541,15 +541,15 @@ Slave *Scheduler::createSlave(ProtocolInfo *protInfo, SimpleJob *job, const KURL { slaveList->append(slave); idleSlaves->append(slave); - connect(slave, TQT_SIGNAL(slaveDied(TDEIO::Slave *)), - TQT_SLOT(slotSlaveDied(TDEIO::Slave *))); - connect(slave, TQT_SIGNAL(slaveStatus(pid_t,const TQCString &,const TQString &, bool)), - TQT_SLOT(slotSlaveStatus(pid_t,const TQCString &, const TQString &, bool))); - - connect(slave,TQT_SIGNAL(authorizationKey(const TQCString&, const TQCString&, bool)), - sessionData,TQT_SLOT(slotAuthData(const TQCString&, const TQCString&, bool))); - connect(slave,TQT_SIGNAL(delAuthorization(const TQCString&)), sessionData, - TQT_SLOT(slotDelAuthData(const TQCString&))); + connect(slave, TQ_SIGNAL(slaveDied(TDEIO::Slave *)), + TQ_SLOT(slotSlaveDied(TDEIO::Slave *))); + connect(slave, TQ_SIGNAL(slaveStatus(pid_t,const TQCString &,const TQString &, bool)), + TQ_SLOT(slotSlaveStatus(pid_t,const TQCString &, const TQString &, bool))); + + connect(slave,TQ_SIGNAL(authorizationKey(const TQCString&, const TQCString&, bool)), + sessionData,TQ_SLOT(slotAuthData(const TQCString&, const TQCString&, bool))); + connect(slave,TQ_SIGNAL(delAuthorization(const TQCString&)), sessionData, + TQ_SLOT(slotDelAuthData(const TQCString&))); } else { @@ -713,10 +713,10 @@ Scheduler::_getConnectedSlave(const KURL &url, const TDEIO::MetaData &config ) setupSlave(slave, url, protocol, proxy, true, &config); slave->send( CMD_CONNECT ); - connect(slave, TQT_SIGNAL(connected()), - TQT_SLOT(slotSlaveConnected())); - connect(slave, TQT_SIGNAL(error(int, const TQString &)), - TQT_SLOT(slotSlaveError(int, const TQString &))); + connect(slave, TQ_SIGNAL(connected()), + TQ_SLOT(slotSlaveConnected())); + connect(slave, TQ_SIGNAL(error(int, const TQString &)), + TQ_SLOT(slotSlaveError(int, const TQString &))); coSlaves.insert(slave, new TQPtrList<SimpleJob>()); // kdDebug(7006) << "_getConnectedSlave( " << slave << ")" << endl; @@ -772,8 +772,8 @@ Scheduler::slotSlaveConnected() Slave *slave = (Slave *)sender(); // kdDebug(7006) << "slotSlaveConnected( " << slave << ")" << endl; slave->setConnected(true); - disconnect(slave, TQT_SIGNAL(connected()), - this, TQT_SLOT(slotSlaveConnected())); + disconnect(slave, TQ_SIGNAL(connected()), + this, TQ_SLOT(slotSlaveConnected())); emit slaveConnected(slave); assert(!coIdleSlaves->contains(slave)); coIdleSlaves->append(slave); @@ -838,10 +838,10 @@ Scheduler::_disconnectSlave(TDEIO::Slave *slave) delete list; coIdleSlaves->removeRef(slave); assert(!coIdleSlaves->contains(slave)); - disconnect(slave, TQT_SIGNAL(connected()), - this, TQT_SLOT(slotSlaveConnected())); - disconnect(slave, TQT_SIGNAL(error(int, const TQString &)), - this, TQT_SLOT(slotSlaveError(int, const TQString &))); + disconnect(slave, TQ_SIGNAL(connected()), + this, TQ_SLOT(slotSlaveConnected())); + disconnect(slave, TQ_SIGNAL(error(int, const TQString &)), + this, TQ_SLOT(slotSlaveError(int, const TQString &))); if (slave->isAlive()) { idleSlaves->append(slave); @@ -873,8 +873,8 @@ Scheduler::_registerWindow(TQWidget *wid) // access TQWidget::winId() (already destructed) WId windowId = wid->winId(); m_windowList.insert(obj, windowId); - connect(wid, TQT_SIGNAL(destroyed(TQObject *)), - this, TQT_SLOT(slotUnregisterWindow(TQObject*))); + connect(wid, TQ_SIGNAL(destroyed(TQObject *)), + this, TQ_SLOT(slotUnregisterWindow(TQObject*))); TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << windowId; @@ -894,8 +894,8 @@ Scheduler::slotUnregisterWindow(TQObject *obj) if (it == m_windowList.end()) return; WId windowId = it.data(); - disconnect( it.key(), TQT_SIGNAL(destroyed(TQObject *)), - this, TQT_SLOT(slotUnregisterWindow(TQObject*))); + disconnect( it.key(), TQ_SIGNAL(destroyed(TQObject *)), + this, TQ_SLOT(slotUnregisterWindow(TQObject*))); m_windowList.remove( it ); if (kapp) { diff --git a/tdeio/tdeio/skipdlg.cpp b/tdeio/tdeio/skipdlg.cpp index 5871bbd09..84dfaefa5 100644 --- a/tdeio/tdeio/skipdlg.cpp +++ b/tdeio/tdeio/skipdlg.cpp @@ -56,15 +56,15 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo setCaption( i18n( "Information" ) ); b0 = new KPushButton( KStdGuiItem::cancel(), this ); - connect(b0, TQT_SIGNAL(clicked()), this, TQT_SLOT(b0Pressed())); + connect(b0, TQ_SIGNAL(clicked()), this, TQ_SLOT(b0Pressed())); if ( _multi ) { b1 = new TQPushButton( i18n( "Skip" ), this ); - connect(b1, TQT_SIGNAL(clicked()), this, TQT_SLOT(b1Pressed())); + connect(b1, TQ_SIGNAL(clicked()), this, TQ_SLOT(b1Pressed())); b2 = new TQPushButton( i18n( "Auto Skip" ), this ); - connect(b2, TQT_SIGNAL(clicked()), this, TQT_SLOT(b2Pressed())); + connect(b2, TQ_SIGNAL(clicked()), this, TQ_SLOT(b2Pressed())); } TQVBoxLayout *vlayout = new TQVBoxLayout( this, 10, 0 ); diff --git a/tdeio/tdeio/slave.cpp b/tdeio/tdeio/slave.cpp index b4a7c8f2a..56d45a315 100644 --- a/tdeio/tdeio/slave.cpp +++ b/tdeio/tdeio/slave.cpp @@ -94,7 +94,7 @@ void Slave::accept(TDESocket *socket) #endif delete serv; serv = 0; - slaveconn.connect(this, TQT_SLOT(gotInput())); + slaveconn.connect(this, TQ_SLOT(gotInput())); unlinkSocket(); } @@ -116,7 +116,7 @@ void Slave::timeout() kdDebug(7002) << "slave is slow... pid=" << m_pid << " t=" << delta_t << endl; if (delta_t < SLAVE_CONNECTION_TIMEOUT_MAX) { - TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, this, TQT_SLOT(timeout())); + TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, this, TQ_SLOT(timeout())); return; } } @@ -152,8 +152,8 @@ Slave::Slave(TDEServerSocket *socket, const TQString &protocol, const TQString & m_pid = 0; m_port = 0; #ifndef Q_WS_WIN - connect(serv, TQT_SIGNAL(accepted( TDESocket* )), - TQT_SLOT(accept(TDESocket*) ) ); + connect(serv, TQ_SIGNAL(accepted( TDESocket* )), + TQ_SLOT(accept(TDESocket*) ) ); #endif } @@ -174,8 +174,8 @@ Slave::Slave(bool /*derived*/, TDEServerSocket *socket, const TQString &protocol m_port = 0; if (serv != 0) { #ifndef Q_WS_WIN - connect(serv, TQT_SIGNAL(accepted( TDESocket* )), - TQT_SLOT(accept(TDESocket*) ) ); + connect(serv, TQ_SIGNAL(accepted( TDESocket* )), + TQ_SLOT(accept(TDESocket*) ) ); #endif } } @@ -420,7 +420,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error #ifndef Q_WS_WIN slave->setPID(proc.pid()); - TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQT_SLOT(timeout())); + TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout())); #endif return slave; } @@ -452,7 +452,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error } #ifndef Q_WS_WIN slave->setPID(pid); - TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQT_SLOT(timeout())); + TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout())); #endif return slave; } @@ -507,7 +507,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) } #ifndef Q_WS_WIN slave->setPID(pid); - TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQT_SLOT(timeout())); + TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout())); #endif return slave; } diff --git a/tdeio/tdeio/slaveinterface.cpp b/tdeio/tdeio/slaveinterface.cpp index 47f935cda..1b9e853ed 100644 --- a/tdeio/tdeio/slaveinterface.cpp +++ b/tdeio/tdeio/slaveinterface.cpp @@ -135,7 +135,7 @@ SlaveInterface::SlaveInterface( Connection * connection ) m_progressId = 0; d = new SlaveInterfacePrivate; - connect(&d->speed_timer, TQT_SIGNAL(timeout()), TQT_SLOT(calcSpeed())); + connect(&d->speed_timer, TQ_SIGNAL(timeout()), TQ_SLOT(calcSpeed())); } SlaveInterface::~SlaveInterface() diff --git a/tdeio/tdeio/statusbarprogress.cpp b/tdeio/tdeio/statusbarprogress.cpp index 3d28f9ad1..270c997d3 100644 --- a/tdeio/tdeio/statusbarprogress.cpp +++ b/tdeio/tdeio/statusbarprogress.cpp @@ -49,7 +49,7 @@ StatusbarProgress::StatusbarProgress( TQWidget* parent, bool button ) box->addWidget( m_pButton ); stack = new TQWidgetStack( this ); box->addWidget( stack ); - connect( m_pButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotStop() ) ); + connect( m_pButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotStop() ) ); m_pProgressBar = new KProgress( this ); m_pProgressBar->setFrameStyle( TQFrame::Box | TQFrame::Raised ); diff --git a/tdeio/tdeio/tdefileshare.cpp b/tdeio/tdeio/tdefileshare.cpp index dc3f8c05a..d13214195 100644 --- a/tdeio/tdeio/tdefileshare.cpp +++ b/tdeio/tdeio/tdefileshare.cpp @@ -54,12 +54,12 @@ bool KFileShare::s_sharingEnabled; KFileSharePrivate::KFileSharePrivate() { KDirWatch::self()->addFile(FILESHARECONF); - connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString &))); - connect(KDirWatch::self(), TQT_SIGNAL(created(const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString &))); - connect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString &))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString &))); + connect(KDirWatch::self(), TQ_SIGNAL(created(const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString &))); + connect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString &))); } KFileSharePrivate::~KFileSharePrivate() diff --git a/tdeio/tdeioexec/main.cpp b/tdeio/tdeioexec/main.cpp index 54987e43c..071c4649c 100644 --- a/tdeio/tdeioexec/main.cpp +++ b/tdeio/tdeioexec/main.cpp @@ -125,7 +125,7 @@ KIOExec::KIOExec() TDEIO::Job *job = TDEIO::file_copy( url, dest ); jobList->append( job ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } } } @@ -133,7 +133,7 @@ KIOExec::KIOExec() if ( tempfiles ) { // #113991 - TQTimer::singleShot( 0, this, TQT_SLOT( slotRunApp() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRunApp() ) ); //slotRunApp(); // does not return return; } @@ -174,7 +174,7 @@ void KIOExec::slotResult( TDEIO::Job * job ) kdDebug() << "All files downloaded, will call slotRunApp shortly" << endl; // We know we can run the app now - but let's finish the job properly first. - TQTimer::singleShot( 0, this, TQT_SLOT( slotRunApp() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRunApp() ) ); jobList->clear(); } diff --git a/tdeio/tests/jobtest.cpp b/tdeio/tests/jobtest.cpp index 95cb96d53..15770c941 100644 --- a/tdeio/tests/jobtest.cpp +++ b/tdeio/tests/jobtest.cpp @@ -195,8 +195,8 @@ void JobTest::get() KURL u; u.setPath( filePath ); m_result = -1; TDEIO::StoredTransferJob* job = TDEIO::storedGet( u ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotGetResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotGetResult( TDEIO::Job* ) ) ); kapp->eventLoop()->enterLoop(); assert( m_result == 0 ); // no error assert( m_data.size() == 11 ); @@ -498,8 +498,8 @@ void JobTest::listRecursive() KURL u; u.setPath( src ); TDEIO::ListJob* job = TDEIO::listRecursive( u ); - connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); m_names.sort(); @@ -565,8 +565,8 @@ void JobTest::copyFileToSystem( bool resolve_local_urls ) // copy the file with file_copy TDEIO::FileCopyJob* job = TDEIO::file_copy( u, d ); - connect( job, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), - this, TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); + connect( job, TQ_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), + this, TQ_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); diff --git a/tdeio/tests/kdcopcheck.cpp b/tdeio/tests/kdcopcheck.cpp index e99de7e79..674e6a3dd 100644 --- a/tdeio/tests/kdcopcheck.cpp +++ b/tdeio/tests/kdcopcheck.cpp @@ -40,14 +40,14 @@ TestService::TestService(const TQString &exec) proc.start(); - connect(kapp->dcopClient(), TQT_SIGNAL( applicationRegistered(const TQCString&)), - this, TQT_SLOT(newApp(const TQCString&))); - connect(kapp->dcopClient(), TQT_SIGNAL( applicationRemoved(const TQCString&)), - this, TQT_SLOT(endApp(const TQCString&))); - connect(&proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(appExit())); - - TQTimer::singleShot(20*1000, this, TQT_SLOT(stop())); + connect(kapp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString&)), + this, TQ_SLOT(newApp(const TQCString&))); + connect(kapp->dcopClient(), TQ_SIGNAL( applicationRemoved(const TQCString&)), + this, TQ_SLOT(endApp(const TQCString&))); + connect(&proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(appExit())); + + TQTimer::singleShot(20*1000, this, TQ_SLOT(stop())); result = KService::DCOP_None; } diff --git a/tdeio/tests/kdirlistertest.cpp b/tdeio/tests/kdirlistertest.cpp index b1208f41d..54cefac87 100644 --- a/tdeio/tests/kdirlistertest.cpp +++ b/tdeio/tests/kdirlistertest.cpp @@ -49,48 +49,48 @@ KDirListerTest::KDirListerTest( TQWidget *parent, const char *name ) layout->addWidget( test ); resize( layout->sizeHint() ); - connect( startR, TQT_SIGNAL( clicked() ), TQT_SLOT( startRoot() ) ); - connect( startH, TQT_SIGNAL( clicked() ), TQT_SLOT( startHome() ) ); - connect( startT, TQT_SIGNAL( clicked() ), TQT_SLOT( startTar() ) ); - connect( test, TQT_SIGNAL( clicked() ), TQT_SLOT( test() ) ); - - connect( lister, TQT_SIGNAL( started( const KURL & ) ), - debug, TQT_SLOT( started( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( completed() ), - debug, TQT_SLOT( completed() ) ); - connect( lister, TQT_SIGNAL( completed( const KURL & ) ), - debug, TQT_SLOT( completed( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( canceled() ), - debug, TQT_SLOT( canceled() ) ); - connect( lister, TQT_SIGNAL( canceled( const KURL & ) ), - debug, TQT_SLOT( canceled( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( redirection( const KURL & ) ), - debug, TQT_SLOT( redirection( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ), - debug, TQT_SLOT( redirection( const KURL &, const KURL & ) ) ); - connect( lister, TQT_SIGNAL( clear() ), - debug, TQT_SLOT( clear() ) ); - connect( lister, TQT_SIGNAL( newItems( const KFileItemList & ) ), - debug, TQT_SLOT( newItems( const KFileItemList & ) ) ); - connect( lister, TQT_SIGNAL( itemsFilteredByMime( const KFileItemList & ) ), - debug, TQT_SLOT( itemsFilteredByMime( const KFileItemList & ) ) ); - connect( lister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - debug, TQT_SLOT( deleteItem( KFileItem * ) ) ); - connect( lister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), - debug, TQT_SLOT( refreshItems( const KFileItemList & ) ) ); - connect( lister, TQT_SIGNAL( infoMessage( const TQString& ) ), - debug, TQT_SLOT( infoMessage( const TQString& ) ) ); - connect( lister, TQT_SIGNAL( percent( int ) ), - debug, TQT_SLOT( percent( int ) ) ); - connect( lister, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ), - debug, TQT_SLOT( totalSize( TDEIO::filesize_t ) ) ); - connect( lister, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ), - debug, TQT_SLOT( processedSize( TDEIO::filesize_t ) ) ); - connect( lister, TQT_SIGNAL( speed( int ) ), - debug, TQT_SLOT( speed( int ) ) ); - - connect( lister, TQT_SIGNAL( completed() ), - this, TQT_SLOT( completed() ) ); + connect( startR, TQ_SIGNAL( clicked() ), TQ_SLOT( startRoot() ) ); + connect( startH, TQ_SIGNAL( clicked() ), TQ_SLOT( startHome() ) ); + connect( startT, TQ_SIGNAL( clicked() ), TQ_SLOT( startTar() ) ); + connect( test, TQ_SIGNAL( clicked() ), TQ_SLOT( test() ) ); + + connect( lister, TQ_SIGNAL( started( const KURL & ) ), + debug, TQ_SLOT( started( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( completed() ), + debug, TQ_SLOT( completed() ) ); + connect( lister, TQ_SIGNAL( completed( const KURL & ) ), + debug, TQ_SLOT( completed( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( canceled() ), + debug, TQ_SLOT( canceled() ) ); + connect( lister, TQ_SIGNAL( canceled( const KURL & ) ), + debug, TQ_SLOT( canceled( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( redirection( const KURL & ) ), + debug, TQ_SLOT( redirection( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ), + debug, TQ_SLOT( redirection( const KURL &, const KURL & ) ) ); + connect( lister, TQ_SIGNAL( clear() ), + debug, TQ_SLOT( clear() ) ); + connect( lister, TQ_SIGNAL( newItems( const KFileItemList & ) ), + debug, TQ_SLOT( newItems( const KFileItemList & ) ) ); + connect( lister, TQ_SIGNAL( itemsFilteredByMime( const KFileItemList & ) ), + debug, TQ_SLOT( itemsFilteredByMime( const KFileItemList & ) ) ); + connect( lister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + debug, TQ_SLOT( deleteItem( KFileItem * ) ) ); + connect( lister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), + debug, TQ_SLOT( refreshItems( const KFileItemList & ) ) ); + connect( lister, TQ_SIGNAL( infoMessage( const TQString& ) ), + debug, TQ_SLOT( infoMessage( const TQString& ) ) ); + connect( lister, TQ_SIGNAL( percent( int ) ), + debug, TQ_SLOT( percent( int ) ) ); + connect( lister, TQ_SIGNAL( totalSize( TDEIO::filesize_t ) ), + debug, TQ_SLOT( totalSize( TDEIO::filesize_t ) ) ); + connect( lister, TQ_SIGNAL( processedSize( TDEIO::filesize_t ) ), + debug, TQ_SLOT( processedSize( TDEIO::filesize_t ) ) ); + connect( lister, TQ_SIGNAL( speed( int ) ), + debug, TQ_SLOT( speed( int ) ) ); + + connect( lister, TQ_SIGNAL( completed() ), + this, TQ_SLOT( completed() ) ); } KDirListerTest::~KDirListerTest() diff --git a/tdeio/tests/kdirwatchtest.cpp b/tdeio/tests/kdirwatchtest.cpp index 9f50c2170..eed240f2d 100644 --- a/tdeio/tests/kdirwatchtest.cpp +++ b/tdeio/tests/kdirwatchtest.cpp @@ -38,9 +38,9 @@ int main (int argc, char **argv) KDirWatch *dirwatch1 = KDirWatch::self(); KDirWatch *dirwatch2 = new KDirWatch; - testObject.connect(dirwatch1, TQT_SIGNAL( dirty( const TQString &)), TQT_SLOT( dirty( const TQString &)) ); - testObject.connect(dirwatch1, TQT_SIGNAL( created( const TQString &)), TQT_SLOT( created( const TQString &)) ); - testObject.connect(dirwatch1, TQT_SIGNAL( deleted( const TQString &)), TQT_SLOT( deleted( const TQString &)) ); + testObject.connect(dirwatch1, TQ_SIGNAL( dirty( const TQString &)), TQ_SLOT( dirty( const TQString &)) ); + testObject.connect(dirwatch1, TQ_SIGNAL( created( const TQString &)), TQ_SLOT( created( const TQString &)) ); + testObject.connect(dirwatch1, TQ_SIGNAL( deleted( const TQString &)), TQ_SLOT( deleted( const TQString &)) ); if (args->count() >0) { for(int i = 0; i < args->count(); i++) { diff --git a/tdeio/tests/kdirwatchunittest.cpp b/tdeio/tests/kdirwatchunittest.cpp index ed59f3c19..773ce476b 100644 --- a/tdeio/tests/kdirwatchunittest.cpp +++ b/tdeio/tests/kdirwatchunittest.cpp @@ -120,9 +120,9 @@ void KDirWatchTest::allTests() TQDir* dir = new TQDir(m_workingDir); VERIFY (dir != 0); - connect(d, TQT_SIGNAL (dirty( const TQString &)), TQT_SLOT( slotDirty( const TQString &)) ); - connect(d, TQT_SIGNAL (created( const TQString &)), TQT_SLOT( slotCreated( const TQString &)) ); - connect(d, TQT_SIGNAL (deleted( const TQString &)), TQT_SLOT( slotDeleted( const TQString &)) ); + connect(d, TQ_SIGNAL (dirty( const TQString &)), TQ_SLOT( slotDirty( const TQString &)) ); + connect(d, TQ_SIGNAL (created( const TQString &)), TQ_SLOT( slotCreated( const TQString &)) ); + connect(d, TQ_SIGNAL (deleted( const TQString &)), TQ_SLOT( slotDeleted( const TQString &)) ); VERIFY (dir->mkdir (m_workingDir)); diff --git a/tdeio/tests/kruntest.cpp b/tdeio/tests/kruntest.cpp index 7562b488a..c10a36898 100644 --- a/tdeio/tests/kruntest.cpp +++ b/tdeio/tests/kruntest.cpp @@ -56,9 +56,9 @@ Receiver::Receiver() start = new TQPushButton( "Launch KRuns", this ); stop = new TQPushButton( "Stop those KRuns", this ); stop->setEnabled(false); - TQObject::connect( h, TQT_SIGNAL(clicked()), kapp, TQT_SLOT(quit()) ); - TQObject::connect( start, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStart()) ); - TQObject::connect( stop, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStop()) ); + TQObject::connect( h, TQ_SIGNAL(clicked()), kapp, TQ_SLOT(quit()) ); + TQObject::connect( start, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStart()) ); + TQObject::connect( stop, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStop()) ); adjustSize(); show(); diff --git a/tdeio/tests/previewtest.cpp b/tdeio/tests/previewtest.cpp index 3237f0180..f30e7ad10 100644 --- a/tdeio/tests/previewtest.cpp +++ b/tdeio/tests/previewtest.cpp @@ -19,7 +19,7 @@ PreviewTest::PreviewTest() m_url->setText("/home/malte/gore_bush.jpg"); layout->addWidget(m_url, 0, 0); TQPushButton *btn = new TQPushButton("Generate", this); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotGenerate())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotGenerate())); layout->addWidget(btn, 0, 1); m_preview = new TQLabel(this); m_preview->setMinimumSize(400, 300); @@ -31,9 +31,9 @@ void PreviewTest::slotGenerate() KURL::List urls; urls.append(m_url->text()); TDEIO::PreviewJob *job = TDEIO::filePreview(urls, m_preview->width(), m_preview->height(), true, 48); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); - connect(job, TQT_SIGNAL(gotPreview(const KFileItem *, const TQPixmap &)), TQT_SLOT(slotPreview(const KFileItem *, const TQPixmap &))); - connect(job, TQT_SIGNAL(failed(const KFileItem *)), TQT_SLOT(slotFailed())); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(gotPreview(const KFileItem *, const TQPixmap &)), TQ_SLOT(slotPreview(const KFileItem *, const TQPixmap &))); + connect(job, TQ_SIGNAL(failed(const KFileItem *)), TQ_SLOT(slotFailed())); } void PreviewTest::slotResult(TDEIO::Job*) diff --git a/tdeio/tests/speed.cpp b/tdeio/tests/speed.cpp index 4b14a6bb6..0c517c808 100644 --- a/tdeio/tests/speed.cpp +++ b/tdeio/tests/speed.cpp @@ -32,10 +32,10 @@ SpeedTest::SpeedTest( const KURL & url ) { Job *job = listRecursive( url ); //Job *job = del( KURL("file:" + TQDir::currentDirPath()) ); DANGEROUS ! - connect(job, TQT_SIGNAL( result( TDEIO::Job*)), - TQT_SLOT( finished( TDEIO::Job* ) )); - /*connect(job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(job, TQ_SIGNAL( result( TDEIO::Job*)), + TQ_SLOT( finished( TDEIO::Job* ) )); + /*connect(job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList&))); */ } diff --git a/tdeio/tests/tdeioslavetest.cpp b/tdeio/tests/tdeioslavetest.cpp index 4d52eab2e..bd5a1f1bb 100644 --- a/tdeio/tests/tdeioslavetest.cpp +++ b/tdeio/tests/tdeioslavetest.cpp @@ -63,7 +63,7 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) // Operation groupbox & buttons opButtons = new TQButtonGroup( "Operation", main_widget ); topLayout->addWidget( opButtons, 10 ); - connect( opButtons, TQT_SIGNAL(clicked(int)), TQT_SLOT(changeOperation(int)) ); + connect( opButtons, TQ_SIGNAL(clicked(int)), TQ_SLOT(changeOperation(int)) ); TQBoxLayout *hbLayout = new TQHBoxLayout( opButtons, 15 ); @@ -117,7 +117,7 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) // Progress groupbox & buttons progressButtons = new TQButtonGroup( "Progress dialog mode", main_widget ); topLayout->addWidget( progressButtons, 10 ); - connect( progressButtons, TQT_SIGNAL(clicked(int)), TQT_SLOT(changeProgressMode(int)) ); + connect( progressButtons, TQ_SIGNAL(clicked(int)), TQ_SLOT(changeProgressMode(int)) ); hbLayout = new TQHBoxLayout( progressButtons, 15 ); @@ -145,19 +145,19 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) pbStart = new TQPushButton( "&Start", main_widget ); pbStart->setFixedSize( pbStart->sizeHint() ); - connect( pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(startJob()) ); + connect( pbStart, TQ_SIGNAL(clicked()), TQ_SLOT(startJob()) ); hbLayout->addWidget( pbStart, 5 ); pbStop = new TQPushButton( "Sto&p", main_widget ); pbStop->setFixedSize( pbStop->sizeHint() ); pbStop->setEnabled( false ); - connect( pbStop, TQT_SIGNAL(clicked()), TQT_SLOT(stopJob()) ); + connect( pbStop, TQ_SIGNAL(clicked()), TQ_SLOT(stopJob()) ); hbLayout->addWidget( pbStop, 5 ); // close button close = new TQPushButton( "&Close", main_widget ); close->setFixedSize( close->sizeHint() ); - connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotQuit())); + connect(close, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotQuit())); topLayout->addWidget( close, 5 ); @@ -166,10 +166,10 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) slave = 0; // slave = TDEIO::Scheduler::getConnectedSlave(KURL("ftp://ftp.kde.org")); - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(TDEIO::Slave*)), - this, TQT_SLOT(slotSlaveConnected())); - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave*,int,const TQString&)), - this, TQT_SLOT(slotSlaveError())); + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveConnected(TDEIO::Slave*)), + this, TQ_SLOT(slotSlaveConnected())); + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveError(TDEIO::Slave*,int,const TQString&)), + this, TQ_SLOT(slotSlaveError())); } @@ -242,14 +242,14 @@ void KioslaveTest::startJob() { switch ( selectedOperation ) { case List: myJob = TDEIO::listDir( src ); - connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(myJob, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); break; case ListRecursive: myJob = TDEIO::listRecursive( src ); - connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(myJob, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); break; case Stat: @@ -258,15 +258,15 @@ void KioslaveTest::startJob() { case Get: myJob = TDEIO::get( src, true ); - connect(myJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); + connect(myJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); break; case Put: putBuffer = 0; myJob = TDEIO::put( src, -1, true, false); - connect(myJob, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray &)), - TQT_SLOT( slotDataReq( TDEIO::Job*, TQByteArray &))); + connect(myJob, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray &)), + TQ_SLOT( slotDataReq( TDEIO::Job*, TQByteArray &))); break; case Copy: @@ -300,11 +300,11 @@ void KioslaveTest::startJob() { job = myJob; } - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( canceled( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( canceled( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); if (progressMode == ProgressStatus) { statusProgress->setJob( job ); |