diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/commonwidget.cpp | 6 | ||||
| -rw-r--r-- | src/indexwidget.cpp | 2 | ||||
| -rw-r--r-- | src/profiledialog.cpp | 4 | ||||
| -rw-r--r-- | src/scanstack.cpp | 8 | ||||
| -rw-r--r-- | src/scanwidget.cpp | 4 | ||||
| -rw-r--r-- | src/timingwidget.cpp | 4 |
7 files changed, 15 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fffe51..0d80651 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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" ) diff --git a/src/commonwidget.cpp b/src/commonwidget.cpp index 2ce9253..7a13902 100644 --- a/src/commonwidget.cpp +++ b/src/commonwidget.cpp @@ -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 ); } diff --git a/src/indexwidget.cpp b/src/indexwidget.cpp index 18cfa7e..f8402e7 100644 --- a/src/indexwidget.cpp +++ b/src/indexwidget.cpp @@ -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 ); diff --git a/src/profiledialog.cpp b/src/profiledialog.cpp index 2842c6d..5d5b3d2 100644 --- a/src/profiledialog.cpp +++ b/src/profiledialog.cpp @@ -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 ); diff --git a/src/scanstack.cpp b/src/scanstack.cpp index 12d623c..5f5644b 100644 --- a/src/scanstack.cpp +++ b/src/scanstack.cpp @@ -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; } diff --git a/src/scanwidget.cpp b/src/scanwidget.cpp index d8fe67c..a704c2a 100644 --- a/src/scanwidget.cpp +++ b/src/scanwidget.cpp @@ -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" ); diff --git a/src/timingwidget.cpp b/src/timingwidget.cpp index a864b99..4cdb218 100644 --- a/src/timingwidget.cpp +++ b/src/timingwidget.cpp @@ -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; } |