SVN commit 1297558 by kossebau: Fixed: in ByteArrayViewProfileSynchronizer::setViewProfileId(...) connect to really all change signals of view if needed M +28 -27 bytearrayviewprofilesynchronizer.cpp M +1 -0 bytearrayviewprofilesynchronizer.h --- trunk/KDE/kdesdk/okteta/kasten/gui/io/bytearrayviewprofilesynchronizer.cpp #1297557:1297558 @@ -60,29 +60,7 @@ { const ByteArrayViewProfile viewProfile = mViewProfileManager->viewProfile( mViewProfileId ); updateView( viewProfile ); - - connect( mView, SIGNAL(showsNonprintingChanged(bool)), - SLOT(onShowsNonprintingChanged()) ); - connect( mView, SIGNAL(valueCodingChanged(int)), - SLOT(onValueCodingChanged()) ); - connect( mView, SIGNAL(charCodecChanged(QString)), - SLOT(onCharCodecChanged()) ); - connect( mView, SIGNAL(substituteCharChanged(QChar)), - SLOT(onSubstituteCharChanged()) ); - connect( mView, SIGNAL(undefinedCharChanged(QChar)), - SLOT(onUndefinedCharChanged()) ); - connect( mView, SIGNAL(visibleByteArrayCodingsChanged(int)), - SLOT(onVisibleByteArrayCodingsChanged()) ); - connect( mView, SIGNAL(offsetColumnVisibleChanged(bool)), - SLOT(onOffsetColumnVisibleChanged()) ); - connect( mView, SIGNAL(noOfBytesPerLineChanged(int)), - SLOT(onNoOfBytesPerLineChanged()) ); - connect( mView, SIGNAL(noOfGroupedBytesChanged(int)), - SLOT(onNoOfGroupedBytesChanged()) ); - connect( mView, SIGNAL(layoutStyleChanged(int)), - SLOT(onLayoutStyleChanged()) ); - connect( mView, SIGNAL(viewModusChanged(int)), - SLOT(onViewModusChanged()) ); + connectViewSignals(); } } @@ -114,12 +92,9 @@ connect( mViewProfileManager, SIGNAL(viewProfilesRemoved(QList)), SLOT(onViewProfilesRemoved(QList)) ); if( mView ) - { - connect( mView, SIGNAL(valueCodingChanged(int)), SIGNAL(valueCodingChanged(int)) ); - connect( mView, SIGNAL(charCodecChanged(QString)), SIGNAL(charCodecChanged(QString)) ); + connectViewSignals(); } } - } else { if ( isListeningBefore ) @@ -266,6 +241,32 @@ viewProfile.setViewModus( mView->viewModus() ); } +void ByteArrayViewProfileSynchronizer::connectViewSignals() +{ + connect( mView, SIGNAL(showsNonprintingChanged(bool)), + SLOT(onShowsNonprintingChanged()) ); + connect( mView, SIGNAL(valueCodingChanged(int)), + SLOT(onValueCodingChanged()) ); + connect( mView, SIGNAL(charCodecChanged(QString)), + SLOT(onCharCodecChanged()) ); + connect( mView, SIGNAL(substituteCharChanged(QChar)), + SLOT(onSubstituteCharChanged()) ); + connect( mView, SIGNAL(undefinedCharChanged(QChar)), + SLOT(onUndefinedCharChanged()) ); + connect( mView, SIGNAL(visibleByteArrayCodingsChanged(int)), + SLOT(onVisibleByteArrayCodingsChanged()) ); + connect( mView, SIGNAL(offsetColumnVisibleChanged(bool)), + SLOT(onOffsetColumnVisibleChanged()) ); + connect( mView, SIGNAL(noOfBytesPerLineChanged(int)), + SLOT(onNoOfBytesPerLineChanged()) ); + connect( mView, SIGNAL(noOfGroupedBytesChanged(int)), + SLOT(onNoOfGroupedBytesChanged()) ); + connect( mView, SIGNAL(layoutStyleChanged(int)), + SLOT(onLayoutStyleChanged()) ); + connect( mView, SIGNAL(viewModusChanged(int)), + SLOT(onViewModusChanged()) ); +} + void ByteArrayViewProfileSynchronizer::onViewProfilesRemoved( const QList& viewProfileIds ) { if( mView == 0 ) --- trunk/KDE/kdesdk/okteta/kasten/gui/io/bytearrayviewprofilesynchronizer.h #1297557:1297558 @@ -100,6 +100,7 @@ void updateView( const ByteArrayViewProfile& viewProfile ); void updateViewProfile( ByteArrayViewProfile& viewProfile ); void setDirtyFlag( int dirtyFlag ); + void connectViewSignals(); private: ByteArrayView* mView;