diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-12 10:51:50 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-16 10:04:33 +0900 |
commit | 1c65be77cd84b454f3fe69f211849a712ad99ed0 (patch) | |
tree | f9309bc873f0f7838ee21373c32d5fd388da79d9 /konqueror | |
parent | 55ba7bff2cd71ef2582b43c336afc55325b48a60 (diff) | |
download | tdebase-1c65be77cd84b454f3fe69f211849a712ad99ed0.tar.gz tdebase-1c65be77cd84b454f3fe69f211849a712ad99ed0.zip |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit a4241b7911d2e0b36edfb02f616b8b282050c0ec)
Diffstat (limited to 'konqueror')
44 files changed, 912 insertions, 912 deletions
diff --git a/konqueror/client/kfmclient.cpp b/konqueror/client/kfmclient.cpp index efc858f61..001734cdb 100644 --- a/konqueror/client/kfmclient.cpp +++ b/konqueror/client/kfmclient.cpp @@ -323,8 +323,8 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co TDEStartupInfo::appStarted(); KRun * run = new KRun( url, 0, 0, false, false /* no progress window */ ); // TODO pass tempFile [needs support in the KRun ctor] - TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() )); - TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() )); app.exec(); return !krun_has_error; } @@ -423,7 +423,7 @@ void clientApp::delayedQuit() { // Quit in 2 seconds. This leaves time for KRun to pop up // "app not found" in TDEProcessRunner, if that was the case. - TQTimer::singleShot( 2000, this, TQT_SLOT(deref()) ); + TQTimer::singleShot( 2000, this, TQ_SLOT(deref()) ); // don't access the KRun instance later, it will be deleted after calling slots if( static_cast< const KRun* >( sender())->hasError()) krun_has_error = true; @@ -504,8 +504,8 @@ bool clientApp::doIt() { checkArgumentCount(argc, 2, 2); KPropertiesDialog * p = new KPropertiesDialog( args->url(1) ); - TQObject::connect( p, TQT_SIGNAL( destroyed() ), &app, TQT_SLOT( quit() )); - TQObject::connect( p, TQT_SIGNAL( canceled() ), &app, TQT_SLOT( slotDialogCanceled() )); + TQObject::connect( p, TQ_SIGNAL( destroyed() ), &app, TQ_SLOT( quit() )); + TQObject::connect( p, TQ_SIGNAL( canceled() ), &app, TQ_SLOT( slotDialogCanceled() )); app.exec(); return m_ok; } @@ -520,8 +520,8 @@ bool clientApp::doIt() else if ( argc == 2 ) { KRun * run = new KRun( args->url(1), 0, 0, false, false /* no progress window */ ); - TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() )); - TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() )); app.exec(); return !krun_has_error; } @@ -538,8 +538,8 @@ bool clientApp::doIt() else if ( command == "openBrowser" ) { KRun * run = new KRun( "http://default.browser", 0, 0, false, false /* no progress window */ ); - TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() )); - TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() )); app.exec(); return !krun_has_error; } @@ -553,7 +553,7 @@ bool clientApp::doIt() TDEIO::Job * job = TDEIO::move( srcLst, args->url(argc - 1) ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); app.exec(); return m_ok; } @@ -588,7 +588,7 @@ bool clientApp::doIt() TDEIO::Job * job = TDEIO::copy( srcLst, dsturl ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); app.exec(); return m_ok; } @@ -602,7 +602,7 @@ bool clientApp::doIt() TDEIO::Job * job = TDEIO::copy( srcLst, args->url(argc - 1) ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); app.exec(); return m_ok; } diff --git a/konqueror/delayedinitializer.cpp b/konqueror/delayedinitializer.cpp index e30db3d21..a635fb1ac 100644 --- a/konqueror/delayedinitializer.cpp +++ b/konqueror/delayedinitializer.cpp @@ -38,7 +38,7 @@ bool DelayedInitializer::eventFilter( TQObject *receiver, TQEvent *event ) // Move the emitting of the event to the end of the eventQueue // so we are absolutely sure the event we get here is handled before // the initialize is fired. - TQTimer::singleShot( 0, this, TQT_SLOT( slotInitialize() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotInitialize() ) ); return false; } diff --git a/konqueror/iconview/konq_iconview.cpp b/konqueror/iconview/konq_iconview.cpp index 1a84fb28d..04b973f8f 100644 --- a/konqueror/iconview/konq_iconview.cpp +++ b/konqueror/iconview/konq_iconview.cpp @@ -184,22 +184,22 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons m_pIconView = new KonqIconViewWidget( parentWidget, "qiconview" ); m_pIconView->initConfig( true ); - connect( m_pIconView, TQT_SIGNAL(imagePreviewFinished()), - this, TQT_SLOT(slotRenderingFinished())); + connect( m_pIconView, TQ_SIGNAL(imagePreviewFinished()), + this, TQ_SLOT(slotRenderingFinished())); // connect up the icon inc/dec signals - connect( m_pIconView, TQT_SIGNAL(incIconSize()), - this, TQT_SLOT(slotIncIconSize())); - connect( m_pIconView, TQT_SIGNAL(decIconSize()), - this, TQT_SLOT(slotDecIconSize())); + connect( m_pIconView, TQ_SIGNAL(incIconSize()), + this, TQ_SLOT(slotIncIconSize())); + connect( m_pIconView, TQ_SIGNAL(decIconSize()), + this, TQ_SLOT(slotDecIconSize())); // pass signals to the extension - connect( m_pIconView, TQT_SIGNAL( enableAction( const char *, bool ) ), - m_extension, TQT_SIGNAL( enableAction( const char *, bool ) ) ); + connect( m_pIconView, TQ_SIGNAL( enableAction( const char *, bool ) ), + m_extension, TQ_SIGNAL( enableAction( const char *, bool ) ) ); // signals from konqdirpart (for BC reasons) - connect( this, TQT_SIGNAL( findOpened( KonqDirPart * ) ), TQT_SLOT( slotKFindOpened() ) ); - connect( this, TQT_SIGNAL( findClosed( KonqDirPart * ) ), TQT_SLOT( slotKFindClosed() ) ); + connect( this, TQ_SIGNAL( findOpened( KonqDirPart * ) ), TQ_SLOT( slotKFindOpened() ) ); + connect( this, TQ_SIGNAL( findClosed( KonqDirPart * ) ), TQ_SLOT( slotKFindClosed() ) ); setWidget( m_pIconView ); m_mimeTypeResolver = new KMimeTypeResolver<KFileIVI,KonqKfmIconView>(this); @@ -211,22 +211,22 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons // Don't repaint on configuration changes during construction m_bInit = true; - m_paDotFiles = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), + m_paDotFiles = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQ_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); // m_paDotFiles->setCheckedState(i18n("Hide &Hidden Files")); m_paDotFiles->setToolTip( i18n( "Toggle displaying of hidden dot files" ) ); - m_paDirectoryOverlays = new TDEToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, TQT_SLOT( slotShowDirectoryOverlays() ), + m_paDirectoryOverlays = new TDEToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, TQ_SLOT( slotShowDirectoryOverlays() ), actionCollection(), "show_directory_overlays" ); - m_paFreeSpaceOverlays = new TDEToggleAction( i18n( "&Media Icons Reflect Free Space" ), 0, this, TQT_SLOT( slotShowFreeSpaceOverlays() ), + m_paFreeSpaceOverlays = new TDEToggleAction( i18n( "&Media Icons Reflect Free Space" ), 0, this, TQ_SLOT( slotShowFreeSpaceOverlays() ), actionCollection(), "show_free_space_overlays" ); m_pamPreview = new TDEActionMenu( i18n( "&Preview" ), actionCollection(), "iconview_preview" ); m_paEnablePreviews = new TDEToggleAction( i18n("Enable Previews"), 0, actionCollection(), "iconview_preview_all" ); m_paEnablePreviews->setCheckedState( i18n("Disable Previews") ); - connect( m_paEnablePreviews, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); + connect( m_paEnablePreviews, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotPreview( bool ) ) ); m_paEnablePreviews->setIcon("thumbnail"); m_pamPreview->insert( m_paEnablePreviews ); m_pamPreview->insert( new TDEActionSeparator(this) ); @@ -240,13 +240,13 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons else { preview = new TDEToggleAction( (*it)->name(), 0, actionCollection(), (*it)->desktopEntryName().latin1() ); - connect( preview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); + connect( preview, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotPreview( bool ) ) ); m_pamPreview->insert( preview ); m_paPreviewPlugins.append( preview ); } } TDEToggleAction *soundPreview = new TDEToggleAction( i18n("Sound Files"), 0, actionCollection(), "audio/" ); - connect( soundPreview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); + connect( soundPreview, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotPreview( bool ) ) ); m_pamPreview->insert( soundPreview ); m_paPreviewPlugins.append( soundPreview ); @@ -270,11 +270,11 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons aSortByType->setChecked( false ); aSortByDate->setChecked( false ); - connect( aSortByNameCS, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByNameCaseSensitive( bool ) ) ); - connect( aSortByNameCI, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByNameCaseInsensitive( bool ) ) ); - connect( aSortBySize, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortBySize( bool ) ) ); - connect( aSortByType, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByType( bool ) ) ); - connect( aSortByDate, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByDate( bool ) ) ); + connect( aSortByNameCS, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByNameCaseSensitive( bool ) ) ); + connect( aSortByNameCI, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByNameCaseInsensitive( bool ) ) ); + connect( aSortBySize, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortBySize( bool ) ) ); + connect( aSortByType, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByType( bool ) ) ); + connect( aSortByDate, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByDate( bool ) ) ); //enable menu item representing the saved sorting criterion TQString sortcrit = KonqIconViewFactory::defaultViewProps()->sortCriterion(); @@ -286,8 +286,8 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons m_paSortDirsFirst->setChecked( KonqIconViewFactory::defaultViewProps()->isDirsFirst() ); - connect( aSortDescending, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortDescending() ) ); - connect( m_paSortDirsFirst, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortDirsFirst() ) ); + connect( aSortDescending, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortDescending() ) ); + connect( m_paSortDirsFirst, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortDirsFirst() ) ); //enable stored settings slotSortDirsFirst(); @@ -307,15 +307,15 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons m_pamSort->insert( aSortDescending ); */ - m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), + m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQ_SLOT( slotSelect() ), actionCollection(), "select" ); - m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), + m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQ_SLOT( slotUnselect() ), actionCollection(), "unselect" ); - m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); - m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), + m_paSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); + m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQ_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, - this, TQT_SLOT( slotInvertSelection() ), + this, TQ_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); m_paSelect->setToolTip( i18n( "Allows selecting of file or folder items based on a given mask" ) ); @@ -328,65 +328,65 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons //m_paRightText = new TDEToggleAction( i18n( "Text at &Right" ), 0, actionCollection(), "textright" ); //m_paBottomText->setExclusiveGroup( "TextPos" ); //m_paRightText->setExclusiveGroup( "TextPos" ); - //connect( m_paBottomText, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotTextBottom( bool ) ) ); - //connect( m_paRightText, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotTextRight( bool ) ) ); + //connect( m_paBottomText, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotTextBottom( bool ) ) ); + //connect( m_paRightText, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotTextRight( bool ) ) ); - connect( m_pIconView, TQT_SIGNAL( executed( TQIconViewItem * ) ), - this, TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) ); - connect( m_pIconView, TQT_SIGNAL( returnPressed( TQIconViewItem * ) ), - this, TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) ); + connect( m_pIconView, TQ_SIGNAL( executed( TQIconViewItem * ) ), + this, TQ_SLOT( slotReturnPressed( TQIconViewItem * ) ) ); + connect( m_pIconView, TQ_SIGNAL( returnPressed( TQIconViewItem * ) ), + this, TQ_SLOT( slotReturnPressed( TQIconViewItem * ) ) ); - connect( m_pIconView, TQT_SIGNAL( onItem( TQIconViewItem * ) ), - this, TQT_SLOT( slotOnItem( TQIconViewItem * ) ) ); + connect( m_pIconView, TQ_SIGNAL( onItem( TQIconViewItem * ) ), + this, TQ_SLOT( slotOnItem( TQIconViewItem * ) ) ); - connect( m_pIconView, TQT_SIGNAL( onViewport() ), - this, TQT_SLOT( slotOnViewport() ) ); + connect( m_pIconView, TQ_SIGNAL( onViewport() ), + this, TQ_SLOT( slotOnViewport() ) ); - connect( m_pIconView, TQT_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)), - this, TQT_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) ); - connect( m_pIconView, TQT_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)), - this, TQT_SLOT( slotMouseButtonClicked(int, TQIconViewItem*, const TQPoint&)) ); - connect( m_pIconView, TQT_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)), - this, TQT_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) ); + connect( m_pIconView, TQ_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)), + this, TQ_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) ); + connect( m_pIconView, TQ_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)), + this, TQ_SLOT( slotMouseButtonClicked(int, TQIconViewItem*, const TQPoint&)) ); + connect( m_pIconView, TQ_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)), + this, TQ_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) ); // Signals needed to implement the spring loading folders behavior - connect( m_pIconView, TQT_SIGNAL( held( TQIconViewItem * ) ), - this, TQT_SLOT( slotDragHeld( TQIconViewItem * ) ) ); - connect( m_pIconView, TQT_SIGNAL( dragEntered( bool ) ), - this, TQT_SLOT( slotDragEntered( bool ) ) ); - connect( m_pIconView, TQT_SIGNAL( dragLeft() ), - this, TQT_SLOT( slotDragLeft() ) ); - connect( m_pIconView, TQT_SIGNAL( dragMove( bool ) ), - this, TQT_SLOT( slotDragMove( bool ) ) ); - connect( m_pIconView, TQT_SIGNAL( dragFinished() ), - this, TQT_SLOT( slotDragFinished() ) ); + connect( m_pIconView, TQ_SIGNAL( held( TQIconViewItem * ) ), + this, TQ_SLOT( slotDragHeld( TQIconViewItem * ) ) ); + connect( m_pIconView, TQ_SIGNAL( dragEntered( bool ) ), + this, TQ_SLOT( slotDragEntered( bool ) ) ); + connect( m_pIconView, TQ_SIGNAL( dragLeft() ), + this, TQ_SLOT( slotDragLeft() ) ); + connect( m_pIconView, TQ_SIGNAL( dragMove( bool ) ), + this, TQ_SLOT( slotDragMove( bool ) ) ); + connect( m_pIconView, TQ_SIGNAL( dragFinished() ), + this, TQ_SLOT( slotDragFinished() ) ); // Create the directory lister m_dirLister = new KDirLister( true ); setDirLister( m_dirLister ); m_dirLister->setMainWindow(m_pIconView->topLevelWidget()); - connect( m_dirLister, TQT_SIGNAL( started( const KURL & ) ), - this, TQT_SLOT( slotStarted() ) ); - connect( m_dirLister, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) ); - connect( m_dirLister, TQT_SIGNAL( canceled( const KURL& ) ), this, TQT_SLOT( slotCanceled( const KURL& ) ) ); - connect( m_dirLister, TQT_SIGNAL( clear() ), this, TQT_SLOT( slotClear() ) ); - connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList& ) ), - this, TQT_SLOT( slotNewItems( const KFileItemList& ) ) ); - connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); - connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList& ) ), - this, TQT_SLOT( slotRefreshItems( const KFileItemList& ) ) ); - connect( m_dirLister, TQT_SIGNAL( redirection( const KURL & ) ), - this, TQT_SLOT( slotRedirection( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ), - TQT_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ) ); - connect( m_dirLister, TQT_SIGNAL( infoMessage( const TQString& ) ), - extension(), TQT_SIGNAL( infoMessage( const TQString& ) ) ); - connect( m_dirLister, TQT_SIGNAL( percent( int ) ), - extension(), TQT_SIGNAL( loadingProgress( int ) ) ); - connect( m_dirLister, TQT_SIGNAL( speed( int ) ), - extension(), TQT_SIGNAL( speedProgress( int ) ) ); + connect( m_dirLister, TQ_SIGNAL( started( const KURL & ) ), + this, TQ_SLOT( slotStarted() ) ); + connect( m_dirLister, TQ_SIGNAL( completed() ), this, TQ_SLOT( slotCompleted() ) ); + connect( m_dirLister, TQ_SIGNAL( canceled( const KURL& ) ), this, TQ_SLOT( slotCanceled( const KURL& ) ) ); + connect( m_dirLister, TQ_SIGNAL( clear() ), this, TQ_SLOT( slotClear() ) ); + connect( m_dirLister, TQ_SIGNAL( newItems( const KFileItemList& ) ), + this, TQ_SLOT( slotNewItems( const KFileItemList& ) ) ); + connect( m_dirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( m_dirLister, TQ_SIGNAL( refreshItems( const KFileItemList& ) ), + this, TQ_SLOT( slotRefreshItems( const KFileItemList& ) ) ); + connect( m_dirLister, TQ_SIGNAL( redirection( const KURL & ) ), + this, TQ_SLOT( slotRedirection( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ), + TQ_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ) ); + connect( m_dirLister, TQ_SIGNAL( infoMessage( const TQString& ) ), + extension(), TQ_SIGNAL( infoMessage( const TQString& ) ) ); + connect( m_dirLister, TQ_SIGNAL( percent( int ) ), + extension(), TQ_SIGNAL( loadingProgress( int ) ) ); + connect( m_dirLister, TQ_SIGNAL( speed( int ) ), + extension(), TQ_SIGNAL( speedProgress( int ) ) ); // Now we may react to configuration changes m_bInit = false; @@ -399,8 +399,8 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons m_bPreviewRunningBeforeCloseURL = false; m_pIconView->setResizeMode( TQIconView::Adjust ); - connect( m_pIconView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( m_pIconView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); // Respect kcmkonq's configuration for word-wrap icon text. // If we want something else, we have to adapt the configuration or remove it... @@ -1150,8 +1150,8 @@ void KonqKfmIconView::showDirectoryOverlay(KFileIVI* item) if (!m_paOutstandingOverlaysTimer) { m_paOutstandingOverlaysTimer = new TQTimer(this); - connect(m_paOutstandingOverlaysTimer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotDirectoryOverlayStart())); + connect(m_paOutstandingOverlaysTimer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotDirectoryOverlayStart())); } m_paOutstandingOverlaysTimer->start(20, true); } @@ -1166,8 +1166,8 @@ void KonqKfmIconView::showFreeSpaceOverlay(KFileIVI* item) if (!m_paOutstandingFreeSpaceOverlaysTimer) { m_paOutstandingFreeSpaceOverlaysTimer = new TQTimer(this); - connect(m_paOutstandingFreeSpaceOverlaysTimer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotFreeSpaceOverlayStart())); + connect(m_paOutstandingFreeSpaceOverlaysTimer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotFreeSpaceOverlayStart())); } m_paOutstandingFreeSpaceOverlaysTimer->start(20, true); } @@ -1185,7 +1185,7 @@ void KonqKfmIconView::slotDirectoryOverlayStart() if (overlay) { - connect( overlay, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDirectoryOverlayFinished() ) ); + connect( overlay, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDirectoryOverlayFinished() ) ); overlay->start(); // Watch out, may emit finished() immediately!! return; // Let it run.... } @@ -1205,7 +1205,7 @@ void KonqKfmIconView::slotFreeSpaceOverlayStart() if (overlay) { - connect( overlay, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFreeSpaceOverlayFinished() ) ); + connect( overlay, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotFreeSpaceOverlayFinished() ) ); overlay->start(); // Watch out, may emit finished() immediately!! return; // Let it run.... } @@ -1295,8 +1295,8 @@ void KonqKfmIconView::slotClear() if ( !m_pTimeoutRefreshTimer ) { m_pTimeoutRefreshTimer = new TQTimer( this ); - connect( m_pTimeoutRefreshTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotRefreshViewport() ) ); + connect( m_pTimeoutRefreshTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotRefreshViewport() ) ); } m_pTimeoutRefreshTimer->start( 700, true ); @@ -1575,8 +1575,8 @@ static KStaticDeleter<SpringLoadingManager> s_springManagerDeleter; SpringLoadingManager::SpringLoadingManager() : m_startPart(0L) { - connect( &m_endTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( finished() ) ); + connect( &m_endTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( finished() ) ); } diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index 9e4480d0b..395da6a5d 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -78,136 +78,136 @@ void KEBApp::createActions() { // save and quit should probably not be in the toplevel??? (void) KStdAction::quit( - this, TQT_SLOT( close() ), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); + this, TQ_SLOT( close() ), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); (void) KStdAction::configureToolbars( - this, TQT_SLOT( slotConfigureToolbars() ), actionCollection()); + this, TQ_SLOT( slotConfigureToolbars() ), actionCollection()); if (m_browser) { (void) KStdAction::open( - actn, TQT_SLOT( slotLoad() ), actionCollection()); + actn, TQ_SLOT( slotLoad() ), actionCollection()); (void) KStdAction::saveAs( - actn, TQT_SLOT( slotSaveAs() ), actionCollection()); + actn, TQ_SLOT( slotSaveAs() ), actionCollection()); } - (void) KStdAction::cut(actn, TQT_SLOT( slotCut() ), actionCollection()); - (void) KStdAction::copy(actn, TQT_SLOT( slotCopy() ), actionCollection()); - (void) KStdAction::paste(actn, TQT_SLOT( slotPaste() ), actionCollection()); - (void) KStdAction::print(actn, TQT_SLOT( slotPrint() ), actionCollection()); + (void) KStdAction::cut(actn, TQ_SLOT( slotCut() ), actionCollection()); + (void) KStdAction::copy(actn, TQ_SLOT( slotCopy() ), actionCollection()); + (void) KStdAction::paste(actn, TQ_SLOT( slotPaste() ), actionCollection()); + (void) KStdAction::print(actn, TQ_SLOT( slotPrint() ), actionCollection()); // settings menu (void) new TDEToggleAction( i18n("&Show Netscape Bookmarks in Konqueror"), 0, - actn, TQT_SLOT( slotShowNS() ), actionCollection(), + actn, TQ_SLOT( slotShowNS() ), actionCollection(), "settings_showNS"); // actions (void) new TDEAction( i18n("&Delete"), "edit-delete", Key_Delete, - actn, TQT_SLOT( slotDelete() ), actionCollection(), "delete"); + actn, TQ_SLOT( slotDelete() ), actionCollection(), "delete"); (void) new TDEAction( i18n("Rename"), "text", Key_F2, - actn, TQT_SLOT( slotRename() ), actionCollection(), "rename"); + actn, TQ_SLOT( slotRename() ), actionCollection(), "rename"); (void) new TDEAction( i18n("C&hange URL"), "text", Key_F3, - actn, TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl"); + actn, TQ_SLOT( slotChangeURL() ), actionCollection(), "changeurl"); (void) new TDEAction( i18n("C&hange Comment"), "text", Key_F4, - actn, TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment"); + actn, TQ_SLOT( slotChangeComment() ), actionCollection(), "changecomment"); (void) new TDEAction( i18n("Chan&ge Icon..."), "icons", 0, - actn, TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon"); + actn, TQ_SLOT( slotChangeIcon() ), actionCollection(), "changeicon"); (void) new TDEAction( i18n("Update Favicon"), 0, - actn, TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon"); + actn, TQ_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon"); (void) new TDEAction( i18n("Recursive Sort"), 0, - actn, TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort"); + actn, TQ_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort"); (void) new TDEAction( i18n("&New Folder..."), "folder-new", CTRL+Key_N, - actn, TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder"); + actn, TQ_SLOT( slotNewFolder() ), actionCollection(), "newfolder"); (void) new TDEAction( i18n("&New Bookmark"), "www", 0, - actn, TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark"); + actn, TQ_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark"); (void) new TDEAction( i18n("&Insert Separator"), CTRL+Key_I, - actn, TQT_SLOT( slotInsertSeparator() ), actionCollection(), + actn, TQ_SLOT( slotInsertSeparator() ), actionCollection(), "insertseparator"); (void) new TDEAction( i18n("&Sort Alphabetically"), 0, - actn, TQT_SLOT( slotSort() ), actionCollection(), "sort"); + actn, TQ_SLOT( slotSort() ), actionCollection(), "sort"); (void) new TDEAction( i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0, - actn, TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar"); + actn, TQ_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar"); (void) new TDEAction( i18n("Show in T&oolbar"), "bookmark_toolbar", 0, - actn, TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar"); + actn, TQ_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar"); (void) new TDEAction( i18n("Hide in T&oolbar"), "bookmark_toolbar", 0, - actn, TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar"); + actn, TQ_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar"); (void) new TDEAction( i18n("&Expand All Folders"), 0, - actn, TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall"); + actn, TQ_SLOT( slotExpandAll() ), actionCollection(), "expandall"); (void) new TDEAction( i18n("Collapse &All Folders"), 0, - actn, TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" ); + actn, TQ_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" ); (void) new TDEAction( i18n("&Open in Konqueror"), "document-open", 0, - actn, TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" ); + actn, TQ_SLOT( slotOpenLink() ), actionCollection(), "openlink" ); (void) new TDEAction( i18n("Check &Status"), "bookmark", 0, - actn, TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" ); + actn, TQ_SLOT( slotTestSelection() ), actionCollection(), "testlink" ); (void) new TDEAction( i18n("Check Status: &All"), 0, - actn, TQT_SLOT( slotTestAll() ), actionCollection(), "testall" ); + actn, TQ_SLOT( slotTestAll() ), actionCollection(), "testall" ); (void) new TDEAction( i18n("Update All &Favicons"), 0, - actn, TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(), + actn, TQ_SLOT( slotUpdateAllFavIcons() ), actionCollection(), "updateallfavicons" ); (void) new TDEAction( i18n("Cancel &Checks"), 0, - actn, TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" ); + actn, TQ_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" ); (void) new TDEAction( i18n("Cancel &Favicon Updates"), 0, - actn, TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(), + actn, TQ_SLOT( slotCancelFavIconUpdates() ), actionCollection(), "cancelfaviconupdates" ); (void) new TDEAction( i18n("Import &Netscape Bookmarks..."), "netscape", 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importNS"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importNS"); (void) new TDEAction( i18n("Import &Opera Bookmarks..."), "opera", 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importOpera"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importOpera"); (void) new TDEAction( i18n("Import All &Crash Sessions as Bookmarks..."), 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importCrashes"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importCrashes"); (void) new TDEAction( i18n("Import &Galeon Bookmarks..."), 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importGaleon"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importGaleon"); (void) new TDEAction( i18n("Import &KDE2/KDE3/TDE Bookmarks..."), 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importKDE2"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importKDE2"); (void) new TDEAction( i18n("Import &IE Bookmarks..."), 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importIE"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importIE"); (void) new TDEAction( i18n("Import &Mozilla Bookmarks..."), "mozilla", 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importMoz"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importMoz"); (void) new TDEAction( i18n("Export to &Netscape Bookmarks"), "netscape", 0, - actn, TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS"); + actn, TQ_SLOT( slotExportNS() ), actionCollection(), "exportNS"); (void) new TDEAction( i18n("Export to &Opera Bookmarks..."), "opera", 0, - actn, TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera"); + actn, TQ_SLOT( slotExportOpera() ), actionCollection(), "exportOpera"); (void) new TDEAction( i18n("Export to &HTML Bookmarks..."), "text-html", 0, - actn, TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML"); + actn, TQ_SLOT( slotExportHTML() ), actionCollection(), "exportHTML"); (void) new TDEAction( i18n("Export to &IE Bookmarks..."), 0, - actn, TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE"); + actn, TQ_SLOT( slotExportIE() ), actionCollection(), "exportIE"); (void) new TDEAction( i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0, - actn, TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz"); + actn, TQ_SLOT( slotExportMoz() ), actionCollection(), "exportMoz"); } void ActionsImpl::slotLoad() { @@ -444,7 +444,7 @@ void ActionsImpl::slotPrint() { s_appId = kapp->dcopClient()->appId(); s_objId = s_part->property("dcopObjectId").toString().latin1(); - connect(s_part, TQT_SIGNAL(completed()), this, TQT_SLOT(slotDelayedPrint())); + connect(s_part, TQ_SIGNAL(completed()), this, TQ_SLOT(slotDelayedPrint())); s_part->openURL(KURL( tmpf.name() )); } diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp index 8a7e05c3a..45da6db7a 100644 --- a/konqueror/keditbookmarks/bookmarkinfo.cpp +++ b/konqueror/keditbookmarks/bookmarkinfo.cpp @@ -231,7 +231,7 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name) : TQWidget(parent, name), m_connected(false) { timer = new TQTimer(this); - connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( commitChanges())); + connect(timer, TQ_SIGNAL( timeout() ), TQ_SLOT( commitChanges())); titlecmd = 0; urlcmd = 0; @@ -246,9 +246,9 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name) new TQLabel(m_title_le, i18n("Name:"), this), 0, 0); - connect(m_title_le, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotTextChangedTitle(const TQString &) )); - connect(m_title_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitTitle() )); + connect(m_title_le, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotTextChangedTitle(const TQString &) )); + connect(m_title_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitTitle() )); m_url_le = new BookmarkLineEdit(this); grid->addWidget(m_url_le, 1, 1); @@ -256,18 +256,18 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name) new TQLabel(m_url_le, i18n("Location:"), this), 1, 0); - connect(m_url_le, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotTextChangedURL(const TQString &) )); - connect(m_url_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitURL() )); + connect(m_url_le, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotTextChangedURL(const TQString &) )); + connect(m_url_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitURL() )); m_comment_le = new BookmarkLineEdit(this); grid->addWidget(m_comment_le, 2, 1); grid->addWidget( new TQLabel(m_comment_le, i18n("Comment:"), this), 2, 0); - connect(m_comment_le, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotTextChangedComment(const TQString &) )); - connect(m_comment_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitComment() )); + connect(m_comment_le, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotTextChangedComment(const TQString &) )); + connect(m_comment_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitComment() )); m_credate_le = new KLineEdit(this); grid->addWidget(m_credate_le, 0, 3); diff --git a/konqueror/keditbookmarks/bookmarkiterator.cpp b/konqueror/keditbookmarks/bookmarkiterator.cpp index 41aa6299d..35374136f 100644 --- a/konqueror/keditbookmarks/bookmarkiterator.cpp +++ b/konqueror/keditbookmarks/bookmarkiterator.cpp @@ -27,8 +27,8 @@ #include <tqtimer.h> BookmarkIterator::BookmarkIterator(TQValueList<KBookmark> bks) : m_bklist(bks) { - connect(this, TQT_SIGNAL( deleteSelf(BookmarkIterator *) ), - TQT_SLOT( slotCancelTest(BookmarkIterator *) )); + connect(this, TQ_SIGNAL( deleteSelf(BookmarkIterator *) ), + TQ_SLOT( slotCancelTest(BookmarkIterator *) )); delayedEmitNextOne(); } @@ -37,7 +37,7 @@ BookmarkIterator::~BookmarkIterator() { } void BookmarkIterator::delayedEmitNextOne() { - TQTimer::singleShot(1, this, TQT_SLOT( nextOne() )); + TQTimer::singleShot(1, this, TQ_SLOT( nextOne() )); } void BookmarkIterator::slotCancelTest(BookmarkIterator *test) { diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp index 0d262bc7a..b02f0af16 100644 --- a/konqueror/keditbookmarks/dcop.cpp +++ b/konqueror/keditbookmarks/dcop.cpp @@ -37,8 +37,8 @@ KBookmarkEditorIface::KBookmarkEditorIface() : TQObject(), DCOPObject("KBookmarkEditor") { - // connect(KBookmarkNotifier_stub, TQT_SIGNAL( updatedAccessMetadata(TQString,TQString) ), - // this, TQT_SLOT( slotDcopUpdatedAccessMetadata(TQString,TQString) )); + // connect(KBookmarkNotifier_stub, TQ_SIGNAL( updatedAccessMetadata(TQString,TQString) ), + // this, TQ_SLOT( slotDcopUpdatedAccessMetadata(TQString,TQString) )); connectDCOPSignal(0, "KBookmarkNotifier", "updatedAccessMetadata(TQString,TQString)", "slotDcopUpdatedAccessMetadata(TQString,TQString)", false); } diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp index 6013187bb..73cbd9ced 100644 --- a/konqueror/keditbookmarks/favicons.cpp +++ b/konqueror/keditbookmarks/favicons.cpp @@ -84,8 +84,8 @@ void FavIconsItr::doAction() { curItem()->setTmpStatus(i18n("Updating favicon...")); if (!m_updater) { m_updater = new FavIconUpdater(kapp, "FavIconUpdater"); - connect(m_updater, TQT_SIGNAL( done(bool) ), - this, TQT_SLOT( slotDone(bool) ) ); + connect(m_updater, TQ_SIGNAL( done(bool) ), + this, TQ_SLOT( slotDone(bool) ) ); } if (curBk().url().protocol().startsWith("http")) { m_updater->downloadIcon(curBk()); diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index 1fd5cf222..f5a8474cc 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/konqueror/keditbookmarks/listview.cpp @@ -229,8 +229,8 @@ void ListView::selected(KEBListViewItem * item, bool s) } //FIXME do it once somewhere if (!KEBApp::self()->bkInfo()->connected()) { - connect(KEBApp::self()->bkInfo(), TQT_SIGNAL( updateListViewItem() ), - TQT_SLOT( slotBkInfoUpdateListViewItem() )); + connect(KEBApp::self()->bkInfo(), TQ_SIGNAL( updateListViewItem() ), + TQ_SLOT( slotBkInfoUpdateListViewItem() )); KEBApp::self()->bkInfo()->setConnected(true); } @@ -716,21 +716,21 @@ void KEBListView::init() { setDragEnabled(true); setSelectionModeExt((!m_folderList) ? TDEListView::Extended: TDEListView::Single); setAllColumnsShowFocus(true); - connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), - this, TQT_SLOT(slotColumnSizeChanged(int, int, int))); + connect(header(), TQ_SIGNAL(sizeChange(int, int, int)), + this, TQ_SLOT(slotColumnSizeChanged(int, int, int))); } void KEBListView::makeConnections() { - connect(this, TQT_SIGNAL( moved() ), - TQT_SLOT( slotMoved() )); - connect(this, TQT_SIGNAL( contextMenu(TDEListView *, TQListViewItem*, const TQPoint &) ), - TQT_SLOT( slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &) )); - connect(this, TQT_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ), - TQT_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) )); - connect(this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), - TQT_SLOT( slotDoubleClicked(TQListViewItem *, const TQPoint &, int) )); - connect(this, TQT_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), - TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) )); + connect(this, TQ_SIGNAL( moved() ), + TQ_SLOT( slotMoved() )); + connect(this, TQ_SIGNAL( contextMenu(TDEListView *, TQListViewItem*, const TQPoint &) ), + TQ_SLOT( slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &) )); + connect(this, TQ_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ), + TQ_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) )); + connect(this, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), + TQ_SLOT( slotDoubleClicked(TQListViewItem *, const TQPoint &, int) )); + connect(this, TQ_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), + TQ_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) )); } void KEBListView::readonlyFlagInit(bool readonly) { diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp index 767c15a50..707491741 100644 --- a/konqueror/keditbookmarks/testlink.cpp +++ b/konqueror/keditbookmarks/testlink.cpp @@ -88,10 +88,10 @@ void TestLinkItr::doAction() { m_job->addMetaData("errorPage", "true"); m_job->addMetaData( TQString("cookies"), TQString("none") ); - connect(m_job, TQT_SIGNAL( result( TDEIO::Job *)), - this, TQT_SLOT( slotJobResult(TDEIO::Job *))); - connect(m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT( slotJobData(TDEIO::Job *, const TQByteArray &))); + connect(m_job, TQ_SIGNAL( result( TDEIO::Job *)), + this, TQ_SLOT( slotJobResult(TDEIO::Job *))); + connect(m_job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT( slotJobData(TDEIO::Job *, const TQByteArray &))); curItem()->setTmpStatus(i18n("Checking...")); TQString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url()); diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index cc8161f4e..d685e8dee 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -58,8 +58,8 @@ CmdHistory* CmdHistory::s_self = 0; CmdHistory::CmdHistory(TDEActionCollection *collection) : m_commandHistory(collection) { - connect(&m_commandHistory, TQT_SIGNAL( commandExecuted(KCommand *) ), - TQT_SLOT( slotCommandExecuted(KCommand *) )); + connect(&m_commandHistory, TQ_SIGNAL( commandExecuted(KCommand *) ), + TQ_SLOT( slotCommandExecuted(KCommand *) )); assert(!s_self); s_self = this; // this is hacky } @@ -138,8 +138,8 @@ void CurrentMgr::createManager(const TQString &filename) { m_mgr = KBookmarkManager::managerForFile(filename, false); - connect(m_mgr, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) )); + connect(m_mgr, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) )); } void CurrentMgr::slotBookmarksChanged(const TQString &, const TQString &) { @@ -219,8 +219,8 @@ KEBApp::KEBApp( TDEListViewSearchLine *searchLineEdit = new KEBSearchLine(quicksearch, 0, "TDEListViewSearchLine"); quicksearch->setStretchableWidget(searchLineEdit); lbl->setBuddy(searchLineEdit); - connect(resetQuickSearch, TQT_SIGNAL(activated()), searchLineEdit, TQT_SLOT(clear())); - connect(searchLineEdit, TQT_SIGNAL(searchUpdated()), TQT_SLOT(updateActions())); + connect(resetQuickSearch, TQ_SIGNAL(activated()), searchLineEdit, TQ_SLOT(clear())); + connect(searchLineEdit, TQ_SIGNAL(searchUpdated()), TQ_SLOT(updateActions())); ListView::createListViews(vsplitter); ListView::self()->initListViews(); @@ -245,8 +245,8 @@ KEBApp::KEBApp( m_dcopIface = new KBookmarkEditorIface(); - connect(kapp->clipboard(), TQT_SIGNAL( dataChanged() ), - TQT_SLOT( slotClipboardDataChanged() )); + connect(kapp->clipboard(), TQ_SIGNAL( dataChanged() ), + TQ_SLOT( slotClipboardDataChanged() )); ListView::self()->connectSignals(); @@ -337,8 +337,8 @@ void KEBApp::notifyCommandExecuted() { void KEBApp::slotConfigureToolbars() { saveMainWindowSettings(TDEGlobal::config(), "MainWindow"); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), - TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg, TQ_SIGNAL( newToolbarConfig() ), + TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp index 9a0280dfa..377026411 100644 --- a/konqueror/keditbookmarks/updater.cpp +++ b/konqueror/keditbookmarks/updater.cpp @@ -95,10 +95,10 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) { part->setProperty("javaEnabled", TQVariant(false)); part->setProperty("autoloadImages", TQVariant(false)); - connect(part, TQT_SIGNAL( canceled(const TQString &) ), - this, TQT_SLOT( slotCompleted() )); - connect(part, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() )); + connect(part, TQ_SIGNAL( canceled(const TQString &) ), + this, TQ_SLOT( slotCompleted() )); + connect(part, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() )); KParts::BrowserExtension *ext = KParts::BrowserExtension::childObject(part); assert(ext); @@ -106,8 +106,8 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) { m_browserIface = new FavIconBrowserInterface(this, "browseriface"); ext->setBrowserInterface(m_browserIface); - connect(ext, TQT_SIGNAL( setIconURL(const KURL &) ), - this, TQT_SLOT( setIconURL(const KURL &) )); + connect(ext, TQ_SIGNAL( setIconURL(const KURL &) ), + this, TQ_SLOT( setIconURL(const KURL &) )); m_part = part; } @@ -115,7 +115,7 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) { if (!m_timer) { // Timeout to stop the updating hanging m_timer = new TQTimer(this); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) ); } m_timer->start(15000,false); m_webGrabber = new FavIconWebGrabber(m_part, bk.url()); @@ -149,10 +149,10 @@ FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url TDEIO::Job *job = TDEIO::get(m_url, false, false); job->addMetaData( TQString("cookies"), TQString("none") ); - connect(job, TQT_SIGNAL( result( TDEIO::Job *)), - this, TQT_SLOT( slotFinished(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( slotFinished(TDEIO::Job *) )); + connect(job, TQ_SIGNAL( mimetype( TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotMimetype(TDEIO::Job *, const TQString &) )); } void FavIconWebGrabber::slotMimetype(TDEIO::Job *job, const TQString & /*type*/) { diff --git a/konqueror/konq_actions.cpp b/konqueror/konq_actions.cpp index d87a73971..fa93bca57 100644 --- a/konqueror/konq_actions.cpp +++ b/konqueror/konq_actions.cpp @@ -98,10 +98,10 @@ int KonqBidiHistoryAction::plug( TQWidget *widget, int index ) { m_goMenu = (TQPopupMenu*)widget; // Forward signal (to main view) - connect( m_goMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SIGNAL( menuAboutToShow() ) ); - connect( m_goMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotActivated( int ) ) ); + connect( m_goMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SIGNAL( menuAboutToShow() ) ); + connect( m_goMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotActivated( int ) ) ); //kdDebug(1202) << "m_goMenu->count()=" << m_goMenu->count() << endl; // Store how many items the menu already contains. // This means, the KonqBidiHistoryAction has to be plugged LAST in a menu ! @@ -261,12 +261,12 @@ int KonqLogoAction::plug( TQWidget *widget, int index ) int id_ = getToolButtonID(); - bar->insertAnimatedWidget( id_, this, TQT_SIGNAL(activated()), TQString("trinity"), index ); + bar->insertAnimatedWidget( id_, this, TQ_SIGNAL(activated()), TQString("trinity"), index ); bar->alignItemRight( id_ ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -284,12 +284,12 @@ KonqViewModeAction::KonqViewModeAction( const TQString &text, const TQString &ic { m_menu = new TQPopupMenu; - connect( m_menu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotPopupAboutToShow() ) ); - connect( m_menu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotPopupActivated() ) ); - connect( m_menu, TQT_SIGNAL( aboutToHide() ), - this, TQT_SLOT( slotPopupAboutToHide() ) ); + connect( m_menu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotPopupAboutToShow() ) ); + connect( m_menu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotPopupActivated() ) ); + connect( m_menu, TQ_SIGNAL( aboutToHide() ), + this, TQ_SLOT( slotPopupAboutToHide() ) ); } KonqViewModeAction::~KonqViewModeAction() @@ -355,10 +355,10 @@ KonqMostOftenURLSAction::KonqMostOftenURLSAction( const TQString& text, { setDelayed( false ); - connect( popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotFillMenu() )); - //connect( popupMenu(), TQT_SIGNAL( aboutToHide() ), TQT_SLOT( slotClearMenu() )); - connect( popupMenu(), TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotActivated(int) )); + connect( popupMenu(), TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotFillMenu() )); + //connect( popupMenu(), TQ_SIGNAL( aboutToHide() ), TQ_SLOT( slotClearMenu() )); + connect( popupMenu(), TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotActivated(int) )); // Need to do all this upfront for a correct initial state init(); } @@ -380,11 +380,11 @@ void KonqMostOftenURLSAction::parseHistory() // only ever called once KonqHistoryManager *mgr = KonqHistoryManager::kself(); KonqHistoryIterator it( mgr->entries() ); - connect( mgr, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * )), - TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * ))); - connect( mgr, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry * )), - TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry * ))); - connect( mgr, TQT_SIGNAL( cleared() ), TQT_SLOT( slotHistoryCleared() )); + connect( mgr, TQ_SIGNAL( entryAdded( const KonqHistoryEntry * )), + TQ_SLOT( slotEntryAdded( const KonqHistoryEntry * ))); + connect( mgr, TQ_SIGNAL( entryRemoved( const KonqHistoryEntry * )), + TQ_SLOT( slotEntryRemoved( const KonqHistoryEntry * ))); + connect( mgr, TQ_SIGNAL( cleared() ), TQ_SLOT( slotHistoryCleared() )); s_mostEntries = new MostOftenList; // exit() will clean this up for now for ( uint i = 0; it.current() && i < s_maxEntries; i++ ) { diff --git a/konqueror/konq_combo.cpp b/konqueror/konq_combo.cpp index 8793441cd..ef65a5412 100644 --- a/konqueror/konq_combo.cpp +++ b/konqueror/konq_combo.cpp @@ -122,14 +122,14 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name ) // Make the lineedit consume the Key_Enter event... setTrapReturnKey( true ); - connect( KonqHistoryManager::kself(), TQT_SIGNAL(cleared()), TQT_SLOT(slotCleared()) ); - connect( this, TQT_SIGNAL(cleared() ), TQT_SLOT(slotCleared()) ); - connect( this, TQT_SIGNAL(highlighted( int )), TQT_SLOT(slotSetIcon( int )) ); - connect( this, TQT_SIGNAL(activated( const TQString& )), - TQT_SLOT(slotActivated( const TQString& )) ); + connect( KonqHistoryManager::kself(), TQ_SIGNAL(cleared()), TQ_SLOT(slotCleared()) ); + connect( this, TQ_SIGNAL(cleared() ), TQ_SLOT(slotCleared()) ); + connect( this, TQ_SIGNAL(highlighted( int )), TQ_SLOT(slotSetIcon( int )) ); + connect( this, TQ_SIGNAL(activated( const TQString& )), + TQ_SLOT(slotActivated( const TQString& )) ); setHistoryEditorEnabled( true ); - connect( this, TQT_SIGNAL(removed( const TQString&) ), TQT_SLOT(slotRemoved( const TQString& )) ); + connect( this, TQ_SIGNAL(removed( const TQString&) ), TQ_SLOT(slotRemoved( const TQString& )) ); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); diff --git a/konqueror/konq_extensionmanager.cpp b/konqueror/konq_extensionmanager.cpp index d60caeeb1..861fe0fff 100644 --- a/konqueror/konq_extensionmanager.cpp +++ b/konqueror/konq_extensionmanager.cpp @@ -52,9 +52,9 @@ KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mai (new TQVBoxLayout(plainPage(), 0, 0))->setAutoAdd(true); d->pluginSelector = new KPluginSelector(plainPage()); setMainWidget(d->pluginSelector); - connect(d->pluginSelector, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(setChanged(bool))); - connect(d->pluginSelector, TQT_SIGNAL(configCommitted(const TQCString &)), - KSettings::Dispatcher::self(), TQT_SLOT(reparseConfiguration(const TQCString &))); + connect(d->pluginSelector, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(setChanged(bool))); + connect(d->pluginSelector, TQ_SIGNAL(configCommitted(const TQCString &)), + KSettings::Dispatcher::self(), TQ_SLOT(reparseConfiguration(const TQCString &))); d->mainWindow = mainWindow; d->activePart = activePart; diff --git a/konqueror/konq_frame.cpp b/konqueror/konq_frame.cpp index 93f465a13..32ca35650 100644 --- a/konqueror/konq_frame.cpp +++ b/konqueror/konq_frame.cpp @@ -90,8 +90,8 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name ) "directory tree with an icon view or detailed view, and possibly a " "terminal emulator window." ) ); addWidget( m_pLinkedViewCheckBox, 0, true /*permanent->right align*/ ); - connect( m_pLinkedViewCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(linkedViewClicked(bool)) ); + connect( m_pLinkedViewCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(linkedViewClicked(bool)) ); m_progressBar = new KProgress( this ); m_progressBar->setMaximumHeight(fontMetrics().height()); @@ -151,7 +151,7 @@ void KonqFrameStatusBar::splitFrameMenu() // We have to ship the remove view action ourselves, // since this may not be the active view (passive view) - TDEAction actRemoveView(i18n("Close View"), "view_remove", 0, m_pParentKonqFrame, TQT_SLOT(slotRemoveView()), (TQObject*)0, "removethisview"); + TDEAction actRemoveView(i18n("Close View"), "view_remove", 0, m_pParentKonqFrame, TQ_SLOT(slotRemoveView()), (TQObject*)0, "removethisview"); //KonqView * nextView = mw->viewManager()->chooseNextView( m_pParentKonqFrame->childView() ); actRemoveView.setEnabled( mw->mainViewsCount() > 1 || m_pParentKonqFrame->childView()->isToggleView() || m_pParentKonqFrame->childView()->isPassiveMode() ); @@ -242,7 +242,7 @@ void KonqFrameStatusBar::slotSpeedProgress( int bytesPerSecond ) void KonqFrameStatusBar::slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *newOne) { if (newOne!=0) - connect(newOne,TQT_SIGNAL(setStatusBarText(const TQString &)),this,TQT_SLOT(slotDisplayStatusText(const TQString&))); + connect(newOne,TQ_SIGNAL(setStatusBarText(const TQString &)),this,TQ_SLOT(slotDisplayStatusText(const TQString&))); slotDisplayStatusText( TQString::null ); } @@ -302,8 +302,8 @@ KonqFrame::KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer, // the frame statusbar m_pStatusBar = new KonqFrameStatusBar( this, "KonquerorFrameStatusBar"); m_pStatusBar->setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); - connect(m_pStatusBar, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStatusBarClicked())); - connect( m_pStatusBar, TQT_SIGNAL( linkedViewClicked( bool ) ), this, TQT_SLOT( slotLinkedViewClicked( bool ) ) ); + connect(m_pStatusBar, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStatusBarClicked())); + connect( m_pStatusBar, TQ_SIGNAL( linkedViewClicked( bool ) ), this, TQ_SLOT( slotLinkedViewClicked( bool ) ) ); m_separator = 0; m_pParentContainer = parentContainer; } @@ -420,8 +420,8 @@ void KonqFrame::setView( KonqView* child ) m_pView = child; if (m_pView) { - connect(m_pView,TQT_SIGNAL(sigPartChanged(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)), - m_pStatusBar,TQT_SLOT(slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *))); + connect(m_pView,TQ_SIGNAL(sigPartChanged(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)), + m_pStatusBar,TQ_SLOT(slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *))); } } diff --git a/konqueror/konq_guiclients.cpp b/konqueror/konq_guiclients.cpp index 0e014e70a..2e3703151 100644 --- a/konqueror/konq_guiclients.cpp +++ b/konqueror/konq_guiclients.cpp @@ -157,7 +157,7 @@ void PopupMenuGUIClient::addEmbeddingService( TQDomElement &menu, int idx, const action.setAttribute( "group", "preview" ); (void)new TDEAction( name, service->pixmap( TDEIcon::Small ), 0, - m_mainWindow, TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName ); + m_mainWindow, TQ_SLOT( slotOpenEmbedded() ), actionCollection(), actName ); } ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) @@ -202,8 +202,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) if ( (*cIt)->icon() != "unknown" ) action->setIcon( (*cIt)->icon() ); - connect( action, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotToggleView( bool ) ) ); + connect( action, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotToggleView( bool ) ) ); m_actions.insert( name, action ); @@ -212,10 +212,10 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) m_mapOrientation.insert( name, horizontal ); } - connect( m_mainWindow, TQT_SIGNAL( viewAdded( KonqView * ) ), - this, TQT_SLOT( slotViewAdded( KonqView * ) ) ); - connect( m_mainWindow, TQT_SIGNAL( viewRemoved( KonqView * ) ), - this, TQT_SLOT( slotViewRemoved( KonqView * ) ) ); + connect( m_mainWindow, TQ_SIGNAL( viewAdded( KonqView * ) ), + this, TQ_SLOT( slotViewAdded( KonqView * ) ) ); + connect( m_mainWindow, TQ_SIGNAL( viewRemoved( KonqView * ) ), + this, TQ_SLOT( slotViewRemoved( KonqView * ) ) ); } ToggleViewGUIClient::~ToggleViewGUIClient() diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp index f5a34925a..01cbf5a52 100644 --- a/konqueror/konq_mainwindow.cpp +++ b/konqueror/konq_mainwindow.cpp @@ -186,9 +186,9 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con KonqExtendedBookmarkOwner *extOwner = new KonqExtendedBookmarkOwner( this ); m_pBookmarksOwner = extOwner; connect( extOwner, - TQT_SIGNAL( signalFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ), + TQ_SIGNAL( signalFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ), extOwner, - TQT_SLOT( slotFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ) ); + TQ_SLOT( slotFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ) ); // init history-manager, load history, get completion object if ( !s_pCompletion ) { @@ -201,7 +201,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con int mode = KonqSettings::settingsCompletionMode(); s_pCompletion->setCompletionMode( (TDEGlobalSettings::Completion) mode ); } - connect(KParts::HistoryProvider::self(), TQT_SIGNAL(cleared()), TQT_SLOT(slotClearComboHistory())); + connect(KParts::HistoryProvider::self(), TQ_SIGNAL(cleared()), TQ_SLOT(slotClearComboHistory())); KonqPixmapProvider *prov = KonqPixmapProvider::self(); if ( !s_comboConfig ) { @@ -210,17 +210,17 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con s_comboConfig->setGroup( "Location Bar" ); prov->load( s_comboConfig, "ComboIconCache" ); } - connect( prov, TQT_SIGNAL( changed() ), TQT_SLOT( slotIconsChanged() ) ); + connect( prov, TQ_SIGNAL( changed() ), TQ_SLOT( slotIconsChanged() ) ); initCombo(); initActions(); setInstance( TDEGlobal::instance() ); - connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), - this, TQT_SLOT( slotDatabaseChanged() ) ); + connect( KSycoca::self(), TQ_SIGNAL( databaseChanged() ), + this, TQ_SLOT( slotDatabaseChanged() ) ); - connect( kapp, TQT_SIGNAL( tdedisplayFontChanged()), TQT_SLOT(slotReconfigure())); + connect( kapp, TQ_SIGNAL( tdedisplayFontChanged()), TQ_SLOT(slotReconfigure())); //load the xmlui file specified in the profile or the default konqueror.rc setXMLFile( xmluiFile ); @@ -229,7 +229,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con createGUI( 0L ); - connect(toolBarMenuAction(),TQT_SIGNAL(activated()),this,TQT_SLOT(slotForceSaveMainWindowSettings()) ); + connect(toolBarMenuAction(),TQ_SIGNAL(activated()),this,TQ_SLOT(slotForceSaveMainWindowSettings()) ); if ( !m_toggleViewGUIClient->empty() ) plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); @@ -255,8 +255,8 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con KonqUndoManager::incRef(); - connect( KonqUndoManager::self(), TQT_SIGNAL( undoAvailable( bool ) ), - this, TQT_SLOT( slotUndoAvailable( bool ) ) ); + connect( KonqUndoManager::self(), TQ_SIGNAL( undoAvailable( bool ) ), + this, TQ_SLOT( slotUndoAvailable( bool ) ) ); m_bNeedApplyKonqMainWindowSettings = true; if ( !initialURL.isEmpty() ) @@ -361,7 +361,7 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T m_bookmarkBarActionCollection->setHighlightingEnabled( true ); connectActionCollection( m_bookmarkBarActionCollection ); DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, res ); - connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT(initBookmarkBar()) ); + connect( initializer, TQ_SIGNAL( initialize() ), this, TQ_SLOT(initBookmarkBar()) ); } } @@ -377,11 +377,11 @@ void KonqMainWindow::initBookmarkBar() delete m_paBookmarkBar; m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, this ); connect( m_paBookmarkBar, - TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ), - this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) )); + TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ), + this, TQ_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) )); connect( m_paBookmarkBar, - TQT_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ), - this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) )); + TQ_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ), + this, TQ_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) )); // hide if empty if (bar->count() == 0 ) @@ -699,7 +699,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, if ( view == m_currentView ) startAnimation(); - connect( run, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotRunFinished() ) ); + connect( run, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotRunFinished() ) ); } } @@ -1535,8 +1535,8 @@ void KonqMainWindow::slotToolFind() findPart->widget()->show(); findPart->widget()->setFocus(); - connect( dirPart, TQT_SIGNAL( findClosed(KonqDirPart *) ), - this, TQT_SLOT( slotFindClosed(KonqDirPart *) ) ); + connect( dirPart, TQ_SIGNAL( findClosed(KonqDirPart *) ), + this, TQ_SLOT( slotFindClosed(KonqDirPart *) ) ); } else if ( sender()->inherits( "TDEAction" ) ) // don't go there if called by the singleShot below { @@ -1550,7 +1550,7 @@ void KonqMainWindow::slotToolFind() "filemanagement", url, KParts::URLArgs(), true /* forbid "use html"*/ ); mw->m_paFindFiles->setChecked(true); // Delay it after the openURL call (hacky!) - TQTimer::singleShot( 1, mw, TQT_SLOT(slotToolFind())); + TQTimer::singleShot( 1, mw, TQ_SLOT(slotToolFind())); m_paFindFiles->setChecked(false); } } @@ -1864,14 +1864,14 @@ void KonqMainWindow::slotReloadStop() { } void KonqMainWindow::toggleReloadStopButton(bool isReload) { - //m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" ); + //m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQ_SLOT( slotStop() ), actionCollection(), "stop" ); if (isReload) { m_paReloadStop->setIcon("process-stop"); m_paReloadStop->setWhatsThis( i18n( "Stop loading the document<p>" "All network transfers will be stopped and Konqueror will display the content " "that has been received so far." ) ); m_paReloadStop->setToolTip( i18n( "Stop loading the document" ) ); - //m_paReloadStop = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload" ); + //m_paReloadStop = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQ_SLOT( slotReloadStop() ), actionCollection(), "reload" ); } else { m_paReloadStop->setIcon("reload"); m_paReloadStop->setWhatsThis( i18n( "Reload the currently displayed document<p>" @@ -1978,7 +1978,7 @@ void KonqMainWindow::slotGoHistory() // Show the sidebar if (!static_cast<TDEToggleAction*>(a)->isChecked()) { a->activate(); - TQTimer::singleShot( 0, this, TQT_SLOT(slotGoHistory())); + TQTimer::singleShot( 0, this, TQ_SLOT(slotGoHistory())); return; } @@ -2042,8 +2042,8 @@ void KonqMainWindow::slotConfigureToolbars() if ( autoSaveSettings() ) saveMainWindowSettings( TDEGlobal::config(), "KonqMainWindow" ); KEditToolbar dlg(factory()); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(initBookmarkBar())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(initBookmarkBar())); dlg.exec(); } @@ -2342,8 +2342,8 @@ void KonqMainWindow::insertChildView( KonqView *childView ) kdDebug(1202) << "KonqMainWindow::insertChildView " << childView << endl; m_mapViews.insert( childView->part(), childView ); - connect( childView, TQT_SIGNAL( viewCompleted( KonqView * ) ), - this, TQT_SLOT( slotViewCompleted( KonqView * ) ) ); + connect( childView, TQ_SIGNAL( viewCompleted( KonqView * ) ), + this, TQ_SLOT( slotViewCompleted( KonqView * ) ) ); if ( !m_pViewManager->isLoadingProfile() ) // see KonqViewManager::loadViewProfile viewCountChanged(); @@ -2355,8 +2355,8 @@ void KonqMainWindow::removeChildView( KonqView *childView ) { kdDebug(1202) << "KonqMainWindow::removeChildView childView " << childView << endl; - disconnect( childView, TQT_SIGNAL( viewCompleted( KonqView * ) ), - this, TQT_SLOT( slotViewCompleted( KonqView * ) ) ); + disconnect( childView, TQ_SIGNAL( viewCompleted( KonqView * ) ), + this, TQ_SLOT( slotViewCompleted( KonqView * ) ) ); #ifndef NDEBUG dumpViewList(); @@ -2714,7 +2714,7 @@ void KonqMainWindow::slotBreakOffTabPopup() //Can't do this safely here as the tabbar may disappear and we're //hanging off here. - TQTimer::singleShot(0, this, TQT_SLOT( slotBreakOffTabPopupDelayed() ) ); + TQTimer::singleShot(0, this, TQ_SLOT( slotBreakOffTabPopupDelayed() ) ); } void KonqMainWindow::slotBreakOffTabPopupDelayed() @@ -2858,7 +2858,7 @@ void KonqMainWindow::slotRemoveTabPopup() } //Can't do immediately - may kill the tabbar, and we're in an event path down from it - TQTimer::singleShot( 0, this, TQT_SLOT( slotRemoveTabPopupDelayed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRemoveTabPopupDelayed() ) ); } void KonqMainWindow::slotRemoveTabPopupDelayed() @@ -2896,7 +2896,7 @@ void KonqMainWindow::slotRemoveOtherTabsPopup() m_pViewManager->showTab( originalView ); //Can't do immediately - kills the tabbar, and we're in an event path down from it - TQTimer::singleShot( 0, this, TQT_SLOT( slotRemoveOtherTabsPopupDelayed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRemoveOtherTabsPopupDelayed() ) ); } void KonqMainWindow::slotRemoveOtherTabsPopupDelayed() @@ -3128,13 +3128,13 @@ void KonqMainWindow::slotUpAboutToShow() void KonqMainWindow::slotUp(TDEAction::ActivationReason, TQt::ButtonState state) { m_goState = state; - TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotUpDelayed() ) ); } void KonqMainWindow::slotUp() { m_goState = TQt::LeftButton; - TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotUpDelayed() ) ); } void KonqMainWindow::slotUpDelayed() @@ -3192,7 +3192,7 @@ void KonqMainWindow::slotGoHistoryActivated( int steps, TQt::ButtonState state ) // Only start 1 timer. m_goBuffer = steps; m_goState = state; - TQTimer::singleShot( 0, this, TQT_SLOT(slotGoHistoryDelayed())); + TQTimer::singleShot( 0, this, TQ_SLOT(slotGoHistoryDelayed())); } } @@ -3284,10 +3284,10 @@ void KonqMainWindow::initCombo() m_combo->init( s_pCompletion ); - connect( m_combo, TQT_SIGNAL(activated(const TQString&,int)), - this, TQT_SLOT(slotURLEntered(const TQString&,int)) ); - connect( m_combo, TQT_SIGNAL(showPageSecurity()), - this, TQT_SLOT(showPageSecurity()) ); + connect( m_combo, TQ_SIGNAL(activated(const TQString&,int)), + this, TQ_SLOT(slotURLEntered(const TQString&,int)) ); + connect( m_combo, TQ_SIGNAL(showPageSecurity()), + this, TQ_SLOT(showPageSecurity()) ); m_pURLCompletion = new KURLCompletion(); m_pURLCompletion->setCompletionMode( s_pCompletion->completionMode() ); @@ -3296,18 +3296,18 @@ void KonqMainWindow::initCombo() // We do want completion of user names, right? //m_pURLCompletion->setReplaceHome( false ); // Leave ~ alone! Will be taken care of by filters!! - connect( m_combo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ))); - connect( m_combo, TQT_SIGNAL( completion( const TQString& )), - TQT_SLOT( slotMakeCompletion( const TQString& ))); - connect( m_combo, TQT_SIGNAL( substringCompletion( const TQString& )), - TQT_SLOT( slotSubstringcompletion( const TQString& ))); - connect( m_combo, TQT_SIGNAL( textRotation( TDECompletionBase::KeyBindingType) ), - TQT_SLOT( slotRotation( TDECompletionBase::KeyBindingType ))); - connect( m_combo, TQT_SIGNAL( cleared() ), - TQT_SLOT ( slotClearHistory() ) ); - connect( m_pURLCompletion, TQT_SIGNAL( match(const TQString&) ), - TQT_SLOT( slotMatch(const TQString&) )); + connect( m_combo, TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ))); + connect( m_combo, TQ_SIGNAL( completion( const TQString& )), + TQ_SLOT( slotMakeCompletion( const TQString& ))); + connect( m_combo, TQ_SIGNAL( substringCompletion( const TQString& )), + TQ_SLOT( slotSubstringcompletion( const TQString& ))); + connect( m_combo, TQ_SIGNAL( textRotation( TDECompletionBase::KeyBindingType) ), + TQ_SLOT( slotRotation( TDECompletionBase::KeyBindingType ))); + connect( m_combo, TQ_SIGNAL( cleared() ), + TQ_SLOT ( slotClearHistory() ) ); + connect( m_pURLCompletion, TQ_SIGNAL( match(const TQString&) ), + TQ_SLOT( slotMatch(const TQString&) )); m_combo->lineEdit()->installEventFilter(this); @@ -3316,7 +3316,7 @@ void KonqMainWindow::initCombo() { bookmarkCompletionInitialized = true; DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, m_combo->lineEdit() ); - connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT( bookmarksIntoCompletion() ) ); + connect( initializer, TQ_SIGNAL( initialize() ), this, TQ_SLOT( bookmarksIntoCompletion() ) ); } } @@ -3504,22 +3504,22 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) duplicate->setEnabled( false ); if (slotNames.contains("cut()")) - disconnect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) ); + disconnect( m_paCut, TQ_SIGNAL( activated() ), ext, TQ_SLOT( cut() ) ); if (slotNames.contains("copy()")) - disconnect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) ); + disconnect( m_paCopy, TQ_SIGNAL( activated() ), ext, TQ_SLOT( copy() ) ); if (slotNames.contains("paste()")) - disconnect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); + disconnect( m_paPaste, TQ_SIGNAL( activated() ), ext, TQ_SLOT( paste() ) ); if (slotNames.contains("del()")) - disconnect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); - disconnect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + disconnect( m_paDelete, TQ_SIGNAL( activated() ), ext, TQ_SLOT( del() ) ); + disconnect( m_paTrash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); - connect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); - connect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); - connect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) ); - connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); - connect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) ); - connect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) ); + connect( m_paCut, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( cut() ) ); + connect( m_paCopy, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( copy() ) ); + connect( m_paPaste, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( paste() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) ); + connect( m_combo->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckComboSelection()) ); + connect( m_combo->lineEdit(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotCheckComboSelection()) ); m_paTrash->setEnabled(false); m_paDelete->setEnabled(false); @@ -3545,22 +3545,22 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) duplicate->setEnabled( actionCollection()->action("new_window")->isEnabled() ); if (slotNames.contains("cut()")) - connect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) ); + connect( m_paCut, TQ_SIGNAL( activated() ), ext, TQ_SLOT( cut() ) ); if (slotNames.contains("copy()")) - connect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) ); + connect( m_paCopy, TQ_SIGNAL( activated() ), ext, TQ_SLOT( copy() ) ); if (slotNames.contains("paste()")) - connect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); + connect( m_paPaste, TQ_SIGNAL( activated() ), ext, TQ_SLOT( paste() ) ); if (slotNames.contains("del()")) - connect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); - connect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + connect( m_paDelete, TQ_SIGNAL( activated() ), ext, TQ_SLOT( del() ) ); + connect( m_paTrash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); - disconnect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); - disconnect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); - disconnect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) ); - disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); - disconnect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) ); - disconnect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) ); + disconnect( m_paCut, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( cut() ) ); + disconnect( m_paCopy, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( copy() ) ); + disconnect( m_paPaste, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( paste() ) ); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) ); + disconnect( m_combo->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckComboSelection()) ); + disconnect( m_combo->lineEdit(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotCheckComboSelection()) ); if ( ext ) { @@ -3815,77 +3815,77 @@ void KonqMainWindow::initActions() // File menu m_pMenuNew = new KNewMenu ( actionCollection(), this, "new_menu" ); - TQObject::connect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotFileNewAboutToShow()) ); + TQObject::connect( m_pMenuNew->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotFileNewAboutToShow()) ); (void) new TDEAction( i18n( "&Edit File Type..." ), 0, actionCollection(), "editMimeType" ); (void) new TDEAction( i18n( "Properties" ), ALT+Key_Return, actionCollection(), "properties" ); - (void) new TDEAction( i18n( "New &Window" ), "window-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" ); - (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, this, TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" ); - (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, this, TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" ); - (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" ); + (void) new TDEAction( i18n( "New &Window" ), "window-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, TQ_SLOT( slotNewWindow() ), actionCollection(), "new_window" ); + (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, this, TQ_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" ); + (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, this, TQ_SLOT( slotSendURL() ), actionCollection(), "sendURL" ); + (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, this, TQ_SLOT( slotSendFile() ), actionCollection(), "sendPage" ); if (kapp->authorize("shell_access")) { - (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, this, TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" ); + (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, this, TQ_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" ); } - (void) new TDEAction( i18n( "&Open Location..." ), "document-open", TDEStdAccel::shortcut(TDEStdAccel::Open), this, TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" ); + (void) new TDEAction( i18n( "&Open Location..." ), "document-open", TDEStdAccel::shortcut(TDEStdAccel::Open), this, TQ_SLOT( slotOpenLocation() ), actionCollection(), "open_location" ); - m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), this, TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" ); + m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), this, TQ_SLOT( slotToolFind() ), actionCollection(), "findfile" ); m_paPrint = KStdAction::print( 0, 0, actionCollection(), "print" ); - (void) KStdAction::quit( this, TQT_SLOT( close() ), actionCollection(), "quit" ); + (void) KStdAction::quit( this, TQ_SLOT( close() ), actionCollection(), "quit" ); - m_ptaUseHTML = new TDEToggleAction( i18n( "&Use index.html" ), 0, this, TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" ); - m_paLockView = new TDEToggleAction( i18n( "Lock to Current Location"), 0, this, TQT_SLOT( slotLockView() ), actionCollection(), "lock" ); - m_paLinkView = new TDEToggleAction( i18n( "Lin&k View"), 0, this, TQT_SLOT( slotLinkView() ), actionCollection(), "link" ); + m_ptaUseHTML = new TDEToggleAction( i18n( "&Use index.html" ), 0, this, TQ_SLOT( slotShowHTML() ), actionCollection(), "usehtml" ); + m_paLockView = new TDEToggleAction( i18n( "Lock to Current Location"), 0, this, TQ_SLOT( slotLockView() ), actionCollection(), "lock" ); + m_paLinkView = new TDEToggleAction( i18n( "Lin&k View"), 0, this, TQ_SLOT( slotLinkView() ), actionCollection(), "link" ); // Go menu m_paUp = new TDEToolBarPopupAction( i18n( "&Up" ), "go-up", TDEStdAccel::shortcut(TDEStdAccel::Up), actionCollection(), "up" ); - connect( m_paUp, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, - TQT_SLOT( slotUp(TDEAction::ActivationReason, TQt::ButtonState) ) ); - connect( m_paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUpAboutToShow() ) ); - connect( m_paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUpActivated( int ) ) ); + connect( m_paUp, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, + TQ_SLOT( slotUp(TDEAction::ActivationReason, TQt::ButtonState) ) ); + connect( m_paUp->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotUpAboutToShow() ) ); + connect( m_paUp->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotUpActivated( int ) ) ); TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward(); m_paBack = new TDEToolBarPopupAction( backForward.first, TDEStdAccel::shortcut(TDEStdAccel::Back), 0, "", actionCollection(), "back" ); - connect( m_paBack, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, - TQT_SLOT( slotBack(TDEAction::ActivationReason, TQt::ButtonState) ) ); - connect( m_paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotBackAboutToShow() ) ); - connect( m_paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotBackActivated( int ) ) ); + connect( m_paBack, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, + TQ_SLOT( slotBack(TDEAction::ActivationReason, TQt::ButtonState) ) ); + connect( m_paBack->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotBackAboutToShow() ) ); + connect( m_paBack->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotBackActivated( int ) ) ); m_paForward = new TDEToolBarPopupAction( backForward.second, TDEStdAccel::shortcut(TDEStdAccel::Forward), 0, "", actionCollection(), "forward" ); - connect( m_paForward, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, - TQT_SLOT( slotForward(TDEAction::ActivationReason, TQt::ButtonState) ) ); - connect( m_paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotForwardAboutToShow() ) ); - connect( m_paForward->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotForwardActivated( int ) ) ); + connect( m_paForward, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, + TQ_SLOT( slotForward(TDEAction::ActivationReason, TQt::ButtonState) ) ); + connect( m_paForward->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotForwardAboutToShow() ) ); + connect( m_paForward->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotForwardActivated( int ) ) ); m_paHistory = new KonqBidiHistoryAction( i18n("History"), actionCollection(), "history" ); - connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), this, TQT_SLOT( slotGoMenuAboutToShow() ) ); - connect( m_paHistory, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotGoHistoryActivated( int ) ) ); + connect( m_paHistory, TQ_SIGNAL( menuAboutToShow() ), this, TQ_SLOT( slotGoMenuAboutToShow() ) ); + connect( m_paHistory, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotGoHistoryActivated( int ) ) ); m_paHome = new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), actionCollection(), "home" ); - connect( m_paHome, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, - TQT_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) ); - - (void) new TDEAction( i18n( "S&ystem" ), "computer", 0, this, TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" ); - (void) new TDEAction( i18n( "App&lications" ), "kmenu", 0, this, TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" ); - (void) new TDEAction( i18n( "&Storage Media" ), "computer", 0, this, TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" ); - (void) new TDEAction( i18n( "&Network Folders" ), "network", 0, this, TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" ); - (void) new TDEAction( i18n( "Sett&ings" ), "kcontrol", 0, this, TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" ); - //(void) new TDEAction( i18n( "Sidebar Configuration" ), 0, this, TQT_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" ); - (void) new TDEAction( i18n( "Trash" ), "trashcan_full", 0, this, TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" ); - (void) new TDEAction( i18n( "Autostart" ), "launch", 0, this, TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" ); + connect( m_paHome, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, + TQ_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) ); + + (void) new TDEAction( i18n( "S&ystem" ), "computer", 0, this, TQ_SLOT( slotGoSystem() ), actionCollection(), "go_system" ); + (void) new TDEAction( i18n( "App&lications" ), "kmenu", 0, this, TQ_SLOT( slotGoApplications() ), actionCollection(), "go_applications" ); + (void) new TDEAction( i18n( "&Storage Media" ), "computer", 0, this, TQ_SLOT( slotGoMedia() ), actionCollection(), "go_media" ); + (void) new TDEAction( i18n( "&Network Folders" ), "network", 0, this, TQ_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" ); + (void) new TDEAction( i18n( "Sett&ings" ), "kcontrol", 0, this, TQ_SLOT( slotGoSettings() ), actionCollection(), "go_settings" ); + //(void) new TDEAction( i18n( "Sidebar Configuration" ), 0, this, TQ_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" ); + (void) new TDEAction( i18n( "Trash" ), "trashcan_full", 0, this, TQ_SLOT( slotGoTrash() ), actionCollection(), "go_trash" ); + (void) new TDEAction( i18n( "Autostart" ), "launch", 0, this, TQ_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" ); KonqMostOftenURLSAction *mostOften = new KonqMostOftenURLSAction( i18n("Most Often Visited"), actionCollection(), "go_most_often" ); - connect( mostOften, TQT_SIGNAL( activated( const KURL& )), - TQT_SLOT( slotOpenURL( const KURL& ))); - (void) new TDEAction( i18n( "History" ), "history", 0, this, TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" ); + connect( mostOften, TQ_SIGNAL( activated( const KURL& )), + TQ_SLOT( slotOpenURL( const KURL& ))); + (void) new TDEAction( i18n( "History" ), "history", 0, this, TQ_SLOT( slotGoHistory() ), actionCollection(), "go_history" ); // Settings menu - m_paSaveViewProfile = new TDEAction( i18n( "&Save View Profile..." ), 0, this, TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" ); - m_paSaveViewPropertiesLocally = new TDEToggleAction( i18n( "Save View Changes per &Folder" ), 0, this, TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" ); + m_paSaveViewProfile = new TDEAction( i18n( "&Save View Profile..." ), 0, this, TQ_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" ); + m_paSaveViewPropertiesLocally = new TDEToggleAction( i18n( "Save View Changes per &Folder" ), 0, this, TQ_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" ); // "Remove" ? "Reset" ? The former is more correct, the latter is more kcontrol-like... - m_paRemoveLocalProperties = new TDEAction( i18n( "Remove Folder Properties" ), 0, this, TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" ); + m_paRemoveLocalProperties = new TDEAction( i18n( "Remove Folder Properties" ), 0, this, TQ_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" ); m_configureModules << "tde-filebehavior.desktop" << "tde-fileappearance.desktop" << @@ -3900,41 +3900,41 @@ void KonqMainWindow::initActions() if (!kapp->authorizeControlModules(configModules()).isEmpty()) - KStdAction::preferences (this, TQT_SLOT (slotConfigure()), actionCollection() ); + KStdAction::preferences (this, TQ_SLOT (slotConfigure()), actionCollection() ); - KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); - KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() ); - m_paConfigureExtensions = new TDEAction( i18n("Configure Extensions..."), 0, this, TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions"); - m_paConfigureSpellChecking = new TDEAction( i18n("Configure Spell Checking..."), "tools-check-spelling", 0,this, TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck"); + m_paConfigureExtensions = new TDEAction( i18n("Configure Extensions..."), 0, this, TQ_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions"); + m_paConfigureSpellChecking = new TDEAction( i18n("Configure Spell Checking..."), "tools-check-spelling", 0,this, TQ_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck"); // Window menu - m_paSplitViewHor = new TDEAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, this, TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" ); - m_paSplitViewVer = new TDEAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, this, TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" ); - m_paAddTab = new TDEAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" ); - m_paDuplicateTab = new TDEAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, this, TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" ); - m_paBreakOffTab = new TDEAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, this, TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" ); - m_paRemoveView = new TDEAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, this, TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" ); - m_paRemoveTab = new TDEAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, this, TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" ); - m_paRemoveOtherTabs = new TDEAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, this, TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" ); - - m_paActivateNextTab = new TDEAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(), this, TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" ); - m_paActivatePrevTab = new TDEAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(), this, TQT_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" ); + m_paSplitViewHor = new TDEAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, this, TQ_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" ); + m_paSplitViewVer = new TDEAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, this, TQ_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" ); + m_paAddTab = new TDEAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQ_SLOT( slotAddTab() ), actionCollection(), "newtab" ); + m_paDuplicateTab = new TDEAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, this, TQ_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" ); + m_paBreakOffTab = new TDEAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, this, TQ_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" ); + m_paRemoveView = new TDEAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, this, TQ_SLOT( slotRemoveView() ), actionCollection(), "removeview" ); + m_paRemoveTab = new TDEAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, this, TQ_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" ); + m_paRemoveOtherTabs = new TDEAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, this, TQ_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" ); + + m_paActivateNextTab = new TDEAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(), this, TQ_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" ); + m_paActivatePrevTab = new TDEAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(), this, TQ_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" ); TQCString actionname; for (int i=1;i<13;i++) { actionname.sprintf("activate_tab_%02d", i); - new TDEAction(i18n("Activate Tab %1").arg(i), 0, this, TQT_SLOT(slotActivateTab()), actionCollection(), actionname); + new TDEAction(i18n("Activate Tab %1").arg(i), 0, this, TQ_SLOT(slotActivateTab()), actionCollection(), actionname); } - m_paMoveTabLeft = new TDEAction( i18n("Move Tab Left"), "go-previous" , CTRL+SHIFT+Key_Left,this, TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left"); - m_paMoveTabRight = new TDEAction( i18n("Move Tab Right"), "go-next" , CTRL+SHIFT+Key_Right,this, TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right"); + m_paMoveTabLeft = new TDEAction( i18n("Move Tab Left"), "go-previous" , CTRL+SHIFT+Key_Left,this, TQ_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left"); + m_paMoveTabRight = new TDEAction( i18n("Move Tab Right"), "go-next" , CTRL+SHIFT+Key_Right,this, TQ_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right"); #ifndef NDEBUG - (void) new TDEAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, this, TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" ); + (void) new TDEAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, this, TQ_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" ); #endif - m_paSaveRemoveViewProfile = new TDEAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQT_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" ); + m_paSaveRemoveViewProfile = new TDEAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQ_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" ); m_pamLoadViewProfile = new TDEActionMenu( i18n( "Load &View Profile" ), actionCollection(), "loadviewprofile" ); m_pViewManager->setProfiles( m_pamLoadViewProfile ); @@ -3943,19 +3943,19 @@ void KonqMainWindow::initActions() TDEShortcut fullScreenShortcut = m_ptaFullScreen->shortcut(); fullScreenShortcut.append( KKey( Key_F11 ) ); m_ptaFullScreen->setShortcut( fullScreenShortcut ); - connect( m_ptaFullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); + connect( m_ptaFullScreen, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT( slotUpdateFullScreen( bool ))); TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload); reloadShortcut.append(KKey(CTRL + Key_R)); - m_paReload = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReload() ), actionCollection(), "reload" ); - m_paReloadAllTabs = new TDEAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, this, TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" ); + m_paReload = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQ_SLOT( slotReload() ), actionCollection(), "reload" ); + m_paReloadAllTabs = new TDEAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, this, TQ_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" ); - m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" ); + m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, this, TQ_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" ); - m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" ); + m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQ_SLOT( undo() ), actionCollection(), "undo" ); //m_paUndo->setEnabled( KonqUndoManager::self()->undoAvailable() ); - connect( KonqUndoManager::self(), TQT_SIGNAL( undoTextChanged( const TQString & ) ), - m_paUndo, TQT_SLOT( setText( const TQString & ) ) ); + connect( KonqUndoManager::self(), TQ_SIGNAL( undoTextChanged( const TQString & ) ), + m_paUndo, TQ_SLOT( setText( const TQString & ) ) ); // Those are connected to the browserextension directly m_paCut = KStdAction::cut( 0, 0, actionCollection(), "cut" ); @@ -3965,24 +3965,24 @@ void KonqMainWindow::initActions() m_paCopy = KStdAction::copy( 0, 0, actionCollection(), "copy" ); m_paPaste = KStdAction::paste( 0, 0, actionCollection(), "paste" ); - m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" ); + m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQ_SLOT( slotStop() ), actionCollection(), "stop" ); m_paRename = new TDEAction( i18n( "&Rename" ), "edit_rename", Key_F2, actionCollection(), "rename" ); m_paTrash = new TDEAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, actionCollection(), "trash" ); - connect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + connect( m_paTrash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); m_paDelete = new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, actionCollection(), "del" ); // F5 is the default key binding for Reload.... a la Windows. mc users want F5 for Copy and F6 for move, but I can't make that default. - m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), "copyfiles", Key_F7, this, TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" ); - m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), "movefiles", Key_F8, this, TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" ); + m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), "copyfiles", Key_F7, this, TQ_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" ); + m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), "movefiles", Key_F8, this, TQ_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" ); // This action doesn't appear in the GUI, it's for the shortcut only. KNewMenu takes care of the GUI stuff. - m_paNewDir = new TDEAction( i18n("Create Folder..." ), "konq_create_dir", Key_F10, this, TQT_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" ); - m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, this, TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" ); + m_paNewDir = new TDEAction( i18n("Create Folder..." ), "konq_create_dir", Key_F10, this, TQ_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" ); + m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, this, TQ_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" ); // Location bar m_locationLabel = new KonqDraggableLabel( this, i18n("L&ocation: ") ); - (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, this, TQT_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" ); + (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, this, TQ_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" ); m_locationLabel->setBuddy( m_combo ); KWidgetAction* comboAction = new KWidgetAction( m_combo, i18n( "Location Bar" ), 0, @@ -3996,8 +3996,8 @@ void KonqMainWindow::initActions() TDEAction *clearLocation = new TDEAction( i18n( "Clear Location Bar" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", CTRL+Key_L, actionCollection(), "clear_location" ); - connect( clearLocation, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - TQT_SLOT( slotClearLocationBar( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + connect( clearLocation, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + TQ_SLOT( slotClearLocationBar( TDEAction::ActivationReason, TQt::ButtonState ) ) ); clearLocation->setWhatsThis( i18n( "Clear Location bar<p>" "Clears the content of the location bar." ) ); @@ -4013,21 +4013,21 @@ void KonqMainWindow::initActions() m_pBookmarkMenu = new KBookmarkMenu( KonqBookmarkManager::self(), m_pBookmarksOwner, m_pamBookmarks->popupMenu(), m_bookmarksActionCollection, true ); connect( m_pBookmarkMenu, - TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ), - this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) )); + TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ), + this, TQ_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) )); connect( m_pBookmarkMenu, - TQT_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ), - this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) )); + TQ_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ), + this, TQ_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) )); TDEAction *addBookmark = actionCollection()->action("add_bookmark"); if (addBookmark) addBookmark->setText(i18n("Bookmark This Location")); - m_paShowMenuBar = KStdAction::showMenubar( this, TQT_SLOT( slotShowMenuBar() ), actionCollection() ); + m_paShowMenuBar = KStdAction::showMenubar( this, TQ_SLOT( slotShowMenuBar() ), actionCollection() ); - (void) new TDEAction( i18n( "Kon&queror Introduction" ), "konqui_intro", 0, this, TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" ); + (void) new TDEAction( i18n( "Kon&queror Introduction" ), "konqui_intro", 0, this, TQ_SLOT( slotIntro() ), actionCollection(), "konqintro" ); - TDEAction *goUrl = new TDEAction( i18n( "Go" ), "key_enter", 0, this, TQT_SLOT( goURL() ), actionCollection(), "go_url" ); + TDEAction *goUrl = new TDEAction( i18n( "Go" ), "key_enter", 0, this, TQ_SLOT( goURL() ), actionCollection(), "go_url" ); goUrl->setWhatsThis( i18n( "Go<p>" "Goes to the page that has been entered into the location bar." ) ); @@ -4120,13 +4120,13 @@ void KonqMainWindow::slotFillContextMenu( const KBookmark &bk, TQPopupMenu * pm TQValueList<KURL>::Iterator it = list.begin(); for (; it != list.end(); ++it ) popupItems.append( new KFileItem( (*it), TQString::null, KFileItem::Unknown) ); - pm->insertItem( SmallIcon(tab_new_x), i18n( "Open Folder in Tabs" ), this, TQT_SLOT( slotPopupNewTabRight() ) ); + pm->insertItem( SmallIcon(tab_new_x), i18n( "Open Folder in Tabs" ), this, TQ_SLOT( slotPopupNewTabRight() ) ); } else { popupItems.append( new KFileItem( bk.url(), TQString::null, KFileItem::Unknown) ); - pm->insertItem( SmallIcon("window-new"), i18n( "Open in New Window" ), this, TQT_SLOT( slotPopupNewWindow() ) ); - pm->insertItem( SmallIcon(tab_new_x), i18n( "Open in New Tab" ), this, TQT_SLOT( slotPopupNewTabRight() ) ); + pm->insertItem( SmallIcon("window-new"), i18n( "Open in New Window" ), this, TQ_SLOT( slotPopupNewWindow() ) ); + pm->insertItem( SmallIcon(tab_new_x), i18n( "Open in New Tab" ), this, TQ_SLOT( slotPopupNewTabRight() ) ); } } @@ -4345,7 +4345,7 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext ) if ( slotNames.contains( it.key()+"()" ) ) { if ( it.key() != "trash" ) - connect( act, TQT_SIGNAL( activated() ), ext, it.data() /* TQT_SLOT(slot name) */ ); + connect( act, TQ_SIGNAL( activated() ), ext, it.data() /* TQ_SLOT(slot name) */ ); act->setEnabled( ext->isActionEnabled( it.key() ) ); const TQString text = ext->actionText( it.key() ); if ( !text.isEmpty() ) @@ -4701,7 +4701,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa popupMenuCollection.insert( m_paDelete ); // The pasteto action is used when clicking on a dir, to paste into it. - TDEAction *actPaste = KStdAction::paste( this, TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" ); + TDEAction *actPaste = KStdAction::paste( this, TQ_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" ); actPaste->setEnabled( m_paPaste->isEnabled() ); popupMenuCollection.insert( actPaste ); @@ -4774,10 +4774,10 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa if (doTabHandling) { if (_args.forcesNewWindow()) { - actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, this, TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" ); + actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, this, TQ_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" ); actNewWindow->setToolTip( i18n( "Open the document in current window" ) ); } - actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" ); + actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQ_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" ); actNewWindow->setToolTip( i18n( "Open the document in a new window" ) ); //Set tab_new_x to point to the correct icon based on NewTabsInFront @@ -4788,12 +4788,12 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa else tab_new_x = "tab_new_bg" ; - TDEAction *actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, this, TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" ); + TDEAction *actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, this, TQ_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" ); actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) ); - TDEAction *actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" ); + TDEAction *actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQ_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" ); actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) ); - actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" ); - actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" ); + actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, this, TQ_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" ); + actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQ_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" ); actNewTab->setToolTip( i18n( "Open the document in a new background tab" ) ); actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) ); doTabHandling = true; @@ -4843,13 +4843,13 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa if ( be ) { - TQObject::connect( this, TQT_SIGNAL(popupItemsDisturbed()), pPopupMenu, TQT_SLOT(close()) ); - TQObject::connect( be, TQT_SIGNAL(itemsRemoved(const KFileItemList &)), - this, TQT_SLOT(slotItemsRemoved(const KFileItemList &)) ); + TQObject::connect( this, TQ_SIGNAL(popupItemsDisturbed()), pPopupMenu, TQ_SLOT(close()) ); + TQObject::connect( be, TQ_SIGNAL(itemsRemoved(const KFileItemList &)), + this, TQ_SLOT(slotItemsRemoved(const KFileItemList &)) ); } - TQObject::disconnect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotFileNewAboutToShow()) ); + TQObject::disconnect( m_pMenuNew->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotFileNewAboutToShow()) ); TQGuardedPtr<TQObject> guard(this); // #149736 pPopupMenu->exec( _global ); @@ -4868,13 +4868,13 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa return; } - TQObject::connect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotFileNewAboutToShow()) ); + TQObject::connect( m_pMenuNew->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotFileNewAboutToShow()) ); if ( be ) { - TQObject::disconnect( be, TQT_SIGNAL(itemsRemoved(const KFileItemList &)), - this, TQT_SLOT(slotItemsRemoved(const KFileItemList &)) ); + TQObject::disconnect( be, TQ_SIGNAL(itemsRemoved(const KFileItemList &)), + this, TQ_SLOT(slotItemsRemoved(const KFileItemList &)) ); } delete konqyMenuClient; @@ -4932,7 +4932,7 @@ void KonqMainWindow::slotOpenEmbedded() m_popupEmbeddingServices.clear(); - TQTimer::singleShot( 0, this, TQT_SLOT( slotOpenEmbeddedDoIt() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotOpenEmbeddedDoIt() ) ); } void KonqMainWindow::slotOpenEmbeddedDoIt() @@ -5045,8 +5045,8 @@ void KonqMainWindow::updateOpenWithActions() TDEAction *action = new TDEAction( i18n( "Open with %1" ).arg( (*it)->name() ), 0, 0, (*it)->desktopEntryName().latin1() ); action->setIcon( (*it)->icon() ); - connect( action, TQT_SIGNAL( activated() ), - this, TQT_SLOT( slotOpenWith() ) ); + connect( action, TQ_SIGNAL( activated() ), + this, TQ_SLOT( slotOpenWith() ) ); m_openWithActions.append( action ); } @@ -5138,8 +5138,8 @@ void KonqMainWindow::updateViewModeActions() action->setExclusiveGroup( "KonqMainWindow_ViewModes" ); - connect( action, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotViewModeToggle( bool ) ) ); + connect( action, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotViewModeToggle( bool ) ) ); m_viewModeActions.append( action ); action->plug( m_viewModeMenu->popupMenu() ); @@ -5193,8 +5193,8 @@ void KonqMainWindow::updateViewModeActions() tbAction->setChecked( action->isChecked() ); - connect( tbAction, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotViewModeToggle( bool ) ) ); + connect( tbAction, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotViewModeToggle( bool ) ) ); m_toolBarViewModeActions.append( tbAction ); @@ -5518,18 +5518,18 @@ void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group ) void KonqMainWindow::connectActionCollection( TDEActionCollection *coll ) { - connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), - this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); - connect( coll, TQT_SIGNAL( clearStatusText() ), - this, TQT_SLOT( slotClearStatusText() ) ); + connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ), + this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( coll, TQ_SIGNAL( clearStatusText() ), + this, TQ_SLOT( slotClearStatusText() ) ); } void KonqMainWindow::disconnectActionCollection( TDEActionCollection *coll ) { - disconnect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), - this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); - disconnect( coll, TQT_SIGNAL( clearStatusText() ), - this, TQT_SLOT( slotClearStatusText() ) ); + disconnect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ), + this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); + disconnect( coll, TQ_SIGNAL( clearStatusText() ), + this, TQ_SLOT( slotClearStatusText() ) ); } // diff --git a/konqueror/konq_misc.cpp b/konqueror/konq_misc.cpp index e24426c8d..1fbea747e 100644 --- a/konqueror/konq_misc.cpp +++ b/konqueror/konq_misc.cpp @@ -269,7 +269,7 @@ void KonqDraggableLabel::dropEvent( TQDropEvent* ev ) { _savedLst.clear(); if ( KURLDrag::decode( ev, _savedLst ) ) { - TQTimer::singleShot(0, this, TQT_SLOT(delayedOpenURL())); + TQTimer::singleShot(0, this, TQ_SLOT(delayedOpenURL())); } } diff --git a/konqueror/konq_profiledlg.cpp b/konqueror/konq_profiledlg.cpp index f7241713b..6819990a9 100644 --- a/konqueror/konq_profiledlg.cpp +++ b/konqueror/konq_profiledlg.cpp @@ -100,8 +100,8 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese box->setStretchFactor( m_pListView, 1 ); - connect( m_pListView, TQT_SIGNAL( itemRenamed( TQListViewItem * ) ), - TQT_SLOT( slotItemRenamed( TQListViewItem * ) ) ); + connect( m_pListView, TQ_SIGNAL( itemRenamed( TQListViewItem * ) ), + TQ_SLOT( slotItemRenamed( TQListViewItem * ) ) ); loadAllProfiles( preselectProfile ); m_pListView->setMinimumSize( m_pListView->sizeHint() ); @@ -112,11 +112,11 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese m_cbSaveSize = new TQCheckBox( i18n("Save &window size in profile"), box ); m_cbSaveSize->setChecked( KonqSettings::saveWindowSizeInProfile() ); - connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + connect( m_pListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); - connect( m_pProfileNameLineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); + connect( m_pProfileNameLineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); enableButton( BTN_RENAME, m_pListView->selectedItem ()!=0 ); enableButton( BTN_DELETE, m_pListView->selectedItem ()!=0 ); diff --git a/konqueror/konq_run.cpp b/konqueror/konq_run.cpp index ecd03d3c4..01cff73c6 100644 --- a/konqueror/konq_run.cpp +++ b/konqueror/konq_run.cpp @@ -150,8 +150,8 @@ void KonqRun::init() // (in case it goes to scanFile, this will be done below) TDEIO::StatJob *job = dynamic_cast<TDEIO::StatJob*>( m_job ); if ( job && !job->error() && m_pView ) { - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - m_pView, TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + m_pView, TQ_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); } } @@ -162,11 +162,11 @@ void KonqRun::scanFile() // BrowserRun changes TDEIO::TransferJob *job = dynamic_cast<TDEIO::TransferJob*>( m_job ); if ( job && !job->error() ) { - connect( job, TQT_SIGNAL( redirection( TDEIO::Job *, const KURL& )), - TQT_SLOT( slotRedirection( TDEIO::Job *, const KURL& ) )); + connect( job, TQ_SIGNAL( redirection( TDEIO::Job *, const KURL& )), + TQ_SLOT( slotRedirection( TDEIO::Job *, const KURL& ) )); if ( m_pView && m_pView->service()->desktopEntryName() != "konq_sidebartng") { - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - m_pView, TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + m_pView, TQ_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); } } } diff --git a/konqueror/konq_tabs.cpp b/konqueror/konq_tabs.cpp index b22610cc2..0506648ff 100644 --- a/konqueror/konq_tabs.cpp +++ b/konqueror/konq_tabs.cpp @@ -78,61 +78,61 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon m_pActiveChild = 0L; m_pViewManager = viewManager; - connect( this, TQT_SIGNAL( currentChanged ( TQWidget * ) ), - this, TQT_SLOT( slotCurrentChanged( TQWidget* ) ) ); + connect( this, TQ_SIGNAL( currentChanged ( TQWidget * ) ), + this, TQ_SLOT( slotCurrentChanged( TQWidget* ) ) ); m_pPopupMenu = new TQPopupMenu( this ); m_pPopupMenu->insertItem( SmallIcon( "tab_new" ), i18n("&New Tab"), m_pViewManager->mainWindow(), - TQT_SLOT( slotAddTab() ), + TQ_SLOT( slotAddTab() ), m_pViewManager->mainWindow()->action("newtab")->shortcut() ); m_pPopupMenu->insertItem( SmallIconSet( "reload" ), i18n( "&Reload Tab" ), m_pViewManager->mainWindow(), - TQT_SLOT( slotReloadPopup() ), + TQ_SLOT( slotReloadPopup() ), m_pViewManager->mainWindow()->action("reload")->shortcut(), RELOAD_ID ); m_pPopupMenu->insertItem( SmallIconSet( "tab_duplicate" ), i18n("&Duplicate Tab"), m_pViewManager->mainWindow(), - TQT_SLOT( slotDuplicateTabPopup() ), + TQ_SLOT( slotDuplicateTabPopup() ), m_pViewManager->mainWindow()->action("duplicatecurrenttab")->shortcut(), DUPLICATE_ID ); m_pPopupMenu->insertItem( SmallIconSet( "tab_breakoff" ), i18n("D&etach Tab"), m_pViewManager->mainWindow(), - TQT_SLOT( slotBreakOffTabPopup() ), + TQ_SLOT( slotBreakOffTabPopup() ), m_pViewManager->mainWindow()->action("breakoffcurrenttab")->shortcut(), BREAKOFF_ID ); m_pPopupMenu->insertSeparator(); m_pPopupMenu->insertItem( SmallIconSet( "tab_move_left" ), i18n("Move Tab &Left"), m_pViewManager->mainWindow(), - TQT_SLOT( slotMoveTabLeft() ), + TQ_SLOT( slotMoveTabLeft() ), m_pViewManager->mainWindow()->action("tab_move_left")->shortcut(), MOVE_LEFT_ID ); m_pPopupMenu->insertItem( SmallIconSet( "tab_move_right" ), i18n("Move Tab &Right"), m_pViewManager->mainWindow(), - TQT_SLOT( slotMoveTabRight() ), + TQ_SLOT( slotMoveTabRight() ), m_pViewManager->mainWindow()->action("tab_move_right")->shortcut(), MOVE_RIGHT_ID ); m_pPopupMenu->insertSeparator(); m_pSubPopupMenuTab = new TQPopupMenu( this ); m_pPopupMenu->insertItem( i18n("Other Tabs" ), m_pSubPopupMenuTab, OTHERTABS_ID ); - connect( m_pSubPopupMenuTab, TQT_SIGNAL( activated ( int ) ), - this, TQT_SLOT( slotSubPopupMenuTabActivated( int ) ) ); + connect( m_pSubPopupMenuTab, TQ_SIGNAL( activated ( int ) ), + this, TQ_SLOT( slotSubPopupMenuTabActivated( int ) ) ); m_pPopupMenu->insertSeparator(); m_pPopupMenu->insertItem( SmallIconSet( "tab_remove" ), i18n("&Close Tab"), m_pViewManager->mainWindow(), - TQT_SLOT( slotRemoveTabPopup() ), + TQ_SLOT( slotRemoveTabPopup() ), m_pViewManager->mainWindow()->action("removecurrenttab")->shortcut(), CLOSETAB_ID ); - connect( this, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ), - TQT_SLOT(slotContextMenu( TQWidget *, const TQPoint & ) ) ); - connect( this, TQT_SIGNAL( contextMenu( const TQPoint & ) ), - TQT_SLOT(slotContextMenu( const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ), + TQ_SLOT(slotContextMenu( TQWidget *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( contextMenu( const TQPoint & ) ), + TQ_SLOT(slotContextMenu( const TQPoint & ) ) ); m_MouseMiddleClickClosesTab = KonqSettings::mouseMiddleClickClosesTab(); @@ -146,14 +146,14 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon setTabCloseActivatePrevious( KonqSettings::tabCloseActivatePrevious() ); if (KonqSettings::tabPosition()=="Bottom") setTabPosition(TQTabWidget::Bottom); - connect( this, TQT_SIGNAL( closeRequest( TQWidget * )), TQT_SLOT(slotCloseRequest( TQWidget * ))); - connect( this, TQT_SIGNAL( removeTabPopup() ), - m_pViewManager->mainWindow(), TQT_SLOT( slotRemoveTabPopup() ) ); + connect( this, TQ_SIGNAL( closeRequest( TQWidget * )), TQ_SLOT(slotCloseRequest( TQWidget * ))); + connect( this, TQ_SIGNAL( removeTabPopup() ), + m_pViewManager->mainWindow(), TQ_SLOT( slotRemoveTabPopup() ) ); if ( KonqSettings::addTabButton() ) { m_leftWidget = new TQToolButton( this ); - connect( m_leftWidget, TQT_SIGNAL( clicked() ), - m_pViewManager->mainWindow(), TQT_SLOT( slotAddTab() ) ); + connect( m_leftWidget, TQ_SIGNAL( clicked() ), + m_pViewManager->mainWindow(), TQ_SLOT( slotAddTab() ) ); m_leftWidget->setIconSet( SmallIcon( "tab_new" ) ); m_leftWidget->adjustSize(); TQToolTip::add(m_leftWidget, i18n("Open a new tab")); @@ -161,8 +161,8 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon } if ( KonqSettings::closeTabButton() ) { m_rightWidget = new TQToolButton( this ); - connect( m_rightWidget, TQT_SIGNAL( clicked() ), - m_pViewManager->mainWindow(), TQT_SLOT( slotRemoveTab() ) ); + connect( m_rightWidget, TQ_SIGNAL( clicked() ), + m_pViewManager->mainWindow(), TQ_SLOT( slotRemoveTab() ) ); m_rightWidget->setIconSet( SmallIconSet( "tab_remove" ) ); m_rightWidget->adjustSize(); TQToolTip::add(m_rightWidget, i18n("Close the current tab")); @@ -171,23 +171,23 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon setAutomaticResizeTabs( true ); setTabReorderingEnabled( true ); - connect( this, TQT_SIGNAL( movedTab( int, int ) ), - TQT_SLOT( slotMovedTab( int, int ) ) ); - connect( this, TQT_SIGNAL( mouseMiddleClick() ), - TQT_SLOT( slotMouseMiddleClick() ) ); - connect( this, TQT_SIGNAL( mouseMiddleClick( TQWidget * ) ), - TQT_SLOT( slotMouseMiddleClick( TQWidget * ) ) ); - connect( this, TQT_SIGNAL( mouseDoubleClick() ), - m_pViewManager->mainWindow(), TQT_SLOT( slotAddTab() ) ); - - connect( this, TQT_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )), - TQT_SLOT( slotTestCanDecode(const TQDragMoveEvent *, bool & ) ) ); - connect( this, TQT_SIGNAL( receivedDropEvent( TQDropEvent * )), - TQT_SLOT( slotReceivedDropEvent( TQDropEvent * ) ) ); - connect( this, TQT_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )), - TQT_SLOT( slotReceivedDropEvent( TQWidget *, TQDropEvent * ) ) ); - connect( this, TQT_SIGNAL( initiateDrag( TQWidget * )), - TQT_SLOT( slotInitiateDrag( TQWidget * ) ) ); + connect( this, TQ_SIGNAL( movedTab( int, int ) ), + TQ_SLOT( slotMovedTab( int, int ) ) ); + connect( this, TQ_SIGNAL( mouseMiddleClick() ), + TQ_SLOT( slotMouseMiddleClick() ) ); + connect( this, TQ_SIGNAL( mouseMiddleClick( TQWidget * ) ), + TQ_SLOT( slotMouseMiddleClick( TQWidget * ) ) ); + connect( this, TQ_SIGNAL( mouseDoubleClick() ), + m_pViewManager->mainWindow(), TQ_SLOT( slotAddTab() ) ); + + connect( this, TQ_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )), + TQ_SLOT( slotTestCanDecode(const TQDragMoveEvent *, bool & ) ) ); + connect( this, TQ_SIGNAL( receivedDropEvent( TQDropEvent * )), + TQ_SLOT( slotReceivedDropEvent( TQDropEvent * ) ) ); + connect( this, TQ_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )), + TQ_SLOT( slotReceivedDropEvent( TQWidget *, TQDropEvent * ) ) ); + connect( this, TQ_SIGNAL( initiateDrag( TQWidget * )), + TQ_SLOT( slotInitiateDrag( TQWidget * ) ) ); setMouseWheelScroll(KonqSettings::tabsCycleWheel()); } @@ -466,7 +466,7 @@ void KonqFrameTabs::refreshSubPopupMenuTab() m_pSubPopupMenuTab->insertItem( SmallIcon( "reload_all_tabs" ), i18n( "&Reload All Tabs" ), m_pViewManager->mainWindow(), - TQT_SLOT( slotReloadAllTabs() ), + TQ_SLOT( slotReloadAllTabs() ), m_pViewManager->mainWindow()->action("reload_all_tabs")->shortcut() ); m_pSubPopupMenuTab->insertSeparator(); for (KonqFrameBase* it = m_pChildFrameList->first(); it; it = m_pChildFrameList->next()) @@ -488,7 +488,7 @@ void KonqFrameTabs::refreshSubPopupMenuTab() m_pSubPopupMenuTab->insertItem( SmallIconSet( "tab_remove_other" ), i18n( "Close &Other Tabs" ), m_pViewManager->mainWindow(), - TQT_SLOT( slotRemoveOtherTabsPopup() ), + TQ_SLOT( slotRemoveOtherTabsPopup() ), m_pViewManager->mainWindow()->action("removeothertabs")->shortcut() ); } diff --git a/konqueror/konq_view.cpp b/konqueror/konq_view.cpp index 89f4a2e07..0f809ccd1 100644 --- a/konqueror/konq_view.cpp +++ b/konqueror/konq_view.cpp @@ -127,7 +127,7 @@ KonqView::~KonqView() { finishedWithCurrentURL(); if ( isPassiveMode() ) - disconnect( m_pPart, TQT_SIGNAL( destroyed() ), m_pMainWindow->viewManager(), TQT_SLOT( slotObjectDestroyed() ) ); + disconnect( m_pPart, TQ_SIGNAL( destroyed() ), m_pMainWindow->viewManager(), TQ_SLOT( slotObjectDestroyed() ) ); delete m_pPart; } @@ -372,16 +372,16 @@ bool KonqView::changeViewMode( const TQString &serviceType, void KonqView::connectPart( ) { //kdDebug(1202) << "KonqView::connectPart" << endl; - connect( m_pPart, TQT_SIGNAL( started( TDEIO::Job * ) ), - this, TQT_SLOT( slotStarted( TDEIO::Job * ) ) ); - connect( m_pPart, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() ) ); - connect( m_pPart, TQT_SIGNAL( completed(bool) ), - this, TQT_SLOT( slotCompleted(bool) ) ); - connect( m_pPart, TQT_SIGNAL( canceled( const TQString & ) ), - this, TQT_SLOT( slotCanceled( const TQString & ) ) ); - connect( m_pPart, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setCaption( const TQString & ) ) ); + connect( m_pPart, TQ_SIGNAL( started( TDEIO::Job * ) ), + this, TQ_SLOT( slotStarted( TDEIO::Job * ) ) ); + connect( m_pPart, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() ) ); + connect( m_pPart, TQ_SIGNAL( completed(bool) ), + this, TQ_SLOT( slotCompleted(bool) ) ); + connect( m_pPart, TQ_SIGNAL( canceled( const TQString & ) ), + this, TQ_SLOT( slotCanceled( const TQString & ) ) ); + connect( m_pPart, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setCaption( const TQString & ) ) ); KParts::BrowserExtension *ext = browserExtension(); @@ -389,8 +389,8 @@ void KonqView::connectPart( ) { ext->setBrowserInterface( m_browserIface ); - connect( ext, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs &) ), - m_pMainWindow, TQT_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect( ext, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs &) ), + m_pMainWindow, TQ_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); if ( m_bPopupMenuEnabled ) { @@ -398,59 +398,59 @@ void KonqView::connectPart( ) enablePopupMenu( true ); } - connect( ext, TQT_SIGNAL( setLocationBarURL( const TQString & ) ), - this, TQT_SLOT( setLocationBarURL( const TQString & ) ) ); + connect( ext, TQ_SIGNAL( setLocationBarURL( const TQString & ) ), + this, TQ_SLOT( setLocationBarURL( const TQString & ) ) ); - connect( ext, TQT_SIGNAL( setIconURL( const KURL & ) ), - this, TQT_SLOT( setIconURL( const KURL & ) ) ); + connect( ext, TQ_SIGNAL( setIconURL( const KURL & ) ), + this, TQ_SLOT( setIconURL( const KURL & ) ) ); - connect( ext, TQT_SIGNAL( setPageSecurity( int ) ), - this, TQT_SLOT( setPageSecurity( int ) ) ); + connect( ext, TQ_SIGNAL( setPageSecurity( int ) ), + this, TQ_SLOT( setPageSecurity( int ) ) ); - connect( ext, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), - m_pMainWindow, TQT_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs & ) ) ); + connect( ext, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), + m_pMainWindow, TQ_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs & ) ) ); - connect( ext, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), - m_pMainWindow, TQT_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ) ); + connect( ext, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), + m_pMainWindow, TQ_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ) ); - connect( ext, TQT_SIGNAL( loadingProgress( int ) ), - m_pKonqFrame->statusbar(), TQT_SLOT( slotLoadingProgress( int ) ) ); + connect( ext, TQ_SIGNAL( loadingProgress( int ) ), + m_pKonqFrame->statusbar(), TQ_SLOT( slotLoadingProgress( int ) ) ); - connect( ext, TQT_SIGNAL( speedProgress( int ) ), - m_pKonqFrame->statusbar(), TQT_SLOT( slotSpeedProgress( int ) ) ); + connect( ext, TQ_SIGNAL( speedProgress( int ) ), + m_pKonqFrame->statusbar(), TQ_SLOT( slotSpeedProgress( int ) ) ); - connect( ext, TQT_SIGNAL( selectionInfo( const KFileItemList & ) ), - this, TQT_SLOT( slotSelectionInfo( const KFileItemList & ) ) ); + connect( ext, TQ_SIGNAL( selectionInfo( const KFileItemList & ) ), + this, TQ_SLOT( slotSelectionInfo( const KFileItemList & ) ) ); - connect( ext, TQT_SIGNAL( mouseOverInfo( const KFileItem * ) ), - this, TQT_SLOT( slotMouseOverInfo( const KFileItem * ) ) ); + connect( ext, TQ_SIGNAL( mouseOverInfo( const KFileItem * ) ), + this, TQ_SLOT( slotMouseOverInfo( const KFileItem * ) ) ); - connect( ext, TQT_SIGNAL( openURLNotify() ), - this, TQT_SLOT( slotOpenURLNotify() ) ); + connect( ext, TQ_SIGNAL( openURLNotify() ), + this, TQ_SLOT( slotOpenURLNotify() ) ); - connect( ext, TQT_SIGNAL( enableAction( const char *, bool ) ), - this, TQT_SLOT( slotEnableAction( const char *, bool ) ) ); + connect( ext, TQ_SIGNAL( enableAction( const char *, bool ) ), + this, TQ_SLOT( slotEnableAction( const char *, bool ) ) ); - connect( ext, TQT_SIGNAL( setActionText( const char *, const TQString& ) ), - this, TQT_SLOT( slotSetActionText( const char *, const TQString& ) ) ); + connect( ext, TQ_SIGNAL( setActionText( const char *, const TQString& ) ), + this, TQ_SLOT( slotSetActionText( const char *, const TQString& ) ) ); - connect( ext, TQT_SIGNAL( moveTopLevelWidget( int, int ) ), - this, TQT_SLOT( slotMoveTopLevelWidget( int, int ) ) ); + connect( ext, TQ_SIGNAL( moveTopLevelWidget( int, int ) ), + this, TQ_SLOT( slotMoveTopLevelWidget( int, int ) ) ); - connect( ext, TQT_SIGNAL( resizeTopLevelWidget( int, int ) ), - this, TQT_SLOT( slotResizeTopLevelWidget( int, int ) ) ); + connect( ext, TQ_SIGNAL( resizeTopLevelWidget( int, int ) ), + this, TQ_SLOT( slotResizeTopLevelWidget( int, int ) ) ); - connect( ext, TQT_SIGNAL( requestFocus(KParts::ReadOnlyPart *) ), - this, TQT_SLOT( slotRequestFocus(KParts::ReadOnlyPart *) ) ); + connect( ext, TQ_SIGNAL( requestFocus(KParts::ReadOnlyPart *) ), + this, TQ_SLOT( slotRequestFocus(KParts::ReadOnlyPart *) ) ); if (service()->desktopEntryName() != "konq_sidebartng") { - connect( ext, TQT_SIGNAL( infoMessage( const TQString & ) ), - m_pKonqFrame->statusbar(), TQT_SLOT( message( const TQString & ) ) ); + connect( ext, TQ_SIGNAL( infoMessage( const TQString & ) ), + m_pKonqFrame->statusbar(), TQ_SLOT( message( const TQString & ) ) ); connect( ext, - TQT_SIGNAL( addWebSideBar(const KURL&, const TQString&) ), + TQ_SIGNAL( addWebSideBar(const KURL&, const TQString&) ), m_pMainWindow, - TQT_SLOT( slotAddWebSideBar(const KURL&, const TQString&) ) ); + TQ_SLOT( slotAddWebSideBar(const KURL&, const TQString&) ) ); } callExtensionBoolMethod( "setSaveViewPropertiesLocally(bool)", m_pMainWindow->saveViewPropertiesLocally() ); @@ -480,8 +480,8 @@ void KonqView::connectPart( ) // KonqDirPart signal if ( m_pPart->inherits("KonqDirPart") ) { - connect( m_pPart, TQT_SIGNAL( findOpen( KonqDirPart * ) ), - m_pMainWindow, TQT_SLOT( slotFindOpen( KonqDirPart * ) ) ); + connect( m_pPart, TQ_SIGNAL( findOpen( KonqDirPart * ) ), + m_pMainWindow, TQ_SLOT( slotFindOpen( KonqDirPart * ) ) ); } } @@ -532,9 +532,9 @@ void KonqView::slotStarted( TDEIO::Job * job ) job->setWindow (m_pMainWindow->topLevelWidget ()); } - connect( job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) ); - connect( job, TQT_SIGNAL( speed( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( slotSpeed( TDEIO::Job *, unsigned long ) ) ); - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), this, TQT_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( speed( TDEIO::Job *, unsigned long ) ), this, TQ_SLOT( slotSpeed( TDEIO::Job *, unsigned long ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), this, TQ_SLOT( slotInfoMessage( TDEIO::Job *, const TQString & ) ) ); } } @@ -1165,39 +1165,39 @@ void KonqView::enablePopupMenu( bool b ) if ( b ) { m_bPopupMenuEnabled = true; - connect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) ); - connect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); - connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); - connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); } else // disable context popup { m_bPopupMenuEnabled = false; - disconnect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) ); + disconnect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) ); - disconnect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + disconnect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - disconnect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); + disconnect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); - disconnect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + disconnect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); } enableBackRightClick( m_bBackRightClick ); } @@ -1207,11 +1207,11 @@ void KonqView::enableBackRightClick( bool b ) { m_bBackRightClick = b; if ( b ) - connect( this, TQT_SIGNAL( backRightClick() ), - m_pMainWindow, TQT_SLOT( slotBack() ) ); + connect( this, TQ_SIGNAL( backRightClick() ), + m_pMainWindow, TQ_SLOT( slotBack() ) ); else - disconnect( this, TQT_SIGNAL( backRightClick() ), - m_pMainWindow, TQT_SLOT( slotBack() ) ); + disconnect( this, TQ_SIGNAL( backRightClick() ), + m_pMainWindow, TQ_SLOT( slotBack() ) ); } void KonqView::reparseConfiguration() diff --git a/konqueror/konq_viewmgr.cpp b/konqueror/konq_viewmgr.cpp index 5c5bdc29b..c7ead1d0b 100644 --- a/konqueror/konq_viewmgr.cpp +++ b/konqueror/konq_viewmgr.cpp @@ -55,8 +55,8 @@ KonqViewManager::KonqViewManager( KonqMainWindow *mainWindow ) m_bLoadingProfile = false; m_activePartChangedTimer = new TQTimer(this); - connect(m_activePartChangedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(emitActivePartChanged())); - connect( this, TQT_SIGNAL( activePartChanged ( KParts::Part * ) ), this, TQT_SLOT( slotActivePartChanged ( KParts::Part * ) ) ); + connect(m_activePartChangedTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(emitActivePartChanged())); + connect( this, TQ_SIGNAL( activePartChanged ( KParts::Part * ) ), this, TQ_SLOT( slotActivePartChanged ( KParts::Part * ) ) ); } KonqView* KonqViewManager::Initialize( const TQString &serviceType, const TQString &serviceName ) @@ -139,7 +139,7 @@ KonqView* KonqViewManager::splitView ( TQt::Orientation orientation, //kdDebug(1202) << "Create new Container" << endl; KonqFrameContainer *newContainer = new KonqFrameContainer( orientation, parentContainer->widget(), parentContainer ); - connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed())); + connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed())); parentContainer->insertChildFrame( newContainer, index ); if ( moveNewContainer ) { @@ -231,7 +231,7 @@ KonqView* KonqViewManager::splitWindow( TQt::Orientation orientation, m_pMainWindow->removeChildFrame( mainFrame ); KonqFrameContainer *newContainer = new KonqFrameContainer( orientation, m_pMainWindow, 0L); - connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed())); + connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed())); m_pMainWindow->insertChildFrame( newContainer ); @@ -286,7 +286,7 @@ void KonqViewManager::convertDocContainer() KonqFrameTabs* newContainer = new KonqFrameTabs( parentContainer->widget() , parentContainer, this); parentContainer->insertChildFrame( newContainer ); - connect( newContainer, TQT_SIGNAL(ctrlTabPressed()), m_pMainWindow, TQT_SLOT(slotCtrlTabPressed()) ); + connect( newContainer, TQ_SIGNAL(ctrlTabPressed()), m_pMainWindow, TQ_SLOT(slotCtrlTabPressed()) ); m_pDocContainer->widget()->reparent( newContainer, pos ); newContainer->insertChildFrame( m_pDocContainer ); @@ -882,7 +882,7 @@ void KonqViewManager::slotPassiveModePartDeleted() // Passive mode parts aren't registered to the part manager, // so we have to handle suicidal ones ourselves KParts::ReadOnlyPart * part = const_cast<KParts::ReadOnlyPart *>( static_cast<const KParts::ReadOnlyPart *>( sender() ) ); - disconnect( part, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotPassiveModePartDeleted() ) ); + disconnect( part, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotPassiveModePartDeleted() ) ); kdDebug(1202) << "KonqViewManager::slotPassiveModePartDeleted part=" << part << endl; KonqView * view = m_pMainWindow->childView( part ); kdDebug(1202) << "view=" << view << endl; @@ -1038,8 +1038,8 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer, m_pMainWindow, service, partServiceOffers, appServiceOffers, sType, passiveMode ); //kdDebug(1202) << "KonqView created - v=" << v << " v->part()=" << v->part() << endl; - TQObject::connect( v, TQT_SIGNAL( sigPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ), - m_pMainWindow, TQT_SLOT( slotPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ) ); + TQObject::connect( v, TQ_SIGNAL( sigPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ), + m_pMainWindow, TQ_SLOT( slotPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ) ); m_pMainWindow->insertChildView( v ); @@ -1063,7 +1063,7 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer, else { // Passive views aren't registered, but we still want to detect the suicidal ones - connect( v->part(), TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotPassiveModePartDeleted() ) ); + connect( v->part(), TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotPassiveModePartDeleted() ) ); } //kdDebug(1202) << "KonqViewManager::setupView done" << endl; @@ -1599,7 +1599,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent, else { KonqFrameContainer *newContainer = new KonqFrameContainer( o, parent->widget(), parent ); - connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed())); + connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed())); int tabindex = -1; if(openAfterCurrentPage && parent->frameType() == "Tabs") // Need to honor it, if possible @@ -1628,7 +1628,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent, //kdDebug(1202) << "KonqViewManager::loadItem: Item is a Tabs" << endl; KonqFrameTabs *newContainer = new KonqFrameTabs( parent->widget(), parent, this ); - connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed())); + connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed())); parent->insertChildFrame( newContainer ); m_pDocContainer = newContainer; @@ -1666,10 +1666,10 @@ void KonqViewManager::setProfiles( TDEActionMenu *profiles ) if ( m_pamProfiles ) { - connect( m_pamProfiles->popupMenu(), TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotProfileActivated( int ) ) ); - connect( m_pamProfiles->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotProfileListAboutToShow() ) ); + connect( m_pamProfiles->popupMenu(), TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotProfileActivated( int ) ) ); + connect( m_pamProfiles->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotProfileListAboutToShow() ) ); } //KonqMainWindow::enableAllActions will call it anyway //profileListDirty(); diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp index 49d206664..94322e267 100644 --- a/konqueror/kttsplugin/tdehtmlkttsd.cpp +++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp @@ -42,7 +42,7 @@ TDEHTMLPluginKTTSD::TDEHTMLPluginKTTSD( TQObject* parent, const char* name, cons { (void) new TDEAction( i18n("&Speak Text"), "kttsd", 0, - this, TQT_SLOT(slotReadOut()), + this, TQ_SLOT(slotReadOut()), actionCollection(), "tools_kttsd" ); } else diff --git a/konqueror/listview/konq_infolistviewwidget.cpp b/konqueror/listview/konq_infolistviewwidget.cpp index 4698365e6..8ec62c79a 100644 --- a/konqueror/listview/konq_infolistviewwidget.cpp +++ b/konqueror/listview/konq_infolistviewwidget.cpp @@ -38,7 +38,7 @@ KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent, m_metaInfoJob = 0; m_mtSelector = new TDESelectAction(i18n("View &As"), 0, this, - TQT_SLOT(slotSelectMimeType()), + TQ_SLOT(slotSelectMimeType()), parent->actionCollection(), "view_as" ); kdDebug(1203) << "created info list view\n"; @@ -237,10 +237,10 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list) else { m_metaInfoJob = TDEIO::fileMetaInfo(list); - connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), - this, TQT_SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)), - this, TQT_SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQ_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)), + this, TQ_SLOT( slotMetaInfoResult())); } } @@ -257,10 +257,10 @@ void KonqInfoListViewWidget::slotRefreshItems( const KFileItemList& list) else { m_metaInfoJob = TDEIO::fileMetaInfo(list); - connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), - this, TQT_SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)), - this, TQT_SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQ_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)), + this, TQ_SLOT( slotMetaInfoResult())); } KonqBaseListViewWidget::slotRefreshItems(list); } @@ -313,10 +313,10 @@ void KonqInfoListViewWidget::slotMetaInfoResult() else { m_metaInfoJob = TDEIO::fileMetaInfo(m_metaInfoTodo); - connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), - this, TQT_SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)), - this, TQT_SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQ_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)), + this, TQ_SLOT( slotMetaInfoResult())); m_metaInfoTodo.clear(); } } diff --git a/konqueror/listview/konq_listview.cpp b/konqueror/listview/konq_listview.cpp index 5a06068ca..6a0d58973 100644 --- a/konqueror/listview/konq_listview.cpp +++ b/konqueror/listview/konq_listview.cpp @@ -289,20 +289,20 @@ KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char // Note: File Type is in fact the mimetype comment. We use UDS_FILE_TYPE but that's not what we show in fact :/ m_pListView->confColumns[10].setData(I18N_NOOP("File Type"),"Type",TDEIO::UDS_FILE_TYPE,m_paShowType); - connect( m_pListView, TQT_SIGNAL( selectionChanged() ), - m_extension, TQT_SLOT( updateActions() ) ); - connect( m_pListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( m_pListView, TQ_SIGNAL( selectionChanged() ), + m_extension, TQ_SLOT( updateActions() ) ); + connect( m_pListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); - connect( m_pListView, TQT_SIGNAL( currentChanged(TQListViewItem*) ), - m_extension, TQT_SLOT( updateActions() ) ); - connect(m_pListView->header(),TQT_SIGNAL(indexChange(int,int,int)),this,TQT_SLOT(headerDragged(int,int,int))); - connect(m_pListView->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(slotHeaderClicked(int))); - connect(m_pListView->header(),TQT_SIGNAL(sizeChange(int,int,int)),TQT_SLOT(slotHeaderSizeChanged())); + connect( m_pListView, TQ_SIGNAL( currentChanged(TQListViewItem*) ), + m_extension, TQ_SLOT( updateActions() ) ); + connect(m_pListView->header(),TQ_SIGNAL(indexChange(int,int,int)),this,TQ_SLOT(headerDragged(int,int,int))); + connect(m_pListView->header(),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(slotHeaderClicked(int))); + connect(m_pListView->header(),TQ_SIGNAL(sizeChange(int,int,int)),TQ_SLOT(slotHeaderSizeChanged())); // signals from konqdirpart (for BC reasons) - connect( this, TQT_SIGNAL( findOpened( KonqDirPart * ) ), TQT_SLOT( slotKFindOpened() ) ); - connect( this, TQT_SIGNAL( findClosed( KonqDirPart * ) ), TQT_SLOT( slotKFindClosed() ) ); + connect( this, TQ_SIGNAL( findOpened( KonqDirPart * ) ), TQ_SLOT( slotKFindOpened() ) ); + connect( this, TQ_SIGNAL( findClosed( KonqDirPart * ) ), TQ_SLOT( slotKFindClosed() ) ); loadPlugins( this, this, instance() ); } @@ -789,7 +789,7 @@ void KonqListView::headerDragged(int sec, int from, int to) kdDebug(1202)<<"section: "<<sec<<" fromIndex: "<<from<<" toIndex "<<to<<endl; //at this point the columns aren't moved yet, so I let the listview //rearrange the stuff and use a single shot timer - TQTimer::singleShot(200,this,TQT_SLOT(slotSaveAfterHeaderDrag())); + TQTimer::singleShot(200,this,TQ_SLOT(slotSaveAfterHeaderDrag())); } const KFileItem * KonqListView::currentItem() @@ -863,7 +863,7 @@ void KonqListView::slotHeaderSizeChanged() if ( !m_headerTimer ) { m_headerTimer = new TQTimer( this ); - connect( m_headerTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSaveColumnWidths() ) ); + connect( m_headerTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotSaveColumnWidths() ) ); } else m_headerTimer->stop(); @@ -885,33 +885,33 @@ void KonqListView::slotKFindClosed() void KonqListView::setupActions() { - m_paShowTime=new TDEToggleAction(i18n("Show &Modification Time"), 0,this, TQT_SLOT(slotColumnToggled()), actionCollection(), "show_time" ); + m_paShowTime=new TDEToggleAction(i18n("Show &Modification Time"), 0,this, TQ_SLOT(slotColumnToggled()), actionCollection(), "show_time" ); m_paShowTime->setCheckedState(i18n("Hide &Modification Time")); - m_paShowType=new TDEToggleAction(i18n("Show &File Type"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_type" ); + m_paShowType=new TDEToggleAction(i18n("Show &File Type"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_type" ); m_paShowType->setCheckedState(i18n("Hide &File Type")); - m_paShowMimeType=new TDEToggleAction(i18n("Show MimeType"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" ); + m_paShowMimeType=new TDEToggleAction(i18n("Show MimeType"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" ); m_paShowMimeType->setCheckedState(i18n("Hide MimeType")); - m_paShowAccessTime=new TDEToggleAction(i18n("Show &Access Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" ); + m_paShowAccessTime=new TDEToggleAction(i18n("Show &Access Time"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" ); m_paShowAccessTime->setCheckedState(i18n("Hide &Access Time")); - m_paShowCreateTime=new TDEToggleAction(i18n("Show &Creation Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" ); + m_paShowCreateTime=new TDEToggleAction(i18n("Show &Creation Time"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" ); m_paShowCreateTime->setCheckedState(i18n("Hide &Creation Time")); - m_paShowLinkDest=new TDEToggleAction(i18n("Show &Link Destination"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" ); + m_paShowLinkDest=new TDEToggleAction(i18n("Show &Link Destination"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" ); m_paShowLinkDest->setCheckedState(i18n("Hide &Link Destination")); - m_paShowSize=new TDEToggleAction(i18n("Show Filesize"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_size" ); + m_paShowSize=new TDEToggleAction(i18n("Show Filesize"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_size" ); m_paShowSize->setCheckedState(i18n("Hide Filesize")); - m_paShowOwner=new TDEToggleAction(i18n("Show Owner"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_owner" ); + m_paShowOwner=new TDEToggleAction(i18n("Show Owner"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_owner" ); m_paShowOwner->setCheckedState(i18n("Hide Owner")); - m_paShowGroup=new TDEToggleAction(i18n("Show Group"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_group" ); + m_paShowGroup=new TDEToggleAction(i18n("Show Group"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_group" ); m_paShowGroup->setCheckedState(i18n("Hide Group")); - m_paShowPermissions=new TDEToggleAction(i18n("Show Permissions"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" ); + m_paShowPermissions=new TDEToggleAction(i18n("Show Permissions"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" ); m_paShowPermissions->setCheckedState(i18n("Hide Permissions")); - m_paShowURL=new TDEToggleAction(i18n("Show URL"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_url" ); + m_paShowURL=new TDEToggleAction(i18n("Show URL"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_url" ); - m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), actionCollection(), "select" ); - m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), actionCollection(), "unselect" ); - m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); - m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); - m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); + m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQ_SLOT( slotSelect() ), actionCollection(), "select" ); + m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQ_SLOT( slotUnselect() ), actionCollection(), "unselect" ); + m_paSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); + m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQ_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); + m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQ_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); // These 2 actions are 'fake' actions. They are defined so that the keyboard shortcuts // can be set from the 'Configure Shortcuts..." dialog. @@ -929,16 +929,16 @@ void KonqListView::setupActions() m_paRenameMovePrev->setToolTip( i18n("Complete rename operation and move the previous item")); m_paRenameMovePrev->setEnabled(false); - m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); + m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQ_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); // m_paShowDot->setCheckedState(i18n("Hide &Hidden Files")); - m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); + m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQ_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); m_paSortAlternate = new TDEAction( i18n( "&Alternate Sort Order" ), CTRL+Key_S, this, - TQT_SLOT( slotSortAlternate() ), actionCollection(), "alternate_sort_order"); + TQ_SLOT( slotSortAlternate() ), actionCollection(), "alternate_sort_order"); m_paSortAlternate->setToolTip( i18n( "Sort by PREVIOUS sort column" ) ); m_paSortReverse = new TDEAction( i18n( "&Reverse Sort Order" ), CTRL+Key_R, this, - TQT_SLOT( slotSortReverse() ), actionCollection(), "reverse_sort_order"); + TQ_SLOT( slotSortReverse() ), actionCollection(), "reverse_sort_order"); m_paSortReverse->setToolTip( i18n( "Reverse sort order of current sort column" ) ); /* @@ -948,17 +948,17 @@ void KonqListView::setupActions() TextSortOrder initialOrder = m_pProps->getSortOrder(); m_paOrderUnicodeUnmodified = new TDEToggleAction( i18n( "&Unicode based" ), ALT+Key_1, this, - TQT_SLOT( slotOrderUnicodeUnmodified() ), actionCollection(), "order_unicode_based" ); + TQ_SLOT( slotOrderUnicodeUnmodified() ), actionCollection(), "order_unicode_based" ); m_paOrderUnicodeUnmodified->setToolTip( i18n( "Strict numeric Unicode based order" ) ); m_paOrderUnicodeUnmodified->setChecked( initialOrder == UNICODE_UNMODIFIED ); m_paOrderUnicodeCaseInsensitive = new TDEToggleAction( i18n( "Unicode based, &case insensitive" ), ALT+Key_2, this, - TQT_SLOT( slotOrderUnicodeCaseInsensitive() ), actionCollection(), "order_unicode_based_case_insensitive" ); + TQ_SLOT( slotOrderUnicodeCaseInsensitive() ), actionCollection(), "order_unicode_based_case_insensitive" ); m_paOrderUnicodeCaseInsensitive->setToolTip( i18n( "Unicode based order but with lower/upper case ASCII letters adjacent" ) ); m_paOrderUnicodeCaseInsensitive->setChecked(initialOrder == UNICODE_CASEINSENSITIVE); m_paOrderLocale = new TDEToggleAction( i18n( "&Locale based" ), ALT+Key_3, this, - TQT_SLOT( slotOrderLocale() ), actionCollection(), "order_locale_based" ); + TQ_SLOT( slotOrderLocale() ), actionCollection(), "order_locale_based" ); m_paOrderLocale->setToolTip( i18n( "Locale based order, usually \"friendly\"" ) ); m_paOrderLocale->setChecked(initialOrder == LOCALE_UNMODIFIED); @@ -968,12 +968,12 @@ void KonqListView::setupActions() m_paOrderLocale->setExclusiveGroup( "sortOrder" ); m_paDisplayDirectoriesFirst = new TDEToggleAction( i18n("Group &Directories First"), CTRL+SHIFT+Key_F, this, - TQT_SLOT(slotToggleDisplayDirectoriesFirst()), actionCollection(), "group_directories_first"); + TQ_SLOT(slotToggleDisplayDirectoriesFirst()), actionCollection(), "group_directories_first"); m_paDisplayDirectoriesFirst->setToolTip( i18n( "Always display directories before non-directories" ) ); m_paDisplayDirectoriesFirst->setChecked(m_pProps->isDirsFirst()); m_paDisplayHiddenFirst = new TDEToggleAction( i18n("Group &Hidden First"), CTRL+SHIFT+Key_H, this, - TQT_SLOT(slotToggleDisplayHiddenFirst()), actionCollection(), "group_hidden_first"); + TQ_SLOT(slotToggleDisplayHiddenFirst()), actionCollection(), "group_hidden_first"); m_paDisplayHiddenFirst->setToolTip( i18n( "Always display hidden files before non-hidden files" ) ); m_paDisplayHiddenFirst->setChecked(m_pProps->isHiddenFirst()); diff --git a/konqueror/listview/konq_listviewwidget.cpp b/konqueror/listview/konq_listviewwidget.cpp index 5a2ff1261..a41cf6367 100644 --- a/konqueror/listview/konq_listviewwidget.cpp +++ b/konqueror/listview/konq_listviewwidget.cpp @@ -121,57 +121,57 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget * initConfig(); #if 0 - connect( this, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), - this, TQT_SLOT(slotRightButtonPressed(TQListViewItem*,const TQPoint&,int))); + connect( this, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), + this, TQ_SLOT(slotRightButtonPressed(TQListViewItem*,const TQPoint&,int))); #endif - connect( this, TQT_SIGNAL(returnPressed( TQListViewItem * )), - this, TQT_SLOT(slotReturnPressed( TQListViewItem * )) ); - connect( this, TQT_SIGNAL(mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )), - this, TQT_SLOT(slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) ); - connect( this, TQT_SIGNAL(executed( TQListViewItem * )), - this, TQT_SLOT(slotExecuted( TQListViewItem * )) ); - connect( this, TQT_SIGNAL(currentChanged( TQListViewItem * )), - this, TQT_SLOT(slotCurrentChanged( TQListViewItem * )) ); - connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )), - this, TQT_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) ); - connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )), - this, TQT_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) ); - connect( this, TQT_SIGNAL(renameNext( TQListViewItem *, int )), - this, TQT_SLOT(slotRenameNextItem( TQListViewItem*, int)) ); - connect( this, TQT_SIGNAL(renamePrev( TQListViewItem *, int )), - this, TQT_SLOT(slotRenamePrevItem( TQListViewItem*, int)) ); - connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); - - connect( horizontalScrollBar(), TQT_SIGNAL(valueChanged( int )), - this, TQT_SIGNAL(viewportAdjusted()) ); - connect( verticalScrollBar(), TQT_SIGNAL(valueChanged( int )), - this, TQT_SIGNAL(viewportAdjusted()) ); + connect( this, TQ_SIGNAL(returnPressed( TQListViewItem * )), + this, TQ_SLOT(slotReturnPressed( TQListViewItem * )) ); + connect( this, TQ_SIGNAL(mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )), + this, TQ_SLOT(slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) ); + connect( this, TQ_SIGNAL(executed( TQListViewItem * )), + this, TQ_SLOT(slotExecuted( TQListViewItem * )) ); + connect( this, TQ_SIGNAL(currentChanged( TQListViewItem * )), + this, TQ_SLOT(slotCurrentChanged( TQListViewItem * )) ); + connect( this, TQ_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )), + this, TQ_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) ); + connect( this, TQ_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )), + this, TQ_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) ); + connect( this, TQ_SIGNAL(renameNext( TQListViewItem *, int )), + this, TQ_SLOT(slotRenameNextItem( TQListViewItem*, int)) ); + connect( this, TQ_SIGNAL(renamePrev( TQListViewItem *, int )), + this, TQ_SLOT(slotRenamePrevItem( TQListViewItem*, int)) ); + connect( this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) ); + + connect( horizontalScrollBar(), TQ_SIGNAL(valueChanged( int )), + this, TQ_SIGNAL(viewportAdjusted()) ); + connect( verticalScrollBar(), TQ_SIGNAL(valueChanged( int )), + this, TQ_SIGNAL(viewportAdjusted()) ); // Connect the directory lister - connect( m_dirLister, TQT_SIGNAL(started( const KURL & )), - this, TQT_SLOT(slotStarted()) ); - connect( m_dirLister, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()) ); - connect( m_dirLister, TQT_SIGNAL(canceled()), this, TQT_SLOT(slotCanceled()) ); - connect( m_dirLister, TQT_SIGNAL(clear()), this, TQT_SLOT(slotClear()) ); - connect( m_dirLister, TQT_SIGNAL(newItems( const KFileItemList & ) ), - this, TQT_SLOT(slotNewItems( const KFileItemList & )) ); - connect( m_dirLister, TQT_SIGNAL(deleteItem( KFileItem * )), - this, TQT_SLOT(slotDeleteItem( KFileItem * )) ); - connect( m_dirLister, TQT_SIGNAL(refreshItems( const KFileItemList & )), - this, TQT_SLOT( slotRefreshItems( const KFileItemList & )) ); - connect( m_dirLister, TQT_SIGNAL(redirection( const KURL & )), - this, TQT_SLOT(slotRedirection( const KURL & )) ); - connect( m_dirLister, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )), - m_pBrowserView, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )) ); - - connect( m_dirLister, TQT_SIGNAL(infoMessage( const TQString& )), - m_pBrowserView->extension(), TQT_SIGNAL(infoMessage( const TQString& )) ); - connect( m_dirLister, TQT_SIGNAL(percent( int )), - m_pBrowserView->extension(), TQT_SIGNAL(loadingProgress( int )) ); - connect( m_dirLister, TQT_SIGNAL(speed( int )), - m_pBrowserView->extension(), TQT_SIGNAL(speedProgress( int )) ); - - connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), TQT_SLOT(slotUpdateBackground()) ); + connect( m_dirLister, TQ_SIGNAL(started( const KURL & )), + this, TQ_SLOT(slotStarted()) ); + connect( m_dirLister, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted()) ); + connect( m_dirLister, TQ_SIGNAL(canceled()), this, TQ_SLOT(slotCanceled()) ); + connect( m_dirLister, TQ_SIGNAL(clear()), this, TQ_SLOT(slotClear()) ); + connect( m_dirLister, TQ_SIGNAL(newItems( const KFileItemList & ) ), + this, TQ_SLOT(slotNewItems( const KFileItemList & )) ); + connect( m_dirLister, TQ_SIGNAL(deleteItem( KFileItem * )), + this, TQ_SLOT(slotDeleteItem( KFileItem * )) ); + connect( m_dirLister, TQ_SIGNAL(refreshItems( const KFileItemList & )), + this, TQ_SLOT( slotRefreshItems( const KFileItemList & )) ); + connect( m_dirLister, TQ_SIGNAL(redirection( const KURL & )), + this, TQ_SLOT(slotRedirection( const KURL & )) ); + connect( m_dirLister, TQ_SIGNAL(itemsFilteredByMime( const KFileItemList & )), + m_pBrowserView, TQ_SIGNAL(itemsFilteredByMime( const KFileItemList & )) ); + + connect( m_dirLister, TQ_SIGNAL(infoMessage( const TQString& )), + m_pBrowserView->extension(), TQ_SIGNAL(infoMessage( const TQString& )) ); + connect( m_dirLister, TQ_SIGNAL(percent( int )), + m_pBrowserView->extension(), TQ_SIGNAL(loadingProgress( int )) ); + connect( m_dirLister, TQ_SIGNAL(speed( int )), + m_pBrowserView->extension(), TQ_SIGNAL(speedProgress( int )) ); + + connect( header(), TQ_SIGNAL(sizeChange( int, int, int )), TQ_SLOT(slotUpdateBackground()) ); viewport()->setMouseTracking( true ); viewport()->setFocusPolicy( TQWidget::WheelFocus ); @@ -453,7 +453,7 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) { } if ( m_scrollTimer ) { - disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ) ); + disconnect( m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() ) ); m_scrollTimer->stop(); delete m_scrollTimer; m_scrollTimer = 0; @@ -762,15 +762,15 @@ void KonqBaseListViewWidget::slotAutoScroll() { m_scrollTimer = new TQTimer( this ); - connect( m_scrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoScroll() ) ); + connect( m_scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoScroll() ) ); m_scrollTimer->start( 100, false ); } } else if ( m_scrollTimer ) { - disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoScroll() ) ); + disconnect( m_scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoScroll() ) ); m_scrollTimer->stop(); delete m_scrollTimer; m_scrollTimer = 0; @@ -1563,7 +1563,7 @@ void KonqBaseListViewWidget::slotUpdateBackground() if ( !m_backgroundTimer ) { m_backgroundTimer = new TQTimer( this ); - connect( m_backgroundTimer, TQT_SIGNAL( timeout() ), viewport(), TQT_SLOT( update() ) ); + connect( m_backgroundTimer, TQ_SIGNAL( timeout() ), viewport(), TQ_SLOT( update() ) ); } else m_backgroundTimer->stop(); diff --git a/konqueror/listview/konq_treeviewwidget.cpp b/konqueror/listview/konq_treeviewwidget.cpp index 77adc4b61..02c297c88 100644 --- a/konqueror/listview/konq_treeviewwidget.cpp +++ b/konqueror/listview/konq_treeviewwidget.cpp @@ -35,12 +35,12 @@ KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWi setRootIsDecorated( true ); setTreeStepSize( 20 ); - connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ), - this, TQT_SLOT( slotCompleted( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( clear( const KURL & ) ), - this, TQT_SLOT( slotClear( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ), - this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( completed( const KURL & ) ), + this, TQ_SLOT( slotCompleted( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( clear( const KURL & ) ), + this, TQ_SLOT( slotClear( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ), + this, TQ_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); } KonqTreeViewWidget::~KonqTreeViewWidget() diff --git a/konqueror/preloader/preloader.cpp b/konqueror/preloader/preloader.cpp index 5d87a8b07..ecc6691da 100644 --- a/konqueror/preloader/preloader.cpp +++ b/konqueror/preloader/preloader.cpp @@ -30,10 +30,10 @@ KonqyPreloader::KonqyPreloader( const TQCString& obj ) : KDEDModule( obj ) { reconfigure(); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& )), - TQT_SLOT( appRemoved( const TQCString& ))); - connect( &check_always_preloaded_timer, TQT_SIGNAL( timeout()), - TQT_SLOT( checkAlwaysPreloaded())); + connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& )), + TQ_SLOT( appRemoved( const TQCString& ))); + connect( &check_always_preloaded_timer, TQ_SIGNAL( timeout()), + TQ_SLOT( checkAlwaysPreloaded())); } KonqyPreloader::~KonqyPreloader() diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index 913444098..c44aaa342 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -50,16 +50,16 @@ KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent, { m_menu = new TDEActionMenu(i18n("Select Remote Charset"), "charset", actionCollection(), "changeremoteencoding"); - connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotAboutToShow())); + connect(m_menu->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotAboutToShow())); m_menu->setEnabled(false); m_menu->setDelayed(false); m_part = dynamic_cast<KonqDirPart*>(parent); if (m_part) // if parent is not a KonqDirPart, our menu will never show - TQObject::connect(m_part, TQT_SIGNAL(aboutToOpenURL()), - this, TQT_SLOT(slotAboutToOpenURL())); + TQObject::connect(m_part, TQ_SIGNAL(aboutToOpenURL()), + this, TQ_SLOT(slotAboutToOpenURL())); } KRemoteEncodingPlugin::~KRemoteEncodingPlugin() @@ -117,11 +117,11 @@ KRemoteEncodingPlugin::fillMenu() TQStringList::ConstIterator it; int count = 0; for (it = m_encodingDescriptions.begin(); it != m_encodingDescriptions.end(); ++it) - menu->insertItem(*it, this, TQT_SLOT(slotItemSelected(int)), 0, ++count); + menu->insertItem(*it, this, TQ_SLOT(slotItemSelected(int)), 0, ++count); menu->insertSeparator(); - menu->insertItem(i18n("Reload"), this, TQT_SLOT(slotReload()), 0, ++count); - menu->insertItem(i18n("Default"), this, TQT_SLOT(slotDefault()), 0, ++count); + menu->insertItem(i18n("Reload"), this, TQ_SLOT(slotReload()), 0, ++count); + menu->insertItem(i18n("Default"), this, TQ_SLOT(slotDefault()), 0, ++count); m_idDefault = count; } diff --git a/konqueror/shellcmdplugin/kshellcmddialog.cpp b/konqueror/shellcmdplugin/kshellcmddialog.cpp index b4ea0cb5d..80c854fcf 100644 --- a/konqueror/shellcmdplugin/kshellcmddialog.cpp +++ b/konqueror/shellcmdplugin/kshellcmddialog.cpp @@ -54,9 +54,9 @@ KShellCommandDialog::KShellCommandDialog(const TQString& title, const TQString& m_shell->setFocus(); - connect(cancelButton, TQT_SIGNAL(clicked()), m_shell, TQT_SLOT(slotFinished())); - connect(m_shell, TQT_SIGNAL(finished()), this, TQT_SLOT(disableStopButton())); - connect(closeButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose())); + connect(cancelButton, TQ_SIGNAL(clicked()), m_shell, TQ_SLOT(slotFinished())); + connect(m_shell, TQ_SIGNAL(finished()), this, TQ_SLOT(disableStopButton())); + connect(closeButton,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose())); } KShellCommandDialog::~KShellCommandDialog() diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp index 228db9a36..d4d6f45f9 100644 --- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp +++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp @@ -87,8 +87,8 @@ int KShellCommandExecutor::exec() m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, this); m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, this); m_writeNotifier->setEnabled(false); - connect (m_readNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(readDataFromShell())); - connect (m_writeNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(writeDataToShell())); + connect (m_readNotifier, TQ_SIGNAL(activated(int)), this,TQ_SLOT(readDataFromShell())); + connect (m_writeNotifier, TQ_SIGNAL(activated(int)), this,TQ_SLOT(writeDataToShell())); return 1; } diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp index 407d6f297..1b426da2a 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp +++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp @@ -34,7 +34,7 @@ KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name, return; new TDEAction( i18n( "&Execute Shell Command..." ), "system-run", CTRL+Key_E, this, - TQT_SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" ); + TQ_SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" ); } void KShellCmdPlugin::slotExecuteShellCommand() diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index 774ad8509..437c7bda9 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -32,11 +32,11 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName, // this should be your custom internal widget m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() ); m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" ); - connect(m_widget,TQT_SIGNAL(started(TDEIO::Job *)), - this, TQT_SIGNAL(started(TDEIO::Job*))); - connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); - connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)), - m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&))); + connect(m_widget,TQ_SIGNAL(started(TDEIO::Job *)), + this, TQ_SIGNAL(started(TDEIO::Job*))); + connect(m_widget,TQ_SIGNAL(completed()),this,TQ_SIGNAL(completed())); + connect(m_extension, TQ_SIGNAL(addWebSideBar(const KURL&, const TQString&)), + m_widget, TQ_SLOT(addWebSideBar(const KURL&, const TQString&))); TDEAcceleratorManager::setNoAccel(m_widget); setWidget(m_widget); } diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index 8fe85f512..5fd3f6d7e 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -60,8 +60,8 @@ addBackEnd::addBackEnd(TQWidget *parent, class TQPopupMenu *addmenu, m_universal=universal; m_currentProfile = currentProfile; menu = addmenu; - connect(menu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(aboutToShowAddMenu())); - connect(menu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activatedAddMenu(int))); + connect(menu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(aboutToShowAddMenu())); + connect(menu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(activatedAddMenu(int))); } void addBackEnd::aboutToShowAddMenu() @@ -268,7 +268,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons if (splitterWidget) { splitterWidget->setResizeMode(parent, TQSplitter::FollowSizeHint); splitterWidget->setOpaqueResize( false ); - connect(splitterWidget,TQT_SIGNAL(setRubberbandCalled()),TQT_SLOT(userMovedSplitter())); + connect(splitterWidget,TQ_SIGNAL(setRubberbandCalled()),TQ_SLOT(userMovedSplitter())); } m_area = new KDockArea(this); @@ -292,22 +292,22 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons if (!m_universalMode) { m_menu->insertItem(SmallIconSet("remove"), i18n("Close Navigation Panel"), - par, TQT_SLOT(deleteLater())); + par, TQ_SLOT(deleteLater())); } - connect(m_menu, TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(aboutToShowConfigMenu())); - connect(m_menu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(activatedMenu(int))); + connect(m_menu, TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(aboutToShowConfigMenu())); + connect(m_menu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(activatedMenu(int))); m_buttonPopup = 0; addBackEnd *ab = new addBackEnd(this, addMenu, universalMode, currentProfile, "Sidebar_Widget-addBackEnd"); - connect(ab, TQT_SIGNAL(updateNeeded()), - this, TQT_SLOT(updateButtons())); - connect(ab, TQT_SIGNAL(initialCopyNeeded()), - this, TQT_SLOT(finishRollBack())); + connect(ab, TQ_SIGNAL(updateNeeded()), + this, TQ_SLOT(updateButtons())); + connect(ab, TQ_SIGNAL(initialCopyNeeded()), + this, TQ_SLOT(finishRollBack())); initialCopy(); @@ -327,13 +327,13 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons m_menu->setItemVisible(2, !m_immutableShowTabsLeft); m_menu->setItemVisible(3, !m_immutableShowExtraButtons); - connect(&m_configTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(saveConfig())); + connect(&m_configTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(saveConfig())); m_somethingVisible = !m_openViews.isEmpty(); doLayout(); - TQTimer::singleShot(0,this,TQT_SLOT(createButtons())); - connect(m_area, TQT_SIGNAL(dockWidgetHasUndocked(KDockWidget*)), - this, TQT_SLOT(dockWidgetHasUndocked(KDockWidget*))); + TQTimer::singleShot(0,this,TQ_SLOT(createButtons())); + connect(m_area, TQ_SIGNAL(dockWidgetHasUndocked(KDockWidget*)), + this, TQ_SLOT(dockWidgetHasUndocked(KDockWidget*))); } void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) { @@ -373,7 +373,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) { scf.writeEntry("X-TDE-KonqSidebarModule", "konqsidebar_web"); scf.sync(); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } } @@ -382,7 +382,7 @@ void Sidebar_Widget::finishRollBack() { m_path = TDEGlobal::dirs()->saveLocation("data",m_relPath,true); initialCopy(); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } @@ -508,7 +508,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) ksc.setGroup("Desktop Entry"); ksc.writeEntry("Icon",iconname); ksc.sync(); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } break; } @@ -531,7 +531,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) //ksc.writeEntry("Name",newurl); ksc.writePathEntry("URL",newurl); ksc.sync(); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } } delete dlg; @@ -545,7 +545,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) TQFile f(m_path+m_currentButton->file); if (!f.remove()) tqDebug("Error, file not deleted"); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } break; } @@ -566,7 +566,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) ksc.sync(); // Update the buttons with a TQTimer (why?) - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } break; } @@ -838,7 +838,7 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos) /*int id=*/m_buttons.insert(lastbtn, bi); KMultiTabBarTab *tab = m_buttonBar->tab(lastbtn); tab->installEventFilter(this); - connect(tab,TQT_SIGNAL(clicked(int)),this,TQT_SLOT(showHidePage(int))); + connect(tab,TQ_SIGNAL(clicked(int)),this,TQ_SLOT(showHidePage(int))); // Set Whats This help // This uses the comments in the .desktop files @@ -882,8 +882,8 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) m_buttonPopup->insertItem(SmallIconSet("edit-delete"), i18n("Remove"),3); m_buttonPopup->insertSeparator(); m_buttonPopup->insertItem(SmallIconSet("configure"), i18n("Configure Navigation Panel"), m_menu, 4); - connect(m_buttonPopup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(buttonPopupActivate(int))); + connect(m_buttonPopup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(buttonPopupActivate(int))); } m_buttonPopup->setItemEnabled(2,!m_currentButton->URL.isEmpty()); m_buttonPopup->changeTitle(50,SmallIcon(m_currentButton->iconName), @@ -961,11 +961,11 @@ bool Sidebar_Widget::createView( ButtonInfo *data) KDockWidget::DockBottom/*|KDockWidget::DockDesktop*/); data->dock->setDockSite(KDockWidget::DockTop|KDockWidget::DockBottom); connectModule(data->module); - connect(this, TQT_SIGNAL(fileSelection(const KFileItemList&)), - data->module, TQT_SLOT(openPreview(const KFileItemList&))); + connect(this, TQ_SIGNAL(fileSelection(const KFileItemList&)), + data->module, TQ_SLOT(openPreview(const KFileItemList&))); - connect(this, TQT_SIGNAL(fileMouseOver(const KFileItem&)), - data->module, TQT_SLOT(openPreviewOnMouseOver(const KFileItem&))); + connect(this, TQ_SIGNAL(fileMouseOver(const KFileItem&)), + data->module, TQ_SLOT(openPreviewOnMouseOver(const KFileItem&))); } delete confFile; @@ -998,14 +998,14 @@ void Sidebar_Widget::showHidePage(int page) m_buttonBar->setTab(page,true); connect(info->module, - TQT_SIGNAL(setIcon(const TQString&)), + TQ_SIGNAL(setIcon(const TQString&)), m_buttonBar->tab(page), - TQT_SLOT(setIcon(const TQString&))); + TQ_SLOT(setIcon(const TQString&))); connect(info->module, - TQT_SIGNAL(setCaption(const TQString&)), + TQ_SIGNAL(setCaption(const TQString&)), m_buttonBar->tab(page), - TQT_SLOT(setText(const TQString&))); + TQ_SLOT(setText(const TQString&))); if (m_singleWidgetMode) { @@ -1217,51 +1217,51 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client, void Sidebar_Widget::connectModule(TQObject *mod) { if (mod->metaObject()->findSignal("started(TDEIO::Job*)") != -1) { - connect(mod,TQT_SIGNAL(started(TDEIO::Job *)),this, TQT_SIGNAL(started(TDEIO::Job*))); + connect(mod,TQ_SIGNAL(started(TDEIO::Job *)),this, TQ_SIGNAL(started(TDEIO::Job*))); } if (mod->metaObject()->findSignal("completed()") != -1) { - connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); + connect(mod,TQ_SIGNAL(completed()),this,TQ_SIGNAL(completed())); } if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) { - connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, - const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const + connect(mod,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, + const TQString &, mode_t)),this,TQ_SLOT(popupMenu( const TQPoint &, const KURL&, const TQString &, mode_t))); } if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const TQPoint &,const KURL&,const TQString&,mode_t)") != -1) { - connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &, + connect(mod,TQ_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t)),this, - TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &, + TQ_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t))); } if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) { - connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), - this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & ))); + connect(mod,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), + this,TQ_SLOT(popupMenu( const TQPoint &, const KFileItemList & ))); } if (mod->metaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) { - connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), - this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(mod,TQ_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), + this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); } if (mod->metaObject()->findSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) { connect(mod, - TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), + TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, - TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); + TQ_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); } if (mod->metaObject()->findSignal("enableAction(const char*,bool)") != -1) { - connect(mod,TQT_SIGNAL(enableAction( const char *, bool)), - this,TQT_SLOT(enableAction(const char *, bool))); + connect(mod,TQ_SIGNAL(enableAction( const char *, bool)), + this,TQ_SLOT(enableAction(const char *, bool))); } if (mod->metaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) { - connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), - this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &))); + connect(mod,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), + this,TQ_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &))); } } diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index 208fe2ee6..f1dd0b953 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -45,39 +45,39 @@ KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTr formats << "text/uri-list" << "application/x-xbel" << "text/plain"; tree()->setDropFormats(formats); - connect(tree(), TQT_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)), - this, TQT_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*))); - connect(tree(), TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)), - this, TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*))); + connect(tree(), TQ_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)), + this, TQ_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*))); + connect(tree(), TQ_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)), + this, TQ_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*))); - connect(tree(), TQT_SIGNAL(expanded(TQListViewItem*)), - this, TQT_SLOT(slotOpenChange(TQListViewItem*))); - connect(tree(), TQT_SIGNAL(collapsed(TQListViewItem*)), - this, TQT_SLOT(slotOpenChange(TQListViewItem*))); + connect(tree(), TQ_SIGNAL(expanded(TQListViewItem*)), + this, TQ_SLOT(slotOpenChange(TQListViewItem*))); + connect(tree(), TQ_SIGNAL(collapsed(TQListViewItem*)), + this, TQ_SLOT(slotOpenChange(TQListViewItem*))); m_collection = new TDEActionCollection( this, "bookmark actions" ); (void) new TDEAction( i18n("&Create New Folder"), "folder-new", 0, this, - TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); + TQ_SLOT( slotCreateFolder() ), m_collection, "create_folder"); (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this, - TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); + TQ_SLOT( slotDelete() ), m_collection, "delete_folder"); (void) new TDEAction( i18n("Delete Bookmark"), "edit-delete", 0, this, - TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark"); + TQ_SLOT( slotDelete() ), m_collection, "delete_bookmark"); (void) new TDEAction( i18n("Properties"), "edit", 0, this, - TQT_SLOT( slotProperties() ), m_collection, "item_properties"); + TQ_SLOT( slotProperties() ), m_collection, "item_properties"); (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this, - TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); + TQ_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this, - TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); + TQ_SLOT( slotOpenTab() ), m_collection, "open_tab"); (void) new TDEAction( i18n("Open Folder in Tabs"), "tab_new", 0, this, - TQT_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs"); + TQ_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs"); (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this, - TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); + TQ_SLOT( slotCopyLocation() ), m_collection, "copy_location"); - KStdAction::editBookmarks( KonqBookmarkManager::self(), TQT_SLOT( slotEditBookmarks() ), + KStdAction::editBookmarks( KonqBookmarkManager::self(), TQ_SLOT( slotEditBookmarks() ), m_collection, "edit_bookmarks" ); - connect( KonqBookmarkManager::self(), TQT_SIGNAL(changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &) ) ); + connect( KonqBookmarkManager::self(), TQ_SIGNAL(changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &) ) ); } KonqSidebarBookmarkModule::~KonqSidebarBookmarkModule() diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index b1b6d0563..e6e4a0af3 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -52,8 +52,8 @@ KonqSidebarDirTreeModule::~KonqSidebarDirTreeModule() // KDirLister may still emit canceled while being deleted. if (m_dirLister) { - disconnect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ), - this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); + disconnect( m_dirLister, TQ_SIGNAL( canceled( const KURL & ) ), + this, TQ_SLOT( slotListingStopped( const KURL & ) ) ); delete m_dirLister; } } @@ -303,18 +303,18 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item ) // mimetypes<<TQString("inode/directory"); // m_dirLister->setMimeFilter(mimetypes); - connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ), - this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) ); - connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), - this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) ); - connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); - connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ), - this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ), - this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ), - this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ), + this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) ); + connect( m_dirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), + this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) ); + connect( m_dirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( m_dirLister, TQ_SIGNAL( completed( const KURL & ) ), + this, TQ_SLOT( slotListingStopped( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( canceled( const KURL & ) ), + this, TQ_SLOT( slotListingStopped( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ), + this, TQ_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); } diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index 6f051a553..416054cf1 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -51,7 +51,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree s_settings->readSettings( true ); } - connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() )); + connect( s_settings, TQ_SIGNAL( settingsChanged() ), TQ_SLOT( slotSettingsChanged() )); m_dict.setAutoDelete( true ); m_currentTime = TQDateTime::currentDateTime(); @@ -63,35 +63,35 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree KonqHistoryManager *manager = KonqHistoryManager::kself(); - connect( manager, TQT_SIGNAL( loadingFinished() ), TQT_SLOT( slotCreateItems() )); - connect( manager, TQT_SIGNAL( cleared() ), TQT_SLOT( clear() )); + connect( manager, TQ_SIGNAL( loadingFinished() ), TQ_SLOT( slotCreateItems() )); + connect( manager, TQ_SIGNAL( cleared() ), TQ_SLOT( clear() )); - connect( manager, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * ) ), - TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * ) )); - connect( manager, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry *) ), - TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry *) )); + connect( manager, TQ_SIGNAL( entryAdded( const KonqHistoryEntry * ) ), + TQ_SLOT( slotEntryAdded( const KonqHistoryEntry * ) )); + connect( manager, TQ_SIGNAL( entryRemoved( const KonqHistoryEntry *) ), + TQ_SLOT( slotEntryRemoved( const KonqHistoryEntry *) )); - connect( parentTree, TQT_SIGNAL( expanded( TQListViewItem * )), - TQT_SLOT( slotItemExpanded( TQListViewItem * ))); + connect( parentTree, TQ_SIGNAL( expanded( TQListViewItem * )), + TQ_SLOT( slotItemExpanded( TQListViewItem * ))); m_collection = new TDEActionCollection( this, "history actions" ); (void) new TDEAction( i18n("New &Window"), "window-new", 0, this, - TQT_SLOT( slotNewWindow() ), m_collection, "open_new"); + TQ_SLOT( slotNewWindow() ), m_collection, "open_new"); (void) new TDEAction( i18n("&Remove Entry"), "edit-delete", 0, this, - TQT_SLOT( slotRemoveEntry() ), m_collection, "remove"); + TQ_SLOT( slotRemoveEntry() ), m_collection, "remove"); (void) new TDEAction( i18n("C&lear History"), "history_clear", 0, this, - TQT_SLOT( slotClearHistory() ), m_collection, "clear"); + TQ_SLOT( slotClearHistory() ), m_collection, "clear"); (void) new TDEAction( i18n("&Preferences..."), "configure", 0, this, - TQT_SLOT( slotPreferences()), m_collection, "preferences"); + TQ_SLOT( slotPreferences()), m_collection, "preferences"); TDERadioAction *sort; sort = new TDERadioAction( i18n("By &Name"), 0, this, - TQT_SLOT( slotSortByName() ), m_collection, "byName"); + TQ_SLOT( slotSortByName() ), m_collection, "byName"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( m_sortsByName ); sort = new TDERadioAction( i18n("By &Date"), 0, this, - TQT_SLOT( slotSortByDate() ), m_collection, "byDate"); + TQ_SLOT( slotSortByDate() ), m_collection, "byDate"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( !m_sortsByName ); diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp index 70e42e113..188da9d93 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp +++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp @@ -75,33 +75,33 @@ HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name, dialog->comboOlder->insertItem( i18n("Days"), KonqSidebarHistorySettings::DAYS ); - connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )), - dialog->spinExpire, TQT_SLOT( setEnabled( bool ))); - connect( dialog->spinExpire, TQT_SIGNAL( valueChanged( int )), - this, TQT_SLOT( slotExpireChanged( int ))); - - connect( dialog->spinNewer, TQT_SIGNAL( valueChanged( int )), - TQT_SLOT( slotNewerChanged( int ))); - connect( dialog->spinOlder, TQT_SIGNAL( valueChanged( int )), - TQT_SLOT( slotOlderChanged( int ))); - - connect( dialog->btnFontNewer, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotGetFontNewer() )); - connect( dialog->btnFontOlder, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotGetFontOlder() )); - connect( dialog->btnClearHistory, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotClearHistory() )); - - connect( dialog->cbDetailedTips, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( configChanged() )); - connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( configChanged() )); - connect( dialog->spinEntries, TQT_SIGNAL( valueChanged( int )), - TQT_SLOT( configChanged() )); - connect( dialog->comboNewer, TQT_SIGNAL( activated( int )), - TQT_SLOT( configChanged() )); - connect( dialog->comboOlder, TQT_SIGNAL( activated( int )), - TQT_SLOT( configChanged() )); + connect( dialog->cbExpire, TQ_SIGNAL( toggled( bool )), + dialog->spinExpire, TQ_SLOT( setEnabled( bool ))); + connect( dialog->spinExpire, TQ_SIGNAL( valueChanged( int )), + this, TQ_SLOT( slotExpireChanged( int ))); + + connect( dialog->spinNewer, TQ_SIGNAL( valueChanged( int )), + TQ_SLOT( slotNewerChanged( int ))); + connect( dialog->spinOlder, TQ_SIGNAL( valueChanged( int )), + TQ_SLOT( slotOlderChanged( int ))); + + connect( dialog->btnFontNewer, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotGetFontNewer() )); + connect( dialog->btnFontOlder, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotGetFontOlder() )); + connect( dialog->btnClearHistory, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotClearHistory() )); + + connect( dialog->cbDetailedTips, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( configChanged() )); + connect( dialog->cbExpire, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( configChanged() )); + connect( dialog->spinEntries, TQ_SIGNAL( valueChanged( int )), + TQ_SLOT( configChanged() )); + connect( dialog->comboNewer, TQ_SIGNAL( activated( int )), + TQ_SLOT( configChanged() )); + connect( dialog->comboOlder, TQ_SIGNAL( activated( int )), + TQ_SLOT( configChanged() )); dialog->show(); topLayout->add(dialog); diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 77e4f640b..6dee8c0dd 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -136,8 +136,8 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg m_part = parent; 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; @@ -148,22 +148,22 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg setTreeStepSize(15); m_autoOpenTimer = new TQTimer( this ); - connect( m_autoOpenTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoOpenFolder() ) ); - - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) ); - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( slotSidebarMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); - - connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), - this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); + connect( m_autoOpenTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoOpenFolder() ) ); + + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) ); + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( slotSidebarMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); + + connect( this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), + this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); /* assert( m_part->getInterfaces()->getInstance()->dirs ); TQString dirtreeDir = m_part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); */ @@ -558,7 +558,7 @@ void KonqSidebarTree::FilesAdded( const KURL & dir ) kdDebug(1201) << "KonqSidebarTree::FilesAdded " << dir.url() << endl; if ( m_dirtreeDir.dir.isParentOf( dir ) ) // We use a timer in case of DCOP re-entrance.. - TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( rescanConfiguration() ) ); } void KonqSidebarTree::FilesRemoved( const KURL::List & urls ) @@ -569,7 +569,7 @@ void KonqSidebarTree::FilesRemoved( const KURL::List & urls ) //kdDebug(1201) << "KonqSidebarTree::FilesRemoved " << (*it).prettyURL() << endl; if ( m_dirtreeDir.dir.isParentOf( *it ) ) { - TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( rescanConfiguration() ) ); kdDebug(1201) << "KonqSidebarTree::FilesRemoved done" << endl; return; } @@ -909,21 +909,21 @@ void KonqSidebarTree::showToplevelContextMenu() { m_collection = new TDEActionCollection( this, "bookmark actions" ); (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, this, - TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); + TQ_SLOT( slotCreateFolder() ), m_collection, "create_folder"); (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this, - TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); + TQ_SLOT( slotDelete() ), m_collection, "delete_folder"); (void) new TDEAction( i18n("Rename"), 0, this, - TQT_SLOT( slotRename() ), m_collection, "rename"); + TQ_SLOT( slotRename() ), m_collection, "rename"); (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, this, - TQT_SLOT( slotDelete() ), m_collection, "delete_link"); + TQ_SLOT( slotDelete() ), m_collection, "delete_link"); (void) new TDEAction( i18n("Properties"), "edit", 0, this, - TQT_SLOT( slotProperties() ), m_collection, "item_properties"); + TQ_SLOT( slotProperties() ), m_collection, "item_properties"); (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this, - TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); + TQ_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this, - TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); + TQ_SLOT( slotOpenTab() ), m_collection, "open_tab"); (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this, - TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); + TQ_SLOT( slotCopyLocation() ), m_collection, "copy_location"); } TQPopupMenu *menu = new TQPopupMenu; diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp index 1903c2328..4bd91f9f3 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.cpp +++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp @@ -34,25 +34,25 @@ KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidg TQLabel* slbl = new TQLabel(i18n("Se&arch:"), searchline); TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(searchline,tree); slbl->setBuddy(listViewSearch); - connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); } else tree=new KonqSidebarTree(this,widget,virt,desktopName_); - connect(tree, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)), - this,TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(tree, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)), + this,TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &))); - connect(tree,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), - this,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &))); + connect(tree,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), + this,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &))); - connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )), - this,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ))); + connect(tree,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )), + this,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ))); - connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), - this,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & ))); + connect(tree,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), + this,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & ))); - connect(tree,TQT_SIGNAL(enableAction( const char *, bool )), - this,TQT_SIGNAL(enableAction( const char *, bool))); + connect(tree,TQ_SIGNAL(enableAction( const char *, bool )), + this,TQ_SIGNAL(enableAction( const char *, bool))); } diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp index 44a94f02c..feb1a6692 100644 --- a/konqueror/sidebar/web_module/web_module.cpp +++ b/konqueror/sidebar/web_module/web_module.cpp @@ -36,30 +36,30 @@ KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *pare : KonqSidebarPlugin(instance, parent, widgetParent, desktopName, name) { _htmlPart = new TDEHTMLSideBar(universalMode()); - connect(_htmlPart, TQT_SIGNAL(reload()), this, TQT_SLOT(reload())); - connect(_htmlPart, TQT_SIGNAL(completed()), this, TQT_SLOT(pageLoaded())); + connect(_htmlPart, TQ_SIGNAL(reload()), this, TQ_SLOT(reload())); + connect(_htmlPart, TQ_SIGNAL(completed()), this, TQ_SLOT(pageLoaded())); connect(_htmlPart, - TQT_SIGNAL(setWindowCaption(const TQString&)), + TQ_SIGNAL(setWindowCaption(const TQString&)), this, - TQT_SLOT(setTitle(const TQString&))); + TQ_SLOT(setTitle(const TQString&))); connect(_htmlPart, - TQT_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)), + TQ_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)), this, - TQT_SLOT(urlClicked(const TQString&, KParts::URLArgs))); + TQ_SLOT(urlClicked(const TQString&, KParts::URLArgs))); connect(_htmlPart->browserExtension(), - TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), + TQ_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), this, - TQT_SLOT(formClicked(const KURL&, const KParts::URLArgs&))); + TQ_SLOT(formClicked(const KURL&, const KParts::URLArgs&))); connect(_htmlPart, - TQT_SIGNAL(setAutoReload()), this, TQT_SLOT( setAutoReload() )); + TQ_SIGNAL(setAutoReload()), this, TQ_SLOT( setAutoReload() )); connect(_htmlPart, - TQT_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)), + TQ_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)), this, - TQT_SLOT(urlNewWindow(const TQString&, KParts::URLArgs))); + TQ_SLOT(urlNewWindow(const TQString&, KParts::URLArgs))); connect(_htmlPart, - TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), + TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, - TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); + TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); _desktopName = desktopName; @@ -69,7 +69,7 @@ KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *pare _url = ksc.readPathEntry("URL"); _htmlPart->openURL(_url ); // Must load this delayed - TQTimer::singleShot(0, this, TQT_SLOT(loadFavicon())); + TQTimer::singleShot(0, this, TQ_SLOT(loadFavicon())); } @@ -176,7 +176,7 @@ void KonqSideBarWebModule::setTitle(const TQString& title) { void KonqSideBarWebModule::pageLoaded() { if( reloadTimeout > 0 ) { - TQTimer::singleShot( reloadTimeout, this, TQT_SLOT( reload() ) ); + TQTimer::singleShot( reloadTimeout, this, TQ_SLOT( reload() ) ); } } diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h index e4669da89..072c3d822 100644 --- a/konqueror/sidebar/web_module/web_module.h +++ b/konqueror/sidebar/web_module/web_module.h @@ -41,9 +41,9 @@ class TDEHTMLSideBar : public TDEHTMLPart setFormNotification(TDEHTMLPart::Only); connect(this, - TQT_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), + TQ_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, - TQT_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)) + TQ_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)) ); @@ -51,22 +51,22 @@ class TDEHTMLSideBar : public TDEHTMLPart "link context menu"); if (!universal) { _linkMenu->insertItem(i18n("&Open Link"), - this, TQT_SLOT(loadPage())); + this, TQ_SLOT(loadPage())); _linkMenu->insertItem(i18n("Open in New &Window"), - this, TQT_SLOT(loadNewWindow())); + this, TQ_SLOT(loadNewWindow())); } else { _linkMenu->insertItem(i18n("Open in New &Window"), - this, TQT_SLOT(loadPage())); + this, TQ_SLOT(loadPage())); } _menu = new TDEPopupMenu(widget(), "context menu"); _menu->insertItem(SmallIcon("reload"), i18n("&Reload"), - this, TQT_SIGNAL(reload())); - _menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"), this, TQT_SIGNAL(setAutoReload())); + this, TQ_SIGNAL(reload())); + _menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"), this, TQ_SIGNAL(setAutoReload())); connect(this, - TQT_SIGNAL(popupMenu(const TQString&,const TQPoint&)), + TQ_SIGNAL(popupMenu(const TQString&,const TQPoint&)), this, - TQT_SLOT(showMenu(const TQString&, const TQPoint&))); + TQ_SLOT(showMenu(const TQString&, const TQPoint&))); } virtual ~TDEHTMLSideBar() {} |