Removed obsolete Qt2's ASSERT and replace with Q_ASSERT.

The definition of -UTQT_NO_COMPAT is no longer needed.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 45e9559726)
r14.0.x
Slávek Banko 6 years ago
parent a83f600010
commit 83fb5c2a16
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -57,7 +57,7 @@ include( ConfigureChecks.cmake )
###### global compiler settings
add_definitions( -DHAVE_CONFIG_H -UQT_NO_ASCII_CAST -UQT_NO_COMPAT )
add_definitions( -DHAVE_CONFIG_H -UQT_NO_ASCII_CAST )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )

@ -369,7 +369,7 @@ bool CommonWidget::portRangesOverlapping( const ushort portFirst, const ushort p
default:
kdDebug( ) << i18n( "unknown value in Port Range Protocol combo box" ) << endl;
ASSERT( false );
Q_ASSERT( false );
delete [] tcpPorts;
delete [] udpPorts;
return false;
@ -495,7 +495,7 @@ void CommonWidget::slotPortRangeAddClicked( )
default:
kdDebug( ) << i18n( "unknown value in Port Range Protocol combo box" ) << endl;
ASSERT( false );
Q_ASSERT( false );
}
m_portRangeAddButton->setEnabled( false );
@ -549,7 +549,7 @@ void CommonWidget::slotPortRangeDoubleClicked( TQListBoxItem* item )
default:
kdDebug( ) << i18n( "unknown value in Port Range Protocol" ) << endl;
ASSERT( false );
Q_ASSERT( false );
m_portRangeComboBox->setCurrentItem( BothProtocol );
}

@ -251,7 +251,7 @@ void IndexWidget::slotScanStarted( )
{ if( m_scanCount++ )
return;
ASSERT( m_blinkTimer == NULL );
Q_ASSERT( m_blinkTimer == NULL );
m_blinkTimer = new TQTimer( this );
connect( m_blinkTimer, SIGNAL( timeout( )), SLOT( slotRepaint( )));
m_blinkTimer->start( 500 );

@ -136,12 +136,12 @@ void ProfileDialog::createlayout( )
void ProfileDialog::deelete( const TQString& profileName, const bool ask )
{ if( !kapp->config( )->hasGroup( PROFILE_PREFIX + profileName ))
{ ASSERT( false );
{ Q_ASSERT( false );
return ;
}
TQListBoxItem* item = m_profileListBox->findItem( profileName, TQt::ExactMatch );
ASSERT( item != NULL );
Q_ASSERT( item != NULL );
if( item != NULL )
deelete( item, ask );

@ -66,7 +66,7 @@ void ScanStack::appendAndRaiseWidget( ScanWidget* scanWidget )
// ================
void ScanStack::appendHTMLWidget( HTMLWidget* htmlWidget )
{ ASSERT( m_widgetId == 1 );
{ Q_ASSERT( m_widgetId == 1 );
addWidget( (TQWidget*) htmlWidget, m_widgetId++ );
}
@ -94,7 +94,7 @@ short ScanStack::indexOfVisibleScanWidget( )
break;
if( !moreScanWidgets( i ))
{ ASSERT( false );
{ Q_ASSERT( false );
return -1;
}
@ -108,7 +108,7 @@ ScanWidget* ScanStack::makeScanWidgetVisible( const ushort index )
{ ScanWidget* current = scanWidget( index );
if( current == NULL )
ASSERT( false );
Q_ASSERT( false );
else
{ current->ignoreTabChanges( true );
raiseWidget( current );
@ -156,7 +156,7 @@ void ScanStack::removeScanWidget( ScanWidget* scanWidgetToRemove )
short index = findScanWidget( scanWidgetToRemove );
if( index < 0 )
{ ASSERT( false );
{ Q_ASSERT( false );
return;
}

@ -506,8 +506,8 @@ bool ScanWidget::createPipe( const TQString type, const TQString& tempDir, TQFil
// ===========
bool ScanWidget::createPipes( )
{ ASSERT( m_pipeStderr == NULL );
ASSERT( m_pipeStdout == NULL );
{ Q_ASSERT( m_pipeStderr == NULL );
Q_ASSERT( m_pipeStdout == NULL );
TDEStandardDirs standardDirs;
TQStringList tempDir = standardDirs.resourceDirs( "tmp" );

@ -397,7 +397,7 @@ void TimingWidget::setInitialValues( )
default:
kdDebug( ) << "internal error - unknown simple timing value " << m_simpleTimingValue << endl;
ASSERT( false );
Q_ASSERT( false );
}
}
@ -416,7 +416,7 @@ TQString TimingWidget::simpleTiming( ) const
}
kdDebug( ) << "internal error - unknown simple timing value " << m_simpleTimingValue << endl;
ASSERT( false );
Q_ASSERT( false );
return TQString::null;
}

Loading…
Cancel
Save