diff --git a/configuredialog.cpp b/configuredialog.cpp index 6b663d078..24ca28267 100644 --- a/configuredialog.cpp +++ b/configuredialog.cpp @@ -477,6 +477,7 @@ void IdentityPage::slotRenameIdentity() { void IdentityPage::slotRenameIdentity( QListViewItem * i, const QString & s, int col ) { assert( col == 0 ); + Q_UNUSED( col ); IdentityListViewItem * item = dynamic_cast( i ); if ( !item ) return; diff --git a/kmfolder.cpp b/kmfolder.cpp index 85c0b7b8b..2291d7785 100644 --- a/kmfolder.cpp +++ b/kmfolder.cpp @@ -332,7 +332,9 @@ bool KMFolder::canAddMsgNow(KMMessage* aMsg, int* aIndex_ret) KMFolder *msgParent = aMsg->parent(); if (aMsg->transferInProgress()) return false; -#warning "FIXME : extract tempOpenFolder to some base class" +#ifdef __GNUC__ +#warning FIXME : extract tempOpenFolder to some base class +#endif if (!aMsg->isComplete() && msgParent && msgParent->folderType() == KMFolderTypeImap) { FolderJob *job = msgParent->createJob(aMsg); diff --git a/kmfoldercachedimap.cpp b/kmfoldercachedimap.cpp index 59bf4f727..7daf7a593 100644 --- a/kmfoldercachedimap.cpp +++ b/kmfoldercachedimap.cpp @@ -253,6 +253,7 @@ bool KMFolderCachedImap::canRemoveFolder() const { /* Reimplemented from KMFolderDir */ int KMFolderCachedImap::rename(const QString& aName, KMFolderDir *aParent) { assert( aParent == 0 ); + Q_UNUSED( aParent ); if ( aName == name() ) // Stupid user trying to rename it to it's old name :) diff --git a/kmfoldersearch.cpp b/kmfoldersearch.cpp index af72180f6..d6e68518f 100644 --- a/kmfoldersearch.cpp +++ b/kmfoldersearch.cpp @@ -629,6 +629,7 @@ FolderJob* KMFolderSearch::doCreateJob(KMMessage*, FolderJob::JobType, { // Should never be called assert(0); + return 0; } FolderJob* KMFolderSearch::doCreateJob(QPtrList&, const QString&, @@ -636,6 +637,7 @@ FolderJob* KMFolderSearch::doCreateJob(QPtrList&, const QString&, { // Should never be called assert(0); + return 0; } const KMMsgBase* KMFolderSearch::getMsgBase(int idx) const @@ -911,6 +913,7 @@ KMMsgBase* KMFolderSearch::takeIndexEntry(int idx) KMMsgInfo* KMFolderSearch::setIndexEntry(int idx, KMMessage *msg) { assert(idx >= 0 && idx < (int)mSerNums.count()); + Q_UNUSED( idx ); return msg->parent()->setIndexEntry(msg->parent()->find(msg), msg); } diff --git a/kmheaders.cpp b/kmheaders.cpp index ef5c63b1e..df0dd8e95 100644 --- a/kmheaders.cpp +++ b/kmheaders.cpp @@ -1042,8 +1042,7 @@ void KMHeaders::msgAdded(int id) CREATE_TIMER(msgAdded); START_TIMER(msgAdded); - KMMsgBase* mb = mFolder->getMsgBase( id ); - assert(mb != 0); // otherwise using count() above is wrong + assert( mFolder->getMsgBase( id ) ); // otherwise using count() above is wrong if (mNested != mNestedOverride) { // make sure the id and subject dicts grow, if necessary diff --git a/kmsender.cpp b/kmsender.cpp index 998574016..64fa8f227 100644 --- a/kmsender.cpp +++ b/kmsender.cpp @@ -932,6 +932,7 @@ void KMSendSendmail::wroteStdin(KProcess *proc) int len; assert(proc!=0); + Q_UNUSED( proc ); str = mMsgPos; len = (mMsgRest>1024 ? 1024 : mMsgRest); @@ -955,6 +956,7 @@ void KMSendSendmail::wroteStdin(KProcess *proc) void KMSendSendmail::receivedStderr(KProcess *proc, char *buffer, int buflen) { assert(proc!=0); + Q_UNUSED( proc ); mMsg.replace(mMsg.length(), buflen, buffer); }