diff options
Diffstat (limited to 'src')
78 files changed, 1008 insertions, 1008 deletions
diff --git a/src/canvas/qcanvas.cpp b/src/canvas/qcanvas.cpp index e947ccfe..88c0c796 100644 --- a/src/canvas/qcanvas.cpp +++ b/src/canvas/qcanvas.cpp @@ -989,7 +989,7 @@ void TQCanvas::setAdvancePeriod(int ms) if ( update_timer ) delete update_timer; update_timer = new TQTimer(this); - connect(update_timer,SIGNAL(timeout()),this,SLOT(advance())); + connect(update_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(advance())); update_timer->start(ms); } } @@ -1010,7 +1010,7 @@ void TQCanvas::setUpdatePeriod(int ms) if ( update_timer ) delete update_timer; update_timer = new TQTimer(this); - connect(update_timer,SIGNAL(timeout()),this,SLOT(update())); + connect(update_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update())); update_timer->start(ms); } } @@ -3535,7 +3535,7 @@ TQCanvasView::TQCanvasView(TQWidget* parent, const char* name, WFlags f) : d = new TQCanvasViewData; viewing = 0; setCanvas(0); - connect(this,SIGNAL(contentsMoving(int,int)),this,SLOT(cMoving(int,int))); + connect(this,TQ_SIGNAL(contentsMoving(int,int)),this,TQ_SLOT(cMoving(int,int))); } /*! @@ -3551,7 +3551,7 @@ TQCanvasView::TQCanvasView(TQCanvas* canvas, TQWidget* parent, const char* name, viewing = 0; setCanvas(canvas); - connect(this,SIGNAL(contentsMoving(int,int)),this,SLOT(cMoving(int,int))); + connect(this,TQ_SIGNAL(contentsMoving(int,int)),this,TQ_SLOT(cMoving(int,int))); } /*! @@ -3584,7 +3584,7 @@ void TQCanvasView::setCanvas(TQCanvas* canvas) } viewing=canvas; if (viewing) { - connect(viewing,SIGNAL(resized()), this, SLOT(updateContentsSize())); + connect(viewing,TQ_SIGNAL(resized()), this, TQ_SLOT(updateContentsSize())); viewing->addView(this); } if ( d ) // called by d'tor diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp index 12efeb3f..addbd1bf 100644 --- a/src/dialogs/qcolordialog.cpp +++ b/src/dialogs/qcolordialog.cpp @@ -1085,10 +1085,10 @@ TQColorShower::TQColorShower( TQWidget *parent, const char *name ) lab = new TQColorShowLabel( this ); lab->setMinimumWidth( 60 ); //### gl->addMultiCellWidget(lab, 0,-1,0,0); - connect( lab, SIGNAL( colorDropped(TQRgb) ), - this, SIGNAL( newCol(TQRgb) ) ); - connect( lab, SIGNAL( colorDropped(TQRgb) ), - this, SLOT( setRgb(TQRgb) ) ); + connect( lab, TQ_SIGNAL( colorDropped(TQRgb) ), + this, TQ_SIGNAL( newCol(TQRgb) ) ); + connect( lab, TQ_SIGNAL( colorDropped(TQRgb) ), + this, TQ_SLOT( setRgb(TQRgb) ) ); hEd = new TQColNumLineEdit( this, "qt_hue_edit" ); hEd->setValidator( val360 ); @@ -1141,14 +1141,14 @@ TQColorShower::TQColorShower( TQWidget *parent, const char *name ) alphaEd->hide(); alphaLab->hide(); - connect( hEd, SIGNAL(textChanged(const TQString&)), this, SLOT(hsvEd()) ); - connect( sEd, SIGNAL(textChanged(const TQString&)), this, SLOT(hsvEd()) ); - connect( vEd, SIGNAL(textChanged(const TQString&)), this, SLOT(hsvEd()) ); + connect( hEd, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(hsvEd()) ); + connect( sEd, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(hsvEd()) ); + connect( vEd, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(hsvEd()) ); - connect( rEd, SIGNAL(textChanged(const TQString&)), this, SLOT(rgbEd()) ); - connect( gEd, SIGNAL(textChanged(const TQString&)), this, SLOT(rgbEd()) ); - connect( bEd, SIGNAL(textChanged(const TQString&)), this, SLOT(rgbEd()) ); - connect( alphaEd, SIGNAL(textChanged(const TQString&)), this, SLOT(rgbEd()) ); + connect( rEd, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(rgbEd()) ); + connect( gEd, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(rgbEd()) ); + connect( bEd, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(rgbEd()) ); + connect( alphaEd, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(rgbEd()) ); } void TQColorShower::showCurrentColor() @@ -1325,7 +1325,7 @@ TQColorDialogPrivate::TQColorDialogPrivate( TQColorDialog *dialog ) : standard->setCellHeight( 24 ); TQLabel * lab = new TQLabel( standard, TQColorDialog::tr( "&Basic colors"), dialog, "qt_basiccolors_lbl" ); - connect( standard, SIGNAL(selected(int,int)), SLOT(newStandard(int,int))); + connect( standard, TQ_SIGNAL(selected(int,int)), TQ_SLOT(newStandard(int,int))); leftLay->addWidget( lab ); leftLay->addWidget( standard ); @@ -1337,7 +1337,7 @@ TQColorDialogPrivate::TQColorDialogPrivate( TQColorDialog *dialog ) : custom->setCellHeight( 24 ); custom->setAcceptDrops( TRUE ); - connect( custom, SIGNAL(selected(int,int)), SLOT(newCustom(int,int))); + connect( custom, TQ_SIGNAL(selected(int,int)), TQ_SLOT(newCustom(int,int))); lab = new TQLabel( custom, TQColorDialog::tr( "&Custom colors") , dialog, "qt_custcolors_lbl" ); leftLay->addWidget( lab ); leftLay->addWidget( custom ); @@ -1372,13 +1372,13 @@ TQColorDialogPrivate::TQColorDialogPrivate( TQColorDialog *dialog ) : lp->setFixedWidth( 20 ); //### pickLay->addWidget( lp ); - connect( cp, SIGNAL(newCol(int,int)), lp, SLOT(setCol(int,int)) ); - connect( lp, SIGNAL(newHsv(int,int,int)), this, SLOT(newHsv(int,int,int)) ); + connect( cp, TQ_SIGNAL(newCol(int,int)), lp, TQ_SLOT(setCol(int,int)) ); + connect( lp, TQ_SIGNAL(newHsv(int,int,int)), this, TQ_SLOT(newHsv(int,int,int)) ); rightLay->addStretch(); cs = new TQColorShower( dialog, "qt_colorshower" ); - connect( cs, SIGNAL(newCol(TQRgb)), this, SLOT(newColorTypedIn(TQRgb))); + connect( cs, TQ_SIGNAL(newCol(TQRgb)), this, TQ_SLOT(newColorTypedIn(TQRgb))); rightLay->addWidget( cs ); TQHBoxLayout *buttons; @@ -1389,10 +1389,10 @@ TQColorDialogPrivate::TQColorDialogPrivate( TQColorDialog *dialog ) : TQPushButton *ok, *cancel; ok = new TQPushButton( TQColorDialog::tr("OK"), dialog, "qt_ok_btn" ); - connect( ok, SIGNAL(clicked()), dialog, SLOT(accept()) ); + connect( ok, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(accept()) ); ok->setDefault(TRUE); cancel = new TQPushButton( TQColorDialog::tr("Cancel"), dialog, "qt_cancel_btn" ); - connect( cancel, SIGNAL(clicked()), dialog, SLOT(reject()) ); + connect( cancel, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(reject()) ); buttons->addWidget( ok ); buttons->addWidget( cancel ); buttons->addStretch(); @@ -1402,7 +1402,7 @@ TQColorDialogPrivate::TQColorDialogPrivate( TQColorDialog *dialog ) : TQColorDialog::tr("&Add to Custom Colors"), dialog, "qt_add_btn" ); rightLay->addWidget( addCusBt ); - connect( addCusBt, SIGNAL(clicked()), this, SLOT(addCustom()) ); + connect( addCusBt, TQ_SIGNAL(clicked()), this, TQ_SLOT(addCustom()) ); } } diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp index 3e3d77c3..7df3bbea 100644 --- a/src/dialogs/qdialog.cpp +++ b/src/dialogs/qdialog.cpp @@ -468,7 +468,7 @@ void TQDialog::done( int r ) bool isMain = tqApp->mainWidget() == this; bool checkLastWindowClosed = isTopLevel() && !isPopup(); if ( checkLastWindowClosed - && tqApp->receivers(SIGNAL(lastWindowClosed())) ) { + && tqApp->receivers(TQ_SIGNAL(lastWindowClosed())) ) { /* if there is no non-withdrawn top level window left (except the desktop, popups, or dialogs with parents), we emit the lastWindowClosed signal */ diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp index 13b55a1e..5fe1b9bf 100644 --- a/src/dialogs/qerrormessage.cpp +++ b/src/dialogs/qerrormessage.cpp @@ -172,7 +172,7 @@ TQErrorMessage::TQErrorMessage( TQWidget * parent, const char * name ) again->setChecked( TRUE ); grid->addWidget( again, 1, 1, AlignTop + AlignAuto ); ok = new TQPushButton( tr( "&OK" ), this, "ok" ); - connect( ok, SIGNAL(clicked()), this, SLOT(accept()) ); + connect( ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); ok->setFocus(); grid->addMultiCellWidget( ok, 2, 2, 0, 1, AlignCenter ); grid->setColStretch( 1, 42 ); diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp index 835742d2..e323f111 100644 --- a/src/dialogs/qfiledialog.cpp +++ b/src/dialogs/qfiledialog.cpp @@ -634,7 +634,7 @@ public: TQRenameEdit( TQWidget *parent ) : TQLineEdit( parent, "qt_rename_edit" ), doRenameAlreadyEmitted(FALSE) { - connect( this, SIGNAL(returnPressed()), SLOT(slotReturnPressed()) ); + connect( this, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); } protected: @@ -792,8 +792,8 @@ TQFDProgressAnimation::TQFDProgressAnimation( TQWidget *parent ) step = -1; next(); timer = new TQTimer( this ); - connect( timer, SIGNAL( timeout() ), - this, SLOT( next() ) ); + connect( timer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( next() ) ); } void TQFDProgressAnimation::start() @@ -892,8 +892,8 @@ TQFDProgressDialog::TQFDProgressDialog( TQWidget *parent, const TQString &fn, in "qt_cancel_btn" ); b->setFixedSize( b->sizeHint() ); layout->addWidget( b ); - connect( b, SIGNAL( clicked() ), - this, SIGNAL( cancelled() ) ); + connect( b, TQ_SIGNAL( clicked() ), + this, TQ_SIGNAL( cancelled() ) ); animation->start(); } @@ -1182,16 +1182,16 @@ TQFileListBox::TQFileListBox( TQWidget *parent, TQFileDialog *dlg ) box->hide(); box->setBackgroundMode( PaletteBase ); renameTimer = new TQTimer( this ); - connect( lined, SIGNAL( doRename() ), - this, SLOT (rename() ) ); - connect( lined, SIGNAL( cancelRename() ), - this, SLOT( cancelRename() ) ); - connect( renameTimer, SIGNAL( timeout() ), - this, SLOT( doubleClickTimeout() ) ); - connect( changeDirTimer, SIGNAL( timeout() ), - this, SLOT( changeDirDuringDrag() ) ); - connect( this, SIGNAL( contentsMoving(int,int) ), - this, SLOT( contentsMoved(int,int) ) ); + connect( lined, TQ_SIGNAL( doRename() ), + this, TQ_SLOT (rename() ) ); + connect( lined, TQ_SIGNAL( cancelRename() ), + this, TQ_SLOT( cancelRename() ) ); + connect( renameTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doubleClickTimeout() ) ); + connect( changeDirTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( changeDirDuringDrag() ) ); + connect( this, TQ_SIGNAL( contentsMoving(int,int) ), + this, TQ_SLOT( contentsMoved(int,int) ) ); viewport()->setAcceptDrops( TRUE ); dragItem = 0; } @@ -1322,8 +1322,8 @@ void TQFileListBox::viewportMouseMoveEvent( TQMouseEvent *e ) if ( lined->parentWidget()->isVisible() ) cancelRename(); - connect( drag, SIGNAL( destroyed() ), - this, SLOT( dragObjDestroyed() ) ); + connect( drag, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( dragObjDestroyed() ) ); drag->drag(); mousePressed = FALSE; @@ -1583,21 +1583,21 @@ TQFileDialogTQFileListView::TQFileDialogTQFileListView( TQWidget *parent, TQFile box->hide(); box->setBackgroundMode( PaletteBase ); renameTimer = new TQTimer( this ); - connect( lined, SIGNAL( doRename() ), - this, SLOT (rename() ) ); - connect( lined, SIGNAL( cancelRename() ), - this, SLOT( cancelRename() ) ); + connect( lined, TQ_SIGNAL( doRename() ), + this, TQ_SLOT (rename() ) ); + connect( lined, TQ_SIGNAL( cancelRename() ), + this, TQ_SLOT( cancelRename() ) ); header()->setMovingEnabled( FALSE ); - connect( renameTimer, SIGNAL( timeout() ), - this, SLOT( doubleClickTimeout() ) ); - connect( changeDirTimer, SIGNAL( timeout() ), - this, SLOT( changeDirDuringDrag() ) ); - disconnect( header(), SIGNAL( sectionClicked(int) ), - this, SLOT( changeSortColumn(int) ) ); - connect( header(), SIGNAL( sectionClicked(int) ), - this, SLOT( changeSortColumn2(int) ) ); - connect( this, SIGNAL( contentsMoving(int,int) ), - this, SLOT( contentsMoved(int,int) ) ); + connect( renameTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doubleClickTimeout() ) ); + connect( changeDirTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( changeDirDuringDrag() ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked(int) ), + this, TQ_SLOT( changeSortColumn(int) ) ); + connect( header(), TQ_SIGNAL( sectionClicked(int) ), + this, TQ_SLOT( changeSortColumn2(int) ) ); + connect( this, TQ_SIGNAL( contentsMoving(int,int) ), + this, TQ_SLOT( contentsMoved(int,int) ) ); viewport()->setAcceptDrops( TRUE ); sortcolumn = 0; @@ -1750,8 +1750,8 @@ void TQFileDialogTQFileListView::viewportMouseMoveEvent( TQMouseEvent *e ) if ( lined->isVisible() ) cancelRename(); - connect( drag, SIGNAL( destroyed() ), - this, SLOT( dragObjDestroyed() ) ); + connect( drag, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( dragObjDestroyed() ) ); drag->drag(); mousePressed = FALSE; @@ -2475,32 +2475,32 @@ void TQFileDialog::init() #if defined(Q_WS_WIN) d->oldPermissionLookup = qt_ntfs_permission_lookup; #endif - connect( d->mimeTypeTimer, SIGNAL( timeout() ), - this, SLOT( doMimeTypeLookup() ) ); + connect( d->mimeTypeTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doMimeTypeLookup() ) ); d->url = TQUrlOperator( ::toRootIfNotExists( TQDir::currentDirPath() ) ); d->oldUrl = d->url; d->currListChildren = 0; - connect( &d->url, SIGNAL( start(TQNetworkOperation*) ), - this, SLOT( urlStart(TQNetworkOperation*) ) ); - connect( &d->url, SIGNAL( finished(TQNetworkOperation*) ), - this, SLOT( urlFinished(TQNetworkOperation*) ) ); - connect( &d->url, SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), - this, SLOT( insertEntry(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ) ); - connect( &d->url, SIGNAL( removed(TQNetworkOperation*) ), - this, SLOT( removeEntry(TQNetworkOperation*) ) ); - connect( &d->url, SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ), - this, SLOT( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ) ); - connect( &d->url, SIGNAL( itemChanged(TQNetworkOperation*) ), - this, SLOT( itemChanged(TQNetworkOperation*) ) ); - connect( &d->url, SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), - this, SLOT( dataTransferProgress(int,int,TQNetworkOperation*) ) ); + connect( &d->url, TQ_SIGNAL( start(TQNetworkOperation*) ), + this, TQ_SLOT( urlStart(TQNetworkOperation*) ) ); + connect( &d->url, TQ_SIGNAL( finished(TQNetworkOperation*) ), + this, TQ_SLOT( urlFinished(TQNetworkOperation*) ) ); + connect( &d->url, TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), + this, TQ_SLOT( insertEntry(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ) ); + connect( &d->url, TQ_SIGNAL( removed(TQNetworkOperation*) ), + this, TQ_SLOT( removeEntry(TQNetworkOperation*) ) ); + connect( &d->url, TQ_SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ), + this, TQ_SLOT( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ) ); + connect( &d->url, TQ_SIGNAL( itemChanged(TQNetworkOperation*) ), + this, TQ_SLOT( itemChanged(TQNetworkOperation*) ) ); + connect( &d->url, TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), + this, TQ_SLOT( dataTransferProgress(int,int,TQNetworkOperation*) ) ); nameEdit = new TQLineEdit( this, "name/filter editor" ); nameEdit->setMaxLength( 255 ); //_POSIX_MAX_PATH - connect( nameEdit, SIGNAL(textChanged(const TQString&)), - this, SLOT(fileNameEditDone()) ); + connect( nameEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(fileNameEditDone()) ); nameEdit->installEventFilter( this ); d->splitter = new TQSplitter( this, "qt_splitter" ); @@ -2521,16 +2521,16 @@ void TQFileDialog::init() files->setMinimumSize( 50, 25 + 2*fm.lineSpacing() ); - connect( files, SIGNAL( selectionChanged() ), - this, SLOT( detailViewSelectionChanged() ) ); - connect( files, SIGNAL(currentChanged(TQListViewItem*)), - this, SLOT(updateFileNameEdit(TQListViewItem*)) ); - connect( files, SIGNAL(doubleClicked(TQListViewItem*)), - this, SLOT(selectDirectoryOrFile(TQListViewItem*)) ); - connect( files, SIGNAL(returnPressed(TQListViewItem*)), - this, SLOT(selectDirectoryOrFile(TQListViewItem*)) ); - connect( files, SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), - this, SLOT(popupContextMenu(TQListViewItem*,const TQPoint&,int)) ); + connect( files, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( detailViewSelectionChanged() ) ); + connect( files, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(updateFileNameEdit(TQListViewItem*)) ); + connect( files, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(selectDirectoryOrFile(TQListViewItem*)) ); + connect( files, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(selectDirectoryOrFile(TQListViewItem*)) ); + connect( files, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), + this, TQ_SLOT(popupContextMenu(TQListViewItem*,const TQPoint&,int)) ); files->installEventFilter( this ); files->viewport()->installEventFilter( this ); @@ -2539,14 +2539,14 @@ void TQFileDialog::init() d->moreFiles->setRowMode( TQListBox::FitToHeight ); d->moreFiles->setVariableWidth( TRUE ); - connect( d->moreFiles, SIGNAL(selected(TQListBoxItem*)), - this, SLOT(selectDirectoryOrFile(TQListBoxItem*)) ); - connect( d->moreFiles, SIGNAL( selectionChanged() ), - this, SLOT( listBoxSelectionChanged() ) ); - connect( d->moreFiles, SIGNAL(highlighted(TQListBoxItem*)), - this, SLOT(updateFileNameEdit(TQListBoxItem*)) ); - connect( d->moreFiles, SIGNAL( rightButtonPressed(TQListBoxItem*,const TQPoint&) ), - this, SLOT( popupContextMenu(TQListBoxItem*,const TQPoint&) ) ); + connect( d->moreFiles, TQ_SIGNAL(selected(TQListBoxItem*)), + this, TQ_SLOT(selectDirectoryOrFile(TQListBoxItem*)) ); + connect( d->moreFiles, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( listBoxSelectionChanged() ) ); + connect( d->moreFiles, TQ_SIGNAL(highlighted(TQListBoxItem*)), + this, TQ_SLOT(updateFileNameEdit(TQListBoxItem*)) ); + connect( d->moreFiles, TQ_SIGNAL( rightButtonPressed(TQListBoxItem*,const TQPoint&) ), + this, TQ_SLOT( popupContextMenu(TQListBoxItem*,const TQPoint&) ) ); d->moreFiles->installEventFilter( this ); d->moreFiles->viewport()->installEventFilter( this ); @@ -2554,9 +2554,9 @@ void TQFileDialog::init() okB = new TQPushButton( tr("&OK"), this, "OK" ); //### Or "Save (see other "OK") okB->setDefault( TRUE ); okB->setEnabled( FALSE ); - connect( okB, SIGNAL(clicked()), this, SLOT(okClicked()) ); + connect( okB, TQ_SIGNAL(clicked()), this, TQ_SLOT(okClicked()) ); cancelB = new TQPushButton( tr("Cancel") , this, "Cancel" ); - connect( cancelB, SIGNAL(clicked()), this, SLOT(cancelClicked()) ); + connect( cancelB, TQ_SIGNAL(clicked()), this, TQ_SLOT(cancelClicked()) ); d->paths = new TQComboBox( TRUE, this, "directory history/editor" ); d->paths->setDuplicatesEnabled( FALSE ); @@ -2576,8 +2576,8 @@ void TQFileDialog::init() d->paths->insertItem( *openFolderIcon, TQDir::homeDirPath() ); } - connect( d->paths, SIGNAL(activated(const TQString&)), - this, SLOT(setDir(const TQString&)) ); + connect( d->paths, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(setDir(const TQString&)) ); d->paths->installEventFilter( this ); TQObjectList *ol = d->paths->queryList( "TQLineEdit" ); @@ -2589,10 +2589,10 @@ void TQFileDialog::init() d->types = new TQComboBox( TRUE, this, "file types" ); d->types->setDuplicatesEnabled( FALSE ); d->types->setEditable( FALSE ); - connect( d->types, SIGNAL(activated(const TQString&)), - this, SLOT(setFilter(const TQString&)) ); - connect( d->types, SIGNAL(activated(const TQString&)), - this, SIGNAL(filterSelected(const TQString&)) ); + connect( d->types, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(setFilter(const TQString&)) ); + connect( d->types, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SIGNAL(filterSelected(const TQString&)) ); d->pathL = new TQLabel( d->paths, tr("Look &in:"), this, "qt_looin_lbl" ); d->fileL = new TQLabel( nameEdit, tr("File &name:"), this, "qt_filename_lbl" ); @@ -2601,7 +2601,7 @@ void TQFileDialog::init() d->goBack = new TQToolButton( this, "go back" ); d->goBack->setEnabled( FALSE ); d->goBack->setFocusPolicy( TabFocus ); - connect( d->goBack, SIGNAL( clicked() ), this, SLOT( goBack() ) ); + connect( d->goBack, TQ_SIGNAL( clicked() ), this, TQ_SLOT( goBack() ) ); #ifndef TQT_NO_TOOLTIP TQToolTip::add( d->goBack, tr( "Back" ) ); #endif @@ -2613,8 +2613,8 @@ void TQFileDialog::init() TQToolTip::add( d->cdToParent, tr( "One directory up" ) ); #endif d->cdToParent->setIconSet( *cdToParentIcon ); - connect( d->cdToParent, SIGNAL(clicked()), - this, SLOT(cdUpClicked()) ); + connect( d->cdToParent, TQ_SIGNAL(clicked()), + this, TQ_SLOT(cdUpClicked()) ); d->newFolder = new TQToolButton( this, "new folder" ); d->newFolder->setFocusPolicy( TabFocus ); @@ -2622,17 +2622,17 @@ void TQFileDialog::init() TQToolTip::add( d->newFolder, tr( "Create New Folder" ) ); #endif d->newFolder->setIconSet( *newFolderIcon ); - connect( d->newFolder, SIGNAL(clicked()), - this, SLOT(newFolderClicked()) ); + connect( d->newFolder, TQ_SIGNAL(clicked()), + this, TQ_SLOT(newFolderClicked()) ); d->modeButtons = new TQButtonGroup( 0, "invisible group" ); - connect( d->modeButtons, SIGNAL(destroyed()), - this, SLOT(modeButtonsDestroyed()) ); + connect( d->modeButtons, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(modeButtonsDestroyed()) ); d->modeButtons->setExclusive( TRUE ); - connect( d->modeButtons, SIGNAL(clicked(int)), - d->stack, SLOT(raiseWidget(int)) ); - connect( d->modeButtons, SIGNAL(clicked(int)), - this, SLOT(changeMode(int)) ); + connect( d->modeButtons, TQ_SIGNAL(clicked(int)), + d->stack, TQ_SLOT(raiseWidget(int)) ); + connect( d->modeButtons, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(changeMode(int)) ); d->mcView = new TQToolButton( this, "mclistbox view" ); d->mcView->setFocusPolicy( TabFocus ); @@ -2683,14 +2683,14 @@ void TQFileDialog::init() d->previewContents->setToggleButton( TRUE ); d->modeButtons->insert( d->previewContents ); - connect( d->detailView, SIGNAL( clicked() ), - d->moreFiles, SLOT( cancelRename() ) ); - connect( d->detailView, SIGNAL( clicked() ), - files, SLOT( cancelRename() ) ); - connect( d->mcView, SIGNAL( clicked() ), - d->moreFiles, SLOT( cancelRename() ) ); - connect( d->mcView, SIGNAL( clicked() ), - files, SLOT( cancelRename() ) ); + connect( d->detailView, TQ_SIGNAL( clicked() ), + d->moreFiles, TQ_SLOT( cancelRename() ) ); + connect( d->detailView, TQ_SIGNAL( clicked() ), + files, TQ_SLOT( cancelRename() ) ); + connect( d->mcView, TQ_SIGNAL( clicked() ), + d->moreFiles, TQ_SLOT( cancelRename() ) ); + connect( d->mcView, TQ_SIGNAL( clicked() ), + files, TQ_SLOT( cancelRename() ) ); d->stack->raiseWidget( d->moreFiles ); d->mcView->setOn( TRUE ); @@ -2814,8 +2814,8 @@ void TQFileDialog::init() d->preview->hide(); nameEdit->setFocus(); - connect( nameEdit, SIGNAL( returnPressed() ), - this, SLOT( fileNameEditReturnPressed() ) ); + connect( nameEdit, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( fileNameEditReturnPressed() ) ); } /*! @@ -5438,7 +5438,7 @@ bool TQFileDialog::eventFilter( TQObject * o, TQEvent * e ) return TRUE; } else if ( o == files && e->type() == TQEvent::FocusOut && files->currentItem() ) { } else if ( o == files && e->type() == TQEvent::KeyPress ) { - TQTimer::singleShot( 0, this, SLOT(fixupNameEdit()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(fixupNameEdit()) ); } else if ( o == nameEdit && e->type() == TQEvent::KeyPress && d->mode != AnyFile ) { if ( ( nameEdit->cursorPosition() == (int)nameEdit->text().length() || nameEdit->hasSelectedText() ) && isprint(((TQKeyEvent *)e)->ascii()) ) { @@ -5931,8 +5931,8 @@ void TQFileDialog::dataTransferProgress( int bytesDone, int bytesTotal, TQNetwor if ( bytesDone < bytesTotal) { d->ignoreStop = FALSE; d->progressDia = new TQFDProgressDialog( this, label, bytesTotal ); - connect( d->progressDia, SIGNAL( cancelled() ), - this, SLOT( stopCopy() ) ); + connect( d->progressDia, TQ_SIGNAL( cancelled() ), + this, TQ_SLOT( stopCopy() ) ); d->progressDia->show(); } else return; @@ -6319,7 +6319,7 @@ void TQFileDialog::stopCopy() d->url.stop(); if ( d->progressDia ) { d->ignoreStop = TRUE; - TQTimer::singleShot( 100, this, SLOT( removeProgressDia() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( removeProgressDia() ) ); } d->url.blockSignals( FALSE ); } diff --git a/src/dialogs/qfontdialog.cpp b/src/dialogs/qfontdialog.cpp index 9e1094aa..3f713d9e 100644 --- a/src/dialogs/qfontdialog.cpp +++ b/src/dialogs/qfontdialog.cpp @@ -215,21 +215,21 @@ TQFontDialog::TQFontDialog( TQWidget *parent, const char *name, d->size = 0; d->smoothScalable = FALSE; - connect( d->scriptCombo, SIGNAL(activated(int)), - SLOT(scriptHighlighted(int)) ); - connect( d->familyList, SIGNAL(highlighted(int)), - SLOT(familyHighlighted(int)) ); - connect( d->styleList, SIGNAL(highlighted(int)), - SLOT(styleHighlighted(int)) ); - connect( d->sizeList, SIGNAL(highlighted(const TQString&)), - SLOT(sizeHighlighted(const TQString&)) ); - connect( d->sizeEdit, SIGNAL(textChanged(const TQString&)), - SLOT(sizeChanged(const TQString&)) ); - - connect( d->strikeout, SIGNAL(clicked()), - SLOT(updateSample()) ); - connect( d->underline, SIGNAL(clicked()), - SLOT(updateSample()) ); + connect( d->scriptCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(scriptHighlighted(int)) ); + connect( d->familyList, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(familyHighlighted(int)) ); + connect( d->styleList, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(styleHighlighted(int)) ); + connect( d->sizeList, TQ_SIGNAL(highlighted(const TQString&)), + TQ_SLOT(sizeHighlighted(const TQString&)) ); + connect( d->sizeEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(sizeChanged(const TQString&)) ); + + connect( d->strikeout, TQ_SIGNAL(clicked()), + TQ_SLOT(updateSample()) ); + connect( d->underline, TQ_SIGNAL(clicked()), + TQ_SLOT(updateSample()) ); (void)d->familyList->sizeHint(); (void)d->styleList->sizeHint(); @@ -288,7 +288,7 @@ TQFontDialog::TQFontDialog( TQWidget *parent, const char *name, d->ok = new TQPushButton( okt, this, "accept font selection" ); buttonBox->addWidget( d->ok ); if ( modal ) - connect( d->ok, SIGNAL(clicked()), SLOT(accept()) ); + connect( d->ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); d->ok->setDefault( TRUE ); buttonBox->addSpacing( 12 ); @@ -296,7 +296,7 @@ TQFontDialog::TQFontDialog( TQWidget *parent, const char *name, TQString cancelt = modal ? tr("Cancel") : tr("Close"); d->cancel = new TQPushButton( cancelt, this, "cancel/close" ); buttonBox->addWidget( d->cancel ); - connect( d->cancel, SIGNAL(clicked()), SLOT(reject()) ); + connect( d->cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); resize( 500, 360 ); diff --git a/src/dialogs/qinputdialog.cpp b/src/dialogs/qinputdialog.cpp index 1569d7e7..ee6c15e7 100644 --- a/src/dialogs/qinputdialog.cpp +++ b/src/dialogs/qinputdialog.cpp @@ -160,13 +160,13 @@ TQInputDialog::TQInputDialog( const TQString &label, TQWidget* parent, hbox->addWidget( d->ok ); hbox->addWidget( cancel ); - connect( d->lineEdit, SIGNAL( returnPressed() ), - this, SLOT( tryAccept() ) ); - connect( d->lineEdit, SIGNAL( textChanged(const TQString&) ), - this, SLOT( textChanged(const TQString&) ) ); + connect( d->lineEdit, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( tryAccept() ) ); + connect( d->lineEdit, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( textChanged(const TQString&) ) ); - connect( d->ok, SIGNAL( clicked() ), this, SLOT( accept() ) ); - connect( cancel, SIGNAL( clicked() ), this, SLOT( reject() ) ); + connect( d->ok, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( cancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); TQSize sh = sizeHint().expandedTo( TQSize(400, 10) ); setType( type ); diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp index d4c410b4..a17fad13 100644 --- a/src/dialogs/qmessagebox.cpp +++ b/src/dialogs/qmessagebox.cpp @@ -681,7 +681,7 @@ void TQMessageBox::init( int button0, int button1, int button2 ) } mbd->pb[i]->setAutoDefault( TRUE ); mbd->pb[i]->setFocusPolicy( TQWidget::StrongFocus ); - connect( mbd->pb[i], SIGNAL(clicked()), SLOT(buttonClicked()) ); + connect( mbd->pb[i], TQ_SIGNAL(clicked()), TQ_SLOT(buttonClicked()) ); } } resizeButtons(); diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp index 48b180cd..10586217 100644 --- a/src/dialogs/qprintdialog.cpp +++ b/src/dialogs/qprintdialog.cpp @@ -932,8 +932,8 @@ TQPrintDialog::TQPrintDialog( TQPrinter *prn, TQWidget *parent, const char *name tll->activate(); - connect( d->ok, SIGNAL(clicked()), SLOT(okClicked()) ); - connect( cancel, SIGNAL(clicked()), SLOT(reject()) ); + connect( d->ok, TQ_SIGNAL(clicked()), TQ_SLOT(okClicked()) ); + connect( cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); TQSize ms( minimumSize() ); TQSize ss( TQApplication::desktop()->screenGeometry( pos() ).size() ); @@ -988,8 +988,8 @@ TQGroupBox * TQPrintDialog::setupPrinterSettings() d->colorMode = new TQButtonGroup( this ); d->colorMode->hide(); - connect( d->colorMode, SIGNAL(clicked(int)), - this, SLOT(colorModeSelected(int)) ); + connect( d->colorMode, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(colorModeSelected(int)) ); TQRadioButton *rb; rb = new TQRadioButton( tr( "Print in color if available" ), @@ -1013,8 +1013,8 @@ TQGroupBox * TQPrintDialog::setupDestination() d->printerOrFile = new TQButtonGroup( this ); d->printerOrFile->hide(); - connect( d->printerOrFile, SIGNAL(clicked(int)), - this, SLOT(printerOrFileSelected(int)) ); + connect( d->printerOrFile, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(printerOrFileSelected(int)) ); // printer radio button, list TQRadioButton * rb = new TQRadioButton( tr( "Print to printer:" ), g, @@ -1156,8 +1156,8 @@ TQGroupBox * TQPrintDialog::setupDestination() horiz->addSpacing( 19 ); d->fileName = new TQLineEdit( g, "file name" ); - connect( d->fileName, SIGNAL( textChanged(const TQString&) ), - this, SLOT( fileNameEditChanged(const TQString&) ) ); + connect( d->fileName, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( fileNameEditChanged(const TQString&) ) ); horiz->addWidget( d->fileName, 1 ); horiz->addSpacing( 6 ); d->browse = new TQPushButton( tr("Browse..."), g, "browse files" ); @@ -1165,8 +1165,8 @@ TQGroupBox * TQPrintDialog::setupDestination() #ifdef TQT_NO_FILEDIALOG d->browse->setEnabled( FALSE ); #endif - connect( d->browse, SIGNAL(clicked()), - this, SLOT(browseClicked()) ); + connect( d->browse, TQ_SIGNAL(clicked()), + this, TQ_SLOT(browseClicked()) ); horiz->addWidget( d->browse ); d->fileName->setEnabled( FALSE ); @@ -1192,13 +1192,13 @@ TQGroupBox * TQPrintDialog::setupOptions() d->printRange = new TQButtonGroup( this ); d->printRange->hide(); - connect( d->printRange, SIGNAL(clicked(int)), - this, SLOT(printRangeSelected(int)) ); + connect( d->printRange, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(printRangeSelected(int)) ); d->pageOrder = new TQButtonGroup( this ); d->pageOrder->hide(); - connect( d->pageOrder, SIGNAL(clicked(int)), - this, SLOT(pageOrderSelected(int)) ); + connect( d->pageOrder, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(pageOrderSelected(int)) ); d->printAllButton = new TQRadioButton( tr("Print all"), g, "print all" ); d->printRange->insert( d->printAllButton, 0 ); @@ -1224,8 +1224,8 @@ TQGroupBox * TQPrintDialog::setupOptions() d->firstPage = new TQPrintDialogSpinBox( 1, 9999, 1, g, "first page" ); d->firstPage->setValue( 1 ); horiz->addWidget( d->firstPage, 1 ); - connect( d->firstPage, SIGNAL(valueChanged(int)), - this, SLOT(setFirstPage(int)) ); + connect( d->firstPage, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(setFirstPage(int)) ); horiz = new TQBoxLayout( TQBoxLayout::LeftToRight ); tll->addLayout( horiz ); @@ -1237,8 +1237,8 @@ TQGroupBox * TQPrintDialog::setupOptions() d->lastPage = new TQPrintDialogSpinBox( 1, 9999, 1, g, "last page" ); d->lastPage->setValue( 9999 ); horiz->addWidget( d->lastPage, 1 ); - connect( d->lastPage, SIGNAL(valueChanged(int)), - this, SLOT(setLastPage(int)) ); + connect( d->lastPage, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(setLastPage(int)) ); lay->addSpacing( 25 ); tll = new TQBoxLayout( lay, TQBoxLayout::Down ); @@ -1268,8 +1268,8 @@ TQGroupBox * TQPrintDialog::setupOptions() d->copies = new TQPrintDialogSpinBox( 1, 99, 1, g, "copies" ); d->copies->setValue( 1 ); horiz->addWidget( d->copies, 1 ); - connect( d->copies, SIGNAL(valueChanged(int)), - this, SLOT(setNumCopies(int)) ); + connect( d->copies, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(setNumCopies(int)) ); TQSize s = d->firstPageLabel->sizeHint() .expandedTo( d->lastPageLabel->sizeHint() ) @@ -1311,8 +1311,8 @@ TQGroupBox * TQPrintDialog::setupPaper() g->addSpace( 8 ); - connect( d->orientationCombo, SIGNAL( activated(int) ), - this, SLOT( orientSelected(int) ) ); + connect( d->orientationCombo, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( orientSelected(int) ) ); // paper size d->sizeCombo = new TQComboBox( FALSE, g ); @@ -1352,8 +1352,8 @@ TQGroupBox * TQPrintDialog::setupPaper() isc( d, tr( "Tabloid (279 x 432 mm)" ), TQPrinter::Tabloid ); isc( d, tr( "US Common #10 Envelope (105 x 241 mm)" ), TQPrinter::Comm10E ); - connect( d->sizeCombo, SIGNAL( activated(int) ), - this, SLOT( paperSizeSelected(int) ) ); + connect( d->sizeCombo, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( paperSizeSelected(int) ) ); return g; } diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp index f7d1e1c5..6e18f2d7 100644 --- a/src/dialogs/qprogressdialog.cpp +++ b/src/dialogs/qprogressdialog.cpp @@ -167,9 +167,9 @@ Operation::Operation( TQObject *parent = 0 ) : TQObject( parent ), steps( 0 ) { pd = new TQProgressDialog( "Operation in progress.", "Cancel", 100 ); - connect( pd, SIGNAL(canceled()), this, SLOT(cancel()) ); + connect( pd, TQ_SIGNAL(canceled()), this, TQ_SLOT(cancel()) ); t = new TQTimer( this ); - connect( t, SIGNAL(timeout()), this, SLOT(perform()) ); + connect( t, TQ_SIGNAL(timeout()), this, TQ_SLOT(perform()) ); t->start( 0 ); } @@ -314,10 +314,10 @@ void TQProgressDialog::init( TQWidget *creator, d->autoReset = TRUE; d->forceHide = FALSE; setCancelButtonText( canc ); - connect( this, SIGNAL(canceled()), this, SIGNAL(cancelled()) ); - connect( this, SIGNAL(canceled()), this, SLOT(cancel()) ); + connect( this, TQ_SIGNAL(canceled()), this, TQ_SIGNAL(cancelled()) ); + connect( this, TQ_SIGNAL(canceled()), this, TQ_SLOT(cancel()) ); forceTimer = new TQTimer( this ); - connect( forceTimer, SIGNAL(timeout()), this, SLOT(forceShow()) ); + connect( forceTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(forceShow()) ); layout(); } @@ -410,11 +410,11 @@ void TQProgressDialog::setCancelButton( TQPushButton *cancelButton ) } else { cancelButton->reparent( this, 0, TQPoint(0,0), FALSE ); } - connect( d->cancel, SIGNAL(clicked()), this, SIGNAL(canceled()) ); + connect( d->cancel, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(canceled()) ); #ifndef TQT_NO_ACCEL TQAccel *accel = new TQAccel( this ); accel->connectItem( accel->insertItem(Key_Escape), - d->cancel, SIGNAL(clicked()) ); + d->cancel, TQ_SIGNAL(clicked()) ); #endif } int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); diff --git a/src/dialogs/qtabdialog.cpp b/src/dialogs/qtabdialog.cpp index c577bdc6..e6641dbc 100644 --- a/src/dialogs/qtabdialog.cpp +++ b/src/dialogs/qtabdialog.cpp @@ -190,17 +190,17 @@ TQTabDialog::TQTabDialog( TQWidget *parent, const char *name, bool modal, TQ_CHECK_PTR( d ); d->tw = new TQTabWidget( this, "tab widget" ); - connect ( d->tw, SIGNAL ( selected(const TQString&) ), this, SIGNAL( selected(const TQString&) ) ); - connect ( d->tw, SIGNAL ( currentChanged(TQWidget*) ), this, SIGNAL( currentChanged(TQWidget*) ) ); + connect ( d->tw, TQ_SIGNAL ( selected(const TQString&) ), this, TQ_SIGNAL( selected(const TQString&) ) ); + connect ( d->tw, TQ_SIGNAL ( currentChanged(TQWidget*) ), this, TQ_SIGNAL( currentChanged(TQWidget*) ) ); d->ok = new TQPushButton( this, "ok" ); TQ_CHECK_PTR( d->ok ); d->ok->setText( tr("OK") ); d->ok->setDefault( TRUE ); - connect( d->ok, SIGNAL(clicked()), - this, SIGNAL(applyButtonPressed()) ); - connect( d->ok, SIGNAL(clicked()), - this, SLOT(accept()) ); + connect( d->ok, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(applyButtonPressed()) ); + connect( d->ok, TQ_SIGNAL(clicked()), + this, TQ_SLOT(accept()) ); } @@ -686,8 +686,8 @@ void TQTabDialog::setApplyButton( const TQString &text ) } else { if ( !d->ab ) { d->ab = new TQPushButton( this, "apply settings" ); - connect( d->ab, SIGNAL(clicked()), - this, SIGNAL(applyButtonPressed()) ); + connect( d->ab, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(applyButtonPressed()) ); setUpLayout(); } d->ab->setText( text ); @@ -730,8 +730,8 @@ void TQTabDialog::setHelpButton( const TQString &text ) } else { if ( !d->hb ) { d->hb = new TQPushButton( this, "give help" ); - connect( d->hb, SIGNAL(clicked()), - this, SIGNAL(helpButtonPressed()) ); + connect( d->hb, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(helpButtonPressed()) ); setUpLayout(); } d->hb->setText( text ); @@ -777,8 +777,8 @@ void TQTabDialog::setDefaultButton( const TQString &text ) } else { if ( !d->db ) { d->db = new TQPushButton( this, "back to default" ); - connect( d->db, SIGNAL(clicked()), - this, SIGNAL(defaultButtonPressed()) ); + connect( d->db, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(defaultButtonPressed()) ); setUpLayout(); } d->db->setText( text ); @@ -826,10 +826,10 @@ void TQTabDialog::setCancelButton( const TQString &text ) } else { if ( !d->cb ) { d->cb = new TQPushButton( this, "cancel dialog" ); - connect( d->cb, SIGNAL(clicked()), - this, SIGNAL(cancelButtonPressed()) ); - connect( d->cb, SIGNAL(clicked()), - this, SLOT(reject()) ); + connect( d->cb, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(cancelButtonPressed()) ); + connect( d->cb, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject()) ); setUpLayout(); } d->cb->setText( text ); @@ -1051,8 +1051,8 @@ void TQTabDialog::setOkButton( const TQString &text ) } else { if ( !d->ok ) { d->ok = new TQPushButton( this, "ok" ); - connect( d->ok, SIGNAL(clicked()), - this, SIGNAL(applyButtonPressed()) ); + connect( d->ok, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(applyButtonPressed()) ); setUpLayout(); } d->ok->setText( text ); diff --git a/src/dialogs/qwizard.cpp b/src/dialogs/qwizard.cpp index a8bba312..e8a7eeff 100644 --- a/src/dialogs/qwizard.cpp +++ b/src/dialogs/qwizard.cpp @@ -192,23 +192,23 @@ TQWizard::TQWizard( TQWidget *parent, const char *name, bool modal, d->nextButton->setDefault( TRUE ); - connect( d->backButton, SIGNAL(clicked()), - this, SLOT(back()) ); - connect( d->nextButton, SIGNAL(clicked()), - this, SLOT(next()) ); - connect( d->finishButton, SIGNAL(clicked()), - this, SLOT(accept()) ); - connect( d->cancelButton, SIGNAL(clicked()), - this, SLOT(reject()) ); - connect( d->helpButton, SIGNAL(clicked()), - this, SLOT(help()) ); + connect( d->backButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(back()) ); + connect( d->nextButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(next()) ); + connect( d->finishButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(accept()) ); + connect( d->cancelButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject()) ); + connect( d->helpButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(help()) ); #ifndef TQT_NO_ACCEL d->accel = new TQAccel( this, "arrow-key accel" ); d->backAccel = d->accel->insertItem( TQt::ALT + TQt::Key_Left ); - d->accel->connectItem( d->backAccel, this, SLOT(back()) ); + d->accel->connectItem( d->backAccel, this, TQ_SLOT(back()) ); d->nextAccel = d->accel->insertItem( TQt::ALT + TQt::Key_Right ); - d->accel->connectItem( d->nextAccel, this, SLOT(next()) ); + d->accel->connectItem( d->nextAccel, this, TQ_SLOT(next()) ); #endif } diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h index fac233ce..ba5e12b8 100644 --- a/src/kernel/ntqobjectdefs.h +++ b/src/kernel/ntqobjectdefs.h @@ -122,29 +122,29 @@ private: \ #endif // macro for naming members -#ifdef METHOD -#undef METHOD +#ifdef TQ_METHOD +#undef TQ_METHOD #endif -#ifdef SLOT -#undef SLOT +#ifdef TQ_SLOT +#undef TQ_SLOT #endif -#ifdef SIGNAL -#undef SIGNAL +#ifdef TQ_SIGNAL +#undef TQ_SIGNAL #endif #if defined(_OLD_CPP_) -#define METHOD(a) "0""a" -#define SLOT(a) "1""a" -#define SIGNAL(a) "2""a" +#define TQ_METHOD(a) "0""a" +#define TQ_SLOT(a) "1""a" +#define TQ_SIGNAL(a) "2""a" #else -#define METHOD(a) "0"#a -#define SLOT(a) "1"#a -#define SIGNAL(a) "2"#a +#define TQ_METHOD(a) "0"#a +#define TQ_SLOT(a) "1"#a +#define TQ_SIGNAL(a) "2"#a #endif -#define TQMETHOD_CODE 0 // member type codes -#define TQSLOT_CODE 1 -#define TQSIGNAL_CODE 2 +#define TQ_METHOD_CODE 0 // member type codes +#define TQ_SLOT_CODE 1 +#define TQ_SIGNAL_CODE 2 class TQObject; class TQMetaObject; diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp index ffd25393..76181cca 100644 --- a/src/kernel/qaccel.cpp +++ b/src/kernel/qaccel.cpp @@ -73,7 +73,7 @@ \code TQPushButton p( "&Exit", parent ); // automatic shortcut ALT+Key_E TQPopupMenu *fileMenu = new fileMenu( parent ); - fileMenu->insertItem( "Undo", parent, SLOT(undo()), CTRL+Key_Z ); + fileMenu->insertItem( "Undo", parent, TQ_SLOT(undo()), CTRL+Key_Z ); \endcode A TQAccel contains a list of accelerator items that can be @@ -131,7 +131,7 @@ TQAccel *a = new TQAccel( myWindow ); // create accels for myWindow a->connectItem( a->insertItem(Key_P+CTRL), // adds Ctrl+P accelerator myWindow, // connected to myWindow's - SLOT(printDoc()) ); // printDoc() slot + TQ_SLOT(printDoc()) ); // printDoc() slot \endcode \sa TQKeyEvent TQWidget::keyPressEvent() TQMenuData::setAccel() @@ -781,7 +781,7 @@ void TQAccel::setItemEnabled( int id, bool enable ) receiver. \code - a->connectItem( 201, mainView, SLOT(quit()) ); + a->connectItem( 201, mainView, TQ_SLOT(quit()) ); \endcode Of course, you can also send a signal as \a member. @@ -917,7 +917,7 @@ TQString TQAccel::keyToString( TQKeySequence k ) \code TQPopupMenu *file = new TQPopupMenu( this ); - file->insertItem( p1, tr("&Open..."), this, SLOT(open()), + file->insertItem( p1, tr("&Open..."), this, TQ_SLOT(open()), TQAccel::stringToKey(tr("Ctrl+O", "File|Open")) ); \endcode diff --git a/src/kernel/qaccessible.cpp b/src/kernel/qaccessible.cpp index d87b8e68..f9954359 100644 --- a/src/kernel/qaccessible.cpp +++ b/src/kernel/qaccessible.cpp @@ -304,7 +304,7 @@ public: void addObject(TQObject *object, TQAccessibleInterface *iface) { insert(object, iface); - connect(object, SIGNAL(destroyed(TQObject*)), this, SLOT(removeObject(TQObject*))); + connect(object, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(removeObject(TQObject*))); } public slots: diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp index d67b34dd..68e81d0f 100644 --- a/src/kernel/qapplication.cpp +++ b/src/kernel/qapplication.cpp @@ -2318,7 +2318,7 @@ TQFontMetrics TQApplication::fontMetrics() Example: \code TQPushButton *quitButton = new TQPushButton( "Quit" ); - connect( quitButton, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( quitButton, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); \endcode \sa exit() aboutToQuit() lastWindowClosed() TQAction @@ -2340,10 +2340,10 @@ void TQApplication::quit() \code // the "Quit" menu entry should try to close all windows TQPopupMenu* file = new TQPopupMenu( this ); - file->insertItem( "&Quit", tqApp, SLOT(closeAllWindows()), CTRL+Key_Q ); + file->insertItem( "&Quit", tqApp, TQ_SLOT(closeAllWindows()), CTRL+Key_Q ); // when the last window is closed, the application should quit - connect( tqApp, SIGNAL( lastWindowClosed() ), tqApp, SLOT( quit() ) ); + connect( tqApp, TQ_SIGNAL( lastWindowClosed() ), tqApp, TQ_SLOT( quit() ) ); \endcode The windows are closed in random order, until one window does not diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index ef52e5a3..e224f17a 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -6263,7 +6263,7 @@ public: : TQObject(0,0) { TQSocketNotifier* sn = new TQSocketNotifier( socket, TQSocketNotifier::Read, this ); - connect( sn, SIGNAL( activated(int) ), this, SLOT( socketActivated(int) ) ); + connect( sn, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( socketActivated(int) ) ); } public slots: diff --git a/src/kernel/qasyncio.cpp b/src/kernel/qasyncio.cpp index bf5890ac..c4811e75 100644 --- a/src/kernel/qasyncio.cpp +++ b/src/kernel/qasyncio.cpp @@ -320,9 +320,9 @@ void TQIODeviceSource::rewind() TQDataPump::TQDataPump(TQDataSource* data_source, TQDataSink* data_sink) : source(data_source), sink(data_sink) { - source->connect(this, SLOT(kickStart())); - sink->connect(this, SLOT(kickStart())); - connect(&timer, SIGNAL(timeout()), this, SLOT(tryToPump())); + source->connect(this, TQ_SLOT(kickStart())); + sink->connect(this, TQ_SLOT(kickStart())); + connect(&timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(tryToPump())); timer.start(0, TRUE); } diff --git a/src/kernel/qguardedptr.cpp b/src/kernel/qguardedptr.cpp index 803e75e1..5102d094 100644 --- a/src/kernel/qguardedptr.cpp +++ b/src/kernel/qguardedptr.cpp @@ -199,7 +199,7 @@ TQGuardedPtrPrivate::TQGuardedPtrPrivate( TQObject* o) : TQObject(0, "_ptrpriv" ), obj( o ) { if ( obj ) - connect( obj, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); + connect( obj, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); } @@ -212,12 +212,12 @@ void TQGuardedPtrPrivate::reconnect( TQObject *o ) if ( obj == o ) return; if ( obj ) - disconnect( obj, SIGNAL( destroyed() ), - this, SLOT( objectDestroyed() ) ); + disconnect( obj, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( objectDestroyed() ) ); obj = o; if ( obj ) - connect( obj, SIGNAL( destroyed() ), - this, SLOT( objectDestroyed() ) ); + connect( obj, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( objectDestroyed() ) ); } void TQGuardedPtrPrivate::objectDestroyed() diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp index e9fe4313..c679bb52 100644 --- a/src/kernel/qkeysequence.cpp +++ b/src/kernel/qkeysequence.cpp @@ -227,7 +227,7 @@ TQKeySequence::TQKeySequence() \code TQPopupMenu *file = new TQPopupMenu( this ); - file->insertItem( tr("&Open..."), this, SLOT(open()), + file->insertItem( tr("&Open..."), this, TQ_SLOT(open()), TQKeySequence( tr("Ctrl+O", "File|Open") ) ); \endcode diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp index 3b98849e..79218bad 100644 --- a/src/kernel/qmovie.cpp +++ b/src/kernel/qmovie.cpp @@ -234,7 +234,7 @@ TQMoviePrivate::TQMoviePrivate(TQDataSource* src, TQMovie* movie, int bufsize) : { frametimer = new TQTimer(this); pump = src ? new TQDataPump(src, this) : 0; - TQObject::connect(frametimer, SIGNAL(timeout()), this, SLOT(refresh())); + TQObject::connect(frametimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(refresh())); dirty_cache = FALSE; source = src; buffer = 0; @@ -993,7 +993,7 @@ void TQMovie::setSpeed(int percent) */ void TQMovie::connectResize(TQObject* receiver, const char *member) { - TQObject::connect(d, SIGNAL(sizeChanged(const TQSize&)), receiver, member); + TQObject::connect(d, TQ_SIGNAL(sizeChanged(const TQSize&)), receiver, member); } /*! @@ -1002,7 +1002,7 @@ void TQMovie::connectResize(TQObject* receiver, const char *member) */ void TQMovie::disconnectResize(TQObject* receiver, const char *member) { - TQObject::disconnect(d, SIGNAL(sizeChanged(const TQSize&)), receiver, member); + TQObject::disconnect(d, TQ_SIGNAL(sizeChanged(const TQSize&)), receiver, member); } /*! @@ -1017,7 +1017,7 @@ void TQMovie::disconnectResize(TQObject* receiver, const char *member) */ void TQMovie::connectUpdate(TQObject* receiver, const char *member) { - TQObject::connect(d, SIGNAL(areaChanged(const TQRect&)), receiver, member); + TQObject::connect(d, TQ_SIGNAL(areaChanged(const TQRect&)), receiver, member); } /*! @@ -1026,7 +1026,7 @@ void TQMovie::connectUpdate(TQObject* receiver, const char *member) */ void TQMovie::disconnectUpdate(TQObject* receiver, const char *member) { - TQObject::disconnect(d, SIGNAL(areaChanged(const TQRect&)), receiver, member); + TQObject::disconnect(d, TQ_SIGNAL(areaChanged(const TQRect&)), receiver, member); } /*! @@ -1063,7 +1063,7 @@ void TQMovie::disconnectUpdate(TQObject* receiver, const char *member) */ void TQMovie::connectStatus(TQObject* receiver, const char *member) { - TQObject::connect(d, SIGNAL(dataStatus(int)), receiver, member); + TQObject::connect(d, TQ_SIGNAL(dataStatus(int)), receiver, member); } /*! @@ -1072,7 +1072,7 @@ void TQMovie::connectStatus(TQObject* receiver, const char *member) */ void TQMovie::disconnectStatus(TQObject* receiver, const char *member) { - TQObject::disconnect(d, SIGNAL(dataStatus(int)), receiver, member); + TQObject::disconnect(d, TQ_SIGNAL(dataStatus(int)), receiver, member); } diff --git a/src/kernel/qnetworkprotocol.cpp b/src/kernel/qnetworkprotocol.cpp index 1adfa945..27b6dff4 100644 --- a/src/kernel/qnetworkprotocol.cpp +++ b/src/kernel/qnetworkprotocol.cpp @@ -399,38 +399,38 @@ TQNetworkProtocol::TQNetworkProtocol() { d = new TQNetworkProtocolPrivate( this ); - connect( d->opStartTimer, SIGNAL( timeout() ), - this, SLOT( startOps() ) ); - connect( d->removeTimer, SIGNAL( timeout() ), - this, SLOT( removeMe() ) ); + connect( d->opStartTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( startOps() ) ); + connect( d->removeTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( removeMe() ) ); if ( url() ) { - connect( this, SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), - url(), SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ) ); - connect( this, SIGNAL( finished(TQNetworkOperation*) ), - url(), SIGNAL( finished(TQNetworkOperation*) ) ); - connect( this, SIGNAL( start(TQNetworkOperation*) ), - url(), SIGNAL( start(TQNetworkOperation*) ) ); - connect( this, SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), - url(), SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ) ); - connect( this, SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), - url(), SLOT( addEntry(const TQValueList<TQUrlInfo>&) ) ); - connect( this, SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ), - url(), SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ) ); - connect( this, SIGNAL( removed(TQNetworkOperation*) ), - url(), SIGNAL( removed(TQNetworkOperation*) ) ); - connect( this, SIGNAL( itemChanged(TQNetworkOperation*) ), - url(), SIGNAL( itemChanged(TQNetworkOperation*) ) ); - connect( this, SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), - url(), SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); - connect( this, SIGNAL( connectionStateChanged(int,const TQString&) ), - url(), SIGNAL( connectionStateChanged(int,const TQString&) ) ); + connect( this, TQ_SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( finished(TQNetworkOperation*) ), + url(), TQ_SIGNAL( finished(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( start(TQNetworkOperation*) ), + url(), TQ_SIGNAL( start(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), + url(), TQ_SLOT( addEntry(const TQValueList<TQUrlInfo>&) ) ); + connect( this, TQ_SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( removed(TQNetworkOperation*) ), + url(), TQ_SIGNAL( removed(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( itemChanged(TQNetworkOperation*) ), + url(), TQ_SIGNAL( itemChanged(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), + url(), TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( connectionStateChanged(int,const TQString&) ), + url(), TQ_SIGNAL( connectionStateChanged(int,const TQString&) ) ); } - connect( this, SIGNAL( finished(TQNetworkOperation*) ), - this, SLOT( processNextOperation(TQNetworkOperation*) ) ); - connect( this, SIGNAL( newChild(const TQUrlInfo&,TQNetworkOperation*) ), - this, SLOT( emitNewChildren(const TQUrlInfo&,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( finished(TQNetworkOperation*) ), + this, TQ_SLOT( processNextOperation(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( newChild(const TQUrlInfo&,TQNetworkOperation*) ), + this, TQ_SLOT( emitNewChildren(const TQUrlInfo&,TQNetworkOperation*) ) ); } @@ -452,26 +452,26 @@ TQNetworkProtocol::~TQNetworkProtocol() void TQNetworkProtocol::setUrl( TQUrlOperator *u ) { if ( url() ) { - disconnect( this, SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), - url(), SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ) ); - disconnect( this, SIGNAL( finished(TQNetworkOperation*) ), - url(), SIGNAL( finished(TQNetworkOperation*) ) ); - disconnect( this, SIGNAL( start(TQNetworkOperation*) ), - url(), SIGNAL( start(TQNetworkOperation*) ) ); - disconnect( this, SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), - url(), SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ) ); - disconnect( this, SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), - url(), SLOT( addEntry(const TQValueList<TQUrlInfo>&) ) ); - disconnect( this, SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ), - url(), SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ) ); - disconnect( this, SIGNAL( removed(TQNetworkOperation*) ), - url(), SIGNAL( removed(TQNetworkOperation*) ) ); - disconnect( this, SIGNAL( itemChanged(TQNetworkOperation*) ), - url(), SIGNAL( itemChanged(TQNetworkOperation*) ) ); - disconnect( this, SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), - url(), SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); - disconnect( this, SIGNAL( connectionStateChanged(int,const TQString&) ), - url(), SIGNAL( connectionStateChanged(int,const TQString&) ) ); + disconnect( this, TQ_SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ) ); + disconnect( this, TQ_SIGNAL( finished(TQNetworkOperation*) ), + url(), TQ_SIGNAL( finished(TQNetworkOperation*) ) ); + disconnect( this, TQ_SIGNAL( start(TQNetworkOperation*) ), + url(), TQ_SIGNAL( start(TQNetworkOperation*) ) ); + disconnect( this, TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ) ); + disconnect( this, TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), + url(), TQ_SLOT( addEntry(const TQValueList<TQUrlInfo>&) ) ); + disconnect( this, TQ_SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ) ); + disconnect( this, TQ_SIGNAL( removed(TQNetworkOperation*) ), + url(), TQ_SIGNAL( removed(TQNetworkOperation*) ) ); + disconnect( this, TQ_SIGNAL( itemChanged(TQNetworkOperation*) ), + url(), TQ_SIGNAL( itemChanged(TQNetworkOperation*) ) ); + disconnect( this, TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), + url(), TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); + disconnect( this, TQ_SIGNAL( connectionStateChanged(int,const TQString&) ), + url(), TQ_SIGNAL( connectionStateChanged(int,const TQString&) ) ); } @@ -483,26 +483,26 @@ void TQNetworkProtocol::setUrl( TQUrlOperator *u ) d->url = u; if ( url() ) { - connect( this, SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), - url(), SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ) ); - connect( this, SIGNAL( finished(TQNetworkOperation*) ), - url(), SIGNAL( finished(TQNetworkOperation*) ) ); - connect( this, SIGNAL( start(TQNetworkOperation*) ), - url(), SIGNAL( start(TQNetworkOperation*) ) ); - connect( this, SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), - url(), SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ) ); - connect( this, SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), - url(), SLOT( addEntry(const TQValueList<TQUrlInfo>&) ) ); - connect( this, SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ), - url(), SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ) ); - connect( this, SIGNAL( removed(TQNetworkOperation*) ), - url(), SIGNAL( removed(TQNetworkOperation*) ) ); - connect( this, SIGNAL( itemChanged(TQNetworkOperation*) ), - url(), SIGNAL( itemChanged(TQNetworkOperation*) ) ); - connect( this, SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), - url(), SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); - connect( this, SIGNAL( connectionStateChanged(int,const TQString&) ), - url(), SIGNAL( connectionStateChanged(int,const TQString&) ) ); + connect( this, TQ_SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( finished(TQNetworkOperation*) ), + url(), TQ_SIGNAL( finished(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( start(TQNetworkOperation*) ), + url(), TQ_SIGNAL( start(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), + url(), TQ_SLOT( addEntry(const TQValueList<TQUrlInfo>&) ) ); + connect( this, TQ_SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( removed(TQNetworkOperation*) ), + url(), TQ_SIGNAL( removed(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( itemChanged(TQNetworkOperation*) ), + url(), TQ_SIGNAL( itemChanged(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), + url(), TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( connectionStateChanged(int,const TQString&) ), + url(), TQ_SIGNAL( connectionStateChanged(int,const TQString&) ) ); } if ( !d->opInProgress && !d->operationQueue.isEmpty() ) @@ -1018,8 +1018,8 @@ TQNetworkOperation::TQNetworkOperation( TQNetworkProtocol::Operation operation, { d = new TQNetworkOperationPrivate; d->deleteTimer = new TQTimer( this ); - connect( d->deleteTimer, SIGNAL( timeout() ), - this, SLOT( deleteMe() ) ); + connect( d->deleteTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( deleteMe() ) ); d->operation = operation; d->state = TQNetworkProtocol::StWaiting; d->args[ 0 ] = arg0; @@ -1047,8 +1047,8 @@ TQNetworkOperation::TQNetworkOperation( TQNetworkProtocol::Operation operation, { d = new TQNetworkOperationPrivate; d->deleteTimer = new TQTimer( this ); - connect( d->deleteTimer, SIGNAL( timeout() ), - this, SLOT( deleteMe() ) ); + connect( d->deleteTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( deleteMe() ) ); d->operation = operation; d->state = TQNetworkProtocol::StWaiting; d->args[ 0 ] = TQString::null; diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp index 28a82027..e931cdbe 100644 --- a/src/kernel/qobject.cpp +++ b/src/kernel/qobject.cpp @@ -389,7 +389,7 @@ TQMetaCallEvent::~TQMetaCallEvent() // -// Remove white space from SIGNAL and SLOT names. +// Remove white space from TQ_SIGNAL and TQ_SLOT names. // Internal for TQObject::connect() and TQObject::disconnect() // @@ -1755,14 +1755,14 @@ void TQObject::installEventFilter( const TQObject *obj ) int c = eventFilters->findRef( obj ); if ( c >= 0 ) eventFilters->take( c ); - disconnect( obj, SIGNAL(destroyed(TQObject*)), - this, SLOT(cleanupEventFilter(TQObject*)) ); + disconnect( obj, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(cleanupEventFilter(TQObject*)) ); } else { eventFilters = new TQObjectList; TQ_CHECK_PTR( eventFilters ); } eventFilters->insert( 0, obj ); - connect( obj, SIGNAL(destroyed(TQObject*)), this, SLOT(cleanupEventFilter(TQObject*)) ); + connect( obj, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(cleanupEventFilter(TQObject*)) ); } /*! @@ -1785,8 +1785,8 @@ void TQObject::removeEventFilter( const TQObject *obj ) delete eventFilters; eventFilters = 0; // reset event filter list } - disconnect( obj, SIGNAL(destroyed(TQObject*)), - this, SLOT(cleanupEventFilter(TQObject*)) ); + disconnect( obj, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(cleanupEventFilter(TQObject*)) ); } } @@ -1801,12 +1801,12 @@ static bool check_signal_macro( const TQObject *sender, const char *signal, const char *func, const char *op ) { int sigcode = (int)(*signal) - '0'; - if ( sigcode != TQSIGNAL_CODE ) { - if ( sigcode == TQSLOT_CODE ) + if ( sigcode != TQ_SIGNAL_CODE ) { + if ( sigcode == TQ_SLOT_CODE ) tqWarning( "TQObject::%s: Attempt to %s non-signal %s::%s", func, op, sender->className(), signal+1 ); else - tqWarning( "TQObject::%s: Use the SIGNAL macro to %s %s::%s", + tqWarning( "TQObject::%s: Use the TQ_SIGNAL macro to %s %s::%s", func, op, sender->className(), signal ); return FALSE; } @@ -1816,8 +1816,8 @@ static bool check_signal_macro( const TQObject *sender, const char *signal, static bool check_member_code( int code, const TQObject *object, const char *member, const char *func ) { - if ( code != TQSLOT_CODE && code != TQSIGNAL_CODE ) { - tqWarning( "TQObject::%s: Use the SLOT or SIGNAL macro to " + if ( code != TQ_SLOT_CODE && code != TQ_SIGNAL_CODE ) { + tqWarning( "TQObject::%s: Use the TQ_SLOT or TQ_SIGNAL macro to " "%s %s::%s", func, func, object->className(), member ); return FALSE; } @@ -1829,8 +1829,8 @@ static void err_member_notfound( int code, const TQObject *object, { const char *type = 0; switch ( code ) { - case TQSLOT_CODE: type = "slot"; break; - case TQSIGNAL_CODE: type = "signal"; break; + case TQ_SLOT_CODE: type = "slot"; break; + case TQ_SIGNAL_CODE: type = "signal"; break; } if ( strchr(member,')') == 0 ) // common typing mistake tqWarning( "TQObject::%s: Parentheses expected, %s %s::%s", @@ -1866,10 +1866,10 @@ static void err_info_about_candidates( int code, } const TQMetaData *rm = 0; switch ( code ) { - case TQSLOT_CODE: + case TQ_SLOT_CODE: rm = mo->slot( mo->findSlot( newname, TRUE ), TRUE ); break; - case TQSIGNAL_CODE: + case TQ_SIGNAL_CODE: rm = mo->signal( mo->findSignal( newname, TRUE ), TRUE ); break; } @@ -2031,21 +2031,21 @@ TQCString TQObject::normalizeSignalSlot( const char *signalSlot ) \a receiver, and returns TRUE if the connection succeeds; otherwise returns FALSE. - You must use the SIGNAL() and SLOT() macros when specifying the \a signal + You must use the TQ_SIGNAL() and TQ_SLOT() macros when specifying the \a signal and the \a member, for example: \code TQLabel *label = new TQLabel; TQScrollBar *scroll = new TQScrollBar; - TQObject::connect( scroll, SIGNAL(valueChanged(int)), - label, SLOT(setNum(int)) ); + TQObject::connect( scroll, TQ_SIGNAL(valueChanged(int)), + label, TQ_SLOT(setNum(int)) ); \endcode This example ensures that the label always displays the current scroll bar value. Note that the signal and slots parameters must not contain any variable names, only the type. E.g. the following would not work and return FALSE: - TQObject::connect( scroll, SIGNAL(valueChanged(int v)), - label, SLOT(setNum(int v)) ); + TQObject::connect( scroll, TQ_SIGNAL(valueChanged(int v)), + label, TQ_SLOT(setNum(int v)) ); A signal can also be connected to another signal: @@ -2066,7 +2066,7 @@ TQCString TQObject::normalizeSignalSlot( const char *signalSlot ) MyWidget::MyWidget() { aButton = new TQPushButton( this ); - connect( aButton, SIGNAL(clicked()), SIGNAL(myUsefulSignal()) ); + connect( aButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(myUsefulSignal()) ); } \endcode @@ -2124,8 +2124,8 @@ bool TQObject::connect( const TQObject *sender, const char *signal, if ( signal_index < 0 ) { // no such signal #if defined(QT_CHECK_RANGE) - err_member_notfound( TQSIGNAL_CODE, sender, signal, "connect" ); - err_info_about_candidates( TQSIGNAL_CODE, smeta, signal, "connect" ); + err_member_notfound( TQ_SIGNAL_CODE, sender, signal, "connect" ); + err_info_about_candidates( TQ_SIGNAL_CODE, smeta, signal, "connect" ); err_info_about_objects( "connect", sender, receiver ); #endif return FALSE; @@ -2148,7 +2148,7 @@ bool TQObject::connect( const TQObject *sender, const char *signal, TQMetaObject *rmeta = r->metaObject(); int member_index = -1; switch ( membcode ) { // get receiver member - case TQSLOT_CODE: + case TQ_SLOT_CODE: member_index = rmeta->findSlot( member, TRUE ); if ( member_index < 0 ) { // normalize and retry nw_member = qt_rmWS(member); // remove whitespace @@ -2156,7 +2156,7 @@ bool TQObject::connect( const TQObject *sender, const char *signal, member_index = rmeta->findSlot( member, TRUE ); } break; - case TQSIGNAL_CODE: + case TQ_SIGNAL_CODE: member_index = rmeta->findSignal( member, TRUE ); if ( member_index < 0 ) { // normalize and retry nw_member = qt_rmWS(member); // remove whitespace @@ -2181,7 +2181,7 @@ bool TQObject::connect( const TQObject *sender, const char *signal, r->className(), member ); return FALSE; } else { - const TQMetaData *rm = membcode == TQSLOT_CODE ? + const TQMetaData *rm = membcode == TQ_SLOT_CODE ? rmeta->slot( member_index, TRUE ) : rmeta->signal( member_index, TRUE ); if ( rm ) { @@ -2240,10 +2240,10 @@ void TQObject::connectInternal( const TQObject *sender, int signal_index, const const TQMetaData *rm = 0; switch ( membcode ) { // get receiver member - case TQSLOT_CODE: + case TQ_SLOT_CODE: rm = rmeta->slot( member_index, TRUE ); break; - case TQSIGNAL_CODE: + case TQ_SIGNAL_CODE: rm = rmeta->signal( member_index, TRUE ); break; } @@ -2312,11 +2312,11 @@ void TQObject::connectInternal( const TQObject *sender, int signal_index, const \endcode \i Disconnect everything connected to a specific signal: \code - disconnect( myObject, SIGNAL(mySignal()), 0, 0 ); + disconnect( myObject, TQ_SIGNAL(mySignal()), 0, 0 ); \endcode equivalent to the non-static overloaded function \code - myObject->disconnect( SIGNAL(mySignal()) ); + myObject->disconnect( TQ_SIGNAL(mySignal()) ); \endcode \i Disconnect a specific receiver: \code @@ -2376,7 +2376,7 @@ bool TQObject::disconnect( const TQObject *sender, const char *signal, TQMetaObject *rmeta = r->metaObject(); switch ( membcode ) { // get receiver member - case TQSLOT_CODE: + case TQ_SLOT_CODE: member_index = rmeta->findSlot( member, TRUE ); if ( member_index < 0 ) { // normalize and retry nw_member = qt_rmWS(member); // remove whitespace @@ -2384,7 +2384,7 @@ bool TQObject::disconnect( const TQObject *sender, const char *signal, member_index = rmeta->findSlot( member, TRUE ); } break; - case TQSIGNAL_CODE: + case TQ_SIGNAL_CODE: member_index = rmeta->findSignal( member, TRUE ); if ( member_index < 0 ) { // normalize and retry nw_member = qt_rmWS(member); // remove whitespace @@ -2436,7 +2436,7 @@ bool TQObject::disconnect( const TQObject *sender, const char *signal, /* compatibility and safety: If a receiver has several slots * with the same name, disconnect them all*/ bool res = FALSE; - if ( membcode == TQSLOT_CODE && r ) { + if ( membcode == TQ_SLOT_CODE && r ) { TQMetaObject * rmeta = r->metaObject(); do { int mi = rmeta->findSlot( member ); @@ -2780,7 +2780,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) sol->ref(); sol->currentSender = this; } - if ( c->memberType() == TQSIGNAL_CODE ) { + if ( c->memberType() == TQ_SIGNAL_CODE ) { if ((d->disableThreadPostedEvents) || (object->d->disableThreadPostedEvents) || (currentThread && currentThread->threadPostedEventsDisabled()) || @@ -2853,7 +2853,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) sol->ref(); sol->currentSender = this; } - if ( c->memberType() == TQSIGNAL_CODE ) { + if ( c->memberType() == TQ_SIGNAL_CODE ) { if ((d->disableThreadPostedEvents) || (object->d->disableThreadPostedEvents) || (currentThread && currentThread->threadPostedEventsDisabled()) || diff --git a/src/kernel/qobjectcleanuphandler.cpp b/src/kernel/qobjectcleanuphandler.cpp index f9f5d3e2..8523e4ad 100644 --- a/src/kernel/qobjectcleanuphandler.cpp +++ b/src/kernel/qobjectcleanuphandler.cpp @@ -122,7 +122,7 @@ TQObject* TQObjectCleanupHandler::add( TQObject* object ) cleanupObjects = new TQObjectList; cleanupObjects->setAutoDelete( TRUE ); } - connect( object, SIGNAL(destroyed(TQObject*)), this, SLOT(objectDestroyed(TQObject*)) ); + connect( object, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(objectDestroyed(TQObject*)) ); cleanupObjects->insert( 0, object ); return object; } @@ -137,7 +137,7 @@ void TQObjectCleanupHandler::remove( TQObject *object ) return; if ( cleanupObjects->findRef( object ) >= 0 ) { (void) cleanupObjects->take(); - disconnect( object, SIGNAL(destroyed(TQObject*)), this, SLOT(objectDestroyed(TQObject*)) ); + disconnect( object, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(objectDestroyed(TQObject*)) ); } } diff --git a/src/kernel/qprocess.cpp b/src/kernel/qprocess.cpp index 13fb195e..f052c9cb 100644 --- a/src/kernel/qprocess.cpp +++ b/src/kernel/qprocess.cpp @@ -130,7 +130,7 @@ \skipto proc = new TQProcess( this ); \printline proc = new TQProcess( this ); \skipto proc->addArgument( "uic" ); - \printuntil this, SLOT(readFromStdout()) ); + \printuntil this, TQ_SLOT(readFromStdout()) ); \skipto if ( !proc->start() ) { \printuntil // error handling \skipto } @@ -621,8 +621,8 @@ bool TQProcess::launch( const TQByteArray& buf, TQStringList *env ) { if ( start( env ) ) { if ( !buf.isEmpty() ) { - connect( this, SIGNAL(wroteToStdin()), - this, SLOT(closeStdinLaunch()) ); + connect( this, TQ_SIGNAL(wroteToStdin()), + this, TQ_SLOT(closeStdinLaunch()) ); writeToStdin( buf ); } else { closeStdin(); @@ -645,8 +645,8 @@ bool TQProcess::launch( const TQString& buf, TQStringList *env ) { if ( start( env ) ) { if ( !buf.isEmpty() ) { - connect( this, SIGNAL(wroteToStdin()), - this, SLOT(closeStdinLaunch()) ); + connect( this, TQ_SIGNAL(wroteToStdin()), + this, TQ_SLOT(closeStdinLaunch()) ); writeToStdin( buf ); } else { closeStdin(); @@ -664,8 +664,8 @@ bool TQProcess::launch( const TQString& buf, TQStringList *env ) */ void TQProcess::closeStdinLaunch() { - disconnect( this, SIGNAL(wroteToStdin()), - this, SLOT(closeStdinLaunch()) ); + disconnect( this, TQ_SIGNAL(wroteToStdin()), + this, TQ_SLOT(closeStdinLaunch()) ); closeStdin(); emit launchFinished(); } @@ -751,8 +751,8 @@ void TQProcess::connectNotify( const char * signal ) tqDebug( "TQProcess::connectNotify(): signal %s has been connected", signal ); #endif if ( !ioRedirection ) - if ( qstrcmp( signal, SIGNAL(readyReadStdout()) )==0 || - qstrcmp( signal, SIGNAL(readyReadStderr()) )==0 + if ( qstrcmp( signal, TQ_SIGNAL(readyReadStdout()) )==0 || + qstrcmp( signal, TQ_SIGNAL(readyReadStderr()) )==0 ) { #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcess::connectNotify(): set ioRedirection to TRUE" ); @@ -760,14 +760,14 @@ void TQProcess::connectNotify( const char * signal ) setIoRedirection( TRUE ); return; } - if ( !notifyOnExit && qstrcmp( signal, SIGNAL(processExited()) )==0 ) { + if ( !notifyOnExit && qstrcmp( signal, TQ_SIGNAL(processExited()) )==0 ) { #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcess::connectNotify(): set notifyOnExit to TRUE" ); #endif setNotifyOnExit( TRUE ); return; } - if ( !wroteToStdinConnected && qstrcmp( signal, SIGNAL(wroteToStdin()) )==0 ) { + if ( !wroteToStdinConnected && qstrcmp( signal, TQ_SIGNAL(wroteToStdin()) )==0 ) { #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcess::connectNotify(): set wroteToStdinConnected to TRUE" ); #endif @@ -781,21 +781,21 @@ void TQProcess::connectNotify( const char * signal ) void TQProcess::disconnectNotify( const char * ) { if ( ioRedirection && - receivers( SIGNAL(readyReadStdout()) ) ==0 && - receivers( SIGNAL(readyReadStderr()) ) ==0 + receivers( TQ_SIGNAL(readyReadStdout()) ) ==0 && + receivers( TQ_SIGNAL(readyReadStderr()) ) ==0 ) { #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcess::disconnectNotify(): set ioRedirection to FALSE" ); #endif setIoRedirection( FALSE ); } - if ( notifyOnExit && receivers( SIGNAL(processExited()) ) == 0 ) { + if ( notifyOnExit && receivers( TQ_SIGNAL(processExited()) ) == 0 ) { #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcess::disconnectNotify(): set notifyOnExit to FALSE" ); #endif setNotifyOnExit( FALSE ); } - if ( wroteToStdinConnected && receivers( SIGNAL(wroteToStdin()) ) == 0 ) { + if ( wroteToStdinConnected && receivers( TQ_SIGNAL(wroteToStdin()) ) == 0 ) { #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcess::disconnectNotify(): set wroteToStdinConnected to FALSE" ); #endif diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/qprocess_unix.cpp index f41923fd..6d0f27ab 100644 --- a/src/kernel/qprocess_unix.cpp +++ b/src/kernel/qprocess_unix.cpp @@ -277,8 +277,8 @@ TQProcessManager::TQProcessManager() : sn(0) #endif sn = new TQSocketNotifier( sigchldFd[1], TQSocketNotifier::Read, this ); - connect( sn, SIGNAL(activated(int)), - this, SLOT(sigchldHnd(int)) ); + connect( sn, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(sigchldHnd(int)) ); sn->setEnabled( TRUE ); } @@ -352,7 +352,7 @@ void TQProcessManager::remove( TQProc *p ) void TQProcessManager::cleanup() { if ( procList->count() == 0 ) { - TQTimer::singleShot( 0, this, SLOT(removeMe()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(removeMe()) ); } } @@ -944,8 +944,8 @@ bool TQProcess::start( TQStringList *env ) fcntl(d->proc->socketStdin, F_SETFL, originalFlags | O_NONBLOCK); d->notifierStdin = new TQSocketNotifier( sStdin[1], TQSocketNotifier::Write ); - connect( d->notifierStdin, SIGNAL(activated(int)), - this, SLOT(socketWrite(int)) ); + connect( d->notifierStdin, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(socketWrite(int)) ); // setup notifiers for the sockets if ( !d->stdinBuf.isEmpty() ) { d->notifierStdin->setEnabled( TRUE ); @@ -955,8 +955,8 @@ bool TQProcess::start( TQStringList *env ) ::close( sStdout[1] ); d->proc->socketStdout = sStdout[0]; d->notifierStdout = new TQSocketNotifier( sStdout[0], TQSocketNotifier::Read ); - connect( d->notifierStdout, SIGNAL(activated(int)), - this, SLOT(socketRead(int)) ); + connect( d->notifierStdout, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(socketRead(int)) ); if ( ioRedirection ) d->notifierStdout->setEnabled( TRUE ); } @@ -964,8 +964,8 @@ bool TQProcess::start( TQStringList *env ) ::close( sStderr[1] ); d->proc->socketStderr = sStderr[0]; d->notifierStderr = new TQSocketNotifier( sStderr[0], TQSocketNotifier::Read ); - connect( d->notifierStderr, SIGNAL(activated(int)), - this, SLOT(socketRead(int)) ); + connect( d->notifierStderr, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(socketRead(int)) ); if ( ioRedirection ) d->notifierStderr->setEnabled( TRUE ); } @@ -1028,7 +1028,7 @@ void TQProcess::tryTerminate() const is to do something like this: \code process->tryTerminate(); - TQTimer::singleShot( 5000, process, SLOT( kill() ) ); + TQTimer::singleShot( 5000, process, TQ_SLOT( kill() ) ); \endcode This tries to terminate the process the nice way. If the process diff --git a/src/kernel/qsignal.cpp b/src/kernel/qsignal.cpp index 53b0a62a..f9c6c233 100644 --- a/src/kernel/qsignal.cpp +++ b/src/kernel/qsignal.cpp @@ -147,9 +147,9 @@ bool TQSignal::connect( const TQObject *receiver, const char *member ) #ifndef TQT_NO_VARIANT if ( intSignature( member ) ) #endif - return TQObject::connect( (TQObject *)this, SIGNAL(intSignal(int)), receiver, member ); + return TQObject::connect( (TQObject *)this, TQ_SIGNAL(intSignal(int)), receiver, member ); #ifndef TQT_NO_VARIANT - return TQObject::connect( (TQObject *)this, SIGNAL(signal(const TQVariant&)), + return TQObject::connect( (TQObject *)this, TQ_SIGNAL(signal(const TQVariant&)), receiver, member ); #endif } @@ -167,9 +167,9 @@ bool TQSignal::disconnect( const TQObject *receiver, const char *member ) #ifndef TQT_NO_VARIANT if ( intSignature( member ) ) #endif - return TQObject::disconnect( (TQObject *)this, SIGNAL(intSignal(int)), receiver, member ); + return TQObject::disconnect( (TQObject *)this, TQ_SIGNAL(intSignal(int)), receiver, member ); #ifndef TQT_NO_VARIANT - return TQObject::disconnect( (TQObject *)this, SIGNAL(signal(const TQVariant&)), + return TQObject::disconnect( (TQObject *)this, TQ_SIGNAL(signal(const TQVariant&)), receiver, member ); #endif } diff --git a/src/kernel/qsignalmapper.cpp b/src/kernel/qsignalmapper.cpp index ce6f2175..8efd2737 100644 --- a/src/kernel/qsignalmapper.cpp +++ b/src/kernel/qsignalmapper.cpp @@ -158,7 +158,7 @@ TQSignalMapperRec* TQSignalMapper::getRec( const TQObject* sender ) if (!rec) { rec = new TQSignalMapperRec; d->dict.insert( (void*)sender, rec ); - connect( sender, SIGNAL(destroyed()), this, SLOT(removeMapping()) ); + connect( sender, TQ_SIGNAL(destroyed()), this, TQ_SLOT(removeMapping()) ); } return rec; } diff --git a/src/kernel/qsound_x11.cpp b/src/kernel/qsound_x11.cpp index e3a727f8..2eaf0b46 100644 --- a/src/kernel/qsound_x11.cpp +++ b/src/kernel/qsound_x11.cpp @@ -120,8 +120,8 @@ TQAuServerNAS::TQAuServerNAS(TQObject* parent) : // Ask TQt for async messages... sn=new TQSocketNotifier(AuServerConnectionNumber(nas), TQSocketNotifier::Read); - TQObject::connect(sn, SIGNAL(activated(int)), - this, SLOT(dataReceived())); + TQObject::connect(sn, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(dataReceived())); } else { sn = 0; } @@ -223,8 +223,8 @@ void TQAuServerNAS::stop(TQSound* s) void TQAuServerNAS::init(TQSound* s) { - connect(s, SIGNAL(destroyed(TQObject *)), - this, SLOT(soundDestroyed(TQObject *))); + connect(s, TQ_SIGNAL(destroyed(TQObject *)), + this, TQ_SLOT(soundDestroyed(TQObject *))); if ( nas ) { AuBucketID b_id = diff --git a/src/kernel/qtimer.cpp b/src/kernel/qtimer.cpp index 0c70113f..f7736c02 100644 --- a/src/kernel/qtimer.cpp +++ b/src/kernel/qtimer.cpp @@ -62,7 +62,7 @@ Example: \code TQTimer *timer = new TQTimer( myObject ); - connect( timer, SIGNAL(timeout()), myObject, SLOT(timerDone()) ); + connect( timer, TQ_SIGNAL(timeout()), myObject, TQ_SLOT(timerDone()) ); timer->start( 2000, TRUE ); // 2 seconds single-shot timer \endcode @@ -77,7 +77,7 @@ user interface: \code TQTimer *t = new TQTimer( myObject ); - connect( t, SIGNAL(timeout()), SLOT(processOneThing()) ); + connect( t, TQ_SIGNAL(timeout()), TQ_SLOT(processOneThing()) ); t->start( 0, FALSE ); \endcode @@ -308,7 +308,7 @@ bool TQSingleShotTimer::event( TQEvent * ) int main( int argc, char **argv ) { TQApplication a( argc, argv ); - TQTimer::singleShot( 10*60*1000, &a, SLOT(quit()) ); + TQTimer::singleShot( 10*60*1000, &a, TQ_SLOT(quit()) ); ... // create and show your widgets return a.exec(); } diff --git a/src/kernel/qurloperator.cpp b/src/kernel/qurloperator.cpp index 1defadc9..ca508c48 100644 --- a/src/kernel/qurloperator.cpp +++ b/src/kernel/qurloperator.cpp @@ -600,23 +600,23 @@ TQPtrList<TQNetworkOperation> TQUrlOperator::copy( const TQString &from, const T if ( gProt && (gProt->supportedOperations()&TQNetworkProtocol::OpGet) && pProt && (pProt->supportedOperations()&TQNetworkProtocol::OpPut) ) { - connect( gProt, SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), - this, SLOT( copyGotData(const TQByteArray&,TQNetworkOperation*) ) ); - connect( gProt, SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), - this, SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); - connect( gProt, SIGNAL( finished(TQNetworkOperation*) ), - this, SLOT( continueCopy(TQNetworkOperation*) ) ); - connect( gProt, SIGNAL( finished(TQNetworkOperation*) ), - this, SIGNAL( finished(TQNetworkOperation*) ) ); - connect( gProt, SIGNAL( connectionStateChanged(int,const TQString&) ), - this, SIGNAL( connectionStateChanged(int,const TQString&) ) ); - - connect( pProt, SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), - this, SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); - connect( pProt, SIGNAL( finished(TQNetworkOperation*) ), - this, SIGNAL( finished(TQNetworkOperation*) ) ); - connect( pProt, SIGNAL( finished(TQNetworkOperation*) ), - this, SLOT( finishedCopy() ) ); + connect( gProt, TQ_SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), + this, TQ_SLOT( copyGotData(const TQByteArray&,TQNetworkOperation*) ) ); + connect( gProt, TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), + this, TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); + connect( gProt, TQ_SIGNAL( finished(TQNetworkOperation*) ), + this, TQ_SLOT( continueCopy(TQNetworkOperation*) ) ); + connect( gProt, TQ_SIGNAL( finished(TQNetworkOperation*) ), + this, TQ_SIGNAL( finished(TQNetworkOperation*) ) ); + connect( gProt, TQ_SIGNAL( connectionStateChanged(int,const TQString&) ), + this, TQ_SIGNAL( connectionStateChanged(int,const TQString&) ) ); + + connect( pProt, TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), + this, TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); + connect( pProt, TQ_SIGNAL( finished(TQNetworkOperation*) ), + this, TQ_SIGNAL( finished(TQNetworkOperation*) ) ); + connect( pProt, TQ_SIGNAL( finished(TQNetworkOperation*) ), + this, TQ_SLOT( finishedCopy() ) ); TQNetworkOperation *opGet = new TQNetworkOperation( TQNetworkProtocol::OpGet, frm, TQString::null, TQString::null ); ops.append( opGet ); @@ -935,8 +935,8 @@ void TQUrlOperator::getNetworkProtocol() d->networkProtocol = (TQNetworkProtocol *)p; d->networkProtocol->setUrl( this ); - connect( d->networkProtocol, SIGNAL( itemChanged(TQNetworkOperation*) ), - this, SLOT( slotItemChanged(TQNetworkOperation*) ) ); + connect( d->networkProtocol, TQ_SIGNAL( itemChanged(TQNetworkOperation*) ), + this, TQ_SLOT( slotItemChanged(TQNetworkOperation*) ) ); } /*! @@ -1121,10 +1121,10 @@ void TQUrlOperator::continueCopy( TQNetworkOperation *op ) deleteOperation( rm ); } } - disconnect( gProt, SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), - this, SLOT( copyGotData(const TQByteArray&,TQNetworkOperation*) ) ); - disconnect( gProt, SIGNAL( finished(TQNetworkOperation*) ), - this, SLOT( continueCopy(TQNetworkOperation*) ) ); + disconnect( gProt, TQ_SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), + this, TQ_SLOT( copyGotData(const TQByteArray&,TQNetworkOperation*) ) ); + disconnect( gProt, TQ_SIGNAL( finished(TQNetworkOperation*) ), + this, TQ_SLOT( continueCopy(TQNetworkOperation*) ) ); } /*! diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp index 4885346d..0e9c606a 100644 --- a/src/kernel/qwidget.cpp +++ b/src/kernel/qwidget.cpp @@ -3203,15 +3203,15 @@ void TQWidget::setFocusProxy( TQWidget * w ) createExtra(); if ( extra->focus_proxy ) { - disconnect( extra->focus_proxy, SIGNAL(destroyed()), - this, SLOT(focusProxyDestroyed()) ); + disconnect( extra->focus_proxy, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(focusProxyDestroyed()) ); extra->focus_proxy = 0; } if ( w ) { setFocusPolicy( w->focusPolicy() ); - connect( w, SIGNAL(destroyed()), - this, SLOT(focusProxyDestroyed()) ); + connect( w, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(focusProxyDestroyed()) ); } extra->focus_proxy = w; } @@ -4338,7 +4338,7 @@ bool TQWidget::close( bool alsoDelete ) if ( !deleted && !isHidden() ) hide(); if ( checkLastWindowClosed - && tqApp->receivers(SIGNAL(lastWindowClosed())) ) { + && tqApp->receivers(TQ_SIGNAL(lastWindowClosed())) ) { /* if there is no non-withdrawn top level window left (except the desktop, popups, or dialogs with parents), we emit the lastWindowClosed signal */ diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp index 3d64b6fe..a5919b83 100644 --- a/src/kernel/qwidget_x11.cpp +++ b/src/kernel/qwidget_x11.cpp @@ -2968,10 +2968,10 @@ void TQWidget::changeInputContext( const TQString& identifierName ) TQInputContext *qic = TQInputContextFactory::create( identifierName, icWidget ); *qicp = qic; if ( qic ) { - TQObject::connect( qic, SIGNAL(imEventGenerated(TQObject *,TQIMEvent *)), - tqApp, SLOT(postIMEvent(TQObject *,TQIMEvent *)) ); - TQObject::connect( qic, SIGNAL(deletionRequested()), - icWidget, SLOT(destroyInputContext()) ); + TQObject::connect( qic, TQ_SIGNAL(imEventGenerated(TQObject *,TQIMEvent *)), + tqApp, TQ_SLOT(postIMEvent(TQObject *,TQIMEvent *)) ); + TQObject::connect( qic, TQ_SIGNAL(deletionRequested()), + icWidget, TQ_SLOT(destroyInputContext()) ); } } @@ -3007,10 +3007,10 @@ void TQWidget::createInputContext() *qicp = qic; if ( qic ) { - TQObject::connect( qic, SIGNAL(imEventGenerated(TQObject *,TQIMEvent *)), - tqApp, SLOT(postIMEvent(TQObject *,TQIMEvent *)) ); - TQObject::connect( qic, SIGNAL(deletionRequested()), - icWidget, SLOT(destroyInputContext()) ); + TQObject::connect( qic, TQ_SIGNAL(imEventGenerated(TQObject *,TQIMEvent *)), + tqApp, TQ_SLOT(postIMEvent(TQObject *,TQIMEvent *)) ); + TQObject::connect( qic, TQ_SIGNAL(deletionRequested()), + icWidget, TQ_SLOT(destroyInputContext()) ); } } #endif // TQT_NO_IM diff --git a/src/moc/moc.y b/src/moc/moc.y index 86fd20de..4b754b7b 100644 --- a/src/moc/moc.y +++ b/src/moc/moc.y @@ -2134,7 +2134,7 @@ void registerClassInNamespace() } // -// Remove white space from SIGNAL and SLOT names. +// Remove white space from TQ_SIGNAL and TQ_SLOT names. // This function has been copied from qobject.cpp. // @@ -3138,7 +3138,7 @@ void generateClass() // generate C++ source code for a class fixRightAngles( &argstr ); - fprintf( out, "\n// SIGNAL %s\n", (const char*)f->name ); + fprintf( out, "\n// TQ_SIGNAL %s\n", (const char*)f->name ); fprintf( out, "%s %s::%s(", (const char*) f->type, (const char*)qualifiedClassName(), (const char*)f->name ); diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp index 85da933d..ef980dd3 100644 --- a/src/moc/moc_yacc.cpp +++ b/src/moc/moc_yacc.cpp @@ -5009,7 +5009,7 @@ void registerClassInNamespace() } // -// Remove white space from SIGNAL and SLOT names. +// Remove white space from TQ_SIGNAL and TQ_SLOT names. // This function has been copied from qobject.cpp. // @@ -6013,7 +6013,7 @@ void generateClass() // generate C++ source code for a class fixRightAngles( &argstr ); - fprintf( out, "\n// SIGNAL %s\n", (const char*)f->name ); + fprintf( out, "\n// TQ_SIGNAL %s\n", (const char*)f->name ); fprintf( out, "%s %s::%s(", (const char*) f->type, (const char*)qualifiedClassName(), (const char*)f->name ); diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp index d259cc0e..b1eeaa53 100644 --- a/src/network/qdns.cpp +++ b/src/network/qdns.cpp @@ -942,15 +942,15 @@ TQDnsManager::TQDnsManager() TQTimer * sweepTimer = new TQTimer( this ); sweepTimer->start( 1000 * 60 * 3 ); - connect( sweepTimer, SIGNAL(timeout()), - this, SLOT(cleanCache()) ); + connect( sweepTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(cleanCache()) ); TQSocketNotifier * rn4 = new TQSocketNotifier( ipv4Socket->socket(), TQSocketNotifier::Read, this, "dns IPv4 socket watcher" ); ipv4Socket->setAddressReusable( FALSE ); ipv4Socket->setBlocking( FALSE ); - connect( rn4, SIGNAL(activated(int)), SLOT(answer()) ); + connect( rn4, TQ_SIGNAL(activated(int)), TQ_SLOT(answer()) ); #if !defined (TQT_NO_IPV6) // Don't connect the IPv6 socket notifier if the host does not @@ -963,7 +963,7 @@ TQDnsManager::TQDnsManager() ipv6support = TRUE; ipv6Socket->setAddressReusable( FALSE ); ipv6Socket->setBlocking( FALSE ); - connect( rn6, SIGNAL(activated(int)), SLOT(answer()) ); + connect( rn6, TQ_SIGNAL(activated(int)), TQ_SLOT(answer()) ); } #endif @@ -1169,7 +1169,7 @@ void TQDnsManager::transmitQuery( int i ) tqDebug( "DNS Manager: giving up on query 0x%04x", q->id ); #endif delete q; - TQTimer::singleShot( 0, TQDnsManager::manager(), SLOT(cleanCache()) ); + TQTimer::singleShot( 0, TQDnsManager::manager(), TQ_SLOT(cleanCache()) ); // and don't process anything more return; } @@ -1265,7 +1265,7 @@ void TQDnsManager::transmitQuery( int i ) tqDebug( "DNS Manager: no DNS server found on query 0x%04x", q->id ); #endif delete q; - TQTimer::singleShot( 1000*10, TQDnsManager::manager(), SLOT(cleanCache()) ); + TQTimer::singleShot( 1000*10, TQDnsManager::manager(), TQ_SLOT(cleanCache()) ); // and don't process anything more return; } @@ -1467,9 +1467,9 @@ TQPtrList<TQDnsRR> * TQDnsDomain::cached( const TQDns * r ) // timeouts: we make sure to use high timeouts // and few tramsissions. query->step = ns->count(); - TQObject::connect( query, SIGNAL(timeout()), + TQObject::connect( query, TQ_SIGNAL(timeout()), TQDnsManager::manager(), - SLOT(retransmit()) ); + TQ_SLOT(retransmit()) ); TQDnsManager::manager()->transmitQuery( query ); } } @@ -1519,8 +1519,8 @@ TQPtrList<TQDnsRR> * TQDnsDomain::cached( const TQDns * r ) query->t = r->recordType(); query->l = s; query->dns->replace( (void*)r, (void*)r ); - TQObject::connect( query, SIGNAL(timeout()), - TQDnsManager::manager(), SLOT(retransmit()) ); + TQObject::connect( query, TQ_SIGNAL(timeout()), + TQDnsManager::manager(), TQ_SLOT(retransmit()) ); TQDnsManager::manager()->transmitQuery( query ); } else if ( q < m->queries.size() ) { // if we've found an earlier query for the same @@ -1908,8 +1908,8 @@ void TQDns::setStartQueryTimer() { // start the query the next time we enter event loop d->queryTimer = new TQTimer( this ); - connect( d->queryTimer, SIGNAL(timeout()), - this, SLOT(startQuery()) ); + connect( d->queryTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(startQuery()) ); d->queryTimer->start( 0, TRUE ); } } @@ -2278,7 +2278,7 @@ TQString TQDns::canonicalName() const */ void TQDns::connectNotify( const char *signal ) { - if ( d->noEventLoop && qstrcmp(signal,SIGNAL(resultsReady()) )==0 ) { + if ( d->noEventLoop && qstrcmp(signal,TQ_SIGNAL(resultsReady()) )==0 ) { doSynchronousLookup(); } } diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp index f3102932..797392cc 100644 --- a/src/network/qftp.cpp +++ b/src/network/qftp.cpp @@ -297,16 +297,16 @@ TQFtpDTP::TQFtpDTP( TQFtpPI *p, TQObject *parent, const char *name ) : { clearData(); - connect( &socket, SIGNAL( connected() ), - SLOT( socketConnected() ) ); - connect( &socket, SIGNAL( readyRead() ), - SLOT( socketReadyRead() ) ); - connect( &socket, SIGNAL( error(int) ), - SLOT( socketError(int) ) ); - connect( &socket, SIGNAL( connectionClosed() ), - SLOT( socketConnectionClosed() ) ); - connect( &socket, SIGNAL( bytesWritten(int) ), - SLOT( socketBytesWritten(int) ) ); + connect( &socket, TQ_SIGNAL( connected() ), + TQ_SLOT( socketConnected() ) ); + connect( &socket, TQ_SIGNAL( readyRead() ), + TQ_SLOT( socketReadyRead() ) ); + connect( &socket, TQ_SIGNAL( error(int) ), + TQ_SLOT( socketError(int) ) ); + connect( &socket, TQ_SIGNAL( connectionClosed() ), + TQ_SLOT( socketConnectionClosed() ) ); + connect( &socket, TQ_SIGNAL( bytesWritten(int) ), + TQ_SLOT( socketBytesWritten(int) ) ); } void TQFtpDTP::setData( TQByteArray *ba ) @@ -637,21 +637,21 @@ TQFtpPI::TQFtpPI( TQObject *parent ) : waitForDtpToConnect( FALSE ), waitForDtpToClose( FALSE ) { - connect( &commandSocket, SIGNAL(hostFound()), - SLOT(hostFound()) ); - connect( &commandSocket, SIGNAL(connected()), - SLOT(connected()) ); - connect( &commandSocket, SIGNAL(connectionClosed()), - SLOT(connectionClosed()) ); - connect( &commandSocket, SIGNAL(delayedCloseFinished()), - SLOT(delayedCloseFinished()) ); - connect( &commandSocket, SIGNAL(readyRead()), - SLOT(readyRead()) ); - connect( &commandSocket, SIGNAL(error(int)), - SLOT(error(int)) ); + connect( &commandSocket, TQ_SIGNAL(hostFound()), + TQ_SLOT(hostFound()) ); + connect( &commandSocket, TQ_SIGNAL(connected()), + TQ_SLOT(connected()) ); + connect( &commandSocket, TQ_SIGNAL(connectionClosed()), + TQ_SLOT(connectionClosed()) ); + connect( &commandSocket, TQ_SIGNAL(delayedCloseFinished()), + TQ_SLOT(delayedCloseFinished()) ); + connect( &commandSocket, TQ_SIGNAL(readyRead()), + TQ_SLOT(readyRead()) ); + connect( &commandSocket, TQ_SIGNAL(error(int)), + TQ_SLOT(error(int)) ); - connect( &dtp, SIGNAL(connectState(int)), - SLOT(dtpConnectState(int)) ); + connect( &dtp, TQ_SIGNAL(connectState(int)), + TQ_SLOT(dtpConnectState(int)) ); } void TQFtpPI::connectToHost( const TQString &host, TQ_UINT16 port ) @@ -1251,21 +1251,21 @@ void TQFtp::init() TQFtpPrivate *d = ::d( this ); d->errorString = tr( "Unknown error" ); - connect( &d->pi, SIGNAL(connectState(int)), - SLOT(piConnectState(int)) ); - connect( &d->pi, SIGNAL(finished(const TQString&)), - SLOT(piFinished(const TQString&)) ); - connect( &d->pi, SIGNAL(error(int,const TQString&)), - SLOT(piError(int,const TQString&)) ); - connect( &d->pi, SIGNAL(rawFtpReply(int,const TQString&)), - SLOT(piFtpReply(int,const TQString&)) ); + connect( &d->pi, TQ_SIGNAL(connectState(int)), + TQ_SLOT(piConnectState(int)) ); + connect( &d->pi, TQ_SIGNAL(finished(const TQString&)), + TQ_SLOT(piFinished(const TQString&)) ); + connect( &d->pi, TQ_SIGNAL(error(int,const TQString&)), + TQ_SLOT(piError(int,const TQString&)) ); + connect( &d->pi, TQ_SIGNAL(rawFtpReply(int,const TQString&)), + TQ_SLOT(piFtpReply(int,const TQString&)) ); - connect( &d->pi.dtp, SIGNAL(readyRead()), - SIGNAL(readyRead()) ); - connect( &d->pi.dtp, SIGNAL(dataTransferProgress(int,int)), - SIGNAL(dataTransferProgress(int,int)) ); - connect( &d->pi.dtp, SIGNAL(listInfo(const TQUrlInfo&)), - SIGNAL(listInfo(const TQUrlInfo&)) ); + connect( &d->pi.dtp, TQ_SIGNAL(readyRead()), + TQ_SIGNAL(readyRead()) ); + connect( &d->pi.dtp, TQ_SIGNAL(dataTransferProgress(int,int)), + TQ_SIGNAL(dataTransferProgress(int,int)) ); + connect( &d->pi.dtp, TQ_SIGNAL(listInfo(const TQUrlInfo&)), + TQ_SIGNAL(listInfo(const TQUrlInfo&)) ); } /*! @@ -1963,7 +1963,7 @@ int TQFtp::addCommand( TQFtpCommand *cmd ) if ( d->pending.count() == 1 ) // don't emit the commandStarted() signal before the id is returned - TQTimer::singleShot( 0, this, SLOT(startNextCommand()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(startNextCommand()) ); return cmd->id; } @@ -2020,7 +2020,7 @@ void TQFtp::piFinished( const TQString& ) if ( c->command == Close ) { // The order of in which the slots are called is arbitrary, so - // disconnect the SIGNAL-SIGNAL temporary to make sure that we + // disconnect the TQ_SIGNAL-TQ_SIGNAL temporary to make sure that we // don't get the commandFinished() signal before the stateChanged() // signal. if ( d->state != TQFtp::Unconnected ) { @@ -2197,16 +2197,16 @@ bool TQFtp::checkConnection( TQNetworkOperation *op ) { TQFtpPrivate *d = ::d( this ); if ( state() == Unconnected && !d->npWaitForLoginDone ) { - connect( this, SIGNAL(listInfo(const TQUrlInfo&)), - this, SLOT(npListInfo(const TQUrlInfo&)) ); - connect( this, SIGNAL(done(bool)), - this, SLOT(npDone(bool)) ); - connect( this, SIGNAL(stateChanged(int)), - this, SLOT(npStateChanged(int)) ); - connect( this, SIGNAL(dataTransferProgress(int,int)), - this, SLOT(npDataTransferProgress(int,int)) ); - connect( this, SIGNAL(readyRead()), - this, SLOT(npReadyRead()) ); + connect( this, TQ_SIGNAL(listInfo(const TQUrlInfo&)), + this, TQ_SLOT(npListInfo(const TQUrlInfo&)) ); + connect( this, TQ_SIGNAL(done(bool)), + this, TQ_SLOT(npDone(bool)) ); + connect( this, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(npStateChanged(int)) ); + connect( this, TQ_SIGNAL(dataTransferProgress(int,int)), + this, TQ_SLOT(npDataTransferProgress(int,int)) ); + connect( this, TQ_SIGNAL(readyRead()), + this, TQ_SLOT(npReadyRead()) ); d->npWaitForLoginDone = TRUE; switch ( op->operation() ) { @@ -2321,16 +2321,16 @@ void TQFtp::npDone( bool err ) d->npWaitForLoginDone = FALSE; if ( state() == Unconnected ) { - disconnect( this, SIGNAL(listInfo(const TQUrlInfo&)), - this, SLOT(npListInfo(const TQUrlInfo&)) ); - disconnect( this, SIGNAL(done(bool)), - this, SLOT(npDone(bool)) ); - disconnect( this, SIGNAL(stateChanged(int)), - this, SLOT(npStateChanged(int)) ); - disconnect( this, SIGNAL(dataTransferProgress(int,int)), - this, SLOT(npDataTransferProgress(int,int)) ); - disconnect( this, SIGNAL(readyRead()), - this, SLOT(npReadyRead()) ); + disconnect( this, TQ_SIGNAL(listInfo(const TQUrlInfo&)), + this, TQ_SLOT(npListInfo(const TQUrlInfo&)) ); + disconnect( this, TQ_SIGNAL(done(bool)), + this, TQ_SLOT(npDone(bool)) ); + disconnect( this, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(npStateChanged(int)) ); + disconnect( this, TQ_SIGNAL(dataTransferProgress(int,int)), + this, TQ_SLOT(npDataTransferProgress(int,int)) ); + disconnect( this, TQ_SIGNAL(readyRead()), + this, TQ_SLOT(npReadyRead()) ); } // emit the finished() signal at the very end to avoid reentrance problems diff --git a/src/network/qhttp.cpp b/src/network/qhttp.cpp index 393cc18c..d08f10f2 100644 --- a/src/network/qhttp.cpp +++ b/src/network/qhttp.cpp @@ -1225,18 +1225,18 @@ void TQHttp::init() d = new TQHttpPrivate; d->errorString = tr( "Unknown error" ); - connect( &d->socket, SIGNAL( connected() ), - this, SLOT( slotConnected() ) ); - connect( &d->socket, SIGNAL( connectionClosed() ), - this, SLOT( slotClosed() ) ); - connect( &d->socket, SIGNAL( delayedCloseFinished() ), - this, SLOT( slotClosed() ) ); - connect( &d->socket, SIGNAL( readyRead() ), - this, SLOT( slotReadyRead() ) ); - connect( &d->socket, SIGNAL( error(int) ), - this, SLOT( slotError(int) ) ); - connect( &d->socket, SIGNAL( bytesWritten(int) ), - this, SLOT( slotBytesWritten(int) ) ); + connect( &d->socket, TQ_SIGNAL( connected() ), + this, TQ_SLOT( slotConnected() ) ); + connect( &d->socket, TQ_SIGNAL( connectionClosed() ), + this, TQ_SLOT( slotClosed() ) ); + connect( &d->socket, TQ_SIGNAL( delayedCloseFinished() ), + this, TQ_SLOT( slotClosed() ) ); + connect( &d->socket, TQ_SIGNAL( readyRead() ), + this, TQ_SLOT( slotReadyRead() ) ); + connect( &d->socket, TQ_SIGNAL( error(int) ), + this, TQ_SLOT( slotError(int) ) ); + connect( &d->socket, TQ_SIGNAL( bytesWritten(int) ), + this, TQ_SLOT( slotBytesWritten(int) ) ); d->idleTimer = startTimer( 0 ); } @@ -1778,7 +1778,7 @@ int TQHttp::addRequest( TQHttpRequest *req ) if ( d->pending.count() == 1 ) // don't emit the requestStarted() signal before the id is returned - TQTimer::singleShot( 0, this, SLOT(startNextRequest()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(startNextRequest()) ); return req->id; } @@ -2231,12 +2231,12 @@ int TQHttp::supportedOperations() const */ void TQHttp::operationGet( TQNetworkOperation *op ) { - connect( this, SIGNAL(readyRead(const TQHttpResponseHeader&)), - this, SLOT(clientReply(const TQHttpResponseHeader&)) ); - connect( this, SIGNAL(done(bool)), - this, SLOT(clientDone(bool)) ); - connect( this, SIGNAL(stateChanged(int)), - this, SLOT(clientStateChanged(int)) ); + connect( this, TQ_SIGNAL(readyRead(const TQHttpResponseHeader&)), + this, TQ_SLOT(clientReply(const TQHttpResponseHeader&)) ); + connect( this, TQ_SIGNAL(done(bool)), + this, TQ_SLOT(clientDone(bool)) ); + connect( this, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(clientStateChanged(int)) ); bytesRead = 0; op->setState( StInProgress ); @@ -2251,12 +2251,12 @@ void TQHttp::operationGet( TQNetworkOperation *op ) */ void TQHttp::operationPut( TQNetworkOperation *op ) { - connect( this, SIGNAL(readyRead(const TQHttpResponseHeader&)), - this, SLOT(clientReply(const TQHttpResponseHeader&)) ); - connect( this, SIGNAL(done(bool)), - this, SLOT(clientDone(bool)) ); - connect( this, SIGNAL(stateChanged(int)), - this, SLOT(clientStateChanged(int)) ); + connect( this, TQ_SIGNAL(readyRead(const TQHttpResponseHeader&)), + this, TQ_SLOT(clientReply(const TQHttpResponseHeader&)) ); + connect( this, TQ_SIGNAL(done(bool)), + this, TQ_SLOT(clientDone(bool)) ); + connect( this, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(clientStateChanged(int)) ); bytesRead = 0; op->setState( StInProgress ); @@ -2307,12 +2307,12 @@ void TQHttp::clientReply( const TQHttpResponseHeader &rep ) void TQHttp::clientDone( bool err ) { - disconnect( this, SIGNAL(readyRead(const TQHttpResponseHeader&)), - this, SLOT(clientReply(const TQHttpResponseHeader&)) ); - disconnect( this, SIGNAL(done(bool)), - this, SLOT(clientDone(bool)) ); - disconnect( this, SIGNAL(stateChanged(int)), - this, SLOT(clientStateChanged(int)) ); + disconnect( this, TQ_SIGNAL(readyRead(const TQHttpResponseHeader&)), + this, TQ_SLOT(clientReply(const TQHttpResponseHeader&)) ); + disconnect( this, TQ_SIGNAL(done(bool)), + this, TQ_SLOT(clientDone(bool)) ); + disconnect( this, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(clientStateChanged(int)) ); if ( err ) { TQNetworkOperation *op = operationInProgress(); diff --git a/src/network/qserversocket.cpp b/src/network/qserversocket.cpp index 8fd1b7bf..44728d74 100644 --- a/src/network/qserversocket.cpp +++ b/src/network/qserversocket.cpp @@ -173,8 +173,8 @@ void TQServerSocket::init( const TQHostAddress & address, TQ_UINT16 port, int ba { d->n = new TQSocketNotifier( d->s->socket(), TQSocketNotifier::Read, this, "accepting new connections" ); - connect( d->n, SIGNAL(activated(int)), - this, SLOT(incomingConnection(int)) ); + connect( d->n, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(incomingConnection(int)) ); } else { tqWarning( "TQServerSocket: failed to bind or listen to the socket" ); delete d->s; @@ -290,8 +290,8 @@ void TQServerSocket::setSocket( int socket ) d->s = new TQSocketDevice( socket, TQSocketDevice::Stream ); d->n = new TQSocketNotifier( d->s->socket(), TQSocketNotifier::Read, this, "accepting new connections" ); - connect( d->n, SIGNAL(activated(int)), - this, SLOT(incomingConnection(int)) ); + connect( d->n, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(incomingConnection(int)) ); } #endif //TQT_NO_NETWORK diff --git a/src/network/qsocket.cpp b/src/network/qsocket.cpp index a612867b..381a1a8e 100644 --- a/src/network/qsocket.cpp +++ b/src/network/qsocket.cpp @@ -217,9 +217,9 @@ void TQSocketPrivate::setSocketDevice( TQSocket *q, TQSocketDevice *device ) wsn = new TQSocketNotifier( socket->socket(), TQSocketNotifier::Write, q, "write" ); - TQObject::connect( rsn, SIGNAL(activated(int)), q, SLOT(sn_read()) ); + TQObject::connect( rsn, TQ_SIGNAL(activated(int)), q, TQ_SLOT(sn_read()) ); rsn->setEnabled( FALSE ); - TQObject::connect( wsn, SIGNAL(activated(int)), q, SLOT(sn_write()) ); + TQObject::connect( wsn, TQ_SIGNAL(activated(int)), q, TQ_SLOT(sn_write()) ); wsn->setEnabled( FALSE ); } @@ -424,10 +424,10 @@ void TQSocket::connectToHost( const TQString &host, TQ_UINT16 port ) // try if the address is already available (for faster connecting...) tryConnecting(); if ( d->state == HostLookup ) { - connect( d->dns4, SIGNAL(resultsReady()), - this, SLOT(tryConnecting()) ); - connect( d->dns6, SIGNAL(resultsReady()), - this, SLOT(tryConnecting()) ); + connect( d->dns4, TQ_SIGNAL(resultsReady()), + this, TQ_SLOT(tryConnecting()) ); + connect( d->dns6, TQ_SIGNAL(resultsReady()), + this, TQ_SLOT(tryConnecting()) ); } } @@ -1364,7 +1364,7 @@ void TQSocket::tryConnection() emit connected(); } else { d->state = Idle; - TQTimer::singleShot( 0, this, SLOT(emitErrorConnectionRefused()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitErrorConnectionRefused()) ); return; } } diff --git a/src/sql/qdatatable.cpp b/src/sql/qdatatable.cpp index 6df0cce0..62abd2d4 100644 --- a/src/sql/qdatatable.cpp +++ b/src/sql/qdatatable.cpp @@ -280,8 +280,8 @@ void TQDataTable::init() d->falseTxt = tr( "False" ); d->datefmt = TQt::LocalDate; reset(); - connect( this, SIGNAL( selectionChanged() ), - SLOT( updateCurrentSelection())); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( updateCurrentSelection())); } /*! @@ -865,13 +865,13 @@ void TQDataTable::endEdit( int row, int col, bool, bool ) switch ( d->dat.mode() ) { case TQSql::Insert: if ( accept ) - TQTimer::singleShot( 0, this, SLOT( doInsertCurrent() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( doInsertCurrent() ) ); else endInsert(); break; case TQSql::Update: if ( accept ) - TQTimer::singleShot( 0, this, SLOT( doUpdateCurrent() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( doUpdateCurrent() ) ); else endUpdate(); break; @@ -1652,16 +1652,16 @@ void TQDataTable::loadNextPage() /*! \internal */ void TQDataTable::sliderPressed() { - disconnect( verticalScrollBar(), SIGNAL( valueChanged(int) ), - this, SLOT( loadNextPage() ) ); + disconnect( verticalScrollBar(), TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( loadNextPage() ) ); } /*! \internal */ void TQDataTable::sliderReleased() { loadNextPage(); - connect( verticalScrollBar(), SIGNAL( valueChanged(int) ), - this, SLOT( loadNextPage() ) ); + connect( verticalScrollBar(), TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( loadNextPage() ) ); } /*! @@ -1809,22 +1809,22 @@ void TQDataTable::setSize( TQSqlCursor* sql ) // ### what are the connect/disconnect calls doing here!? move to refresh() if ( sql->driver() && sql->driver()->hasFeature( TQSqlDriver::QuerySize ) ) { setVScrollBarMode( Auto ); - disconnect( verticalScrollBar(), SIGNAL( sliderPressed() ), - this, SLOT( sliderPressed() ) ); - disconnect( verticalScrollBar(), SIGNAL( sliderReleased() ), - this, SLOT( sliderReleased() ) ); - disconnect( verticalScrollBar(), SIGNAL( valueChanged(int) ), - this, SLOT( loadNextPage() ) ); + disconnect( verticalScrollBar(), TQ_SIGNAL( sliderPressed() ), + this, TQ_SLOT( sliderPressed() ) ); + disconnect( verticalScrollBar(), TQ_SIGNAL( sliderReleased() ), + this, TQ_SLOT( sliderReleased() ) ); + disconnect( verticalScrollBar(), TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( loadNextPage() ) ); if ( numRows() != sql->size() ) setNumRows( sql->size() ); } else { setVScrollBarMode( AlwaysOn ); - connect( verticalScrollBar(), SIGNAL( sliderPressed() ), - this, SLOT( sliderPressed() ) ); - connect( verticalScrollBar(), SIGNAL( sliderReleased() ), - this, SLOT( sliderReleased() ) ); - connect( verticalScrollBar(), SIGNAL( valueChanged(int) ), - this, SLOT( loadNextPage() ) ); + connect( verticalScrollBar(), TQ_SIGNAL( sliderPressed() ), + this, TQ_SLOT( sliderPressed() ) ); + connect( verticalScrollBar(), TQ_SIGNAL( sliderReleased() ), + this, TQ_SLOT( sliderReleased() ) ); + connect( verticalScrollBar(), TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( loadNextPage() ) ); setNumRows(0); loadNextPage(); } diff --git a/src/sql/qsqlquery.cpp b/src/sql/qsqlquery.cpp index 35d22b5d..b1a25502 100644 --- a/src/sql/qsqlquery.cpp +++ b/src/sql/qsqlquery.cpp @@ -58,7 +58,7 @@ TQSqlResultShared::TQSqlResultShared( TQSqlResult* result ): sqlResult(result) { if ( result ) - connect( result->driver(), SIGNAL(destroyed()), this, SLOT(slotResultDestroyed()) ); + connect( result->driver(), TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotResultDestroyed()) ); } /*! diff --git a/src/table/qtable.cpp b/src/table/qtable.cpp index 93d389e3..1d07d514 100644 --- a/src/table/qtable.cpp +++ b/src/table/qtable.cpp @@ -1272,7 +1272,7 @@ TQWidget *TQComboTableItem::createEditor() const ( (TQComboTableItem*)this )->cb = new TQComboBox( edit, table()->viewport(), "qt_editor_cb" ); cb->insertStringList( entries ); cb->setCurrentItem( current ); - TQObject::connect( cb, SIGNAL( activated(int) ), table(), SLOT( doValueChanged() ) ); + TQObject::connect( cb, TQ_SIGNAL( activated(int) ), table(), TQ_SLOT( doValueChanged() ) ); return cb; } @@ -1538,7 +1538,7 @@ TQWidget *TQCheckTableItem::createEditor() const cb->setChecked( checked ); cb->setText( text() ); cb->setBackgroundColor( table()->viewport()->backgroundColor() ); - TQObject::connect( cb, SIGNAL( toggled(bool) ), table(), SLOT( doValueChanged() ) ); + TQObject::connect( cb, TQ_SIGNAL( toggled(bool) ), table(), TQ_SLOT( doValueChanged() ) ); return cb; } @@ -2076,7 +2076,7 @@ void TQTable::init( int rows, int cols ) d->geomTimer = new TQTimer( this ); d->lastVisCol = 0; d->lastVisRow = 0; - connect( d->geomTimer, SIGNAL( timeout() ), this, SLOT( updateGeometriesSlot() ) ); + connect( d->geomTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateGeometriesSlot() ) ); shouldClearSelection = FALSE; dEnabled = FALSE; roRows.setAutoDelete( TRUE ); @@ -2130,25 +2130,25 @@ void TQTable::init( int rows, int cols ) contents.setAutoDelete( FALSE ); // Connect header, table and scrollbars - connect( horizontalScrollBar(), SIGNAL( valueChanged(int) ), - topHeader, SLOT( setOffset(int) ) ); - connect( verticalScrollBar(), SIGNAL( valueChanged(int) ), - leftHeader, SLOT( setOffset(int) ) ); - connect( topHeader, SIGNAL( sectionSizeChanged(int) ), - this, SLOT( columnWidthChanged(int) ) ); - connect( topHeader, SIGNAL( indexChange(int,int,int) ), - this, SLOT( columnIndexChanged(int,int,int) ) ); - connect( topHeader, SIGNAL( sectionClicked(int) ), - this, SLOT( columnClicked(int) ) ); - connect( leftHeader, SIGNAL( sectionSizeChanged(int) ), - this, SLOT( rowHeightChanged(int) ) ); - connect( leftHeader, SIGNAL( indexChange(int,int,int) ), - this, SLOT( rowIndexChanged(int,int,int) ) ); + connect( horizontalScrollBar(), TQ_SIGNAL( valueChanged(int) ), + topHeader, TQ_SLOT( setOffset(int) ) ); + connect( verticalScrollBar(), TQ_SIGNAL( valueChanged(int) ), + leftHeader, TQ_SLOT( setOffset(int) ) ); + connect( topHeader, TQ_SIGNAL( sectionSizeChanged(int) ), + this, TQ_SLOT( columnWidthChanged(int) ) ); + connect( topHeader, TQ_SIGNAL( indexChange(int,int,int) ), + this, TQ_SLOT( columnIndexChanged(int,int,int) ) ); + connect( topHeader, TQ_SIGNAL( sectionClicked(int) ), + this, TQ_SLOT( columnClicked(int) ) ); + connect( leftHeader, TQ_SIGNAL( sectionSizeChanged(int) ), + this, TQ_SLOT( rowHeightChanged(int) ) ); + connect( leftHeader, TQ_SIGNAL( indexChange(int,int,int) ), + this, TQ_SLOT( rowIndexChanged(int,int,int) ) ); // Initialize variables autoScrollTimer = new TQTimer( this ); - connect( autoScrollTimer, SIGNAL( timeout() ), - this, SLOT( doAutoScroll() ) ); + connect( autoScrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doAutoScroll() ) ); curRow = curCol = 0; topHeader->setSectionState( curCol, TQTableHeader::Bold ); leftHeader->setSectionState( curRow, TQTableHeader::Bold ); @@ -3948,7 +3948,7 @@ void TQTable::contentsMouseReleaseEvent( TQMouseEvent *e ) void TQTable::contentsContextMenuEvent( TQContextMenuEvent *e ) { - if ( !receivers( SIGNAL(contextMenuRequested(int,int,const TQPoint&)) ) ) { + if ( !receivers( TQ_SIGNAL(contextMenuRequested(int,int,const TQPoint&)) ) ) { e->ignore(); return; } @@ -6527,8 +6527,8 @@ TQTableHeader::TQTableHeader( int i, TQTable *t, states.fill( Normal, -1 ); stretchable.fill( FALSE, -1 ); autoScrollTimer = new TQTimer( this ); - connect( autoScrollTimer, SIGNAL( timeout() ), - this, SLOT( doAutoScroll() ) ); + connect( autoScrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doAutoScroll() ) ); #ifndef NO_LINE_WIDGET line1 = new TQWidget( table->viewport(), "qt_line1" ); line1->hide(); @@ -6542,17 +6542,17 @@ TQTableHeader::TQTableHeader( int i, TQTable *t, d = new TQTableHeaderPrivate; d->oldLinePos = -1; //outside, in contents coords #endif - connect( this, SIGNAL( sizeChange(int,int,int) ), - this, SLOT( sectionWidthChanged(int,int,int) ) ); - connect( this, SIGNAL( indexChange(int,int,int) ), - this, SLOT( indexChanged(int,int,int) ) ); + connect( this, TQ_SIGNAL( sizeChange(int,int,int) ), + this, TQ_SLOT( sectionWidthChanged(int,int,int) ) ); + connect( this, TQ_SIGNAL( indexChange(int,int,int) ), + this, TQ_SLOT( indexChanged(int,int,int) ) ); stretchTimer = new TQTimer( this ); widgetStretchTimer = new TQTimer( this ); - connect( stretchTimer, SIGNAL( timeout() ), - this, SLOT( updateStretches() ) ); - connect( widgetStretchTimer, SIGNAL( timeout() ), - this, SLOT( updateWidgetStretches() ) ); + connect( stretchTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( updateStretches() ) ); + connect( widgetStretchTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( updateWidgetStretches() ) ); startPos = -1; } diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp index 14bb5743..361ed026 100644 --- a/src/widgets/qaction.cpp +++ b/src/widgets/qaction.cpp @@ -782,7 +782,7 @@ void TQAction::setAccel( const TQKeySequence& key ) if ( p ) { d->accel = new TQAccel( (TQWidget*)p, this, "qt_action_accel" ); d->accelid = d->accel->insertItem( d->key ); - d->accel->connectItem( d->accelid, this, SLOT( internalActivation() ) ); + d->accel->connectItem( d->accelid, this, TQ_SLOT( internalActivation() ) ); } #if defined(QT_CHECK_STATE) else @@ -1018,12 +1018,12 @@ bool TQAction::addTo( TQWidget* w ) if ( d->iconset ) btn->setIconSet( *d->iconset ); d->update( TQActionPrivate::State | TQActionPrivate::Visibility | TQActionPrivate::EverythingElse ) ; - connect( btn, SIGNAL( clicked() ), this, SIGNAL( activated() ) ); - connect( btn, SIGNAL( toggled(bool) ), this, SLOT( toolButtonToggled(bool) ) ); - connect( btn, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); + connect( btn, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( activated() ) ); + connect( btn, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( toolButtonToggled(bool) ) ); + connect( btn, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); #ifndef TQT_NO_TOOLTIP - connect( &(d->tipGroup), SIGNAL(showTip(const TQString&)), this, SLOT(showStatusText(const TQString&)) ); - connect( &(d->tipGroup), SIGNAL(removeTip()), this, SLOT(clearStatusText()) ); + connect( &(d->tipGroup), TQ_SIGNAL(showTip(const TQString&)), this, TQ_SLOT(showStatusText(const TQString&)) ); + connect( &(d->tipGroup), TQ_SIGNAL(removeTip()), this, TQ_SLOT(clearStatusText()) ); #endif } } else @@ -1039,18 +1039,18 @@ bool TQAction::addTo( TQWidget* w ) else mi->id = mi->popup->insertItem( TQString::fromLatin1("") ); addedTo( mi->popup->indexOf( mi->id ), mi->popup ); - mi->popup->connectItem( mi->id, this, SLOT(internalActivation()) ); + mi->popup->connectItem( mi->id, this, TQ_SLOT(internalActivation()) ); d->menuitems.append( mi ); d->update( TQActionPrivate::State | TQActionPrivate::Visibility | TQActionPrivate::EverythingElse ) ; w->topLevelWidget()->className(); - connect( mi->popup, SIGNAL(highlighted(int)), this, SLOT(menuStatusText(int)) ); - connect( mi->popup, SIGNAL(aboutToHide()), this, SLOT(clearStatusText()) ); - connect( mi->popup, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); + connect( mi->popup, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuStatusText(int)) ); + connect( mi->popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(clearStatusText()) ); + connect( mi->popup, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); // Makes only sense when called by TQActionGroup::addTo } else if ( ::tqt_cast<TQComboBox*>(w) ) { TQActionPrivate::ComboItem *ci = new TQActionPrivate::ComboItem; ci->combo = (TQComboBox*)w; - connect( ci->combo, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); + connect( ci->combo, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); ci->id = ci->combo->count(); if ( qstrcmp( name(), "qt_separator_action" ) ) { if ( d->iconset ) @@ -1193,7 +1193,7 @@ bool TQAction::removeFrom( TQWidget* w ) ++it; if ( btn->parentWidget() == w ) { d->toolbuttons.removeRef( btn ); - disconnect( btn, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); + disconnect( btn, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); delete btn; // no need to disconnect from statusbar } @@ -1206,9 +1206,9 @@ bool TQAction::removeFrom( TQWidget* w ) while ( ( mi = it.current() ) ) { ++it; if ( mi->popup == w ) { - disconnect( mi->popup, SIGNAL(highlighted(int)), this, SLOT(menuStatusText(int)) ); - disconnect( mi->popup, SIGNAL(aboutToHide()), this, SLOT(clearStatusText()) ); - disconnect( mi->popup, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); + disconnect( mi->popup, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuStatusText(int)) ); + disconnect( mi->popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(clearStatusText()) ); + disconnect( mi->popup, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); mi->popup->removeItem( mi->id ); d->menuitems.removeRef( mi ); } @@ -1219,7 +1219,7 @@ bool TQAction::removeFrom( TQWidget* w ) while ( ( ci = it.current() ) ) { ++it; if ( ci->combo == w ) { - disconnect( ci->combo, SIGNAL(destroyed()), this, SLOT(objectDestroyed()) ); + disconnect( ci->combo, TQ_SIGNAL(destroyed()), this, TQ_SLOT(objectDestroyed()) ); d->comboitems.removeRef( ci ); } } @@ -1445,7 +1445,7 @@ TQActionGroup::TQActionGroup( TQObject* parent, const char* name ) d->separatorAction = 0; TQAction::d->d_group = d; - connect( this, SIGNAL(selected(TQAction*)), SLOT(internalToggle(TQAction*)) ); + connect( this, TQ_SIGNAL(selected(TQAction*)), TQ_SLOT(internalToggle(TQAction*)) ); } /*! @@ -1466,7 +1466,7 @@ TQActionGroup::TQActionGroup( TQObject* parent, const char* name, bool exclusive d->separatorAction = 0; TQAction::d->d_group = d; - connect( this, SIGNAL(selected(TQAction*)), SLOT(internalToggle(TQAction*)) ); + connect( this, TQ_SIGNAL(selected(TQAction*)), TQ_SLOT(internalToggle(TQAction*)) ); } /*! @@ -1480,26 +1480,26 @@ TQActionGroup::~TQActionGroup() TQActionGroupPrivate::MenuItem *mi = mit.current(); ++mit; if ( mi->popup ) - mi->popup->disconnect( SIGNAL(destroyed()), this, SLOT(objectDestroyed()) ); + mi->popup->disconnect( TQ_SIGNAL(destroyed()), this, TQ_SLOT(objectDestroyed()) ); } TQPtrListIterator<TQComboBox> cbit( d->comboboxes ); while ( cbit.current() ) { TQComboBox *cb = cbit.current(); ++cbit; - cb->disconnect( SIGNAL(destroyed()), this, SLOT(objectDestroyed()) ); + cb->disconnect( TQ_SIGNAL(destroyed()), this, TQ_SLOT(objectDestroyed()) ); } TQPtrListIterator<TQToolButton> mbit( d->menubuttons ); while ( mbit.current() ) { TQToolButton *mb = mbit.current(); ++mbit; - mb->disconnect( SIGNAL(destroyed()), this, SLOT(objectDestroyed()) ); + mb->disconnect( TQ_SIGNAL(destroyed()), this, TQ_SLOT(objectDestroyed()) ); } TQPtrListIterator<TQPopupMenu> pmit( d->popupmenus ); while ( pmit.current() ) { TQPopupMenu *pm = pmit.current(); ++pmit; - pm->disconnect( SIGNAL(destroyed()), this, SLOT(objectDestroyed()) ); + pm->disconnect( TQ_SIGNAL(destroyed()), this, TQ_SLOT(objectDestroyed()) ); } delete d->separatorAction; @@ -1590,9 +1590,9 @@ void TQActionGroup::add( TQAction* action ) if (!action->d->forceInvisible) action->d->visible = isVisible(); - connect( action, SIGNAL( destroyed() ), this, SLOT( childDestroyed() ) ); - connect( action, SIGNAL( activated() ), this, SIGNAL( activated() ) ); - connect( action, SIGNAL( toggled(bool) ), this, SLOT( childToggled(bool) ) ); + connect( action, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( childDestroyed() ) ); + connect( action, TQ_SIGNAL( activated() ), this, TQ_SIGNAL( activated() ) ); + connect( action, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( childToggled(bool) ) ); for ( TQPtrListIterator<TQComboBox> cb( d->comboboxes ); cb.current(); ++cb ) { action->addTo( cb.current() ); @@ -1663,7 +1663,7 @@ bool TQActionGroup::addTo( TQWidget* w ) TQToolButton* btn = new TQToolButton( (TQToolBar*) w, "qt_actiongroup_btn" ); addedTo( btn, w ); - connect( btn, SIGNAL(destroyed()), SLOT(objectDestroyed()) ); + connect( btn, TQ_SIGNAL(destroyed()), TQ_SLOT(objectDestroyed()) ); d->menubuttons.append( btn ); if ( !iconSet().isNull() ) @@ -1687,9 +1687,9 @@ bool TQActionGroup::addTo( TQWidget* w ) TQWhatsThis::add( btn, defAction->whatsThis() ); #endif - connect( btn, SIGNAL( clicked() ), defAction, SIGNAL( activated() ) ); - connect( btn, SIGNAL( toggled(bool) ), defAction, SLOT( toolButtonToggled(bool) ) ); - connect( btn, SIGNAL( destroyed() ), defAction, SLOT( objectDestroyed() ) ); + connect( btn, TQ_SIGNAL( clicked() ), defAction, TQ_SIGNAL( activated() ) ); + connect( btn, TQ_SIGNAL( toggled(bool) ), defAction, TQ_SLOT( toolButtonToggled(bool) ) ); + connect( btn, TQ_SIGNAL( destroyed() ), defAction, TQ_SLOT( objectDestroyed() ) ); TQPopupMenu *menu = new TQPopupMenu( btn, "qt_actiongroup_menu" ); btn->setPopupDelay( 0 ); @@ -1704,7 +1704,7 @@ bool TQActionGroup::addTo( TQWidget* w ) } else { TQComboBox *box = new TQComboBox( FALSE, w, "qt_actiongroup_combo" ); addedTo( box, w ); - connect( box, SIGNAL(destroyed()), SLOT(objectDestroyed()) ); + connect( box, TQ_SIGNAL(destroyed()), TQ_SLOT(objectDestroyed()) ); d->comboboxes.append( box ); #ifndef TQT_NO_TOOLTIP if ( !!toolTip() ) @@ -1727,8 +1727,8 @@ bool TQActionGroup::addTo( TQWidget* w ) } if ( foundOn ) box->setCurrentItem( onIndex ); - connect( box, SIGNAL(activated(int)), this, SLOT( internalComboBoxActivated(int)) ); - connect( box, SIGNAL(highlighted(int)), this, SLOT( internalComboBoxHighlighted(int)) ); + connect( box, TQ_SIGNAL(activated(int)), this, TQ_SLOT( internalComboBoxActivated(int)) ); + connect( box, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT( internalComboBoxHighlighted(int)) ); d->update( this ); return TRUE; } @@ -1741,7 +1741,7 @@ bool TQActionGroup::addTo( TQWidget* w ) TQPopupMenu *menu = (TQPopupMenu*)w; popup = new TQPopupMenu( w, "qt_actiongroup_menu" ); d->popupmenus.append( popup ); - connect( popup, SIGNAL(destroyed()), SLOT(objectDestroyed()) ); + connect( popup, TQ_SIGNAL(destroyed()), TQ_SLOT(objectDestroyed()) ); int id; if ( !iconSet().isNull() ) { diff --git a/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp index 90fe7cb0..3b91b18f 100644 --- a/src/widgets/qbutton.cpp +++ b/src/widgets/qbutton.cpp @@ -85,7 +85,7 @@ void TQButton::ensureData() if ( !d ) { d = new TQButtonData; TQ_CHECK_PTR( d ); - connect(&d->timer, SIGNAL(timeout()), this, SLOT(autoRepeatTimeout())); + connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(autoRepeatTimeout())); } } @@ -538,8 +538,8 @@ void TQButton::setAccel( const TQKeySequence& key ) ensureData(); if ( !d->a ) { d->a = new TQAccel( this, "buttonAccel" ); - connect( d->a, SIGNAL( activated(int) ), this, SLOT( animateClick() ) ); - connect( d->a, SIGNAL( activatedAmbiguously(int) ), this, SLOT( setFocus() ) ); + connect( d->a, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( animateClick() ) ); + connect( d->a, TQ_SIGNAL( activatedAmbiguously(int) ), this, TQ_SLOT( setFocus() ) ); } d->a->insertItem( key, 0 ); } @@ -573,7 +573,7 @@ void TQButton::animateClick() buttonDown = TRUE; repaint( FALSE ); emit pressed(); - TQTimer::singleShot( 100, this, SLOT(animateTimeout()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(animateTimeout()) ); } void TQButton::emulateClick() diff --git a/src/widgets/qbuttongroup.cpp b/src/widgets/qbuttongroup.cpp index ec429867..15495edf 100644 --- a/src/widgets/qbuttongroup.cpp +++ b/src/widgets/qbuttongroup.cpp @@ -268,10 +268,10 @@ int TQButtonGroup::insert( TQButton *button, int id ) button->setGroup(this); buttons->append( bi ); - connect( button, SIGNAL(pressed()) , SLOT(buttonPressed()) ); - connect( button, SIGNAL(released()), SLOT(buttonReleased()) ); - connect( button, SIGNAL(clicked()) , SLOT(buttonClicked()) ); - connect( button, SIGNAL(toggled(bool)) , SLOT(buttonToggled(bool)) ); + connect( button, TQ_SIGNAL(pressed()) , TQ_SLOT(buttonPressed()) ); + connect( button, TQ_SIGNAL(released()), TQ_SLOT(buttonReleased()) ); + connect( button, TQ_SIGNAL(clicked()) , TQ_SLOT(buttonClicked()) ); + connect( button, TQ_SIGNAL(toggled(bool)) , TQ_SLOT(buttonToggled(bool)) ); if ( button->isToggleButton() && !button->isOn() && selected() && (selected()->focusPolicy() & TabFocus) != 0 ) diff --git a/src/widgets/qcombobox.cpp b/src/widgets/qcombobox.cpp index db1c4b49..b75d23ed 100644 --- a/src/widgets/qcombobox.cpp +++ b/src/widgets/qcombobox.cpp @@ -521,10 +521,10 @@ TQComboBox::TQComboBox( TQWidget *parent, const char *name ) style().styleHint(TQStyle::SH_GUIStyle) == TQt::MotifStyle ) { d->setPopupMenu( new TQComboBoxPopup( this, "in-combo" ) ); d->popup()->setFont( font() ); - connect( d->popup(), SIGNAL(activated(int)), - SLOT(internalActivate(int)) ); - connect( d->popup(), SIGNAL(highlighted(int)), - SLOT(internalHighlight(int)) ); + connect( d->popup(), TQ_SIGNAL(activated(int)), + TQ_SLOT(internalActivate(int)) ); + connect( d->popup(), TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int)) ); } else { setUpListBox(); } @@ -1393,7 +1393,7 @@ void TQComboBox::mousePressEvent( TQMouseEvent *e ) } else { popup(); } - TQTimer::singleShot( 200, this, SLOT(internalClickTimeout())); + TQTimer::singleShot( 200, this, TQ_SLOT(internalClickTimeout())); d->shortClick = TRUE; } } @@ -1562,8 +1562,8 @@ void TQComboBox::popup() TQComboBoxPopup *p = new TQComboBoxPopup( this, "in-combo" ); d->setPopupMenu( p, FALSE ); p->setFont( font() ); - connect( p, SIGNAL(activated(int)), SLOT(internalActivate(int)) ); - connect( p, SIGNAL(highlighted(int)), SLOT(internalHighlight(int)) ); + connect( p, TQ_SIGNAL(activated(int)), TQ_SLOT(internalActivate(int)) ); + connect( p, TQ_SIGNAL(highlighted(int)), TQ_SLOT(internalHighlight(int)) ); } d->popup()->clear(); for(unsigned int i = 0; i < d->listBox()->count(); i++) { @@ -2138,10 +2138,10 @@ void TQComboBox::setListBox( TQListBox * newListBox ) d->listBox()->setLineWidth( 1 ); d->listBox()->resize( 100, 10 ); - connect( d->listBox(), SIGNAL(selected(int)), - SLOT(internalActivate(int)) ); - connect( d->listBox(), SIGNAL(highlighted(int)), - SLOT(internalHighlight(int))); + connect( d->listBox(), TQ_SIGNAL(selected(int)), + TQ_SLOT(internalActivate(int)) ); + connect( d->listBox(), TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int))); } @@ -2268,10 +2268,10 @@ void TQComboBox::setUpListBox() d->listBox()->setLineWidth( 1 ); d->listBox()->resize( 100, 10 ); - connect( d->listBox(), SIGNAL(selected(int)), - SLOT(internalActivate(int)) ); - connect( d->listBox(), SIGNAL(highlighted(int)), - SLOT(internalHighlight(int))); + connect( d->listBox(), TQ_SIGNAL(selected(int)), + TQ_SLOT(internalActivate(int)) ); + connect( d->listBox(), TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int))); } @@ -2301,9 +2301,9 @@ void TQComboBox::setLineEdit( TQLineEdit *edit ) if ( edit->parent() != this ) edit->reparent( this, TQPoint(0,0), FALSE ); - connect (edit, SIGNAL( textChanged(const TQString&) ), - this, SIGNAL( textChanged(const TQString&) ) ); - connect( edit, SIGNAL(returnPressed()), SLOT(returnPressed()) ); + connect (edit, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SIGNAL( textChanged(const TQString&) ) ); + connect( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) ); edit->setFrame( FALSE ); d->updateLinedGeometry(); diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/qdatetimeedit.cpp index 2989678a..6454bdf4 100644 --- a/src/widgets/qdatetimeedit.cpp +++ b/src/widgets/qdatetimeedit.cpp @@ -952,10 +952,10 @@ void TQDateEdit::init() d->ed = new TQDateTimeEditor( this, d->controls, "date editor" ); d->controls->setEditWidget( d->ed ); setFocusProxy( d->ed ); - connect( d->controls, SIGNAL( stepUpPressed() ), SLOT( stepUp() ) ); - connect( d->controls, SIGNAL( stepDownPressed() ), SLOT( stepDown() ) ); - connect( this, SIGNAL( valueChanged(const TQDate&) ), - SLOT( updateButtons() ) ); + connect( d->controls, TQ_SIGNAL( stepUpPressed() ), TQ_SLOT( stepUp() ) ); + connect( d->controls, TQ_SIGNAL( stepDownPressed() ), TQ_SLOT( stepDown() ) ); + connect( this, TQ_SIGNAL( valueChanged(const TQDate&) ), + TQ_SLOT( updateButtons() ) ); d->ed->appendSection( TQNumberSection( 0,4 ) ); d->ed->appendSection( TQNumberSection( 5,7 ) ); d->ed->appendSection( TQNumberSection( 8,10 ) ); @@ -1854,8 +1854,8 @@ void TQTimeEdit::init() d->ed = new TQDateTimeEditor( this, d->controls, "time edit base" ); d->controls->setEditWidget( d->ed ); setFocusProxy( d->ed ); - connect( d->controls, SIGNAL( stepUpPressed() ), SLOT( stepUp() ) ); - connect( d->controls, SIGNAL( stepDownPressed() ), SLOT( stepDown() ) ); + connect( d->controls, TQ_SIGNAL( stepUpPressed() ), TQ_SLOT( stepUp() ) ); + connect( d->controls, TQ_SIGNAL( stepDownPressed() ), TQ_SLOT( stepDown() ) ); d->ed->appendSection( TQNumberSection( 0,0, TRUE, 0 ) ); d->ed->appendSection( TQNumberSection( 0,0, TRUE, 1 ) ); @@ -2728,10 +2728,10 @@ void TQDateTimeEdit::init() de = new TQDateEdit( this, "qt_datetime_dateedit" ); te = new TQTimeEdit( this, "qt_datetime_timeedit" ); d->adv = FALSE; - connect( de, SIGNAL( valueChanged(const TQDate&) ), - this, SLOT( newValue(const TQDate&) ) ); - connect( te, SIGNAL( valueChanged(const TQTime&) ), - this, SLOT( newValue(const TQTime&) ) ); + connect( de, TQ_SIGNAL( valueChanged(const TQDate&) ), + this, TQ_SLOT( newValue(const TQDate&) ) ); + connect( te, TQ_SIGNAL( valueChanged(const TQTime&) ), + this, TQ_SLOT( newValue(const TQTime&) ) ); setFocusProxy( de ); setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); } diff --git a/src/widgets/qdialogbuttons.cpp b/src/widgets/qdialogbuttons.cpp index fd3d5c4c..8f32fd61 100644 --- a/src/widgets/qdialogbuttons.cpp +++ b/src/widgets/qdialogbuttons.cpp @@ -68,8 +68,8 @@ TQDialogButtons::TQDialogButtons(TQDialog *parent, bool autoConnect, TQ_UINT32 b { init(buttons, orient); if(parent && autoConnect) { - TQObject::connect(this, SIGNAL(acceptClicked()), parent, SLOT(accept())); - TQObject::connect(this, SIGNAL(rejectClicked()), parent, SLOT(reject())); + TQObject::connect(this, TQ_SIGNAL(acceptClicked()), parent, TQ_SLOT(accept())); + TQObject::connect(this, TQ_SIGNAL(rejectClicked()), parent, TQ_SLOT(reject())); } } #endif // TQT_NO_DIALOG @@ -242,7 +242,7 @@ TQWidget * TQDialogButtons::createButton(Button b) { TQPushButton *ret = new TQPushButton(this, "qdialog_button"); - TQObject::connect(ret, SIGNAL(clicked()), this, SLOT(handleClicked())); + TQObject::connect(ret, TQ_SIGNAL(clicked()), this, TQ_SLOT(handleClicked())); if(d->text.contains(b)) { ret->setText(d->text[b]); } else { diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp index 76900503..93823706 100644 --- a/src/widgets/qdockwindow.cpp +++ b/src/widgets/qdockwindow.cpp @@ -392,7 +392,7 @@ TQDockWindowHandle::TQDockWindowHandle( TQDockWindow *dw ) { ctrlDown = FALSE; timer = new TQTimer( this ); - connect( timer, SIGNAL( timeout() ), this, SLOT( minimize() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( minimize() ) ); #ifdef Q_WS_WIN setCursor( SizeAllCursor ); #endif @@ -512,8 +512,8 @@ void TQDockWindowHandle::updateGui() #endif closeButton->setPixmap( style().stylePixmap( TQStyle::SP_DockWindowCloseButton, closeButton ) ); closeButton->setFixedSize( 12, 12 ); - connect( closeButton, SIGNAL( clicked() ), - dockWindow, SLOT( hide() ) ); + connect( closeButton, TQ_SIGNAL( clicked() ), + dockWindow, TQ_SLOT( hide() ) ); } if ( dockWindow->isCloseEnabled() && dockWindow->area() ) @@ -578,7 +578,7 @@ TQDockWindowTitleBar::TQDockWindowTitleBar( TQDockWindow *dw ) ctrlDown = FALSE; setMouseTracking( TRUE ); setFixedHeight( style().pixelMetric( TQStyle::PM_TitleBarHeight, this ) ); - connect( this, SIGNAL(doClose()), dockWindow, SLOT(hide()) ); + connect( this, TQ_SIGNAL(doClose()), dockWindow, TQ_SLOT(hide()) ); } void TQDockWindowTitleBar::keyPressEvent( TQKeyEvent *e ) @@ -1062,11 +1062,11 @@ void TQDockWindow::init() stretchable[ Horizontal ] = FALSE; stretchable[ Vertical ] = FALSE; - connect( titleBar, SIGNAL( doubleClicked() ), this, SLOT( dock() ) ); - connect( verHandle, SIGNAL( doubleClicked() ), this, SLOT( undock() ) ); - connect( horHandle, SIGNAL( doubleClicked() ), this, SLOT( undock() ) ); - connect( this, SIGNAL( orientationChanged(Orientation) ), - this, SLOT( setOrientation(Orientation) ) ); + connect( titleBar, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( dock() ) ); + connect( verHandle, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( undock() ) ); + connect( horHandle, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( undock() ) ); + connect( this, TQ_SIGNAL( orientationChanged(Orientation) ), + this, TQ_SLOT( setOrientation(Orientation) ) ); } /*! diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp index 40170dbe..d1416483 100644 --- a/src/widgets/qeffects.cpp +++ b/src/widgets/qeffects.cpp @@ -166,7 +166,7 @@ void TQAlphaWidget::run( int time ) show(); setEnabled(FALSE); - connect( &anim, SIGNAL(timeout()), this, SLOT(render())); + connect( &anim, TQ_SIGNAL(timeout()), this, TQ_SLOT(render())); anim.start( 1 ); } else { duration = 0; @@ -509,7 +509,7 @@ void TQRollEffect::run( int time ) duration = TQMIN( TQMAX( dist/3, 50 ), 120 ); } - connect( &anim, SIGNAL(timeout()), this, SLOT(scroll())); + connect( &anim, TQ_SIGNAL(timeout()), this, TQ_SLOT(scroll())); widget->setWState( WState_Visible ); diff --git a/src/widgets/qgroupbox.cpp b/src/widgets/qgroupbox.cpp index 1a8a1d1b..9a31d397 100644 --- a/src/widgets/qgroupbox.cpp +++ b/src/widgets/qgroupbox.cpp @@ -253,7 +253,7 @@ void TQGroupBox::setTitle( const TQString &title ) if ( s ) { accel = new TQAccel( this, "automatic focus-change accelerator" ); accel->connectItem( accel->insertItem( s, 0 ), - this, SLOT(fixFocus()) ); + this, TQ_SLOT(fixFocus()) ); } #endif #ifndef TQT_NO_CHECKBOX @@ -846,10 +846,10 @@ void TQGroupBox::setCheckable( bool b ) meAsButtonGroup->remove(d->checkbox); setChecked( TRUE ); setChildrenEnabled( TRUE ); - connect( d->checkbox, SIGNAL( toggled(bool) ), - this, SLOT( setChildrenEnabled(bool) ) ); - connect( d->checkbox, SIGNAL( toggled(bool) ), - this, SIGNAL( toggled(bool) ) ); + connect( d->checkbox, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( setChildrenEnabled(bool) ) ); + connect( d->checkbox, TQ_SIGNAL( toggled(bool) ), + this, TQ_SIGNAL( toggled(bool) ) ); updateCheckBoxGeometry(); } d->checkbox->show(); diff --git a/src/widgets/qiconview.cpp b/src/widgets/qiconview.cpp index 8ce8cfb9..ce41f05b 100644 --- a/src/widgets/qiconview.cpp +++ b/src/widgets/qiconview.cpp @@ -2789,14 +2789,14 @@ TQIconView::TQIconView( TQWidget *parent, const char *name, WFlags f ) d->drawDragShapes = FALSE; d->backrubber = 0; - connect( d->adjustTimer, SIGNAL( timeout() ), - this, SLOT( adjustItems() ) ); - connect( d->updateTimer, SIGNAL( timeout() ), - this, SLOT( slotUpdate() ) ); - connect( d->fullRedrawTimer, SIGNAL( timeout() ), - this, SLOT( updateContents() ) ); - connect( this, SIGNAL( contentsMoving(int,int) ), - this, SLOT( movedContents(int,int) ) ); + connect( d->adjustTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( adjustItems() ) ); + connect( d->updateTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotUpdate() ) ); + connect( d->fullRedrawTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( updateContents() ) ); + connect( this, TQ_SIGNAL( contentsMoving(int,int) ), + this, TQ_SLOT( movedContents(int,int) ) ); setAcceptDrops( TRUE ); viewport()->setAcceptDrops( TRUE ); @@ -3425,13 +3425,13 @@ void TQIconView::doAutoScroll() !d->scrollTimer ) { d->scrollTimer = new TQTimer( this ); - connect( d->scrollTimer, SIGNAL( timeout() ), - this, SLOT( doAutoScroll() ) ); + connect( d->scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doAutoScroll() ) ); d->scrollTimer->start( 100, FALSE ); } else if ( TQRect( 50, 50, viewport()->width()-100, viewport()->height()-100 ).contains( vp ) && d->scrollTimer ) { - disconnect( d->scrollTimer, SIGNAL( timeout() ), - this, SLOT( doAutoScroll() ) ); + disconnect( d->scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doAutoScroll() ) ); d->scrollTimer->stop(); delete d->scrollTimer; d->scrollTimer = 0; @@ -4473,7 +4473,7 @@ void TQIconView::contentsMousePressEventEx( TQMouseEvent *e ) d->backrubber = 0; if ( d->scrollTimer ) { - disconnect( d->scrollTimer, SIGNAL( timeout() ), this, SLOT( doAutoScroll() ) ); + disconnect( d->scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( doAutoScroll() ) ); d->scrollTimer->stop(); delete d->scrollTimer; d->scrollTimer = 0; @@ -4616,7 +4616,7 @@ void TQIconView::contentsMousePressEventEx( TQMouseEvent *e ) void TQIconView::contentsContextMenuEvent( TQContextMenuEvent *e ) { - if ( !receivers( SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)) ) ) { + if ( !receivers( TQ_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)) ) ) { e->ignore(); return; } @@ -4664,7 +4664,7 @@ void TQIconView::contentsMouseReleaseEvent( TQMouseEvent *e ) } if ( d->scrollTimer ) { - disconnect( d->scrollTimer, SIGNAL( timeout() ), this, SLOT( doAutoScroll() ) ); + disconnect( d->scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( doAutoScroll() ) ); d->scrollTimer->stop(); delete d->scrollTimer; d->scrollTimer = 0; diff --git a/src/widgets/qlabel.cpp b/src/widgets/qlabel.cpp index ff647ab2..a9b485af 100644 --- a/src/widgets/qlabel.cpp +++ b/src/widgets/qlabel.cpp @@ -294,7 +294,7 @@ void TQLabel::setText( const TQString &text ) if ( !accel ) accel = new TQAccel( this, "accel label accel" ); accel->connectItem( accel->insertItem( p ), - this, SLOT(acceleratorSlot()) ); + this, TQ_SLOT(acceleratorSlot()) ); } } #endif @@ -949,7 +949,7 @@ void TQLabel::setBuddy( TQWidget *buddy ) setAlignment( alignment() & ~ShowPrefix ); if ( lbuddy ) - disconnect( lbuddy, SIGNAL(destroyed()), this, SLOT(buddyDied()) ); + disconnect( lbuddy, TQ_SIGNAL(destroyed()), this, TQ_SLOT(buddyDied()) ); lbuddy = buddy; @@ -965,11 +965,11 @@ void TQLabel::setBuddy( TQWidget *buddy ) if ( !accel ) accel = new TQAccel( this, "accel label accel" ); accel->connectItem( accel->insertItem( p ), - this, SLOT(acceleratorSlot()) ); + this, TQ_SLOT(acceleratorSlot()) ); } } - connect( lbuddy, SIGNAL(destroyed()), this, SLOT(buddyDied()) ); + connect( lbuddy, TQ_SIGNAL(destroyed()), this, TQ_SLOT(buddyDied()) ); } @@ -1027,8 +1027,8 @@ void TQLabel::setMovie( const TQMovie& movie ) clearContents(); lmovie = new TQMovie( movie ); - lmovie->connectResize(this, SLOT(movieResized(const TQSize&))); - lmovie->connectUpdate(this, SLOT(movieUpdated(const TQRect&))); + lmovie->connectResize(this, TQ_SLOT(movieResized(const TQSize&))); + lmovie->connectUpdate(this, TQ_SLOT(movieUpdated(const TQRect&))); if ( !lmovie->running() ) // Assume that if the movie is running, updateLabel( osh ); // resize/update signals will come soon enough @@ -1067,8 +1067,8 @@ void TQLabel::clearContents() #endif #ifndef TQT_NO_MOVIE if ( lmovie ) { - lmovie->disconnectResize(this, SLOT(movieResized(const TQSize&))); - lmovie->disconnectUpdate(this, SLOT(movieUpdated(const TQRect&))); + lmovie->disconnectResize(this, TQ_SLOT(movieResized(const TQSize&))); + lmovie->disconnectUpdate(this, TQ_SLOT(movieUpdated(const TQRect&))); delete lmovie; lmovie = 0; } diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp index 27f5867c..41ad0135 100644 --- a/src/widgets/qlineedit.cpp +++ b/src/widgets/qlineedit.cpp @@ -669,12 +669,12 @@ const TQValidator * TQLineEdit::validator() const void TQLineEdit::setValidator( const TQValidator *v ) { if ( d->validator ) - disconnect( (TQObject*)d->validator, SIGNAL( destroyed() ), - this, SLOT( clearValidator() ) ); + disconnect( (TQObject*)d->validator, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( clearValidator() ) ); d->validator = v; if ( d->validator ) - connect( (TQObject*)d->validator, SIGNAL( destroyed() ), - this, SLOT( clearValidator() ) ); + connect( (TQObject*)d->validator, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( clearValidator() ) ); } @@ -1349,10 +1349,10 @@ void TQLineEditPrivate::copy( bool clipboard ) const { TQString t = q->selectedText(); if ( !t.isEmpty() && echoMode == TQLineEdit::Normal ) { - q->disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), q, 0); + q->disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), q, 0); TQApplication::clipboard()->setText( t, clipboard ? TQClipboard::Clipboard : TQClipboard::Selection ); - q->connect( TQApplication::clipboard(), SIGNAL(selectionChanged()), - q, SLOT(clipboardChanged()) ); + q->connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), + q, TQ_SLOT(clipboardChanged()) ); } } diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp index 5ccedf40..3669b3e2 100644 --- a/src/widgets/qlistbox.cpp +++ b/src/widgets/qlistbox.cpp @@ -1022,12 +1022,12 @@ TQListBox::TQListBox( TQWidget *parent, const char *name, WFlags f ) setMouseTracking( TRUE ); viewport()->setMouseTracking( TRUE ); - connect( d->updateTimer, SIGNAL(timeout()), - this, SLOT(refreshSlot()) ); - connect( d->visibleTimer, SIGNAL(timeout()), - this, SLOT(ensureCurrentVisible()) ); - connect( d->resizeTimer, SIGNAL( timeout() ), - this, SLOT( adjustItems() ) ); + connect( d->updateTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(refreshSlot()) ); + connect( d->visibleTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(ensureCurrentVisible()) ); + connect( d->resizeTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( adjustItems() ) ); viewport()->setBackgroundMode( PaletteBase ); setBackgroundMode( PaletteBackground, PaletteBase ); viewport()->setFocusProxy( this ); @@ -2312,8 +2312,8 @@ void TQListBox::mouseMoveEvent( TQMouseEvent *e ) if ( ( dx || dy ) && !d->scrollTimer && e->state() == LeftButton && e->button() != LeftButton ) { // start autoscrolling if necessary d->scrollTimer = new TQTimer( this ); - connect( d->scrollTimer, SIGNAL(timeout()), - this, SLOT(doAutoScroll()) ); + connect( d->scrollTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(doAutoScroll()) ); d->scrollTimer->start( 100, FALSE ); doAutoScroll(); } else if ( !d->scrollTimer ) { @@ -2423,7 +2423,7 @@ void TQListBox::repaintSelection() void TQListBox::contentsContextMenuEvent( TQContextMenuEvent *e ) { - if ( !receivers( SIGNAL(contextMenuRequested(TQListBoxItem*,const TQPoint&)) ) ) { + if ( !receivers( TQ_SIGNAL(contextMenuRequested(TQListBoxItem*,const TQPoint&)) ) ) { e->ignore(); return; } diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp index 22c04e03..599c9943 100644 --- a/src/widgets/qlistview.cpp +++ b/src/widgets/qlistview.cpp @@ -2694,29 +2694,29 @@ void TQListView::init() setMouseTracking( TRUE ); viewport()->setMouseTracking( TRUE ); - connect( d->timer, SIGNAL(timeout()), - this, SLOT(updateContents()) ); - connect( d->dirtyItemTimer, SIGNAL(timeout()), - this, SLOT(updateDirtyItems()) ); - connect( d->visibleTimer, SIGNAL(timeout()), - this, SLOT(makeVisible()) ); - connect( d->renameTimer, SIGNAL(timeout()), - this, SLOT(startRename()) ); - connect( d->autoopenTimer, SIGNAL(timeout()), - this, SLOT(openFocusItem()) ); - - connect( d->h, SIGNAL(sizeChange(int,int,int)), - this, SLOT(handleSizeChange(int,int,int)) ); - connect( d->h, SIGNAL(indexChange(int,int,int)), - this, SLOT(handleIndexChange()) ); - connect( d->h, SIGNAL(sectionClicked(int)), - this, SLOT(changeSortColumn(int)) ); - connect( d->h, SIGNAL(sectionHandleDoubleClicked(int)), - this, SLOT(adjustColumn(int)) ); - connect( horizontalScrollBar(), SIGNAL(sliderMoved(int)), - d->h, SLOT(setOffset(int)) ); - connect( horizontalScrollBar(), SIGNAL(valueChanged(int)), - d->h, SLOT(setOffset(int)) ); + connect( d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateContents()) ); + connect( d->dirtyItemTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateDirtyItems()) ); + connect( d->visibleTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(makeVisible()) ); + connect( d->renameTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(startRename()) ); + connect( d->autoopenTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(openFocusItem()) ); + + connect( d->h, TQ_SIGNAL(sizeChange(int,int,int)), + this, TQ_SLOT(handleSizeChange(int,int,int)) ); + connect( d->h, TQ_SIGNAL(indexChange(int,int,int)), + this, TQ_SLOT(handleIndexChange()) ); + connect( d->h, TQ_SIGNAL(sectionClicked(int)), + this, TQ_SLOT(changeSortColumn(int)) ); + connect( d->h, TQ_SIGNAL(sectionHandleDoubleClicked(int)), + this, TQ_SLOT(adjustColumn(int)) ); + connect( horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)), + d->h, TQ_SLOT(setOffset(int)) ); + connect( horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)), + d->h, TQ_SLOT(setOffset(int)) ); // will access d->r TQListViewPrivate::Root * r = new TQListViewPrivate::Root( this ); @@ -3460,11 +3460,11 @@ void TQListView::setColumnWidth( int column, int w ) int oldw = d->h->sectionSize( column ); if ( column < d->h->count() && oldw != w ) { d->h->resizeSection( column, w ); - disconnect( d->h, SIGNAL(sizeChange(int,int,int)), - this, SLOT(handleSizeChange(int,int,int)) ); + disconnect( d->h, TQ_SIGNAL(sizeChange(int,int,int)), + this, TQ_SLOT(handleSizeChange(int,int,int)) ); emit d->h->sizeChange( column, oldw, w); - connect( d->h, SIGNAL(sizeChange(int,int,int)), - this, SLOT(handleSizeChange(int,int,int)) ); + connect( d->h, TQ_SIGNAL(sizeChange(int,int,int)), + this, TQ_SLOT(handleSizeChange(int,int,int)) ); updateGeometries(); viewport()->update(); } @@ -4446,7 +4446,7 @@ void TQListView::contentsMousePressEventEx( TQMouseEvent * e ) void TQListView::contentsContextMenuEvent( TQContextMenuEvent *e ) { - if ( !receivers( SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)) ) ) { + if ( !receivers( TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)) ) ) { e->ignore(); return; } @@ -4486,8 +4486,8 @@ void TQListView::contentsMouseReleaseEventEx( TQMouseEvent * e ) d->buttonDown = FALSE; // delete and disconnect autoscroll timer, if we have one if ( d->scrollTimer ) { - disconnect( d->scrollTimer, SIGNAL(timeout()), - this, SLOT(doAutoScroll()) ); + disconnect( d->scrollTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(doAutoScroll()) ); d->scrollTimer->stop(); delete d->scrollTimer; d->scrollTimer = 0; @@ -4709,8 +4709,8 @@ void TQListView::contentsMouseMoveEvent( TQMouseEvent * e ) // connect the timer if ( needAutoScroll && !d->scrollTimer ) { d->scrollTimer = new TQTimer( this ); - connect( d->scrollTimer, SIGNAL(timeout()), - this, SLOT(doAutoScroll()) ); + connect( d->scrollTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(doAutoScroll()) ); d->scrollTimer->start( 100, FALSE ); // call it once manually doAutoScroll( vp ); @@ -4720,8 +4720,8 @@ void TQListView::contentsMouseMoveEvent( TQMouseEvent * e ) if ( !needAutoScroll ) { // if there is a autoscroll timer, delete it if ( d->scrollTimer ) { - disconnect( d->scrollTimer, SIGNAL(timeout()), - this, SLOT(doAutoScroll()) ); + disconnect( d->scrollTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(doAutoScroll()) ); d->scrollTimer->stop(); delete d->scrollTimer; d->scrollTimer = 0; diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp index f196a1d3..ab9beba9 100644 --- a/src/widgets/qmainwindow.cpp +++ b/src/widgets/qmainwindow.cpp @@ -995,10 +995,10 @@ void TQMainWindow::setStatusBar( TQStatusBar * newStatusBar ) d->sb = newStatusBar; #ifndef TQT_NO_TOOLTIP // ### this code can cause unnecessary creation of a tool tip group - connect( toolTipGroup(), SIGNAL(showTip(const TQString&)), - d->sb, SLOT(message(const TQString&)) ); - connect( toolTipGroup(), SIGNAL(removeTip()), - d->sb, SLOT(clear()) ); + connect( toolTipGroup(), TQ_SIGNAL(showTip(const TQString&)), + d->sb, TQ_SLOT(message(const TQString&)) ); + connect( toolTipGroup(), TQ_SIGNAL(removeTip()), + d->sb, TQ_SLOT(clear()) ); #endif d->sb->installEventFilter( this ); triggerLayout(); @@ -1054,10 +1054,10 @@ void TQMainWindow::setToolTipGroup( TQToolTipGroup * newToolTipGroup ) delete d->ttg; d->ttg = newToolTipGroup; - connect( toolTipGroup(), SIGNAL(showTip(const TQString&)), - statusBar(), SLOT(message(const TQString&)) ); - connect( toolTipGroup(), SIGNAL(removeTip()), - statusBar(), SLOT(clear()) ); + connect( toolTipGroup(), TQ_SIGNAL(showTip(const TQString&)), + statusBar(), TQ_SLOT(message(const TQString&)) ); + connect( toolTipGroup(), TQ_SIGNAL(removeTip()), + statusBar(), TQ_SLOT(clear()) ); } @@ -1148,8 +1148,8 @@ void TQMainWindow::setDockEnabled( TQDockWindow *dw, Dock dock, bool enable ) { if ( d->dockWindows.find( dw ) == -1 ) { d->dockWindows.append( dw ); - connect( dw, SIGNAL( placeChanged(TQDockWindow::Place) ), - this, SLOT( slotPlaceChanged() ) ); + connect( dw, TQ_SIGNAL( placeChanged(TQDockWindow::Place) ), + this, TQ_SLOT( slotPlaceChanged() ) ); } TQString s; s.sprintf( "%p_%d", (void*)dw, (int)dock ); @@ -1247,8 +1247,8 @@ void TQMainWindow::addDockWindow( TQDockWindow *dockWindow, dockWindow->setNewLine( newLine ); if ( d->dockWindows.find( dockWindow ) == -1 ) { d->dockWindows.append( dockWindow ); - connect( dockWindow, SIGNAL( placeChanged(TQDockWindow::Place) ), - this, SLOT( slotPlaceChanged() ) ); + connect( dockWindow, TQ_SIGNAL( placeChanged(TQDockWindow::Place) ), + this, TQ_SLOT( slotPlaceChanged() ) ); dockWindow->installEventFilter( this ); } dockWindow->setOpaqueMoving( d->opaque ); @@ -1414,8 +1414,8 @@ void TQMainWindow::removeDockWindow( TQDockWindow * dockWindow ) dockWindow->hide(); d->dockWindows.removeRef( dockWindow ); - disconnect( dockWindow, SIGNAL( placeChanged(TQDockWindow::Place) ), - this, SLOT( slotPlaceChanged() ) ); + disconnect( dockWindow, TQ_SIGNAL( placeChanged(TQDockWindow::Place) ), + this, TQ_SLOT( slotPlaceChanged() ) ); dockWindow->removeEventFilter( this ); } @@ -1844,7 +1844,7 @@ void TQMainWindow::triggerLayout( bool deleteLayout ) \code TQPopupMenu * help = new TQPopupMenu( this ); - help->insertItem( "What's &This", this , SLOT(whatsThis()), SHIFT+Key_F1); + help->insertItem( "What's &This", this , TQ_SLOT(whatsThis()), SHIFT+Key_F1); \endcode \sa TQWhatsThis::enterWhatsThisMode() @@ -2164,7 +2164,7 @@ TQPopupMenu *TQMainWindow::createDockWindowMenu( DockWindows dockWindows ) const TQPopupMenu *menu = new TQPopupMenu( (TQMainWindow*)this, "qt_customize_menu" ); menu->setCheckable( TRUE ); d->dockWindowModes.replace( menu, dockWindows ); - connect( menu, SIGNAL( aboutToShow() ), this, SLOT( menuAboutToShow() ) ); + connect( menu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( menuAboutToShow() ) ); return menu; } @@ -2203,7 +2203,7 @@ void TQMainWindow::menuAboutToShow() continue; TQString label = dw->caption(); if ( !label.isEmpty() ) { - int id = menu->insertItem( label, dw, SLOT( toggleVisible() ) ); + int id = menu->insertItem( label, dw, TQ_SLOT( toggleVisible() ) ); menu->setItemChecked( id, dw->isVisible() ); empty = FALSE; } @@ -2222,7 +2222,7 @@ void TQMainWindow::menuAboutToShow() continue; TQString label = tb->label(); if ( !label.isEmpty() ) { - int id = menu->insertItem( label, tb, SLOT( toggleVisible() ) ); + int id = menu->insertItem( label, tb, TQ_SLOT( toggleVisible() ) ); menu->setItemChecked( id, tb->isVisible() ); empty = FALSE; } @@ -2238,9 +2238,9 @@ void TQMainWindow::menuAboutToShow() menu->insertSeparator(); if ( dockWindowsMovable() ) - menu->insertItem( tr( "Line up" ), this, SLOT( doLineUp() ) ); + menu->insertItem( tr( "Line up" ), this, TQ_SLOT( doLineUp() ) ); if ( isCustomizable() ) - menu->insertItem( tr( "Customize..." ), this, SLOT( customize() ) ); + menu->insertItem( tr( "Customize..." ), this, TQ_SLOT( customize() ) ); } /*! diff --git a/src/widgets/qmenubar.cpp b/src/widgets/qmenubar.cpp index d832bcc4..c0051ef6 100644 --- a/src/widgets/qmenubar.cpp +++ b/src/widgets/qmenubar.cpp @@ -375,7 +375,7 @@ void TQMenuBar::menuContentsChanged() return; pendingDelayedContentsChanges = 1; if( !pendingDelayedStateChanges )// if the timer hasn't been started yet - TQTimer::singleShot( 0, this, SLOT(performDelayedChanges())); + TQTimer::singleShot( 0, this, TQ_SLOT(performDelayedChanges())); } void TQMenuBar::performDelayedContentsChanged() @@ -418,7 +418,7 @@ void TQMenuBar::menuStateChanged() return; pendingDelayedStateChanges = 1; if( !pendingDelayedContentsChanges ) // if the timer hasn't been started yet - TQTimer::singleShot( 0, this, SLOT(performDelayedChanges())); + TQTimer::singleShot( 0, this, TQ_SLOT(performDelayedChanges())); } void TQMenuBar::performDelayedStateChanged() @@ -467,20 +467,20 @@ void TQMenuBar::performDelayedChanges() void TQMenuBar::menuInsPopup( TQPopupMenu *popup ) { - connect( popup, SIGNAL(activatedRedirect(int)), - SLOT(subActivated(int)) ); - connect( popup, SIGNAL(highlightedRedirect(int)), - SLOT(subHighlighted(int)) ); - connect( popup, SIGNAL(destroyed(TQObject*)), - this, SLOT(popupDestroyed(TQObject*)) ); + connect( popup, TQ_SIGNAL(activatedRedirect(int)), + TQ_SLOT(subActivated(int)) ); + connect( popup, TQ_SIGNAL(highlightedRedirect(int)), + TQ_SLOT(subHighlighted(int)) ); + connect( popup, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(popupDestroyed(TQObject*)) ); } void TQMenuBar::menuDelPopup( TQPopupMenu *popup ) { - popup->disconnect( SIGNAL(activatedRedirect(int)) ); - popup->disconnect( SIGNAL(highlightedRedirect(int)) ); - disconnect( popup, SIGNAL(destroyed(TQObject*)), - this, SLOT(popupDestroyed(TQObject*)) ); + popup->disconnect( TQ_SIGNAL(activatedRedirect(int)) ); + popup->disconnect( TQ_SIGNAL(highlightedRedirect(int)) ); + disconnect( popup, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(popupDestroyed(TQObject*)) ); } void TQMenuBar::frameChanged() @@ -1547,12 +1547,12 @@ void TQMenuBar::setupAccelerators() autoaccel = new TQAccel( this ); TQ_CHECK_PTR( autoaccel ); autoaccel->setIgnoreWhatsThis( TRUE ); - connect( autoaccel, SIGNAL(activated(int)), - SLOT(accelActivated(int)) ); - connect( autoaccel, SIGNAL(activatedAmbiguously(int)), - SLOT(accelActivated(int)) ); - connect( autoaccel, SIGNAL(destroyed()), - SLOT(accelDestroyed()) ); + connect( autoaccel, TQ_SIGNAL(activated(int)), + TQ_SLOT(accelActivated(int)) ); + connect( autoaccel, TQ_SIGNAL(activatedAmbiguously(int)), + TQ_SLOT(accelActivated(int)) ); + connect( autoaccel, TQ_SIGNAL(destroyed()), + TQ_SLOT(accelDestroyed()) ); } autoaccel->insertItem( i, mi->id() ); } diff --git a/src/widgets/qmenudata.cpp b/src/widgets/qmenudata.cpp index 98bc2bf1..720cba9e 100644 --- a/src/widgets/qmenudata.cpp +++ b/src/widgets/qmenudata.cpp @@ -361,8 +361,8 @@ void TQMenuData::removePopup( TQPopupMenu *popup ) \code TQMenuBar *mainMenu = new TQMenuBar; TQPopupMenu *fileMenu = new TQPopupMenu; - fileMenu->insertItem( "New", myView, SLOT(newFile()), CTRL+Key_N ); - fileMenu->insertItem( "Open", myView, SLOT(open()), CTRL+Key_O ); + fileMenu->insertItem( "New", myView, TQ_SLOT(newFile()), CTRL+Key_N ); + fileMenu->insertItem( "Open", myView, TQ_SLOT(open()), CTRL+Key_O ); mainMenu->insertItem( "File", fileMenu ); \endcode @@ -373,7 +373,7 @@ void TQMenuData::removePopup( TQPopupMenu *popup ) accelerator. (For translations use a string \link TQKeySequence key sequence\endlink.): \code - fileMenu->insertItem( tr("Open"), myView, SLOT(open()), + fileMenu->insertItem( tr("Open"), myView, TQ_SLOT(open()), tr("Ctrl+O") ); \endcode diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp index 051ef6d0..5e327d20 100644 --- a/src/widgets/qpopupmenu.cpp +++ b/src/widgets/qpopupmenu.cpp @@ -115,9 +115,9 @@ static void popupSubMenuLater( int msec, TQPopupMenu * receiver ) { tqAddPostRoutine( cleanup ); } - singleSingleShot->disconnect( SIGNAL(timeout()) ); - TQObject::connect( singleSingleShot, SIGNAL(timeout()), - receiver, SLOT(subMenuTimer()) ); + singleSingleShot->disconnect( TQ_SIGNAL(timeout()) ); + TQObject::connect( singleSingleShot, TQ_SIGNAL(timeout()), + receiver, TQ_SLOT(subMenuTimer()) ); singleSingleShot->start( msec, TRUE ); } @@ -380,7 +380,7 @@ void TQPopupMenu::menuContentsChanged() return; pendingDelayedContentsChanges = 1; if( !pendingDelayedStateChanges ) // if the timer hasn't been started yet - TQTimer::singleShot( 0, this, SLOT(performDelayedChanges())); + TQTimer::singleShot( 0, this, TQ_SLOT(performDelayedChanges())); } void TQPopupMenu::performDelayedContentsChanged() @@ -417,7 +417,7 @@ void TQPopupMenu::menuStateChanged() return; pendingDelayedStateChanges = 1; if( !pendingDelayedContentsChanges ) // if the timer hasn't been started yet - TQTimer::singleShot( 0, this, SLOT(performDelayedChanges())); + TQTimer::singleShot( 0, this, TQ_SLOT(performDelayedChanges())); } void TQPopupMenu::performDelayedStateChanged() @@ -443,20 +443,20 @@ void TQPopupMenu::performDelayedChanges() void TQPopupMenu::menuInsPopup( TQPopupMenu *popup ) { - connect( popup, SIGNAL(activatedRedirect(int)), - SLOT(subActivated(int)) ); - connect( popup, SIGNAL(highlightedRedirect(int)), - SLOT(subHighlighted(int)) ); - connect( popup, SIGNAL(destroyed(TQObject*)), - this, SLOT(popupDestroyed(TQObject*)) ); + connect( popup, TQ_SIGNAL(activatedRedirect(int)), + TQ_SLOT(subActivated(int)) ); + connect( popup, TQ_SIGNAL(highlightedRedirect(int)), + TQ_SLOT(subHighlighted(int)) ); + connect( popup, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(popupDestroyed(TQObject*)) ); } void TQPopupMenu::menuDelPopup( TQPopupMenu *popup ) { - popup->disconnect( SIGNAL(activatedRedirect(int)) ); - popup->disconnect( SIGNAL(highlightedRedirect(int)) ); - disconnect( popup, SIGNAL(destroyed(TQObject*)), - this, SLOT(popupDestroyed(TQObject*)) ); + popup->disconnect( TQ_SIGNAL(activatedRedirect(int)) ); + popup->disconnect( TQ_SIGNAL(highlightedRedirect(int)) ); + disconnect( popup, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(popupDestroyed(TQObject*)) ); } @@ -803,7 +803,7 @@ void TQPopupMenu::hideAllPopups() { TQMenuData *top = this; // find top level popup if ( !preventAnimation ) - TQTimer::singleShot( 10, this, SLOT(allowAnimation()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(allowAnimation()) ); preventAnimation = TRUE; if ( !isPopup() ) @@ -831,7 +831,7 @@ void TQPopupMenu::hideAllPopups() void TQPopupMenu::hidePopups() { if ( !preventAnimation ) - TQTimer::singleShot( 10, this, SLOT(allowAnimation()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(allowAnimation()) ); preventAnimation = TRUE; TQMenuItemListIt it(*mitems); @@ -1270,12 +1270,12 @@ void TQPopupMenu::updateAccel( TQWidget *parent ) // create an autoaccel in any case, even if we might not use // it immediately. Maybe the user needs it later. autoaccel = new TQAccel( parent, this ); - connect( autoaccel, SIGNAL(activated(int)), - SLOT(accelActivated(int)) ); - connect( autoaccel, SIGNAL(activatedAmbiguously(int)), - SLOT(accelActivated(int)) ); - connect( autoaccel, SIGNAL(destroyed()), - SLOT(accelDestroyed()) ); + connect( autoaccel, TQ_SIGNAL(activated(int)), + TQ_SLOT(accelActivated(int)) ); + connect( autoaccel, TQ_SIGNAL(activatedAmbiguously(int)), + TQ_SLOT(accelActivated(int)) ); + connect( autoaccel, TQ_SIGNAL(destroyed()), + TQ_SLOT(accelDestroyed()) ); if ( accelDisabled ) autoaccel->setEnabled( FALSE ); } @@ -1768,8 +1768,8 @@ void TQPopupMenu::mouseMoveEvent( TQMouseEvent *e ) (d->scroll.scrollable & TQPopupMenuPrivate::Scroll::ScrollDown && e->pos().y() >= height()-sh)) { if(!d->scroll.scrolltimer) { d->scroll.scrolltimer = new TQTimer(this, "popup scroll timer"); - TQObject::connect( d->scroll.scrolltimer, SIGNAL(timeout()), - this, SLOT(subScrollTimer()) ); + TQObject::connect( d->scroll.scrolltimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(subScrollTimer()) ); } if(!d->scroll.scrolltimer->isActive()) d->scroll.scrolltimer->start(40); @@ -2497,11 +2497,11 @@ void TQPopupMenu::connectModal( TQPopupMenu* receiver, bool doConnect ) connectModalRecursionSafety = doConnect; if ( doConnect ) - connect( this, SIGNAL(activated(int)), - receiver, SLOT(modalActivation(int)) ); + connect( this, TQ_SIGNAL(activated(int)), + receiver, TQ_SLOT(modalActivation(int)) ); else - disconnect( this, SIGNAL(activated(int)), - receiver, SLOT(modalActivation(int)) ); + disconnect( this, TQ_SIGNAL(activated(int)), + receiver, TQ_SLOT(modalActivation(int)) ); TQMenuItemListIt it(*mitems); TQMenuItem *mi; @@ -2716,7 +2716,7 @@ public: int TQPopupMenu::insertTearOffHandle( int id, int index ) { int myid = insertItem( new TQTearOffMenuItem, id, index ); - connectItem( myid, this, SLOT( toggleTearOff() ) ); + connectItem( myid, this, TQ_SLOT( toggleTearOff() ) ); TQMenuData::d->aInt = myid; return myid; } @@ -2735,8 +2735,8 @@ void TQPopupMenu::toggleTearOff() } else { // create a tear off menu TQPopupMenu* p = new TQPopupMenu( parentWidget(), "tear off menu" ); - connect( p, SIGNAL( activated(int) ), this, SIGNAL( activated(int) ) ); - connect( p, SIGNAL( highlighted(int) ), this, SIGNAL( highlighted(int) ) ); + connect( p, TQ_SIGNAL( activated(int) ), this, TQ_SIGNAL( activated(int) ) ); + connect( p, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( highlighted(int) ) ); #ifndef TQT_NO_WIDGET_TOPEXTRA p->setCaption( caption() ); #endif diff --git a/src/widgets/qpushbutton.cpp b/src/widgets/qpushbutton.cpp index 469eb802..b9c1924c 100644 --- a/src/widgets/qpushbutton.cpp +++ b/src/widgets/qpushbutton.cpp @@ -657,7 +657,7 @@ void TQPushButton::setPopup( TQPopupMenu* popup ) if ( !d ) d = new TQPushButtonPrivate; if ( popup && !d->popup ) - connect( this, SIGNAL( pressed() ), this, SLOT( popupPressed() ) ); + connect( this, TQ_SIGNAL( pressed() ), this, TQ_SLOT( popupPressed() ) ); d->popup = popup; setIsMenuButton( popup != 0 ); diff --git a/src/widgets/qscrollbar.cpp b/src/widgets/qscrollbar.cpp index b234f1f2..f9850b2f 100644 --- a/src/widgets/qscrollbar.cpp +++ b/src/widgets/qscrollbar.cpp @@ -481,8 +481,8 @@ void TQScrollBar::startAutoRepeat() { if ( !repeater ) { repeater = new TQTimer( this, "auto-repeat timer" ); - connect( repeater, SIGNAL(timeout()), - this, SLOT(doAutoRepeat()) ); + connect( repeater, TQ_SIGNAL(timeout()), + this, TQ_SLOT(doAutoRepeat()) ); } repeater->start( thresholdTime, FALSE ); } diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp index 67bf56fe..c4986c80 100644 --- a/src/widgets/qscrollview.cpp +++ b/src/widgets/qscrollview.cpp @@ -586,25 +586,25 @@ TQScrollView::TQScrollView( TQWidget *parent, const char *name, WFlags f ) : d = new TQScrollViewData( this, flags ); #ifndef TQT_NO_DRAGANDDROP - connect( &d->autoscroll_timer, SIGNAL( timeout() ), - this, SLOT( doDragAutoScroll() ) ); + connect( &d->autoscroll_timer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doDragAutoScroll() ) ); #endif - connect( d->hbar, SIGNAL( valueChanged(int) ), - this, SLOT( hslide(int) ) ); - connect( d->vbar, SIGNAL( valueChanged(int) ), - this, SLOT( vslide(int) ) ); + connect( d->hbar, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( hslide(int) ) ); + connect( d->vbar, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( vslide(int) ) ); - connect( d->hbar, SIGNAL(sliderPressed()), this, SLOT(hbarIsPressed()) ); - connect( d->hbar, SIGNAL(sliderReleased()), this, SLOT(hbarIsReleased()) ); - connect( d->vbar, SIGNAL(sliderPressed()), this, SLOT(vbarIsPressed()) ); - connect( d->vbar, SIGNAL(sliderReleased()), this, SLOT(vbarIsReleased()) ); + connect( d->hbar, TQ_SIGNAL(sliderPressed()), this, TQ_SLOT(hbarIsPressed()) ); + connect( d->hbar, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(hbarIsReleased()) ); + connect( d->vbar, TQ_SIGNAL(sliderPressed()), this, TQ_SLOT(vbarIsPressed()) ); + connect( d->vbar, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(vbarIsReleased()) ); d->viewport->installEventFilter( this ); - connect( &d->scrollbar_timer, SIGNAL( timeout() ), - this, SLOT( updateScrollBars() ) ); + connect( &d->scrollbar_timer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( updateScrollBars() ) ); setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); setLineWidth( style().pixelMetric(TQStyle::PM_DefaultFrameWidth, this) ); diff --git a/src/widgets/qslider.cpp b/src/widgets/qslider.cpp index 883065e0..55e1589c 100644 --- a/src/widgets/qslider.cpp +++ b/src/widgets/qslider.cpp @@ -461,7 +461,7 @@ void TQSlider::mousePressEvent( TQMouseEvent *e ) } if ( !timer ) timer = new TQTimer( this ); - connect( timer, SIGNAL(timeout()), SLOT(repeatTimeout()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(repeatTimeout()) ); timer->start( thresholdTime, TRUE ); } else if ( ( orient == Horizontal && e->pos().x() > r.right() ) //### goodPart || ( orient == Vertical && e->pos().y() > r.bottom() ) ) { @@ -474,7 +474,7 @@ void TQSlider::mousePressEvent( TQMouseEvent *e ) } if ( !timer ) timer = new TQTimer( this ); - connect( timer, SIGNAL(timeout()), SLOT(repeatTimeout()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(repeatTimeout()) ); timer->start( thresholdTime, TRUE ); } update( sliderRect() ); @@ -713,9 +713,9 @@ void TQSlider::repeatTimeout() Q_ASSERT( timer ); timer->disconnect(); if ( state == TimingDown ) - connect( timer, SIGNAL(timeout()), SLOT(subtractStep()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(subtractStep()) ); else if ( state == TimingUp ) - connect( timer, SIGNAL(timeout()), SLOT(addStep()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(addStep()) ); timer->start( repeatTime, FALSE ); } diff --git a/src/widgets/qspinbox.cpp b/src/widgets/qspinbox.cpp index a79b18d7..87e232a4 100644 --- a/src/widgets/qspinbox.cpp +++ b/src/widgets/qspinbox.cpp @@ -267,8 +267,8 @@ void TQSpinBox::initSpinBox() d = new TQSpinBoxPrivate; d->controls = new TQSpinWidget( this, "controls" ); - connect( d->controls, SIGNAL( stepUpPressed() ), SLOT( stepUp() ) ); - connect( d->controls, SIGNAL( stepDownPressed() ), SLOT( stepDown() ) ); + connect( d->controls, TQ_SIGNAL( stepUpPressed() ), TQ_SLOT( stepUp() ) ); + connect( d->controls, TQ_SIGNAL( stepDownPressed() ), TQ_SLOT( stepDown() ) ); wrap = FALSE; edited = FALSE; @@ -287,7 +287,7 @@ void TQSpinBox::initSpinBox() updateDisplay(); - connect( vi, SIGNAL(textChanged(const TQString&)), SLOT(textChanged()) ); + connect( vi, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textChanged()) ); } /*! diff --git a/src/widgets/qspinwidget.cpp b/src/widgets/qspinwidget.cpp index 7ea124cc..839bf872 100644 --- a/src/widgets/qspinwidget.cpp +++ b/src/widgets/qspinwidget.cpp @@ -87,7 +87,7 @@ TQSpinWidget::TQSpinWidget( TQWidget* parent, const char* name ) : TQWidget( parent, name ) { d = new TQSpinWidgetPrivate(); - connect( &d->auRepTimer, SIGNAL( timeout() ), this, SLOT( timerDone() ) ); + connect( &d->auRepTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( timerDone() ) ); setFocusPolicy( StrongFocus ); arrange(); @@ -209,7 +209,7 @@ void TQSpinWidget::timerDone() { // we use a double timer to make it possible for users to do // something with 0-timer on valueChanged. - TQTimer::singleShot( 1, this, SLOT( timerDoneEx() ) ); + TQTimer::singleShot( 1, this, TQ_SLOT( timerDoneEx() ) ); } void TQSpinWidget::timerDoneEx() diff --git a/src/widgets/qstatusbar.cpp b/src/widgets/qstatusbar.cpp index d3d294d2..f5830d4b 100644 --- a/src/widgets/qstatusbar.cpp +++ b/src/widgets/qstatusbar.cpp @@ -80,8 +80,8 @@ one that has a time limit: \code - connect( loader, SIGNAL(progressMessage(const TQString&)), - statusBar(), SLOT(message(const TQString&)) ); + connect( loader, TQ_SIGNAL(progressMessage(const TQString&)), + statusBar(), TQ_SLOT(message(const TQString&)) ); statusBar()->message("Loading..."); // Initial message loader.loadStuff(); // Emits progress messages @@ -377,7 +377,7 @@ void TQStatusBar::message( const TQString &message, int ms ) if ( !d->timer ) { d->timer = new TQTimer( this ); - connect( d->timer, SIGNAL(timeout()), this, SLOT(clear()) ); + connect( d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(clear()) ); } if ( ms > 0 ) { d->timer->start( ms ); diff --git a/src/widgets/qsyntaxhighlighter.cpp b/src/widgets/qsyntaxhighlighter.cpp index e33f0113..814cc5a9 100644 --- a/src/widgets/qsyntaxhighlighter.cpp +++ b/src/widgets/qsyntaxhighlighter.cpp @@ -82,7 +82,7 @@ TQSyntaxHighlighter::TQSyntaxHighlighter( TQTextEdit *textEdit ) { textEdit->document()->setPreProcessor( new TQSyntaxHighlighterInternal( this ) ); textEdit->document()->invalidate(); - TQTimer::singleShot( 0, textEdit->viewport(), SLOT( update() ) ); + TQTimer::singleShot( 0, textEdit->viewport(), TQ_SLOT( update() ) ); } /*! diff --git a/src/widgets/qtabbar.cpp b/src/widgets/qtabbar.cpp index 08e5f24f..33a19d82 100644 --- a/src/widgets/qtabbar.cpp +++ b/src/widgets/qtabbar.cpp @@ -344,16 +344,16 @@ TQTabBar::TQTabBar( TQWidget * parent, const char *name ) d->toolTips = 0; #ifndef TQT_NO_ACCEL d->a = new TQAccel( this, "tab accelerators" ); - connect( d->a, SIGNAL(activated(int)), this, SLOT(setCurrentTab(int)) ); - connect( d->a, SIGNAL(activatedAmbiguously(int)), this, SLOT(setCurrentTab(int)) ); + connect( d->a, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setCurrentTab(int)) ); + connect( d->a, TQ_SIGNAL(activatedAmbiguously(int)), this, TQ_SLOT(setCurrentTab(int)) ); #endif d->s = RoundedAbove; d->scrolls = FALSE; d->leftB = new TQToolButton( LeftArrow, this, "qt_left_btn" ); - connect( d->leftB, SIGNAL( clicked() ), this, SLOT( scrollTabs() ) ); + connect( d->leftB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( scrollTabs() ) ); d->leftB->hide(); d->rightB = new TQToolButton( RightArrow, this, "qt_right_btn" ); - connect( d->rightB, SIGNAL( clicked() ), this, SLOT( scrollTabs() ) ); + connect( d->rightB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( scrollTabs() ) ); d->rightB->hide(); d->btnWidth = style().pixelMetric(TQStyle::PM_TabBarScrollButtonWidth, this); l = new TQPtrList<TQTab>; diff --git a/src/widgets/qtabwidget.cpp b/src/widgets/qtabwidget.cpp index 21436881..5f194909 100644 --- a/src/widgets/qtabwidget.cpp +++ b/src/widgets/qtabwidget.cpp @@ -636,8 +636,8 @@ void TQTabWidget::setTabBar( TQTabBar* tb) delete d->tabs; d->tabs = tb; setFocusProxy( d->tabs ); - connect( d->tabs, SIGNAL(selected(int)), - this, SLOT(showTab(int)) ); + connect( d->tabs, TQ_SIGNAL(selected(int)), + this, TQ_SLOT(showTab(int)) ); setUpLayout(); } diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp index fac5ca2b..1205f46f 100644 --- a/src/widgets/qtextedit.cpp +++ b/src/widgets/qtextedit.cpp @@ -956,8 +956,8 @@ void TQTextEdit::init() readonly = TRUE; setReadOnly( FALSE ); setFrameStyle( LineEditPanel | Sunken ); - connect( doc, SIGNAL( minimumWidthChanged(int) ), - this, SLOT( documentWidthChanged(int) ) ); + connect( doc, TQ_SIGNAL( minimumWidthChanged(int) ), + this, TQ_SLOT( documentWidthChanged(int) ) ); mousePressed = FALSE; inDoubleClick = FALSE; @@ -989,28 +989,28 @@ void TQTextEdit::init() cursor = new TQTextCursor( doc ); formatTimer = new TQTimer( this ); - connect( formatTimer, SIGNAL( timeout() ), - this, SLOT( formatMore() ) ); + connect( formatTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( formatMore() ) ); lastFormatted = doc->firstParagraph(); scrollTimer = new TQTimer( this ); - connect( scrollTimer, SIGNAL( timeout() ), - this, SLOT( autoScrollTimerDone() ) ); + connect( scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( autoScrollTimerDone() ) ); interval = 0; changeIntervalTimer = new TQTimer( this ); - connect( changeIntervalTimer, SIGNAL( timeout() ), - this, SLOT( doChangeInterval() ) ); + connect( changeIntervalTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doChangeInterval() ) ); cursorVisible = TRUE; blinkTimer = new TQTimer( this ); - connect( blinkTimer, SIGNAL( timeout() ), - this, SLOT( blinkCursor() ) ); + connect( blinkTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( blinkCursor() ) ); #ifndef TQT_NO_DRAGANDDROP dragStartTimer = new TQTimer( this ); - connect( dragStartTimer, SIGNAL( timeout() ), - this, SLOT( startDrag() ) ); + connect( dragStartTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( startDrag() ) ); #endif d->trippleClickTimer = new TQTimer( this ); @@ -1023,8 +1023,8 @@ void TQTextEdit::init() viewport()->setFocusPolicy( WheelFocus ); setInputMethodEnabled( TRUE ); viewport()->installEventFilter( this ); - connect( this, SIGNAL(horizontalSliderReleased()), this, SLOT(sliderReleased()) ); - connect( this, SIGNAL(verticalSliderReleased()), this, SLOT(sliderReleased()) ); + connect( this, TQ_SIGNAL(horizontalSliderReleased()), this, TQ_SLOT(sliderReleased()) ); + connect( this, TQ_SIGNAL(verticalSliderReleased()), this, TQ_SLOT(sliderReleased()) ); installEventFilter( this ); } @@ -2411,11 +2411,11 @@ void TQTextEdit::copyToClipboard() d->clipboard_mode = TQClipboard::Selection; // don't listen to selection changes - disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); copy(); // listen to selection changes - connect( TQApplication::clipboard(), SIGNAL(selectionChanged()), - this, SLOT(clipboardChanged()) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(clipboardChanged()) ); d->clipboard_mode = TQClipboard::Clipboard; } @@ -2776,11 +2776,11 @@ void TQTextEdit::contentsContextMenuEvent( TQContextMenuEvent *e ) d->clipboard_mode = TQClipboard::Selection; // don't listen to selection changes - disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); copy(); // listen to selection changes - connect( TQApplication::clipboard(), SIGNAL(selectionChanged()), - this, SLOT(clipboardChanged()) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(clipboardChanged()) ); d->clipboard_mode = TQClipboard::Clipboard; } @@ -6135,7 +6135,7 @@ void TQTextEdit::clipboardChanged() { #ifndef TQT_NO_CLIPBOARD // don't listen to selection changes - disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); #endif selectAll(FALSE); } @@ -6186,19 +6186,19 @@ bool TQTextEdit::checkOptimMode() if ( oldMode != d->optimMode ) { if ( d->optimMode ) { d->od = new TQTextEditOptimPrivate; - connect( scrollTimer, SIGNAL( timeout() ), this, SLOT( optimDoAutoScroll() ) ); - disconnect( doc, SIGNAL( minimumWidthChanged(int) ), this, SLOT( documentWidthChanged(int) ) ); - disconnect( scrollTimer, SIGNAL( timeout() ), this, SLOT( autoScrollTimerDone() ) ); - disconnect( formatTimer, SIGNAL( timeout() ), this, SLOT( formatMore() ) ); + connect( scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( optimDoAutoScroll() ) ); + disconnect( doc, TQ_SIGNAL( minimumWidthChanged(int) ), this, TQ_SLOT( documentWidthChanged(int) ) ); + disconnect( scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoScrollTimerDone() ) ); + disconnect( formatTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( formatMore() ) ); optimSetText( doc->originalText() ); doc->clear(TRUE); delete cursor; cursor = new TQTextCursor( doc ); } else { - disconnect( scrollTimer, SIGNAL( timeout() ), this, SLOT( optimDoAutoScroll() ) ); - connect( doc, SIGNAL( minimumWidthChanged(int) ), this, SLOT( documentWidthChanged(int) ) ); - connect( scrollTimer, SIGNAL( timeout() ), this, SLOT( autoScrollTimerDone() ) ); - connect( formatTimer, SIGNAL( timeout() ), this, SLOT( formatMore() ) ); + disconnect( scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( optimDoAutoScroll() ) ); + connect( doc, TQ_SIGNAL( minimumWidthChanged(int) ), this, TQ_SLOT( documentWidthChanged(int) ) ); + connect( scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoScrollTimerDone() ) ); + connect( formatTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( formatMore() ) ); setText( optimText() ); delete d->od; d->od = 0; diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/qtoolbar.cpp index 79b13a80..dfff7c76 100644 --- a/src/widgets/qtoolbar.cpp +++ b/src/widgets/qtoolbar.cpp @@ -165,8 +165,8 @@ TQToolBarSeparator::TQToolBarSeparator(Orientation o , TQToolBar *parent, const char* name ) : TQWidget( parent, name ) { - connect( parent, SIGNAL(orientationChanged(Orientation)), - this, SLOT(setOrientation(Orientation)) ); + connect( parent, TQ_SIGNAL(orientationChanged(Orientation)), + this, TQ_SLOT(setOrientation(Orientation)) ); setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); @@ -602,7 +602,7 @@ void TQToolBar::createPopup() { if (!d->extensionPopup) { d->extensionPopup = new TQPopupMenu( this, "qt_dockwidget_internal" ); - connect( d->extensionPopup, SIGNAL( aboutToShow() ), this, SLOT( createPopup() ) ); + connect( d->extensionPopup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( createPopup() ) ); } if (!d->extension) { @@ -654,7 +654,7 @@ void TQToolBar::createPopup() if ( b->popup() && b->popupDelay() <= 0 ) id = d->extensionPopup->insertItem( b->iconSet(), s, b->popup() ); else - id = d->extensionPopup->insertItem( b->iconSet(), s, b, SLOT( emulateClick() ) ) ; + id = d->extensionPopup->insertItem( b->iconSet(), s, b, TQ_SLOT( emulateClick() ) ) ; if ( b->isToggleButton() ) d->extensionPopup->setItemChecked( id, b->isOn() ); if ( !b->isEnabled() ) @@ -665,9 +665,9 @@ void TQToolBar::createPopup() if ( s.isEmpty() ) s = ""; if ( b->pixmap() ) - id = d->extensionPopup->insertItem( *b->pixmap(), s, b, SLOT( emulateClick() ) ); + id = d->extensionPopup->insertItem( *b->pixmap(), s, b, TQ_SLOT( emulateClick() ) ); else - id = d->extensionPopup->insertItem( s, b, SLOT( emulateClick() ) ); + id = d->extensionPopup->insertItem( s, b, TQ_SLOT( emulateClick() ) ); if ( b->isToggleButton() ) d->extensionPopup->setItemChecked( id, b->isOn() ); if ( !b->isEnabled() ) @@ -687,7 +687,7 @@ void TQToolBar::createPopup() TQPopupMenu *cp = new TQPopupMenu(d->extensionPopup); cp->setEnabled(c->isEnabled()); d->extensionPopup->insertItem( s, cp ); - connect( cp, SIGNAL( activated(int) ), c, SLOT( internalActivate(int) ) ); + connect( cp, TQ_SIGNAL( activated(int) ), c, TQ_SLOT( internalActivate(int) ) ); for ( int i = 0; i < c->count(); ++i ) { TQString tmp = c->text( i ); cp->insertItem( tmp, i ); @@ -702,7 +702,7 @@ void TQToolBar::createPopup() TQPopupMenu* sp = new TQPopupMenu(d->extensionPopup); cp->insertItem( tr( "More..." ), sp ); cp = sp; - connect( cp, SIGNAL( activated(int) ), c, SLOT( internalActivate(int) ) ); + connect( cp, TQ_SIGNAL( activated(int) ), c, TQ_SLOT( internalActivate(int) ) ); } } } diff --git a/src/widgets/qtoolbox.cpp b/src/widgets/qtoolbox.cpp index 40bfb6de..d5c90647 100644 --- a/src/widgets/qtoolbox.cpp +++ b/src/widgets/qtoolbox.cpp @@ -349,12 +349,12 @@ int TQToolBox::insertItem( int index, TQWidget *item, const TQIconSet &iconSet, if ( !item ) return -1; - connect(item, SIGNAL(destroyed(TQObject*)), this, SLOT(itemDestroyed(TQObject*))); + connect(item, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(itemDestroyed(TQObject*))); TQToolBoxPrivate::Page c; c.widget = item; c.button = new TQToolBoxButton( this, label.latin1() ); - connect( c.button, SIGNAL( clicked() ), this, SLOT( buttonClicked() ) ); + connect( c.button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( buttonClicked() ) ); c.sv = new TQScrollView( this ); c.sv->hide(); @@ -487,7 +487,7 @@ int TQToolBox::removeItem( TQWidget *item ) { int index = indexOf(item); if (index >= 0) { - disconnect(item, SIGNAL(destroyed(TQObject*)), this, SLOT(itemDestroyed(TQObject*))); + disconnect(item, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(itemDestroyed(TQObject*))); item->reparent( this, TQPoint(0,0) ); // destroy internal data itemDestroyed(item); diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp index 1316944f..b2a4443b 100644 --- a/src/widgets/qtoolbutton.cpp +++ b/src/widgets/qtoolbutton.cpp @@ -147,11 +147,11 @@ TQToolButton::TQToolButton( TQWidget * parent, const char *name ) if ( tb ) { setAutoRaise( TRUE ); if ( tb->mainWindow() ) { - connect( tb->mainWindow(), SIGNAL(pixmapSizeChanged(bool)), - this, SLOT(setUsesBigPixmap(bool)) ); + connect( tb->mainWindow(), TQ_SIGNAL(pixmapSizeChanged(bool)), + this, TQ_SLOT(setUsesBigPixmap(bool)) ); setUsesBigPixmap( tb->mainWindow()->usesBigPixmaps() ); - connect( tb->mainWindow(), SIGNAL(usesTextLabelChanged(bool)), - this, SLOT(setUsesTextLabel(bool)) ); + connect( tb->mainWindow(), TQ_SIGNAL(usesTextLabelChanged(bool)), + this, TQ_SLOT(setUsesTextLabel(bool)) ); setUsesTextLabel( tb->mainWindow()->usesTextLabel() ); } else { setUsesBigPixmap( FALSE ); @@ -237,13 +237,13 @@ TQToolButton::TQToolButton( const TQIconSet& iconSet, const TQString &textLabel, setIconSet( iconSet ); setTextLabel( textLabel ); if ( receiver && slot ) - connect( this, SIGNAL(clicked()), receiver, slot ); + connect( this, TQ_SIGNAL(clicked()), receiver, slot ); if ( parent->mainWindow() ) { - connect( parent->mainWindow(), SIGNAL(pixmapSizeChanged(bool)), - this, SLOT(setUsesBigPixmap(bool)) ); + connect( parent->mainWindow(), TQ_SIGNAL(pixmapSizeChanged(bool)), + this, TQ_SLOT(setUsesBigPixmap(bool)) ); setUsesBigPixmap( parent->mainWindow()->usesBigPixmaps() ); - connect( parent->mainWindow(), SIGNAL(usesTextLabelChanged(bool)), - this, SLOT(setUsesTextLabel(bool)) ); + connect( parent->mainWindow(), TQ_SIGNAL(usesTextLabelChanged(bool)), + this, TQ_SLOT(setUsesTextLabel(bool)) ); setUsesTextLabel( parent->mainWindow()->usesTextLabel() ); } else { setUsesBigPixmap( FALSE ); @@ -749,9 +749,9 @@ TQIconSet TQToolButton::iconSet() const void TQToolButton::setPopup( TQPopupMenu* popup ) { if ( popup && !d->popupTimer ) { - connect( this, SIGNAL( pressed() ), this, SLOT( popupPressed() ) ); + connect( this, TQ_SIGNAL( pressed() ), this, TQ_SLOT( popupPressed() ) ); d->popupTimer = new TQTimer( this ); - connect( d->popupTimer, SIGNAL( timeout() ), this, SLOT( popupTimerDone() ) ); + connect( d->popupTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( popupTimerDone() ) ); } d->popup = popup; diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp index 5d3cae19..118c0da6 100644 --- a/src/widgets/qtooltip.cpp +++ b/src/widgets/qtooltip.cpp @@ -165,8 +165,8 @@ TQTipManager::TQTipManager() label = 0; preventAnimation = FALSE; isApplicationFilter = FALSE; - connect( &wakeUp, SIGNAL(timeout()), SLOT(showTip()) ); - connect( &fallAsleep, SIGNAL(timeout()), SLOT(hideTip()) ); + connect( &wakeUp, TQ_SIGNAL(timeout()), TQ_SLOT(showTip()) ); + connect( &fallAsleep, TQ_SIGNAL(timeout()), TQ_SLOT(hideTip()) ); removeTimer = new TQTimer( this ); } @@ -225,7 +225,7 @@ void TQTipManager::add( const TQRect &gm, TQWidget *w, delete h; } } else - connect( w, SIGNAL(destroyed()), this, SLOT(clientWidgetDestroyed()) ); + connect( w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(clientWidgetDestroyed()) ); tips->insert( w, t ); @@ -241,10 +241,10 @@ void TQTipManager::add( const TQRect &gm, TQWidget *w, } if ( t->group ) { - disconnect( removeTimer, SIGNAL( timeout() ), - t->group, SIGNAL( removeTip() ) ); - connect( removeTimer, SIGNAL( timeout() ), - t->group, SIGNAL( removeTip() ) ); + disconnect( removeTimer, TQ_SIGNAL( timeout() ), + t->group, TQ_SIGNAL( removeTip() ) ); + connect( removeTimer, TQ_SIGNAL( timeout() ), + t->group, TQ_SIGNAL( removeTip() ) ); } } @@ -288,7 +288,7 @@ void TQTipManager::remove( TQWidget *w, const TQRect & r, bool delayhide ) } if ( (*tips)[ w ] == 0 ) - disconnect( w, SIGNAL(destroyed()), this, SLOT(clientWidgetDestroyed()) ); + disconnect( w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(clientWidgetDestroyed()) ); #if 0 // not needed, leads sometimes to crashes if ( tips->isEmpty() ) { // the manager will be recreated if needed @@ -337,7 +337,7 @@ void TQTipManager::remove( TQWidget *w ) t = d; } - disconnect( w, SIGNAL(destroyed()), this, SLOT(clientWidgetDestroyed()) ); + disconnect( w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(clientWidgetDestroyed()) ); #if 0 if ( tips->isEmpty() ) { delete tipManager; @@ -356,8 +356,8 @@ void TQTipManager::removeFromGroup( TQToolTipGroup *g ) while ( t ) { if ( t->group == g ) { if ( t->group ) - disconnect( removeTimer, SIGNAL( timeout() ), - t->group, SIGNAL( removeTip() ) ); + disconnect( removeTimer, TQ_SIGNAL( timeout() ), + t->group, TQ_SIGNAL( removeTip() ) ); t->group = 0; } t = t->next; @@ -525,7 +525,7 @@ void TQTipManager::showTip() if ( t->geometry != TQRect( -1, -1, -1, -1 ) ) label->resize( t->geometry.size() ); TQ_CHECK_PTR( label ); - connect( label, SIGNAL(destroyed()), SLOT(labelDestroyed()) ); + connect( label, TQ_SIGNAL(destroyed()), TQ_SLOT(labelDestroyed()) ); } // the above deletion and creation of a TQTipLabel causes events to be sent. We had reports that the widget // pointer was 0 after this. This is in principle possible if the wrong kind of events get sent through our event @@ -598,7 +598,7 @@ void TQTipManager::showTip() void TQTipManager::hideTip() { - TQTimer::singleShot( 250, this, SLOT(allowAnimation()) ); + TQTimer::singleShot( 250, this, TQ_SLOT(allowAnimation()) ); preventAnimation = TRUE; if ( label && label->isVisible() ) { @@ -1122,10 +1122,10 @@ void TQToolTip::clear() \code TQToolTipGroup * grp = new TQToolTipGroup( this, "tool tip relay" ); - connect( grp, SIGNAL(showTip(const TQString&)), - myLabel, SLOT(setText(const TQString&)) ); - connect( grp, SIGNAL(removeTip()), - myLabel, SLOT(clear()) ); + connect( grp, TQ_SIGNAL(showTip(const TQString&)), + myLabel, TQ_SLOT(setText(const TQString&)) ); + connect( grp, TQ_SIGNAL(removeTip()), + myLabel, TQ_SLOT(clear()) ); TQToolTip::add( giraffeButton, "feed giraffe", grp, "Give the giraffe a meal" ); TQToolTip::add( gorillaButton, "feed gorilla", diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp index cd87acd5..de2b19c1 100644 --- a/src/widgets/qwhatsthis.cpp +++ b/src/widgets/qwhatsthis.cpp @@ -252,7 +252,7 @@ TQWhatsThat::TQWhatsThat( TQWidget* w, const TQString& txt, TQWidget* parent, co #endif if ( widget ) - connect( widget, SIGNAL( destroyed() ), this, SLOT( widgetDestroyed() ) ); + connect( widget, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( widgetDestroyed() ) ); TQRect r; @@ -455,8 +455,8 @@ TQWhatsThisButton::TQWhatsThisButton( TQWidget * parent, const char * name ) setFocusPolicy( NoFocus ); setTextLabel( tr( "What's this?" ) ); wt->buttons->insert( (void *)this, this ); - connect( this, SIGNAL( released() ), - this, SLOT( mouseReleased() ) ); + connect( this, TQ_SIGNAL( released() ), + this, TQ_SLOT( mouseReleased() ) ); } @@ -742,7 +742,7 @@ TQWhatsThisPrivate::WhatsThisItem* TQWhatsThisPrivate::newItem( TQWidget * widge tlw->insert( (void *)t, t ); t->installEventFilter( this ); } - connect( widget, SIGNAL(destroyed()), this, SLOT(cleanupWidget()) ); + connect( widget, TQ_SIGNAL(destroyed()), this, TQ_SLOT(cleanupWidget()) ); return i; } diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp index 7df81651..2ce255c3 100644 --- a/src/workspace/qworkspace.cpp +++ b/src/workspace/qworkspace.cpp @@ -313,8 +313,8 @@ TQWorkspace::init() d->menuId = -1; d->controlId = -1; - connect( d->popup, SIGNAL( aboutToShow() ), this, SLOT(operationMenuAboutToShow() )); - connect( d->popup, SIGNAL( activated(int) ), this, SLOT( operationMenuActivated(int) ) ); + connect( d->popup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT(operationMenuAboutToShow() )); + connect( d->popup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( operationMenuActivated(int) ) ); d->popup->insertItem(TQIconSet(style().stylePixmap(TQStyle::SP_TitleBarNormalButton)), tr("&Restore"), 1); d->popup->insertItem(tr("&Move"), 2); d->popup->insertItem(tr("&Size"), 3); @@ -326,10 +326,10 @@ TQWorkspace::init() #ifndef TQT_NO_ACCEL +"\t"+TQAccel::keyToString(CTRL+Key_F4) #endif - , this, SLOT( closeActiveWindow() ) ); + , this, TQ_SLOT( closeActiveWindow() ) ); - connect( d->toolPopup, SIGNAL( aboutToShow() ), this, SLOT(toolMenuAboutToShow() )); - connect( d->toolPopup, SIGNAL( activated(int) ), this, SLOT( operationMenuActivated(int) ) ); + connect( d->toolPopup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT(toolMenuAboutToShow() )); + connect( d->toolPopup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( operationMenuActivated(int) ) ); d->toolPopup->insertItem(tr("&Move"), 2); d->toolPopup->insertItem(tr("&Size"), 3); d->toolPopup->insertItem(tr("Stay on &Top"), 7); @@ -342,29 +342,29 @@ TQWorkspace::init() #ifndef TQT_NO_ACCEL +"\t"+TQAccel::keyToString( CTRL+Key_F4) #endif - , this, SLOT( closeActiveWindow() ) ); + , this, TQ_SLOT( closeActiveWindow() ) ); #ifndef TQT_NO_ACCEL TQAccel* a = new TQAccel( this ); a->connectItem( a->insertItem( ALT + Key_Minus), - this, SLOT( showOperationMenu() ) ); + this, TQ_SLOT( showOperationMenu() ) ); a->connectItem( a->insertItem( CTRL + Key_F6), - this, SLOT( activateNextWindow() ) ); + this, TQ_SLOT( activateNextWindow() ) ); a->connectItem( a->insertItem( CTRL + Key_Tab), - this, SLOT( activateNextWindow() ) ); + this, TQ_SLOT( activateNextWindow() ) ); a->connectItem( a->insertItem( Key_Forward ), - this, SLOT( activateNextWindow() ) ); + this, TQ_SLOT( activateNextWindow() ) ); a->connectItem( a->insertItem( CTRL + SHIFT + Key_F6), - this, SLOT( activatePreviousWindow() ) ); + this, TQ_SLOT( activatePreviousWindow() ) ); a->connectItem( a->insertItem( CTRL + SHIFT + Key_Tab), - this, SLOT( activatePreviousWindow() ) ); + this, TQ_SLOT( activatePreviousWindow() ) ); a->connectItem( a->insertItem( Key_Back ), - this, SLOT( activatePreviousWindow() ) ); + this, TQ_SLOT( activatePreviousWindow() ) ); a->connectItem( a->insertItem( CTRL + Key_F4 ), - this, SLOT( closeActiveWindow() ) ); + this, TQ_SLOT( closeActiveWindow() ) ); #endif setBackgroundMode( PaletteDark ); @@ -434,10 +434,10 @@ void TQWorkspace::childEvent( TQChildEvent * e) TQWorkspaceChild* child = new TQWorkspaceChild( w, this, "qt_workspacechild" ); child->installEventFilter( this ); - connect( child, SIGNAL( popupOperationMenu(const TQPoint&) ), - this, SLOT( popupOperationMenu(const TQPoint&) ) ); - connect( child, SIGNAL( showOperationMenu() ), - this, SLOT( showOperationMenu() ) ); + connect( child, TQ_SIGNAL( popupOperationMenu(const TQPoint&) ), + this, TQ_SLOT( popupOperationMenu(const TQPoint&) ) ); + connect( child, TQ_SIGNAL( showOperationMenu() ), + this, TQ_SLOT( showOperationMenu() ) ); d->windows.append( child ); if ( child->isVisibleTo( this ) ) d->focus.append( child ); @@ -857,7 +857,7 @@ void TQWorkspace::handleUndock(TQDockWindow *w) while(d->dockwindows.remove(o)); d->newdocks.append(o); if(d->newdocks.count() == 1) - TQTimer::singleShot(0, this, SLOT(dockWindowsShow())); + TQTimer::singleShot(0, this, TQ_SLOT(dockWindowsShow())); break; } @@ -1027,7 +1027,7 @@ void TQWorkspace::showEvent( TQShowEvent *e ) TQWidget *w = new TQWidget(NULL, "TQDoesNotExist", WType_Dialog | WStyle_Customize | WStyle_NoBorder); // if(tqApp->mainWidget() == o) -// TQObject::connect(tqApp, SIGNAL(lastWindowClosed()), tqApp, SLOT(quit())); +// TQObject::connect(tqApp, TQ_SIGNAL(lastWindowClosed()), tqApp, TQ_SLOT(quit())); TQDesktopWidget *dw = TQApplication::desktop(); w->setGeometry(dw->availableGeometry(dw->screenNumber(o))); o->reparent(w, TQPoint(0, 0), TRUE); @@ -1326,7 +1326,7 @@ bool TQWorkspace::eventFilter( TQObject *o, TQEvent * e) else d->newdocks.append(w); if(d->newdocks.count() == 1) - TQTimer::singleShot(0, this, SLOT(dockWindowsShow())); + TQTimer::singleShot(0, this, TQ_SLOT(dockWindowsShow())); } } else if(e->type() == TQEvent::Hide && !e->spontaneous() && !tqstrncmp(o->name(), "TQMagicDock_", 11)) { // d->mainwindow->close(); @@ -1508,8 +1508,8 @@ void TQWorkspace::showMaximizeControls() iconB->setFocusPolicy( NoFocus ); iconB->setIconSet(style().stylePixmap(TQStyle::SP_TitleBarMinButton)); iconB->setFixedSize(BUTTON_WIDTH, BUTTON_HEIGHT); - connect( iconB, SIGNAL( clicked() ), - this, SLOT( minimizeActiveWindow() ) ); + connect( iconB, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( minimizeActiveWindow() ) ); } TQToolButton* restoreB = new TQToolButton( d->maxcontrols, "restore" ); @@ -1520,8 +1520,8 @@ void TQWorkspace::showMaximizeControls() restoreB->setFocusPolicy( NoFocus ); restoreB->setIconSet( style().stylePixmap(TQStyle::SP_TitleBarNormalButton)); restoreB->setFixedSize(BUTTON_WIDTH, BUTTON_HEIGHT); - connect( restoreB, SIGNAL( clicked() ), - this, SLOT( normalizeActiveWindow() ) ); + connect( restoreB, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( normalizeActiveWindow() ) ); l->addSpacing( 2 ); TQToolButton* closeB = new TQToolButton( d->maxcontrols, "close" ); @@ -1532,8 +1532,8 @@ void TQWorkspace::showMaximizeControls() closeB->setFocusPolicy( NoFocus ); closeB->setIconSet( style().stylePixmap(TQStyle::SP_TitleBarCloseButton) ); closeB->setFixedSize(BUTTON_WIDTH, BUTTON_HEIGHT); - connect( closeB, SIGNAL( clicked() ), - this, SLOT( closeActiveWindow() ) ); + connect( closeB, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( closeActiveWindow() ) ); d->maxcontrols->setFixedSize( d->maxcontrols->minimumSizeHint() ); } @@ -2050,24 +2050,24 @@ TQWorkspaceChild::TQWorkspaceChild( TQWidget* window, TQWorkspace *parent, if ( window && window->testWFlags( WStyle_Title ) && parent->windowMode() != TQWorkspace::TopLevel ) { titlebar = new TQTitleBar( window, this, "qt_ws_titlebar" ); - connect( titlebar, SIGNAL( doActivate() ), - this, SLOT( activate() ) ); - connect( titlebar, SIGNAL( doClose() ), - window, SLOT( close() ) ); - connect( titlebar, SIGNAL( doMinimize() ), - this, SLOT( showMinimized() ) ); - connect( titlebar, SIGNAL( doNormal() ), - this, SLOT( showNormal() ) ); - connect( titlebar, SIGNAL( doMaximize() ), - this, SLOT( showMaximized() ) ); - connect( titlebar, SIGNAL( popupOperationMenu(const TQPoint&) ), - this, SIGNAL( popupOperationMenu(const TQPoint&) ) ); - connect( titlebar, SIGNAL( showOperationMenu() ), - this, SIGNAL( showOperationMenu() ) ); - connect( titlebar, SIGNAL( doShade() ), - this, SLOT( showShaded() ) ); - connect( titlebar, SIGNAL( doubleClicked() ), - this, SLOT( titleBarDoubleClicked() ) ); + connect( titlebar, TQ_SIGNAL( doActivate() ), + this, TQ_SLOT( activate() ) ); + connect( titlebar, TQ_SIGNAL( doClose() ), + window, TQ_SLOT( close() ) ); + connect( titlebar, TQ_SIGNAL( doMinimize() ), + this, TQ_SLOT( showMinimized() ) ); + connect( titlebar, TQ_SIGNAL( doNormal() ), + this, TQ_SLOT( showNormal() ) ); + connect( titlebar, TQ_SIGNAL( doMaximize() ), + this, TQ_SLOT( showMaximized() ) ); + connect( titlebar, TQ_SIGNAL( popupOperationMenu(const TQPoint&) ), + this, TQ_SIGNAL( popupOperationMenu(const TQPoint&) ) ); + connect( titlebar, TQ_SIGNAL( showOperationMenu() ), + this, TQ_SIGNAL( showOperationMenu() ) ); + connect( titlebar, TQ_SIGNAL( doShade() ), + this, TQ_SLOT( showShaded() ) ); + connect( titlebar, TQ_SIGNAL( doubleClicked() ), + this, TQ_SLOT( titleBarDoubleClicked() ) ); } setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); @@ -2129,8 +2129,8 @@ TQWorkspaceChild::TQWorkspaceChild( TQWidget* window, TQWorkspace *parent, widgetResizeHandler = new TQWidgetResizeHandler( this, window ); widgetResizeHandler->setSizeProtection( !parent->scrollBarsEnabled() ); - connect( widgetResizeHandler, SIGNAL( activate() ), - this, SLOT( activate() ) ); + connect( widgetResizeHandler, TQ_SIGNAL( activate() ), + this, TQ_SLOT( activate() ) ); if ( !style().styleHint( TQStyle::SH_TitleBar_NoBorder, titlebar ) ) widgetResizeHandler->setExtraHeight( th + contentsRect().y() - 2*frameWidth() ); else @@ -2630,20 +2630,20 @@ TQWidget* TQWorkspaceChild::iconWidget() const that->iconw = tb; iconw->setActive( isActive() ); - connect( iconw, SIGNAL( doActivate() ), - this, SLOT( activate() ) ); - connect( iconw, SIGNAL( doClose() ), - windowWidget(), SLOT( close() ) ); - connect( iconw, SIGNAL( doNormal() ), - this, SLOT( showNormal() ) ); - connect( iconw, SIGNAL( doMaximize() ), - this, SLOT( showMaximized() ) ); - connect( iconw, SIGNAL( popupOperationMenu(const TQPoint&) ), - this, SIGNAL( popupOperationMenu(const TQPoint&) ) ); - connect( iconw, SIGNAL( showOperationMenu() ), - this, SIGNAL( showOperationMenu() ) ); - connect( iconw, SIGNAL( doubleClicked() ), - this, SLOT( titleBarDoubleClicked() ) ); + connect( iconw, TQ_SIGNAL( doActivate() ), + this, TQ_SLOT( activate() ) ); + connect( iconw, TQ_SIGNAL( doClose() ), + windowWidget(), TQ_SLOT( close() ) ); + connect( iconw, TQ_SIGNAL( doNormal() ), + this, TQ_SLOT( showNormal() ) ); + connect( iconw, TQ_SIGNAL( doMaximize() ), + this, TQ_SLOT( showMaximized() ) ); + connect( iconw, TQ_SIGNAL( popupOperationMenu(const TQPoint&) ), + this, TQ_SIGNAL( popupOperationMenu(const TQPoint&) ) ); + connect( iconw, TQ_SIGNAL( showOperationMenu() ), + this, TQ_SIGNAL( showOperationMenu() ) ); + connect( iconw, TQ_SIGNAL( doubleClicked() ), + this, TQ_SLOT( titleBarDoubleClicked() ) ); } #ifndef TQT_NO_WIDGET_TOPEXTRA if ( windowWidget() ) { @@ -2832,9 +2832,9 @@ void TQWorkspace::setScrollBarsEnabled( bool enable ) d->xoffset = d->yoffset = 0; if ( enable ) { d->vbar = new TQScrollBar( Vertical, this, "vertical scrollbar" ); - connect( d->vbar, SIGNAL( valueChanged(int) ), this, SLOT( scrollBarChanged() ) ); + connect( d->vbar, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( scrollBarChanged() ) ); d->hbar = new TQScrollBar( Horizontal, this, "horizontal scrollbar" ); - connect( d->hbar, SIGNAL( valueChanged(int) ), this, SLOT( scrollBarChanged() ) ); + connect( d->hbar, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( scrollBarChanged() ) ); d->corner = new TQWidget( this, "qt_corner" ); updateWorkspace(); } else { |