From 6ebf16526af3e87e344541508c4177251fe7e0f9 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 25 Jun 2007 12:58:37 +0000 Subject: [PATCH] the usual "daily unbreak compilation" svn path=/trunk/KDE/kdepim/; revision=680111 --- filterlog.h | 18 +++++++++--------- folderselectiondialog.cpp | 4 ++-- kmacctcachedimap.h | 4 ++-- kmcommands.h | 12 ++++++------ kmcomposewin.cpp | 1 + kmfilter.h | 2 +- kmfilteraction.h | 2 +- kmfolderimap.h | 4 ++-- kmmainwin.h | 2 +- kmmessage.h | 6 +++--- kmpopfiltercnfrmdlg.h | 8 ++++---- kmsearchpattern.h | 2 +- newfolderdialog.h | 2 +- objecttreeparser.cpp | 3 ++- partNode.h | 4 ++-- 15 files changed, 38 insertions(+), 36 deletions(-) diff --git a/filterlog.h b/filterlog.h index 8f347f13c..27a10e04d 100644 --- a/filterlog.h +++ b/filterlog.h @@ -71,18 +71,18 @@ namespace KMail { /** check the logging state */ - bool isLogging() { return mLogging; }; + bool isLogging() { return mLogging; } /** set the logging state */ void setLogging( bool active ) { mLogging = active; emit logStateChanged(); - }; + } /** control the size of the log */ void setMaxLogSize( long size = -1 ); - long getMaxLogSize() { return mMaxLogSize; }; + long getMaxLogSize() { return mMaxLogSize; } /** add/remove a content type to the set of logged ones */ @@ -93,30 +93,30 @@ namespace KMail { else mAllowedTypes &= ~contentType; emit logStateChanged(); - }; + } /** check a content type for inclusion in the set of logged ones */ bool isContentTypeEnabled( ContentType contentType ) { return mAllowedTypes & contentType; - }; + } /** add a log entry */ void add( const QString &logEntry, ContentType contentType ); /** add a separating line in the log */ - void addSeparator() { add( "------------------------------", meta ); }; + void addSeparator() { add( "------------------------------", meta ); } /** discard collected log data */ void clear() { mLogEntries.clear(); mCurrentLogSize = 0; emit logShrinked(); - }; + } /** get access to the log entries */ - const QStringList & getLogEntries() { return mLogEntries; }; + const QStringList & getLogEntries() { return mLogEntries; } /** dump the log - for testing purposes */ void dump(); /** save the log to a file - returns true if okay */ @@ -125,7 +125,7 @@ namespace KMail { /** destructor */ virtual ~FilterLog(); - static QString recode( const QString & plain ) { return Qt::escape(plain); }; + static QString recode( const QString & plain ) { return Qt::escape(plain); } signals: void logEntryAdded(const QString& ); diff --git a/folderselectiondialog.cpp b/folderselectiondialog.cpp index 0b054a165..75772560a 100644 --- a/folderselectiondialog.cpp +++ b/folderselectiondialog.cpp @@ -44,8 +44,8 @@ class FolderItem : public KFolderTreeItem FolderItem( KFolderTree * listView ); FolderItem( KFolderTreeItem * listViewItem ); - void setFolder( KMFolder * folder ) { mFolder = folder; }; - const KMFolder * folder() { return mFolder; }; + void setFolder( KMFolder * folder ) { mFolder = folder; } + const KMFolder * folder() { return mFolder; } private: KMFolder * mFolder; diff --git a/kmacctcachedimap.h b/kmacctcachedimap.h index a4bcec4c0..4891dcda6 100644 --- a/kmacctcachedimap.h +++ b/kmacctcachedimap.h @@ -182,8 +182,8 @@ public: virtual FolderStorage* rootFolder() const; /** return if the account passed the annotation test */ - bool annotationCheckPassed(){ return mAnnotationCheckPassed;}; - void setAnnotationCheckPassed( bool a ){ mAnnotationCheckPassed = a; }; + bool annotationCheckPassed(){ return mAnnotationCheckPassed;} + void setAnnotationCheckPassed( bool a ){ mAnnotationCheckPassed = a; } protected: friend class ::AccountManager; diff --git a/kmcommands.h b/kmcommands.h index ea95b4b3c..002145d7f 100644 --- a/kmcommands.h +++ b/kmcommands.h @@ -826,7 +826,7 @@ class KMAIL_EXPORT KMMailingListCommand : public KMCommand { Q_OBJECT public: - KMMailingListCommand( QWidget *parent, KMFolder *parent ); + KMMailingListCommand( QWidget *parent, KMFolder *parentFolder ); private: virtual Result execute(); private slots: @@ -841,7 +841,7 @@ class KMAIL_EXPORT KMMailingListPostCommand : public KMMailingListCommand { Q_OBJECT public: - KMMailingListPostCommand( QWidget *parent, KMFolder *parent ); + KMMailingListPostCommand( QWidget *parent, KMFolder *parentFolder ); protected: virtual KUrl::List urls() const; }; @@ -850,7 +850,7 @@ class KMAIL_EXPORT KMMailingListSubscribeCommand : public KMMailingListCommand { Q_OBJECT public: - KMMailingListSubscribeCommand( QWidget *parent, KMFolder *parent ); + KMMailingListSubscribeCommand( QWidget *parent, KMFolder *parentFolder ); protected: virtual KUrl::List urls() const; }; @@ -859,7 +859,7 @@ class KMAIL_EXPORT KMMailingListUnsubscribeCommand : public KMMailingListCommand { Q_OBJECT public: - KMMailingListUnsubscribeCommand( QWidget *parent, KMFolder *parent ); + KMMailingListUnsubscribeCommand( QWidget *parent, KMFolder *parentFolder ); protected: virtual KUrl::List urls() const; }; @@ -868,7 +868,7 @@ class KMAIL_EXPORT KMMailingListArchivesCommand : public KMMailingListCommand { Q_OBJECT public: - KMMailingListArchivesCommand( QWidget *parent, KMFolder *parent ); + KMMailingListArchivesCommand( QWidget *parent, KMFolder *parentFolder ); protected: virtual KUrl::List urls() const; }; @@ -877,7 +877,7 @@ class KMAIL_EXPORT KMMailingListHelpCommand : public KMMailingListCommand { Q_OBJECT public: - KMMailingListHelpCommand( QWidget *parent, KMFolder *parent ); + KMMailingListHelpCommand( QWidget *parent, KMFolder *parentFolder ); protected: virtual KUrl::List urls() const; }; diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp index 525dffdca..2bbaa73cb 100644 --- a/kmcomposewin.cpp +++ b/kmcomposewin.cpp @@ -152,6 +152,7 @@ using MailTransport::TransportManager; #include #include +#include #include #include diff --git a/kmfilter.h b/kmfilter.h index 5c8962274..7f62227f6 100644 --- a/kmfilter.h +++ b/kmfilter.h @@ -251,7 +251,7 @@ public: or toolbar. Default is no shortcut. @see setConfigureShortcut setConfigureToolbar */ - void setShortcut( const KShortcut & shortcut ) { mShortcut = shortcut; }; + void setShortcut( const KShortcut & shortcut ) { mShortcut = shortcut; } /** @return The shortcut assigned to the filter. @see setShortcut diff --git a/kmfilteraction.h b/kmfilteraction.h index 1421387a4..82424dee5 100644 --- a/kmfilteraction.h +++ b/kmfilteraction.h @@ -185,7 +185,7 @@ public: /** Read extra arguments from given string. This type of filter action has no parameters, so this is a no-op. */ - virtual void argsFromString(const QString &argStr) {}; + virtual void argsFromString(const QString &argStr) {} /** Return extra arguments as string. Must not contain newlines. We return QString(), because we have no parameter. */ diff --git a/kmfolderimap.h b/kmfolderimap.h index 07d162abe..c2efdba51 100644 --- a/kmfolderimap.h +++ b/kmfolderimap.h @@ -65,7 +65,7 @@ public: :mStatus(aStatus), mSerNum(0) {} KMMsgMetaData(const MessageStatus& aStatus, quint32 aSerNum) :mStatus(aStatus), mSerNum(aSerNum) {} - ~KMMsgMetaData() {}; + ~KMMsgMetaData() {} const MessageStatus& status() const { return mStatus; } const MessageStatus& messageStatus() const { return mStatus; } const quint32 serNum() const { return mSerNum; } @@ -216,7 +216,7 @@ void getUids(const QList& msgList, QList& uids); */ void expungeFolder(KMFolderImap * aFolder, bool quiet); -virtual int compact( bool ) { expungeFolder(this, false); return 0; }; +virtual int compact( bool ) { expungeFolder(this, false); return 0; } /** * Emit the folderComplete signal diff --git a/kmmainwin.h b/kmmainwin.h index a9b110b2c..8c73abe2b 100644 --- a/kmmainwin.h +++ b/kmmainwin.h @@ -41,7 +41,7 @@ public: // settings by kwin doesn't work KMMainWin(QWidget *parent = 0); virtual ~KMMainWin(); - KMMainWidget *mainKMWidget() const { return mKMMainWidget; }; + KMMainWidget *mainKMWidget() const { return mKMMainWidget; } StatusbarProgressWidget* progressWidget() const { return mLittleProgress; } ProgressDialog* progressDialog() const { return mProgressDialog; } diff --git a/kmmessage.h b/kmmessage.h index 9bbb05949..a85e000f8 100644 --- a/kmmessage.h +++ b/kmmessage.h @@ -346,7 +346,7 @@ public: void setSubject(const QString& aStr); /** Calculate strippedSubject */ - void initStrippedSubjectMD5() {}; + void initStrippedSubjectMD5() {} /** Get or set the 'X-Mark' header field */ QString xmark() const; @@ -826,9 +826,9 @@ public: QString asPlainText( bool stripSignature, bool allowDecryption ) const; /** Get stored cursor position */ - int getCursorPos() { return mCursorPos; }; + int getCursorPos() { return mCursorPos; } /** Set cursor position as offset from message start */ - void setCursorPos(int pos) { mCursorPos = pos; }; + void setCursorPos(int pos) { mCursorPos = pos; } /* This is set in kmreaderwin if a message is being parsed to avoid other parts of kmail (e.g. kmheaders) destroying the message. diff --git a/kmpopfiltercnfrmdlg.h b/kmpopfiltercnfrmdlg.h index a859ca3bc..65c7c3c24 100644 --- a/kmpopfiltercnfrmdlg.h +++ b/kmpopfiltercnfrmdlg.h @@ -43,8 +43,8 @@ class KMPopHeadersView : public K3ListView public: explicit KMPopHeadersView(QWidget *aParent=0, KMPopFilterCnfrmDlg *aDialog=0); ~KMPopHeadersView(); - static const KMPopFilterAction mapToAction(int aColumn) { return (KMPopFilterAction)aColumn;}; - static const int mapToColumn(KMPopFilterAction aAction) { return (int)aAction;}; + static const KMPopFilterAction mapToAction(int aColumn) { return (KMPopFilterAction)aColumn;} + static const int mapToColumn(KMPopFilterAction aAction) { return (int)aAction;} static const char *mUnchecked[26]; static const char *mChecked[26]; protected: @@ -68,7 +68,7 @@ public: KMPopHeadersViewItem(KMPopHeadersView *aParent, KMPopFilterAction aAction); ~KMPopHeadersViewItem(); void setAction(KMPopFilterAction aAction); - KMPopFilterAction action() { return mAction; }; + KMPopFilterAction action() { return mAction; } virtual void paintFocus(QPainter *, const QColorGroup & cg, const QRect &r); virtual QString key(int col, bool ascending) const; protected: @@ -82,7 +82,7 @@ class KMPopFilterCnfrmDlg : public KDialog friend class ::KMPopHeadersView; Q_OBJECT protected: - KMPopFilterCnfrmDlg() { }; + KMPopFilterCnfrmDlg() { } QMap mItemMap; QList mDelList; QList mDDLList; diff --git a/kmsearchpattern.h b/kmsearchpattern.h index be5d89bf0..20f0d10b3 100644 --- a/kmsearchpattern.h +++ b/kmsearchpattern.h @@ -87,7 +87,7 @@ public: call isEmpty yourself if you need valid rules. */ static KMSearchRule* createInstanceFromConfig( const KConfigGroup & config, int aIdx ); - virtual ~KMSearchRule() {}; + virtual ~KMSearchRule() {} /** Tries to match the rule against the given KMMessage. @return true if the rule matched, false otherwise. Must be diff --git a/newfolderdialog.h b/newfolderdialog.h index 319ae952e..a06b5fc5d 100644 --- a/newfolderdialog.h +++ b/newfolderdialog.h @@ -53,7 +53,7 @@ class NewFolderDialog : public KDialog public: NewFolderDialog( QWidget* parent = 0, KMFolder *folder = 0 ); - ~NewFolderDialog() {}; + ~NewFolderDialog() {} QLabel* mNameLabel; QLineEdit* mNameLineEdit; diff --git a/objecttreeparser.cpp b/objecttreeparser.cpp index a25293821..dc5629cea 100644 --- a/objecttreeparser.cpp +++ b/objecttreeparser.cpp @@ -2622,7 +2622,8 @@ QString ObjectTreeParser::quotedHTML( const QString& s, bool decorate ) const unsigned int length = s.length(); // skip leading empty lines - for ( pos = 0; pos < length && s[pos] <= ' '; pos++ ); + for ( pos = 0; pos < length && s[pos] <= ' '; pos++ ) + ; while (pos > 0 && (s[pos-1] == ' ' || s[pos-1] == '\t')) pos--; beg = pos; diff --git a/partNode.h b/partNode.h index 6b746434e..0e7100421 100644 --- a/partNode.h +++ b/partNode.h @@ -231,10 +231,10 @@ public: int childCount() const; bool processed() const { return mWasProcessed; } - KMail::Interface::BodyPartMemento * bodyPartMemento() const { return mBodyPartMemento; }; + KMail::Interface::BodyPartMemento * bodyPartMemento() const { return mBodyPartMemento; } void setBodyPartMemento( KMail::Interface::BodyPartMemento * memento ) { mBodyPartMemento = memento; - }; + } private: partNode* mRoot;