From 8c94fd2f9bea6e051ac0903362fceb7cd92fde41 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 28 Dec 2023 21:15:09 +0900 Subject: [PATCH] Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- src/commonwidget.cpp | 70 ++++++++++++------------ src/compoundwidget.cpp | 110 +++++++++++++++++++------------------- src/htmlwidget.cpp | 14 ++--- src/indexwidget.cpp | 18 +++---- src/knmap.cpp | 68 ++++++++++++------------ src/loggingoptions.cpp | 64 +++++++++++----------- src/mainwidget.cpp | 38 ++++++------- src/outputwidget.cpp | 2 +- src/pandsoptions.cpp | 64 +++++++++++----------- src/profiledialog.cpp | 12 ++--- src/scannamedialog.cpp | 2 +- src/scanwidget.cpp | 90 +++++++++++++++---------------- src/simpleoptions.cpp | 32 +++++------ src/stylesheetdialog.cpp | 4 +- src/timingwidget.cpp | 112 +++++++++++++++++++-------------------- 15 files changed, 350 insertions(+), 350 deletions(-) diff --git a/src/commonwidget.cpp b/src/commonwidget.cpp index 1287f73..6170907 100644 --- a/src/commonwidget.cpp +++ b/src/commonwidget.cpp @@ -228,33 +228,33 @@ void CommonWidget::enablePortRangeWidgets( ) void CommonWidget::finaliseInitialisation( ) { WhatsThis* whatsThis = new WhatsThis( this ); - connect( m_hostButton, SIGNAL( clicked( )), SLOT( slotHostButtonClicked( ))); - connect( m_hostComboBox, SIGNAL( activated( int )), SLOT( slotHostActivated( int ))); - connect( m_hostComboBox, SIGNAL( textChanged( const TQString& )), SLOT( slotHostTextChanged( const TQString& ))); - connect( m_portRangeAddButton, SIGNAL( clicked( )), SLOT( slotPortRangeAddClicked( ))); - connect( m_portRangeButton, SIGNAL( clicked( )), SLOT( slotPortRangeButtonClicked( ))); - connect( m_portRangeDeleteButton, SIGNAL( clicked( )), SLOT( slotPortRangeDeleteClicked( ))); - connect( m_portRangeComboBox, SIGNAL( activated( int )), SLOT( slotPortRangeActivated( int ))); - connect( m_portRangeLineEdit, SIGNAL( textChanged( const TQString& )), SLOT( slotPortRangeTextChanged( const TQString& ))); - connect( m_portRangeListBox, SIGNAL( doubleClicked( TQListBoxItem* )), SLOT( slotPortRangeDoubleClicked( TQListBoxItem* ))); - connect( m_portRangeListBox, SIGNAL( highlighted( int )), SLOT( slotPortRangeHighlighted( ))); - connect( m_portRangesCheckBox, SIGNAL( clicked( )), SLOT( slotPortRangesClicked( ))); - connect( whatsThis, SIGNAL( clicked( )), SLOT( slotWhatsThisClicked( ))); - - connect( m_hostButton, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_hostComboBox, SIGNAL( activated ( int )), SIGNAL( optionsDirty( ))); - connect( m_hostComboBox, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_portRangeAddButton, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_portRangeButton, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_portRangeComboBox, SIGNAL( activated( int )), SIGNAL( optionsDirty( ))); - connect( m_portRangeDeleteButton, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_portRangeLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_portRangeListBox, SIGNAL( doubleClicked( TQListBoxItem* )), SIGNAL( optionsDirty( ))); - connect( m_portRangeListBox, SIGNAL( highlighted ( int )), SIGNAL( optionsDirty( ))); - connect( m_portRangesCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_resovleAlwaysRadio, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_resovleDefaultRadio, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_resovleNeverRadio, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); + connect( m_hostButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotHostButtonClicked( ))); + connect( m_hostComboBox, TQ_SIGNAL( activated( int )), TQ_SLOT( slotHostActivated( int ))); + connect( m_hostComboBox, TQ_SIGNAL( textChanged( const TQString& )), TQ_SLOT( slotHostTextChanged( const TQString& ))); + connect( m_portRangeAddButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotPortRangeAddClicked( ))); + connect( m_portRangeButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotPortRangeButtonClicked( ))); + connect( m_portRangeDeleteButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotPortRangeDeleteClicked( ))); + connect( m_portRangeComboBox, TQ_SIGNAL( activated( int )), TQ_SLOT( slotPortRangeActivated( int ))); + connect( m_portRangeLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SLOT( slotPortRangeTextChanged( const TQString& ))); + connect( m_portRangeListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem* )), TQ_SLOT( slotPortRangeDoubleClicked( TQListBoxItem* ))); + connect( m_portRangeListBox, TQ_SIGNAL( highlighted( int )), TQ_SLOT( slotPortRangeHighlighted( ))); + connect( m_portRangesCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotPortRangesClicked( ))); + connect( whatsThis, TQ_SIGNAL( clicked( )), TQ_SLOT( slotWhatsThisClicked( ))); + + connect( m_hostButton, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_hostComboBox, TQ_SIGNAL( activated ( int )), TQ_SIGNAL( optionsDirty( ))); + connect( m_hostComboBox, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_portRangeAddButton, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_portRangeButton, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_portRangeComboBox, TQ_SIGNAL( activated( int )), TQ_SIGNAL( optionsDirty( ))); + connect( m_portRangeDeleteButton, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_portRangeLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_portRangeListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem* )), TQ_SIGNAL( optionsDirty( ))); + connect( m_portRangeListBox, TQ_SIGNAL( highlighted ( int )), TQ_SIGNAL( optionsDirty( ))); + connect( m_portRangesCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_resovleAlwaysRadio, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_resovleDefaultRadio, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_resovleNeverRadio, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); emit( targetChanged( m_hostComboBox->currentText( ))); } @@ -300,11 +300,11 @@ bool CommonWidget::getOptions( ) m_portRanges = new TQStringList( portRanges ); getHosts( m_hosts ); - disconnect( m_hostComboBox, SIGNAL( activated( int )), this, SLOT( slotHostActivated( int ))); - disconnect( m_hostComboBox, SIGNAL( textChanged( const TQString& )), this, SLOT( slotHostTextChanged( const TQString& ))); + disconnect( m_hostComboBox, TQ_SIGNAL( activated( int )), this, TQ_SLOT( slotHostActivated( int ))); + disconnect( m_hostComboBox, TQ_SIGNAL( textChanged( const TQString& )), this, TQ_SLOT( slotHostTextChanged( const TQString& ))); - disconnect( m_hostComboBox, SIGNAL( activated ( int )), this, SIGNAL( optionsDirty( ))); - disconnect( m_hostComboBox, SIGNAL( textChanged( const TQString& )), this, SIGNAL( optionsDirty( ))); + disconnect( m_hostComboBox, TQ_SIGNAL( activated ( int )), this, TQ_SIGNAL( optionsDirty( ))); + disconnect( m_hostComboBox, TQ_SIGNAL( textChanged( const TQString& )), this, TQ_SIGNAL( optionsDirty( ))); byte i; TQStringList::Iterator it; @@ -327,11 +327,11 @@ bool CommonWidget::getOptions( ) m_hostComboBox->setCurrentItem( 0 ); m_hosts->prepend( m_host ); - connect( m_hostComboBox, SIGNAL( activated( int )), SLOT( slotHostActivated( int ))); - connect( m_hostComboBox, SIGNAL( textChanged( const TQString& )), SLOT( slotHostTextChanged( const TQString& ))); + connect( m_hostComboBox, TQ_SIGNAL( activated( int )), TQ_SLOT( slotHostActivated( int ))); + connect( m_hostComboBox, TQ_SIGNAL( textChanged( const TQString& )), TQ_SLOT( slotHostTextChanged( const TQString& ))); - connect( m_hostComboBox, SIGNAL( activated ( int )), SIGNAL( optionsDirty( ))); - connect( m_hostComboBox, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); + connect( m_hostComboBox, TQ_SIGNAL( activated ( int )), TQ_SIGNAL( optionsDirty( ))); + connect( m_hostComboBox, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); return true; } diff --git a/src/compoundwidget.cpp b/src/compoundwidget.cpp index 3a1ebc4..071e5ea 100644 --- a/src/compoundwidget.cpp +++ b/src/compoundwidget.cpp @@ -190,61 +190,61 @@ void CompoundWidget::createLayout( ) void CompoundWidget::finaliseInitialisation( ) { WhatsThis* whatsThis = new WhatsThis( this ); - connect( m_dataDirButton, SIGNAL( clicked( )), SLOT( slotDataDirButtonClicked( ))); - connect( m_dataDirCheckBox, SIGNAL( clicked( )), SLOT( slotDataDirCheckBoxClicked( ))); - connect( m_dataLengthCheckBox, SIGNAL( clicked( )), SLOT( slotDataLengthCheckBoxClicked( ))); - connect( m_debugLevelCheckBox, SIGNAL( clicked( )), SLOT( slotDebugLevelCheckBoxClicked( ))); - connect( m_decoyButton, SIGNAL( clicked( )), SLOT( slotDecoyButtonClicked( ))); - connect( m_decoyCheckBox, SIGNAL( clicked( )), SLOT( slotDecoyCheckBoxClicked( ))); - connect( m_excludeButton, SIGNAL( clicked( )), SLOT( slotExcludeButtonClicked( ))); - connect( m_excludeCheckBox, SIGNAL( clicked( )), SLOT( slotExcludeCheckBoxClicked( ))); - connect( m_excludeFileButton, SIGNAL( clicked( )), SLOT( slotExcludeFileButtonClicked( ))); - connect( m_excludeFileCheckBox, SIGNAL( clicked( )), SLOT( slotExcludeFileCheckBoxClicked( ))); - connect( m_fragmentLevelCheckBox, SIGNAL( clicked( )), SLOT( slotFragmentLevelCheckBoxClicked( ))); - connect( m_interfaceButton, SIGNAL( clicked( )), SLOT( slotInterfaceButtonClicked( ))); - connect( m_interfaceCheckBox, SIGNAL( clicked( )), SLOT( slotInterfaceCheckBoxClicked( ))); - connect( m_maxSocketsCheckBox, SIGNAL( clicked( )), SLOT( slotMaxSocketsCheckBoxClicked( ))); - connect( m_randomIPCheckBox, SIGNAL( clicked( )), SLOT( slotRandomIPCheckBoxClicked( ))); - connect( m_sourceIPButton, SIGNAL( clicked( )), SLOT( slotSourceIPButtonClicked( ))); - connect( m_sourceIPCheckBox, SIGNAL( clicked( )), SLOT( slotSourceIPCheckBoxClicked( ))); - connect( m_sourcePortCheckBox, SIGNAL( clicked( )), SLOT( slotSourcePortCheckBoxClicked( ))); - connect( m_spoofMacButton, SIGNAL( clicked( )), SLOT( slotSpoofMACButtonClicked( ))); - connect( m_spoofMacCheckBox, SIGNAL( clicked( )), SLOT( slotSpoofMacCheckBoxClicked( ))); - connect( m_targetFileButton, SIGNAL( clicked( )), SLOT( slotTargetFileButtonClicked( ))); - connect( m_targetFileCheckBox, SIGNAL( clicked( )), SLOT( slotTargetFileCheckBoxClicked( ))); - connect( m_ttlCheckBox, SIGNAL( clicked( )), SLOT( slotTTLCheckBoxClicked( ))); - connect( whatsThis, SIGNAL( clicked( )), SLOT( slotWhatsThisClicked( ))); - - connect( m_dataDirCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_dataDirLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_dataLengthCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_dataLengthSpinBox, SIGNAL( valueChanged( int )), SIGNAL( optionsDirty( ))); - connect( m_debugLevelCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_debugLevelSpinBox, SIGNAL( valueChanged( int )), SIGNAL( optionsDirty( ))); - connect( m_decoyCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_decoyLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_excludeCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_excludeLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_excludeFileCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_excludeFileLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_fragmentLevelCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_fragmentLevelSpinBox, SIGNAL( valueChanged( int )), SIGNAL( optionsDirty( ))); - connect( m_interfaceCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_interfaceLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_maxSocketsCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_maxSocketsSpinBox, SIGNAL( valueChanged( int )), SIGNAL( optionsDirty( ))); - connect( m_randomIPCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_randomIPSpinBox, SIGNAL( valueChanged( int )), SIGNAL( optionsDirty( ))); - connect( m_sourceIPCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_sourceIPLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_sourcePortCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_sourcePortSpinBox, SIGNAL( valueChanged( int )), SIGNAL( optionsDirty( ))); - connect( m_spoofMacCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_spoofMacLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_targetFileCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_targetFileLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_ttlCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_ttlSpinBox, SIGNAL( valueChanged( int )), SIGNAL( optionsDirty( ))); + connect( m_dataDirButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotDataDirButtonClicked( ))); + connect( m_dataDirCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotDataDirCheckBoxClicked( ))); + connect( m_dataLengthCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotDataLengthCheckBoxClicked( ))); + connect( m_debugLevelCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotDebugLevelCheckBoxClicked( ))); + connect( m_decoyButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotDecoyButtonClicked( ))); + connect( m_decoyCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotDecoyCheckBoxClicked( ))); + connect( m_excludeButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotExcludeButtonClicked( ))); + connect( m_excludeCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotExcludeCheckBoxClicked( ))); + connect( m_excludeFileButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotExcludeFileButtonClicked( ))); + connect( m_excludeFileCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotExcludeFileCheckBoxClicked( ))); + connect( m_fragmentLevelCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotFragmentLevelCheckBoxClicked( ))); + connect( m_interfaceButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotInterfaceButtonClicked( ))); + connect( m_interfaceCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotInterfaceCheckBoxClicked( ))); + connect( m_maxSocketsCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotMaxSocketsCheckBoxClicked( ))); + connect( m_randomIPCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotRandomIPCheckBoxClicked( ))); + connect( m_sourceIPButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotSourceIPButtonClicked( ))); + connect( m_sourceIPCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotSourceIPCheckBoxClicked( ))); + connect( m_sourcePortCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotSourcePortCheckBoxClicked( ))); + connect( m_spoofMacButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotSpoofMACButtonClicked( ))); + connect( m_spoofMacCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotSpoofMacCheckBoxClicked( ))); + connect( m_targetFileButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotTargetFileButtonClicked( ))); + connect( m_targetFileCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotTargetFileCheckBoxClicked( ))); + connect( m_ttlCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotTTLCheckBoxClicked( ))); + connect( whatsThis, TQ_SIGNAL( clicked( )), TQ_SLOT( slotWhatsThisClicked( ))); + + connect( m_dataDirCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_dataDirLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_dataLengthCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_dataLengthSpinBox, TQ_SIGNAL( valueChanged( int )), TQ_SIGNAL( optionsDirty( ))); + connect( m_debugLevelCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_debugLevelSpinBox, TQ_SIGNAL( valueChanged( int )), TQ_SIGNAL( optionsDirty( ))); + connect( m_decoyCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_decoyLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_excludeCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_excludeLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_excludeFileCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_excludeFileLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_fragmentLevelCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_fragmentLevelSpinBox, TQ_SIGNAL( valueChanged( int )), TQ_SIGNAL( optionsDirty( ))); + connect( m_interfaceCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_interfaceLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_maxSocketsCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_maxSocketsSpinBox, TQ_SIGNAL( valueChanged( int )), TQ_SIGNAL( optionsDirty( ))); + connect( m_randomIPCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_randomIPSpinBox, TQ_SIGNAL( valueChanged( int )), TQ_SIGNAL( optionsDirty( ))); + connect( m_sourceIPCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_sourceIPLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_sourcePortCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_sourcePortSpinBox, TQ_SIGNAL( valueChanged( int )), TQ_SIGNAL( optionsDirty( ))); + connect( m_spoofMacCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_spoofMacLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_targetFileCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_targetFileLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_ttlCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_ttlSpinBox, TQ_SIGNAL( valueChanged( int )), TQ_SIGNAL( optionsDirty( ))); } // getOptions diff --git a/src/htmlwidget.cpp b/src/htmlwidget.cpp index 586651a..306bf95 100644 --- a/src/htmlwidget.cpp +++ b/src/htmlwidget.cpp @@ -97,8 +97,8 @@ void HTMLWidget::loadLocalManPage( ) *m_process << "-w"; *m_process << "nmap"; - connect( m_process, SIGNAL( processExited( TDEProcess* )), SLOT( slotManProcessExited( ))); - connect( m_process, SIGNAL( receivedStdout( TDEProcess*, char*, int )), SLOT( slotManReceivedStdout( TDEProcess*, char*, int ))); + connect( m_process, TQ_SIGNAL( processExited( TDEProcess* )), TQ_SLOT( slotManProcessExited( ))); + connect( m_process, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int )), TQ_SLOT( slotManReceivedStdout( TDEProcess*, char*, int ))); m_manPagePath = TQString::null; m_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ); @@ -155,7 +155,7 @@ void HTMLWidget::setInitialValues( ) void HTMLWidget::setStylesheet( ) { m_dlg = new StylesheetDialog( m_stylesheetURL.path( ), *m_stylesheetURLs, this, "man stylesheet dlg" ); - connect( m_dlg, SIGNAL( stylesheetRemoved( )), SLOT( slotStylesheetRemoved( ))); + connect( m_dlg, TQ_SIGNAL( stylesheetRemoved( )), TQ_SLOT( slotStylesheetRemoved( ))); if( m_dlg->exec( ) != TQDialog::Accepted ) { delete m_dlg; @@ -189,8 +189,8 @@ void HTMLWidget::slotGunzipProcessExited( ) *m_process << "man2html"; *m_process << "-"; - connect( m_process, SIGNAL( processExited( TDEProcess* )), SLOT( slotMan2HTMLProcessExited( ))); - connect( m_process, SIGNAL( receivedStdout( TDEProcess*, char*, int )), SLOT( slotMan2HTMLReceivedStdout( TDEProcess*, char*, int ))); + connect( m_process, TQ_SIGNAL( processExited( TDEProcess* )), TQ_SLOT( slotMan2HTMLProcessExited( ))); + connect( m_process, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int )), TQ_SLOT( slotMan2HTMLReceivedStdout( TDEProcess*, char*, int ))); m_htmlData = TQString::null; m_process->start( TDEProcess::NotifyOnExit, TDEProcess::Communication( TDEProcess::Stdin | TDEProcess::Stdout )); @@ -284,8 +284,8 @@ void HTMLWidget::slotManProcessExited( ) *m_process << "-c"; *m_process << m_manPagePath; - connect( m_process, SIGNAL( processExited( TDEProcess* )), SLOT( slotGunzipProcessExited( ))); - connect( m_process, SIGNAL( receivedStdout( TDEProcess*, char*, int )), SLOT( slotGunzipReceivedStdout( TDEProcess*, char*, int ))); + connect( m_process, TQ_SIGNAL( processExited( TDEProcess* )), TQ_SLOT( slotGunzipProcessExited( ))); + connect( m_process, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int )), TQ_SLOT( slotGunzipReceivedStdout( TDEProcess*, char*, int ))); m_manPageData = TQString::null; m_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ); diff --git a/src/indexwidget.cpp b/src/indexwidget.cpp index f8402e7..77a8e8a 100644 --- a/src/indexwidget.cpp +++ b/src/indexwidget.cpp @@ -85,15 +85,15 @@ void IndexWidget::contentsContextMenuEvent( TQContextMenuEvent* event ) TQIconSet scanNew = iconLoader->loadIconSet( "scannew", TDEIcon::Small ); TQIconSet scanRename = iconLoader->loadIconSet( "scanrename", TDEIcon::Small ); - contextMenu->insertItem( scanClose, i18n( "&Close scan" ), parent( ), SLOT( slotScanClose( )), CTRL+Key_W ); - contextMenu->insertItem( scanDuplicate, i18n( "&Duplicate scan" ), parent( ), SLOT( slotScanDuplicate( )), CTRL+Key_C ); - contextMenu->insertItem( scanNew, i18n( "&New scan..." ), parent( ), SLOT( slotScanNew( )), CTRL+Key_N ); - contextMenu->insertItem( scanRename, i18n( "&Rename scan..." ), parent( ), SLOT( slotScanRename( )), Key_F2 ); - contextMenu->insertItem( i18n( "&Use target host name" ), parent( ), SLOT( slotUseTargetHost( ))); + contextMenu->insertItem( scanClose, i18n( "&Close scan" ), parent( ), TQ_SLOT( slotScanClose( )), CTRL+Key_W ); + contextMenu->insertItem( scanDuplicate, i18n( "&Duplicate scan" ), parent( ), TQ_SLOT( slotScanDuplicate( )), CTRL+Key_C ); + contextMenu->insertItem( scanNew, i18n( "&New scan..." ), parent( ), TQ_SLOT( slotScanNew( )), CTRL+Key_N ); + contextMenu->insertItem( scanRename, i18n( "&Rename scan..." ), parent( ), TQ_SLOT( slotScanRename( )), Key_F2 ); + contextMenu->insertItem( i18n( "&Use target host name" ), parent( ), TQ_SLOT( slotUseTargetHost( ))); contextMenu->insertSeparator( ); - contextMenu->insertItem( profileLoad, i18n( "&Load profile..." ), parent( ), SLOT( slotProfileLoad( ))); - contextMenu->insertItem( profileSave, i18n( "&Save profile..." ), parent( ), SLOT( slotProfileSave( ))); - contextMenu->insertItem( profileSaveAs, i18n( "&Save profile as..." ), parent( ), SLOT( slotProfileSaveAs( ))); + contextMenu->insertItem( profileLoad, i18n( "&Load profile..." ), parent( ), TQ_SLOT( slotProfileLoad( ))); + contextMenu->insertItem( profileSave, i18n( "&Save profile..." ), parent( ), TQ_SLOT( slotProfileSave( ))); + contextMenu->insertItem( profileSaveAs, i18n( "&Save profile as..." ), parent( ), TQ_SLOT( slotProfileSaveAs( ))); contextMenu->exec( event->globalPos( )); } @@ -253,7 +253,7 @@ void IndexWidget::slotScanStarted( ) Q_ASSERT( m_blinkTimer == NULL ); m_blinkTimer = new TQTimer( this ); - connect( m_blinkTimer, SIGNAL( timeout( )), SLOT( slotRepaint( ))); + connect( m_blinkTimer, TQ_SIGNAL( timeout( )), TQ_SLOT( slotRepaint( ))); m_blinkTimer->start( 500 ); m_highlight = true; } diff --git a/src/knmap.cpp b/src/knmap.cpp index 5d14314..fae0b1e 100644 --- a/src/knmap.cpp +++ b/src/knmap.cpp @@ -57,47 +57,47 @@ Knmap::Knmap( ) setAutoSaveSettings( ); connect( m_mainWidget, - SIGNAL( outputAvailable( const bool, const bool )), - SLOT( slotOutputAvailable( const bool, const bool))); + TQ_SIGNAL( outputAvailable( const bool, const bool )), + TQ_SLOT( slotOutputAvailable( const bool, const bool))); connect( m_mainWidget, - SIGNAL( setManPageActionStuff( const bool )), - SLOT( slotSetManPageActionStuff( const bool ))); + TQ_SIGNAL( setManPageActionStuff( const bool )), + TQ_SLOT( slotSetManPageActionStuff( const bool ))); connect( m_mainWidget, - SIGNAL( setCaption( const TQString& )), - SLOT( slotSetCaption( const TQString& ))); + TQ_SIGNAL( setCaption( const TQString& )), + TQ_SLOT( slotSetCaption( const TQString& ))); connect( m_mainWidget, - SIGNAL( statusBarText( const TQString& )), statusBar( ), - SLOT( message( const TQString& ))); + TQ_SIGNAL( statusBarText( const TQString& )), statusBar( ), + TQ_SLOT( message( const TQString& ))); connect( m_mainWidget, - SIGNAL( visibleScanWidgetChanged( ScanWidget* )), - SLOT( slotVisibleScanWidgetChanged( ScanWidget* ))); + TQ_SIGNAL( visibleScanWidgetChanged( ScanWidget* )), + TQ_SLOT( slotVisibleScanWidgetChanged( ScanWidget* ))); } // createMenu // ========== void Knmap::createMenu( ) -{ KStdAction::configureToolbars( this, SLOT( slotConfigureToolbars( )), actionCollection( )); - KStdAction::keyBindings( this, SLOT( slotConfigureShortcuts( )), actionCollection( )); - KStdAction::quit( kapp, SLOT( quit( )), actionCollection( )); +{ KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars( )), actionCollection( )); + KStdAction::keyBindings( this, TQ_SLOT( slotConfigureShortcuts( )), actionCollection( )); + KStdAction::quit( kapp, TQ_SLOT( quit( )), actionCollection( )); m_fileSaveAction = KStdAction::save( m_mainWidget, - SLOT( slotFileSave( )), + TQ_SLOT( slotFileSave( )), actionCollection( )); m_fileSaveAsAction = KStdAction::saveAs( m_mainWidget, - SLOT( slotFileSaveAs( )), + TQ_SLOT( slotFileSaveAs( )), actionCollection( )); m_settingsManAction = new TDEAction( i18n( "&Use local man page" ), "localman.png", 0, m_mainWidget, - SLOT( slotSwitchManPages( )), + TQ_SLOT( slotSwitchManPages( )), actionCollection( ), "settings_local" ); @@ -105,7 +105,7 @@ void Knmap::createMenu( ) NULL, 0, m_mainWidget, - SLOT( slotUseTargetHost( )), + TQ_SLOT( slotUseTargetHost( )), actionCollection( ), "scan_use" ); @@ -113,7 +113,7 @@ void Knmap::createMenu( ) NULL, 0, m_mainWidget, - SLOT( slotWrapText( )), + TQ_SLOT( slotWrapText( )), actionCollection( ), "settings_wrap_text" ); @@ -121,7 +121,7 @@ void Knmap::createMenu( ) "scanclose", CTRL+Key_W, m_mainWidget, - SLOT( slotScanClose( )), + TQ_SLOT( slotScanClose( )), actionCollection( ), "scan_close" ); @@ -129,7 +129,7 @@ void Knmap::createMenu( ) "profilecopy", 0, m_mainWidget, - SLOT( slotProfileCopy( )), + TQ_SLOT( slotProfileCopy( )), actionCollection( ), "profile_copy" ); @@ -137,7 +137,7 @@ void Knmap::createMenu( ) "profiledelete", 0, m_mainWidget, - SLOT( slotProfileDelete( )), + TQ_SLOT( slotProfileDelete( )), actionCollection( ), "profile_delete" ); @@ -145,7 +145,7 @@ void Knmap::createMenu( ) "manpage", 0, m_mainWidget, - SLOT( slotShowManPage( )), + TQ_SLOT( slotShowManPage( )), actionCollection( ), "help_man_page" ); @@ -153,7 +153,7 @@ void Knmap::createMenu( ) "scanduplicate", CTRL+Key_C, m_mainWidget, - SLOT( slotScanDuplicate( )), + TQ_SLOT( slotScanDuplicate( )), actionCollection( ), "scan_duplicate" ); @@ -161,7 +161,7 @@ void Knmap::createMenu( ) "profileload", 0, m_mainWidget, - SLOT( slotProfileLoad( )), + TQ_SLOT( slotProfileLoad( )), actionCollection( ), "profile_load" ); @@ -169,7 +169,7 @@ void Knmap::createMenu( ) "manstylesheet", 0, m_mainWidget, - SLOT( slotSetStylesheet( )), + TQ_SLOT( slotSetStylesheet( )), actionCollection( ), "settings_stylesheet" ); @@ -177,7 +177,7 @@ void Knmap::createMenu( ) "scannew", CTRL+Key_N, m_mainWidget, - SLOT( slotScanNew( )), + TQ_SLOT( slotScanNew( )), actionCollection( ), "scan_new" ); @@ -185,7 +185,7 @@ void Knmap::createMenu( ) "profilerename", 0, m_mainWidget, - SLOT( slotProfileRename( )), + TQ_SLOT( slotProfileRename( )), actionCollection( ), "profile_rename" ); @@ -193,7 +193,7 @@ void Knmap::createMenu( ) "scanrename", Key_F2, m_mainWidget, - SLOT( slotScanRename( )), + TQ_SLOT( slotScanRename( )), actionCollection( ), "scan_rename" ); @@ -201,7 +201,7 @@ void Knmap::createMenu( ) "profilesave", 0, m_mainWidget, - SLOT( slotProfileSave( )), + TQ_SLOT( slotProfileSave( )), actionCollection( ), "profile_save" ); @@ -209,7 +209,7 @@ void Knmap::createMenu( ) "profilesaveas", 0, m_mainWidget, - SLOT( slotProfileSaveAs( )), + TQ_SLOT( slotProfileSaveAs( )), actionCollection( ), "profile_save_as" ); @@ -217,7 +217,7 @@ void Knmap::createMenu( ) "zoomcustom", 0, m_mainWidget, - SLOT( slotZoomCustom( )), + TQ_SLOT( slotZoomCustom( )), actionCollection( ), "settings_zoom_custom" ); @@ -225,7 +225,7 @@ void Knmap::createMenu( ) "zoomin", 0, m_mainWidget, - SLOT( slotZoomIn( )), + TQ_SLOT( slotZoomIn( )), actionCollection( ), "settings_zoom_in" ); @@ -233,7 +233,7 @@ void Knmap::createMenu( ) "zoomout", 0, m_mainWidget, - SLOT( slotZoomOut( )), + TQ_SLOT( slotZoomOut( )), actionCollection( ), "settings_zoom_out" ); @@ -354,7 +354,7 @@ void Knmap::slotConfigureToolbars( ) { saveMainWindowSettings( TDEGlobal::config( ), autoSaveGroup( )); KEditToolbar dlg( actionCollection( )); - connect( &dlg, SIGNAL( newToolbarConfig( )),this, SLOT( slotNewToolbarConfig( ))); + connect( &dlg, TQ_SIGNAL( newToolbarConfig( )),this, TQ_SLOT( slotNewToolbarConfig( ))); dlg.exec( ); } diff --git a/src/loggingoptions.cpp b/src/loggingoptions.cpp index ef31b88..ad1e6a5 100644 --- a/src/loggingoptions.cpp +++ b/src/loggingoptions.cpp @@ -130,38 +130,38 @@ void LoggingOptions::createLayout( ) void LoggingOptions::finaliseInitialisation( ) { WhatsThis* whatsThis = new WhatsThis( this ); - connect( m_baseFileNameButton, SIGNAL( clicked( )), SLOT( slotBaseFileNameButtonClicked( ))); - connect( m_baseFileNameCheckBox, SIGNAL( clicked( )), SLOT( slotBaseFileNameCheckBoxClicked( ))); - connect( m_grepableLogButton, SIGNAL( clicked( )), SLOT( slotGrepableLogButtonClicked( ))); - connect( m_grepableLogCheckBox, SIGNAL( clicked( )), SLOT( slotGrepableLogCheckBoxClicked( ))); - connect( m_normalLogButton, SIGNAL( clicked( )), SLOT( slotNormalLogButtonClicked( ))); - connect( m_normalLogCheckBox, SIGNAL( clicked( )), SLOT( slotNormalLogCheckBoxClicked( ))); - connect( m_noStylesheetCheckBox, SIGNAL( clicked( )), SLOT( slotNoStylesheetCheckBoxClicked( ))); - connect( m_resumeButton, SIGNAL( clicked( )), SLOT( slotResumeButtonClicked( ))); - connect( m_resumeCheckBox, SIGNAL( clicked( )), SLOT( slotResumeCheckBoxClicked( ))); - connect( m_scriptKiddieButton, SIGNAL( clicked( )), SLOT( slotScriptKiddieButtonClicked( ))); - connect( m_scriptKiddieCheckBox, SIGNAL( clicked( )), SLOT( slotScriptKiddieCheckBoxClicked( ))); - connect( m_stylesheetButton, SIGNAL( clicked( )), SLOT( slotStylesheetButtonClicked( ))); - connect( m_stylesheetCheckBox, SIGNAL( clicked( )), SLOT( slotStylesheetCheckBoxClicked( ))); - connect( whatsThis, SIGNAL( clicked( )), SLOT( slotWhatsThisClicked( ))); - connect( m_xmlLogButton, SIGNAL( clicked( )), SLOT( slotXMLLogButtonClicked( ))); - connect( m_xmlLogCheckBox, SIGNAL( clicked( )), SLOT( slotXMLLogCheckBoxClicked( ))); - - connect( m_appendOutputCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_baseFileNameCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_baseFileNameLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_grepableLogCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_grepableLogLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_normalLogCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_normalLogLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_resumeCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_resumeLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_scriptKiddieCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scriptKiddieLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_stylesheetCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_stylesheetLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_xmlLogCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_xmlLogLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); + connect( m_baseFileNameButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotBaseFileNameButtonClicked( ))); + connect( m_baseFileNameCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotBaseFileNameCheckBoxClicked( ))); + connect( m_grepableLogButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotGrepableLogButtonClicked( ))); + connect( m_grepableLogCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotGrepableLogCheckBoxClicked( ))); + connect( m_normalLogButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotNormalLogButtonClicked( ))); + connect( m_normalLogCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotNormalLogCheckBoxClicked( ))); + connect( m_noStylesheetCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotNoStylesheetCheckBoxClicked( ))); + connect( m_resumeButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotResumeButtonClicked( ))); + connect( m_resumeCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotResumeCheckBoxClicked( ))); + connect( m_scriptKiddieButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotScriptKiddieButtonClicked( ))); + connect( m_scriptKiddieCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotScriptKiddieCheckBoxClicked( ))); + connect( m_stylesheetButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotStylesheetButtonClicked( ))); + connect( m_stylesheetCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotStylesheetCheckBoxClicked( ))); + connect( whatsThis, TQ_SIGNAL( clicked( )), TQ_SLOT( slotWhatsThisClicked( ))); + connect( m_xmlLogButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotXMLLogButtonClicked( ))); + connect( m_xmlLogCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotXMLLogCheckBoxClicked( ))); + + connect( m_appendOutputCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_baseFileNameCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_baseFileNameLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_grepableLogCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_grepableLogLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_normalLogCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_normalLogLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_resumeCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_resumeLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scriptKiddieCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scriptKiddieLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_stylesheetCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_stylesheetLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_xmlLogCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_xmlLogLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); } // getOptions diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp index 42b7465..fcdb625 100644 --- a/src/mainwidget.cpp +++ b/src/mainwidget.cpp @@ -51,15 +51,15 @@ MainWidget::MainWidget( TQWidget* parent, const char* name ) moveToFirst( m_indexWidget ); m_scanStack->appendHTMLWidget( m_htmlWidget ); setOpaqueResize( true ); - TQTimer::singleShot( 0, this, SLOT( slotFinaliseInitialisation( ))); + TQTimer::singleShot( 0, this, TQ_SLOT( slotFinaliseInitialisation( ))); connect( m_htmlWidget, - SIGNAL( errorLoadingLocalManPage( const TQString& )), - SLOT( slotErrorLoadingLocalManPage( const TQString& ))); + TQ_SIGNAL( errorLoadingLocalManPage( const TQString& )), + TQ_SLOT( slotErrorLoadingLocalManPage( const TQString& ))); connect( m_indexWidget, - SIGNAL( visibleScanWidgetChanged( ScanWidget* )), - SLOT( slotVisibleScanWidgetChanged( ScanWidget* ))); + TQ_SIGNAL( visibleScanWidgetChanged( ScanWidget* )), + TQ_SLOT( slotVisibleScanWidgetChanged( ScanWidget* ))); } // createScan @@ -77,34 +77,34 @@ ScanWidget* MainWidget::createScan( const TQString& scanName, const bool useTarg scanWidget->setProfileName( profileName ); connect( scanWidget, - SIGNAL( displayHelp( const TQString& )), - SLOT( slotDisplayHelp( const TQString& ))); + TQ_SIGNAL( displayHelp( const TQString& )), + TQ_SLOT( slotDisplayHelp( const TQString& ))); connect( scanWidget, - SIGNAL( optionsDirty( )), - SLOT( slotOptionsDirty( ))); + TQ_SIGNAL( optionsDirty( )), + TQ_SLOT( slotOptionsDirty( ))); connect( scanWidget, - SIGNAL( outputAvailable( const bool, const bool )), - SIGNAL( outputAvailable( const bool, const bool ))); + TQ_SIGNAL( outputAvailable( const bool, const bool )), + TQ_SIGNAL( outputAvailable( const bool, const bool ))); connect( scanWidget, - SIGNAL( scanRename( const TQString& )), - SLOT( slotScanRename( const TQString& ))); + TQ_SIGNAL( scanRename( const TQString& )), + TQ_SLOT( slotScanRename( const TQString& ))); connect( scanWidget, - SIGNAL( scanStarted( )), + TQ_SIGNAL( scanStarted( )), m_indexWidget, - SLOT( slotScanStarted( ))); + TQ_SLOT( slotScanStarted( ))); connect( scanWidget, - SIGNAL( scanStopped( ScanWidget* )), + TQ_SIGNAL( scanStopped( ScanWidget* )), m_indexWidget, - SLOT( slotScanStopped( ScanWidget* ))); + TQ_SLOT( slotScanStopped( ScanWidget* ))); connect( scanWidget, - SIGNAL( statusBarText( const TQString& )), - SIGNAL( statusBarText( const TQString& ))); + TQ_SIGNAL( statusBarText( const TQString& )), + TQ_SIGNAL( statusBarText( const TQString& ))); return scanWidget; } diff --git a/src/outputwidget.cpp b/src/outputwidget.cpp index d5a5399..9855a8a 100644 --- a/src/outputwidget.cpp +++ b/src/outputwidget.cpp @@ -42,7 +42,7 @@ OutputWidget::OutputWidget( TQWidget* parent, const char* name ) m_priorType( OutputType( -1 )) { setFamily( "monospace" ); setReadOnly( true ); - TQTimer::singleShot( 0, this, SLOT( slotUpdateStatusBarText( ))); + TQTimer::singleShot( 0, this, TQ_SLOT( slotUpdateStatusBarText( ))); } // addOutput diff --git a/src/pandsoptions.cpp b/src/pandsoptions.cpp index b98e39f..e44deee 100644 --- a/src/pandsoptions.cpp +++ b/src/pandsoptions.cpp @@ -170,38 +170,38 @@ void PAndSOptions::createLayout( ) void PAndSOptions::finaliseInitialisation( ) { WhatsThis* whatsThis = new WhatsThis( this ); - connect( m_ackCheckBox, SIGNAL( clicked( )), SLOT( slotAckClicked( ))); - connect( m_scanFTPBounceCheckBox, SIGNAL( clicked( )), SLOT( slotScanFTPBounceCheckBoxClicked( ))); - connect( m_scanIdleCheckBox, SIGNAL( clicked( )), SLOT( slotScanIdleCheckBoxClicked( ))); - connect( m_synCheckBox, SIGNAL( clicked( )), SLOT( slotSynClicked( ))); - connect( whatsThis, SIGNAL( clicked( )), SLOT( slotWhatsThisClicked( ))); - - connect( m_ackCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_ackLineEdit, SIGNAL( textChanged ( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_arpCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_dontPingCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_echoCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_netmaskCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scanAckCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scanFINCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scanFTPBounceCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scanFTPRelayLineEdit, SIGNAL( textChanged ( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_scanIdleCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scanListCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scanNullCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scanPingCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scanProtocolCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scanRPCCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scanSYNCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scanTCPConnectCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scanUDPCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scanVersionCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scanWindowCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scanXmasCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_synCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_synLineEdit, SIGNAL( textChanged ( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_timestampCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_zombieLineEdit, SIGNAL( textChanged ( const TQString& )), SIGNAL( optionsDirty( ))); + connect( m_ackCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotAckClicked( ))); + connect( m_scanFTPBounceCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotScanFTPBounceCheckBoxClicked( ))); + connect( m_scanIdleCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotScanIdleCheckBoxClicked( ))); + connect( m_synCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotSynClicked( ))); + connect( whatsThis, TQ_SIGNAL( clicked( )), TQ_SLOT( slotWhatsThisClicked( ))); + + connect( m_ackCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_ackLineEdit, TQ_SIGNAL( textChanged ( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_arpCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_dontPingCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_echoCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_netmaskCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanAckCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanFINCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanFTPBounceCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanFTPRelayLineEdit, TQ_SIGNAL( textChanged ( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanIdleCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanListCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanNullCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanPingCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanProtocolCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanRPCCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanSYNCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanTCPConnectCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanUDPCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanVersionCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanWindowCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanXmasCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_synCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_synLineEdit, TQ_SIGNAL( textChanged ( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_timestampCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_zombieLineEdit, TQ_SIGNAL( textChanged ( const TQString& )), TQ_SIGNAL( optionsDirty( ))); } // getOptions diff --git a/src/profiledialog.cpp b/src/profiledialog.cpp index 5d5b3d2..d426926 100644 --- a/src/profiledialog.cpp +++ b/src/profiledialog.cpp @@ -56,9 +56,9 @@ ProfileDialog::ProfileDialog( Action action, createlayout( ); setInitialValues( currentProfile ); - connect( m_profileListBox, SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& )), SLOT( slotProfileListContextMenu( TQListBoxItem*, const TQPoint& ))); - connect( m_profileListBox, SIGNAL( doubleClicked( TQListBoxItem* )), SLOT( slotOk( ))); - connect( m_profileListBox, SIGNAL( selectionChanged( )), SLOT( slotProfileListBoxChanged( ))); + connect( m_profileListBox, TQ_SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& )), TQ_SLOT( slotProfileListContextMenu( TQListBoxItem*, const TQPoint& ))); + connect( m_profileListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem* )), TQ_SLOT( slotOk( ))); + connect( m_profileListBox, TQ_SIGNAL( selectionChanged( )), TQ_SLOT( slotProfileListBoxChanged( ))); } // checkForDuplicateName @@ -298,9 +298,9 @@ void ProfileDialog::slotProfileListContextMenu( TQListBoxItem* item, const TQPoi { m_contextItem = item; TQPopupMenu* contextMenu = new TQPopupMenu( this, "context menu" ); - contextMenu->insertItem( i18n( "&Copy" ), this, SLOT( slotCopy( ))); - contextMenu->insertItem( i18n( "&Delete" ), this, SLOT( slotDelete( ))); - contextMenu->insertItem( i18n( "&Rename" ), this, SLOT( slotRename( ))); + contextMenu->insertItem( i18n( "&Copy" ), this, TQ_SLOT( slotCopy( ))); + contextMenu->insertItem( i18n( "&Delete" ), this, TQ_SLOT( slotDelete( ))); + contextMenu->insertItem( i18n( "&Rename" ), this, TQ_SLOT( slotRename( ))); contextMenu->exec( pos ); } diff --git a/src/scannamedialog.cpp b/src/scannamedialog.cpp index 65e05cd..827a46a 100644 --- a/src/scannamedialog.cpp +++ b/src/scannamedialog.cpp @@ -73,7 +73,7 @@ void ScanNameDialog::createlayout( ) m_useHostNameCheckbox->setChecked( true ); slotUseHostNameToggled( true ); - connect( m_useHostNameCheckbox, SIGNAL( toggled( bool )), SLOT( slotUseHostNameToggled( bool ))); + connect( m_useHostNameCheckbox, TQ_SIGNAL( toggled( bool )), TQ_SLOT( slotUseHostNameToggled( bool ))); } // slotOk diff --git a/src/scanwidget.cpp b/src/scanwidget.cpp index 80a7536..75679a8 100644 --- a/src/scanwidget.cpp +++ b/src/scanwidget.cpp @@ -86,7 +86,7 @@ ScanWidget::ScanWidget( const TQString& scanName, m_startButton->setDefault( true ); srand( time( NULL )); - TQTimer::singleShot( 0, this, SLOT( slotFinaliseInitialisation( ))); + TQTimer::singleShot( 0, this, TQ_SLOT( slotFinaliseInitialisation( ))); } // destructor @@ -836,45 +836,45 @@ void ScanWidget::slotFinaliseInitialisation( ) m_simpleWidget->finaliseInitialisation( ); m_timingWidget->finaliseInitialisation( ); - connect( m_outputWidget, SIGNAL( statusBarText( const TQString& )), SIGNAL( statusBarText( const TQString& ))); - - connect( m_clearOutputButton, SIGNAL( clicked( )), SLOT( slotClearOutput( ))); - connect( m_commonWidget, SIGNAL( disableFastScan( )), m_simpleWidget, SLOT( slotDisableFastScan( ))); - connect( m_commonWidget, SIGNAL( targetChanged( const TQString& )), SLOT( slotTargetChanged( const TQString& ))); - connect( m_hideOptionsButton, SIGNAL( clicked( )), SLOT( slotHideOptions( ))); - connect( m_simpleWidget, SIGNAL( disablePortRanges( )), m_commonWidget, SLOT( slotDisablePortRanges( ))); - connect( m_startButton, SIGNAL( clicked( )), SLOT( slotStartClicked( ))); - connect( m_stopButton, SIGNAL( clicked( )), SLOT( slotStopClicked( ))); - connect( m_tabWidget, SIGNAL( currentChanged( TQWidget* )), SLOT( slotTabChanged( TQWidget* ))); - - connect( m_commonWidget, SIGNAL( optionsDirty( )), SLOT( slotOptionsDirty( ))); - connect( m_compoundWidget, SIGNAL( optionsDirty( )), SLOT( slotOptionsDirty( ))); - connect( m_loggingWidget, SIGNAL( optionsDirty( )), SLOT( slotOptionsDirty( ))); - connect( m_pAndSWidget, SIGNAL( optionsDirty( )), SLOT( slotOptionsDirty( ))); - connect( m_simpleWidget, SIGNAL( optionsDirty( )), SLOT( slotOptionsDirty( ))); - connect( m_tabWidget, SIGNAL( movedTab( int, int )), SLOT( slotOptionsDirty( ))); - connect( m_timingWidget, SIGNAL( optionsDirty( )), SLOT( slotOptionsDirty( ))); - - connect( m_commonWidget, SIGNAL( displayHelp( const TQString& )), SIGNAL( displayHelp( const TQString& ))); - connect( m_compoundWidget, SIGNAL( displayHelp( const TQString& )), SIGNAL( displayHelp( const TQString& ))); - connect( m_loggingWidget, SIGNAL( displayHelp( const TQString& )), SIGNAL( displayHelp( const TQString& ))); - connect( m_pAndSWidget, SIGNAL( displayHelp( const TQString& )), SIGNAL( displayHelp( const TQString& ))); - connect( m_simpleWidget, SIGNAL( displayHelp( const TQString& )), SIGNAL( displayHelp( const TQString& ))); - connect( m_timingWidget, SIGNAL( displayHelp( const TQString& )), SIGNAL( displayHelp( const TQString& ))); - - connect( m_commonWidget, SIGNAL( displayDocBook( const TQString& )), SLOT( slotDisplayDocBook( const TQString&))); - connect( m_compoundWidget, SIGNAL( displayDocBook( const TQString& )), SLOT( slotDisplayDocBook( const TQString&))); - connect( m_loggingWidget, SIGNAL( displayDocBook( const TQString& )), SLOT( slotDisplayDocBook( const TQString&))); - connect( m_pAndSWidget, SIGNAL( displayDocBook( const TQString& )), SLOT( slotDisplayDocBook( const TQString&))); - connect( m_simpleWidget, SIGNAL( displayDocBook( const TQString& )), SLOT( slotDisplayDocBook( const TQString&))); - connect( m_timingWidget, SIGNAL( displayDocBook( const TQString& )), SLOT( slotDisplayDocBook( const TQString&))); - - connect( m_commonWidget, SIGNAL( displayUnknown( )), SLOT( slotDisplayUnknown( ))); - connect( m_compoundWidget, SIGNAL( displayUnknown( )), SLOT( slotDisplayUnknown( ))); - connect( m_loggingWidget, SIGNAL( displayUnknown( )), SLOT( slotDisplayUnknown( ))); - connect( m_pAndSWidget, SIGNAL( displayUnknown( )), SLOT( slotDisplayUnknown( ))); - connect( m_simpleWidget, SIGNAL( displayUnknown( )), SLOT( slotDisplayUnknown( ))); - connect( m_timingWidget, SIGNAL( displayUnknown( )), SLOT( slotDisplayUnknown( ))); + connect( m_outputWidget, TQ_SIGNAL( statusBarText( const TQString& )), TQ_SIGNAL( statusBarText( const TQString& ))); + + connect( m_clearOutputButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotClearOutput( ))); + connect( m_commonWidget, TQ_SIGNAL( disableFastScan( )), m_simpleWidget, TQ_SLOT( slotDisableFastScan( ))); + connect( m_commonWidget, TQ_SIGNAL( targetChanged( const TQString& )), TQ_SLOT( slotTargetChanged( const TQString& ))); + connect( m_hideOptionsButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotHideOptions( ))); + connect( m_simpleWidget, TQ_SIGNAL( disablePortRanges( )), m_commonWidget, TQ_SLOT( slotDisablePortRanges( ))); + connect( m_startButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotStartClicked( ))); + connect( m_stopButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotStopClicked( ))); + connect( m_tabWidget, TQ_SIGNAL( currentChanged( TQWidget* )), TQ_SLOT( slotTabChanged( TQWidget* ))); + + connect( m_commonWidget, TQ_SIGNAL( optionsDirty( )), TQ_SLOT( slotOptionsDirty( ))); + connect( m_compoundWidget, TQ_SIGNAL( optionsDirty( )), TQ_SLOT( slotOptionsDirty( ))); + connect( m_loggingWidget, TQ_SIGNAL( optionsDirty( )), TQ_SLOT( slotOptionsDirty( ))); + connect( m_pAndSWidget, TQ_SIGNAL( optionsDirty( )), TQ_SLOT( slotOptionsDirty( ))); + connect( m_simpleWidget, TQ_SIGNAL( optionsDirty( )), TQ_SLOT( slotOptionsDirty( ))); + connect( m_tabWidget, TQ_SIGNAL( movedTab( int, int )), TQ_SLOT( slotOptionsDirty( ))); + connect( m_timingWidget, TQ_SIGNAL( optionsDirty( )), TQ_SLOT( slotOptionsDirty( ))); + + connect( m_commonWidget, TQ_SIGNAL( displayHelp( const TQString& )), TQ_SIGNAL( displayHelp( const TQString& ))); + connect( m_compoundWidget, TQ_SIGNAL( displayHelp( const TQString& )), TQ_SIGNAL( displayHelp( const TQString& ))); + connect( m_loggingWidget, TQ_SIGNAL( displayHelp( const TQString& )), TQ_SIGNAL( displayHelp( const TQString& ))); + connect( m_pAndSWidget, TQ_SIGNAL( displayHelp( const TQString& )), TQ_SIGNAL( displayHelp( const TQString& ))); + connect( m_simpleWidget, TQ_SIGNAL( displayHelp( const TQString& )), TQ_SIGNAL( displayHelp( const TQString& ))); + connect( m_timingWidget, TQ_SIGNAL( displayHelp( const TQString& )), TQ_SIGNAL( displayHelp( const TQString& ))); + + connect( m_commonWidget, TQ_SIGNAL( displayDocBook( const TQString& )), TQ_SLOT( slotDisplayDocBook( const TQString&))); + connect( m_compoundWidget, TQ_SIGNAL( displayDocBook( const TQString& )), TQ_SLOT( slotDisplayDocBook( const TQString&))); + connect( m_loggingWidget, TQ_SIGNAL( displayDocBook( const TQString& )), TQ_SLOT( slotDisplayDocBook( const TQString&))); + connect( m_pAndSWidget, TQ_SIGNAL( displayDocBook( const TQString& )), TQ_SLOT( slotDisplayDocBook( const TQString&))); + connect( m_simpleWidget, TQ_SIGNAL( displayDocBook( const TQString& )), TQ_SLOT( slotDisplayDocBook( const TQString&))); + connect( m_timingWidget, TQ_SIGNAL( displayDocBook( const TQString& )), TQ_SLOT( slotDisplayDocBook( const TQString&))); + + connect( m_commonWidget, TQ_SIGNAL( displayUnknown( )), TQ_SLOT( slotDisplayUnknown( ))); + connect( m_compoundWidget, TQ_SIGNAL( displayUnknown( )), TQ_SLOT( slotDisplayUnknown( ))); + connect( m_loggingWidget, TQ_SIGNAL( displayUnknown( )), TQ_SLOT( slotDisplayUnknown( ))); + connect( m_pAndSWidget, TQ_SIGNAL( displayUnknown( )), TQ_SLOT( slotDisplayUnknown( ))); + connect( m_simpleWidget, TQ_SIGNAL( displayUnknown( )), TQ_SLOT( slotDisplayUnknown( ))); + connect( m_timingWidget, TQ_SIGNAL( displayUnknown( )), TQ_SLOT( slotDisplayUnknown( ))); if( m_useTargetHost ) renameScan( m_commonWidget->getHostName( )); @@ -986,16 +986,16 @@ void ScanWidget::slotStartClicked( ) m_outputWidget->addOutput( OutputWidget::Stdin, cmd.local8Bit(), cmd.local8Bit().length( )); emit( outputAvailable( true, true )); - connect( m_nmapProcess, SIGNAL( processExited( TDEProcess* )), SLOT( slotProcessExited( ))); + connect( m_nmapProcess, TQ_SIGNAL( processExited( TDEProcess* )), TQ_SLOT( slotProcessExited( ))); if( !m_piping ) { connect( m_nmapProcess, - SIGNAL( receivedStderr( TDEProcess*, char*, int )), - SLOT( slotReceivedStderr( TDEProcess*, char*, int ))); + TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int )), + TQ_SLOT( slotReceivedStderr( TDEProcess*, char*, int ))); connect( m_nmapProcess, - SIGNAL( receivedStdout( TDEProcess*, char*, int )), - SLOT( slotReceivedStdout( TDEProcess*, char*, int ))); + TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int )), + TQ_SLOT( slotReceivedStdout( TDEProcess*, char*, int ))); } m_nmapProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); diff --git a/src/simpleoptions.cpp b/src/simpleoptions.cpp index 08980b2..682008c 100644 --- a/src/simpleoptions.cpp +++ b/src/simpleoptions.cpp @@ -114,22 +114,22 @@ void SimpleOptions::createLayout( ) void SimpleOptions::finaliseInitialisation( ) { WhatsThis* whatsThis = new WhatsThis( this ); - connect( m_fastScanCheckBox, SIGNAL( clicked( )), SLOT( slotFastScanCheckBoxClicked( ))); - connect( whatsThis, SIGNAL( clicked( )), SLOT( slotWhatsThisClicked( ))); - - connect( m_allPortsCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_fastScanCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_ipV6CheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_noRandomPortsCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_osDetectionCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_osScanLimitCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_packetTraceCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_prepackagedCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_privilegedCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_randomizeHostsCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_sendEthCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_sendIPCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_verboseCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); + connect( m_fastScanCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotFastScanCheckBoxClicked( ))); + connect( whatsThis, TQ_SIGNAL( clicked( )), TQ_SLOT( slotWhatsThisClicked( ))); + + connect( m_allPortsCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_fastScanCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_ipV6CheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_noRandomPortsCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_osDetectionCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_osScanLimitCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_packetTraceCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_prepackagedCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_privilegedCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_randomizeHostsCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_sendEthCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_sendIPCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_verboseCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); } // getOptions diff --git a/src/stylesheetdialog.cpp b/src/stylesheetdialog.cpp index 3e3a6cf..58f22ee 100644 --- a/src/stylesheetdialog.cpp +++ b/src/stylesheetdialog.cpp @@ -74,8 +74,8 @@ StylesheetDialog::StylesheetDialog( const TQString& currentStylesheetURL, layout->setRowStretch( 3, 10 ); layout->setRowStretch( 4, 2 ); - connect( urlButton, SIGNAL( clicked( )), SLOT( slotURLButtonClicked( ))); - connect( m_urlListBox, SIGNAL( doubleClicked( TQListBoxItem* )), SLOT( slotURLListBoxDoubleClicked( TQListBoxItem* ))); + connect( urlButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotURLButtonClicked( ))); + connect( m_urlListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem* )), TQ_SLOT( slotURLListBoxDoubleClicked( TQListBoxItem* ))); } // slotOk diff --git a/src/timingwidget.cpp b/src/timingwidget.cpp index dcb8107..1a85f45 100644 --- a/src/timingwidget.cpp +++ b/src/timingwidget.cpp @@ -173,62 +173,62 @@ void TimingWidget::createLayout( ) void TimingWidget::finaliseInitialisation( ) { WhatsThis* whatsThis = new WhatsThis( this ); - connect( m_aggressiveRadio, SIGNAL( clicked( )), SLOT( slotAggressiveRadioClicked( ))); - connect( m_defaultRadio, SIGNAL( clicked( )), SLOT( slotDefaultRadioClicked( ))); - connect( m_hostTimeoutButton, SIGNAL( clicked( )), SLOT( slotHostTimeoutButtonClicked( ))); - connect( m_hostTimeoutCheckBox, SIGNAL( clicked( )), SLOT( slotHostTimeoutCheckBoxClicked( ))); - connect( m_initialRTTTimeoutButton, SIGNAL( clicked( )), SLOT( slotInitialRTTTimeoutButtonClicked( ))); - connect( m_initialRTTTimeoutCheckBox, SIGNAL( clicked( )), SLOT( slotInitialRTTTimeoutCheckBoxClicked( ))); - connect( m_insaneRadio, SIGNAL( clicked( )), SLOT( slotInsaneRadioClicked( ))); - connect( m_maxHostGroupButton, SIGNAL( clicked( )), SLOT( slotMaxHostGroupButtonClicked( ))); - connect( m_maxHostGroupCheckBox, SIGNAL( clicked( )), SLOT( slotMaxHostGroupCheckBoxClicked( ))); - connect( m_maxParallelismButton, SIGNAL( clicked( )), SLOT( slotMaxParallelismButtonClicked( ))); - connect( m_maxParallelismCheckBox, SIGNAL( clicked( )), SLOT( slotMaxParallelismCheckBoxClicked( ))); - connect( m_maxRTTTimeoutButton, SIGNAL( clicked( )), SLOT( slotMaxRTTTimeoutButtonClicked( ))); - connect( m_maxRTTTimeoutCheckBox, SIGNAL( clicked( )), SLOT( slotMaxRTTTimeoutCheckBoxClicked( ))); - connect( m_maxScanDelayButton, SIGNAL( clicked( )), SLOT( slotMaxScanDelayButtonClicked( ))); - connect( m_maxScanDelayCheckBox, SIGNAL( clicked( )), SLOT( slotMaxScanDelayCheckBoxClicked( ))); - connect( m_minHostGroupButton, SIGNAL( clicked( )), SLOT( slotMinHostGroupButtonClicked( ))); - connect( m_minHostGroupCheckBox, SIGNAL( clicked( )), SLOT( slotMinHostGroupCheckBoxClicked( ))); - connect( m_minParallelismButton, SIGNAL( clicked( )), SLOT( slotMinParallelismButtonClicked( ))); - connect( m_minParallelismCheckBox, SIGNAL( clicked( )), SLOT( slotMinParallelismCheckBoxClicked( ))); - connect( m_minRTTTimeoutButton, SIGNAL( clicked( )), SLOT( slotMinRTTTimeoutButtonClicked( ))); - connect( m_minRTTTimeoutCheckBox, SIGNAL( clicked( )), SLOT( slotMinRTTTimeoutCheckBoxClicked( ))); - connect( m_normalRadio, SIGNAL( clicked( )), SLOT( slotNormalRadioClicked( ))); - connect( m_paranoidRadio, SIGNAL( clicked( )), SLOT( slotParanoidRadioClicked( ))); - connect( m_politeRadio, SIGNAL( clicked( )), SLOT( slotPoliteRadioClicked( ))); - connect( m_scanDelayButton, SIGNAL( clicked( )), SLOT( slotScanDelayButtonClicked( ))); - connect( m_scanDelayCheckBox, SIGNAL( clicked( )), SLOT( slotScanDelayCheckBoxClicked( ))); - connect( m_sneakyRadio, SIGNAL( clicked( )), SLOT( slotSneakyRadioClicked( ))); - connect( whatsThis, SIGNAL( clicked( )), SLOT( slotWhatsThisClicked( ))); - - connect( m_aggressiveRadio, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_defaultRadio, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_hostTimeoutCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_hostTimeoutLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_initialRTTTimeoutCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_initialRTTTimeoutLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_insaneRadio, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_maxHostGroupCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_maxHostGroupLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_maxParallelismCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_maxParallelismLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_maxRTTTimeoutCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_maxRTTTimeoutLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_maxScanDelayCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_maxScanDelayLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_minHostGroupCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_minHostGroupLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_minParallelismCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_minParallelismLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_minRTTTimeoutCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_minRTTTimeoutLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_normalRadio, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_paranoidRadio, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_politeRadio, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scanDelayCheckBox, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); - connect( m_scanDelayLineEdit, SIGNAL( textChanged( const TQString& )), SIGNAL( optionsDirty( ))); - connect( m_sneakyRadio, SIGNAL( clicked( )), SIGNAL( optionsDirty( ))); + connect( m_aggressiveRadio, TQ_SIGNAL( clicked( )), TQ_SLOT( slotAggressiveRadioClicked( ))); + connect( m_defaultRadio, TQ_SIGNAL( clicked( )), TQ_SLOT( slotDefaultRadioClicked( ))); + connect( m_hostTimeoutButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotHostTimeoutButtonClicked( ))); + connect( m_hostTimeoutCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotHostTimeoutCheckBoxClicked( ))); + connect( m_initialRTTTimeoutButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotInitialRTTTimeoutButtonClicked( ))); + connect( m_initialRTTTimeoutCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotInitialRTTTimeoutCheckBoxClicked( ))); + connect( m_insaneRadio, TQ_SIGNAL( clicked( )), TQ_SLOT( slotInsaneRadioClicked( ))); + connect( m_maxHostGroupButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotMaxHostGroupButtonClicked( ))); + connect( m_maxHostGroupCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotMaxHostGroupCheckBoxClicked( ))); + connect( m_maxParallelismButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotMaxParallelismButtonClicked( ))); + connect( m_maxParallelismCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotMaxParallelismCheckBoxClicked( ))); + connect( m_maxRTTTimeoutButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotMaxRTTTimeoutButtonClicked( ))); + connect( m_maxRTTTimeoutCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotMaxRTTTimeoutCheckBoxClicked( ))); + connect( m_maxScanDelayButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotMaxScanDelayButtonClicked( ))); + connect( m_maxScanDelayCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotMaxScanDelayCheckBoxClicked( ))); + connect( m_minHostGroupButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotMinHostGroupButtonClicked( ))); + connect( m_minHostGroupCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotMinHostGroupCheckBoxClicked( ))); + connect( m_minParallelismButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotMinParallelismButtonClicked( ))); + connect( m_minParallelismCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotMinParallelismCheckBoxClicked( ))); + connect( m_minRTTTimeoutButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotMinRTTTimeoutButtonClicked( ))); + connect( m_minRTTTimeoutCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotMinRTTTimeoutCheckBoxClicked( ))); + connect( m_normalRadio, TQ_SIGNAL( clicked( )), TQ_SLOT( slotNormalRadioClicked( ))); + connect( m_paranoidRadio, TQ_SIGNAL( clicked( )), TQ_SLOT( slotParanoidRadioClicked( ))); + connect( m_politeRadio, TQ_SIGNAL( clicked( )), TQ_SLOT( slotPoliteRadioClicked( ))); + connect( m_scanDelayButton, TQ_SIGNAL( clicked( )), TQ_SLOT( slotScanDelayButtonClicked( ))); + connect( m_scanDelayCheckBox, TQ_SIGNAL( clicked( )), TQ_SLOT( slotScanDelayCheckBoxClicked( ))); + connect( m_sneakyRadio, TQ_SIGNAL( clicked( )), TQ_SLOT( slotSneakyRadioClicked( ))); + connect( whatsThis, TQ_SIGNAL( clicked( )), TQ_SLOT( slotWhatsThisClicked( ))); + + connect( m_aggressiveRadio, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_defaultRadio, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_hostTimeoutCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_hostTimeoutLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_initialRTTTimeoutCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_initialRTTTimeoutLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_insaneRadio, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_maxHostGroupCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_maxHostGroupLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_maxParallelismCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_maxParallelismLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_maxRTTTimeoutCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_maxRTTTimeoutLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_maxScanDelayCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_maxScanDelayLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_minHostGroupCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_minHostGroupLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_minParallelismCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_minParallelismLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_minRTTTimeoutCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_minRTTTimeoutLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_normalRadio, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_paranoidRadio, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_politeRadio, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanDelayCheckBox, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); + connect( m_scanDelayLineEdit, TQ_SIGNAL( textChanged( const TQString& )), TQ_SIGNAL( optionsDirty( ))); + connect( m_sneakyRadio, TQ_SIGNAL( clicked( )), TQ_SIGNAL( optionsDirty( ))); } // getOptions