KDE/kdepim

[Allen Winter]

On Wednesday 08 October 2008 09:31:35 Marc Mutz wrote:
> On Wednesday October 8 2008, Matthias Fuchs wrote:
> > SVN commit 869194 by mfuchs:
> >
> > Fix some compiler warnings.
> 
> Please switch those warning off. They're bogus.
> Please revert.
> 
That would have to be done to the compile flags in kdelibs/cmake/modules/FindKDE4Internal.
Apparently gcc 4.3 introduced extra "strict"? checks.

I'm not exactly sure what options to turnoff.. or if we can agree which ones to turnoff.

> Thanks,
> Marc
> 
> >
> >  M  +3 -2      kleopatra/libkleopatraclient/core/command.cpp
> >  M  +4 -2      libkleo/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
> >  M  +2 -1      libkleo/backends/qgpgme/qgpgmerefreshkeysjob.cpp
> >  M  +2 -2      libkleo/backends/qgpgme/qgpgmesignencryptjob.cpp
> >  M  +2 -2      libkleo/kleo/keyfiltermanager.cpp
> >  M  +2 -2      libkleo/ui/directoryserviceswidget.cpp
> >
> >
> > --- trunk/KDE/kdepim/kleopatra/libkleopatraclient/core/command.cpp
> > #869193:869194 @@ -62,7 +62,7 @@
> >      for ( std::string::const_iterator it = in.begin(), end = in.end() ; it
> > != end ; ++it ) switch ( const unsigned char ch = *it ) {
> >          default:
> > -            if ( ch >= '!' && ch <= '~' || ch > 0xA0 ) {
> > +            if ( ( ch >= '!' && ch <= '~' ) || ch > 0xA0 ) {
> >                  result += ch;
> >                  break;
> >              }
> > @@ -442,7 +442,7 @@
> >      }
> >
> >      for ( std::map<std::string,Option>::const_iterator it =
> > in.options.begin(), end = in.options.end() ; it != end ; ++it ) -        if
> > ( ( err = send_option( ctx, it->first.c_str(), it->second.hasValue ?
> > it->second.value.toString() : QVariant() ) ) ) +        if ( ( err =
> > send_option( ctx, it->first.c_str(), it->second.hasValue ?
> > it->second.value.toString() : QVariant() ) ) ) { if ( it->second.isCritical
> > ) {
> >                  out.errorString = tr("Failed to send critical option %1:
> > %2") .arg( QString::fromLatin1( it->first.c_str() ), to_error_string( err )
> > ); @@ -450,6 +450,7 @@
> >              } else {
> >                  qDebug() << "Failed to send non-critical option" <<
> > it->first.c_str() << ":" << to_error_string( err ); }
> > +        }
> >
> >      Q_FOREACH( const QString & filePath, in.filePaths )
> >          if ( ( err = send_file( ctx, filePath ) ) ) {
> > --- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
> > #869193:869194 @@ -104,8 +104,8 @@
> >
> >    qDebug() << "QGpgMEProgressTokenMapper::map(" << token << subtoken <<
> > ")";
> >
> > -  for ( const _tokens * it = boost::begin( tokens ), *end = boost::end(
> > tokens ) ; it != end ; ++it ) -    if ( token.compare( QLatin1String(
> > it->token ), Qt::CaseInsensitive ) == 0 ) +  for ( const _tokens * it =
> > boost::begin( tokens ), *end = boost::end( tokens ) ; it != end ; ++it ) {
> > +    if ( token.compare( QLatin1String( it->token ), Qt::CaseInsensitive )
> > == 0 ) { if ( it->desc && it->numDesc ) {
> >          for ( unsigned int i = 0, e = it->numDesc ; i != e ; ++i )
> >            if ( it->desc[i].type == subtoken )
> > @@ -114,6 +114,8 @@
> >        } else {
> >          break;
> >        }
> > +    }
> > +  }
> >
> >    return token;
> >  }
> > --- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmerefreshkeysjob.cpp
> > #869193:869194 @@ -196,11 +196,12 @@
> >  }
> >
> >  void Kleo::QGpgMERefreshKeysJob::slotProcessExited(int exitCode,
> > QProcess::ExitStatus exitStatus) { -  if ( !mError &&
> > !mPatternsToDo.empty() )
> > +  if ( !mError && !mPatternsToDo.empty() ) {
> >      if ( const GpgME::Error err = startAProcess() )
> >        mError = err;
> >      else
> >        return;
> > +  }
> >
> >    emit done();
> >    if ( !mError &&
> > --- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmesignencryptjob.cpp
> > #869193:869194 @@ -135,8 +135,8 @@
> >  }
> >
> >  void QGpgMESignEncryptJob::showErrorDialog( QWidget * parent, const
> > QString & caption ) const { -    if ( mResult.first.error()  &&
> > !mResult.first.error().isCanceled() || -         mResult.second.error() &&
> > !mResult.second.error().isCanceled() ) +    if ( ( mResult.first.error() 
> > && !mResult.first.error().isCanceled() ) || +         (
> > mResult.second.error() && !mResult.second.error().isCanceled() ) )
> > MessageBox::error( parent, mResult.first, mResult.second, this, caption );
> > }
> >
> > --- trunk/KDE/kdepim/libkleo/kleo/keyfiltermanager.cpp #869193:869194
> > @@ -255,8 +255,8 @@
> >  }
> >
> >  QVariant Model::data( const QModelIndex & idx, int role ) const {
> > -    if ( role != Qt::DisplayRole && role != Qt::EditRole &&
> > -         role != Qt::ToolTipRole && role != Qt::DecorationRole ||
> > +    if ( ( role != Qt::DisplayRole && role != Qt::EditRole &&
> > +         role != Qt::ToolTipRole && role != Qt::DecorationRole ) ||
> >           !idx.isValid() || idx.model() != this ||
> >           idx.row() < 0 || static_cast<unsigned>(idx.row()) > 
> > m_keyFilterManagerPrivate->filters.size() ) return QVariant();
> > --- trunk/KDE/kdepim/libkleo/ui/directoryserviceswidget.cpp #869193:869194
> > @@ -207,8 +207,8 @@
> >          KUrl          service( unsigned int row ) const { return row <
> > m_items.size() ?  m_items[row].url : KUrl() ; }
> >
> >          bool isReadOnlyRow( unsigned int row ) const {
> > -            return isX509Service( row ) && m_x509ReadOnly
> > -                || isOpenPGPService( row ) && m_openPGPReadOnly ;
> > +            return ( isX509Service( row ) && m_x509ReadOnly )
> > +                || ( isOpenPGPService( row ) && m_openPGPReadOnly );
> >          }
> >
> >          enum Columns {
> 
> 
> 
> -- 
> Marc Mutz - marc at kdab.com, mutz at kde.org - Klarälvdalens Datakonsult AB
> Platform-independent software solutions - www.kdab.com info at kdab.com
>