SVN_SILENT just few typos and qMin/qMax fixes.

svn path=/trunk/KDE/kdepim/; revision=701272
wilder-work
Arto Hytnen 19 years ago
parent 93635cfc8b
commit f1ee1a5928
  1. 4
      editorwatcher.cpp
  2. 2
      headeritem.cpp
  3. 2
      kmailicalifaceimpl.cpp
  4. 2
      kmmsgbase.h
  5. 2
      main.cpp

@ -131,7 +131,7 @@ void EditorWatcher::inotifyEvent()
char buffer[4096]; char buffer[4096];
ioctl( mInotifyFd, FIONREAD, &pending ); ioctl( mInotifyFd, FIONREAD, &pending );
while ( pending > 0 ) { while ( pending > 0 ) {
int size = read( mInotifyFd, buffer, QMIN( pending, (int)sizeof(buffer) ) ); int size = read( mInotifyFd, buffer, qMin( pending, (int)sizeof(buffer) ) );
pending -= size; pending -= size;
if ( size < 0 ) if ( size < 0 )
break; // error break; // error
@ -166,7 +166,7 @@ void EditorWatcher::checkEditDone()
// nobody can edit that fast, we seem to be unable to detect // nobody can edit that fast, we seem to be unable to detect
// when the editor will be closed // when the editor will be closed
if ( mEditTime.elapsed() <= 3000 ) { if ( mEditTime.elapsed() <= 3000 ) {
KMessageBox::error( 0, i18n("KMail is unable to detect when the choosen editor is closed. " KMessageBox::error( 0, i18n("KMail is unable to detect when the chosen editor is closed. "
"To avoid data loss, editing the attachment will be aborted."), i18n("Unable to edit attachment") ); "To avoid data loss, editing the attachment will be aborted."), i18n("Unable to edit attachment") );
} }

@ -391,7 +391,7 @@ void HeaderItem::paintCell( QPainter * p, const QColorGroup & cg,
QFont tmp_font = firstTag->textFont(); QFont tmp_font = firstTag->textFont();
if ( tmp_font != QFont() ) { if ( tmp_font != QFont() ) {
font = tmp_font; font = tmp_font;
weight = QMAX( weight, font.weight() ); weight = qMax( weight, font.weight() );
} }
} }
} }

@ -479,7 +479,7 @@ bool KMailICalIfaceImpl::deleteIncidenceKolab( const QString& resource,
int KMailICalIfaceImpl::incidencesKolabCount( const QString& mimetype, int KMailICalIfaceImpl::incidencesKolabCount( const QString& mimetype,
const QString& resource ) const QString& resource )
{ {
Q_UNUSED( mimetype ); // honouring that would be too slow... Q_UNUSED( mimetype ); // honoring that would be too slow...
if( !mUseResourceIMAP ) if( !mUseResourceIMAP )
return 0; return 0;

@ -110,7 +110,7 @@ public:
/** Const reference to a status object of a message. */ /** Const reference to a status object of a message. */
const MessageStatus& messageStatus() const; const MessageStatus& messageStatus() const;
/**Get a comma seperated list of tag labels*/ /**Get a comma separated list of tag labels*/
virtual QString tagString( void ) const = 0; virtual QString tagString( void ) const = 0;
/**Get a pointer to the tag label list*/ /**Get a pointer to the tag label list*/
virtual KMMessageTagList *tagList( void ) const = 0; virtual KMMessageTagList *tagList( void ) const = 0;

@ -66,7 +66,7 @@ int KMailApplication::newInstance()
return 0; return 0;
// If the event loop hasn't been reached yet, the kernel is probably not // If the event loop hasn't been reached yet, the kernel is probably not
// fully initalized. Creating an instance would therefore fail, this is why // fully initialized. Creating an instance would therefore fail, this is why
// that is delayed until delayedInstanceCreation() is called. // that is delayed until delayedInstanceCreation() is called.
if ( !mEventLoopReached ) { if ( !mEventLoopReached ) {
kDebug(5006) <<"Delaying instance creation."; kDebug(5006) <<"Delaying instance creation.";

Loading…
Cancel
Save