Index: kabc/addressbook.h =================================================================== --- kabc/addressbook.h (revision 517411) +++ kabc/addressbook.h (working copy) @@ -470,7 +470,7 @@ /** @deprecated There is no need to call this function anymore. */ - void cleanUp() KDE_DEPRECATED; + KDE_DEPRECATED void cleanUp(); /** Used for debug output. This function prints out the list Index: kabc/stdaddressbook.h =================================================================== --- kabc/stdaddressbook.h (revision 517411) +++ kabc/stdaddressbook.h (working copy) @@ -83,12 +83,12 @@ @deprecated Use AddressBook::save( Ticket* ) instead */ - static bool save() KDE_DEPRECATED; + KDE_DEPRECATED static bool save(); /** @deprecated There is no need to call this function anymore. */ - static void handleCrash() KDE_DEPRECATED; + KDE_DEPRECATED static void handleCrash(); /** Returns the default file name for vcard-based addressbook Index: kate/part/katerenderer.h =================================================================== --- kate/part/katerenderer.h (revision 517411) +++ kate/part/katerenderer.h (working copy) @@ -198,9 +198,9 @@ // Width calculators uint spaceWidth() const; - uint textWidth(const KateTextLine::Ptr &, int cursorCol) KDE_DEPRECATED; - uint textWidth(const KateTextLine::Ptr &textLine, uint startcol, uint maxwidth, bool *needWrap, int *endX = 0) KDE_DEPRECATED; - uint textWidth(const KTextEditor::Cursor& cursor) KDE_DEPRECATED; + KDE_DEPRECATED uint textWidth(const KateTextLine::Ptr &, int cursorCol); + KDE_DEPRECATED uint textWidth(const KateTextLine::Ptr &textLine, uint startcol, uint maxwidth, bool *needWrap, int *endX = 0); + KDE_DEPRECATED uint textWidth(const KTextEditor::Cursor& cursor); /** * Returns the x position of cursor \p col on the line \p range. Index: kdecore/kconfigbase.h =================================================================== --- kdecore/kconfigbase.h (revision 517411) +++ kdecore/kconfigbase.h (working copy) @@ -648,7 +648,7 @@ * @return The value for this key. * @deprecated */ - QFont readFontEntry( const QString& pKey, const QFont* pDefault = 0L ) const KDE_DEPRECATED; + KDE_DEPRECATED QFont readFontEntry( const QString& pKey, const QFont* pDefault = 0L ) const; /** * Reads a QFont value. @@ -662,7 +662,7 @@ * @return The value for this key. * @deprecated */ - QFont readFontEntry( const char *pKey, const QFont* pDefault = 0L ) const KDE_DEPRECATED; + KDE_DEPRECATED QFont readFontEntry( const char *pKey, const QFont* pDefault = 0L ) const; /** * Reads a boolean entry. @@ -706,7 +706,7 @@ * @return The value for this key. * @deprecated */ - QRect readRectEntry( const QString& pKey, const QRect* pDefault = 0L ) const KDE_DEPRECATED; + KDE_DEPRECATED QRect readRectEntry( const QString& pKey, const QRect* pDefault = 0L ) const; /** * Reads a QRect entry. @@ -720,7 +720,7 @@ * @return The value for this key. * @deprecated */ - QRect readRectEntry( const char *pKey, const QRect* pDefault = 0L ) const KDE_DEPRECATED; + KDE_DEPRECATED QRect readRectEntry( const char *pKey, const QRect* pDefault = 0L ) const; /** * Reads a QPoint entry. @@ -734,7 +734,7 @@ * @return The value for this key. * @deprecated */ - QPoint readPointEntry( const QString& pKey, const QPoint* pDefault = 0L ) const KDE_DEPRECATED; + KDE_DEPRECATED QPoint readPointEntry( const QString& pKey, const QPoint* pDefault = 0L ) const; /** * Reads a QPoint entry. @@ -748,7 +748,7 @@ * @return The value for this key. * @deprecated */ - QPoint readPointEntry( const char *pKey, const QPoint* pDefault = 0L ) const KDE_DEPRECATED; + KDE_DEPRECATED QPoint readPointEntry( const char *pKey, const QPoint* pDefault = 0L ) const; /** * Reads a QSize entry. @@ -762,7 +762,7 @@ * @return The value for this key. * @deprecated */ - QSize readSizeEntry( const QString& pKey, const QSize* pDefault = 0L ) const KDE_DEPRECATED; + KDE_DEPRECATED QSize readSizeEntry( const QString& pKey, const QSize* pDefault = 0L ) const; /** * Reads a QSize entry. @@ -776,7 +776,7 @@ * @return The value for this key. * @deprecated */ - QSize readSizeEntry( const char *pKey, const QSize* pDefault = 0L ) const KDE_DEPRECATED; + KDE_DEPRECATED QSize readSizeEntry( const char *pKey, const QSize* pDefault = 0L ) const; /** @@ -822,7 +822,7 @@ * @return The value for this key. * @deprecated */ - QDateTime readDateTimeEntry( const QString& pKey, const QDateTime* pDefault = 0L ) const KDE_DEPRECATED; + KDE_DEPRECATED QDateTime readDateTimeEntry( const QString& pKey, const QDateTime* pDefault = 0L ) const; /** * Reads a QDateTime entry. @@ -837,7 +837,7 @@ * @return The value for this key. * @deprecated */ - QDateTime readDateTimeEntry( const char *pKey, const QDateTime* pDefault = 0L ) const KDE_DEPRECATED; + KDE_DEPRECATED QDateTime readDateTimeEntry( const char *pKey, const QDateTime* pDefault = 0L ) const; /** * Reads the value of an entry specified by @p pKey in the current group. Index: kdecore/kurl.h =================================================================== --- kdecore/kurl.h (revision 517411) +++ kdecore/kurl.h (working copy) @@ -697,7 +697,8 @@ * ignore trailing '/' characters. * @deprecated Use equals() instead. */ - bool cmp( const KUrl &u, bool ignore_trailing = false ) const KDE_DEPRECATED; + + KDE_DEPRECATED bool cmp( const KUrl &u, bool ignore_trailing = false ) const; /** * Compares this url with @p u. Index: kdeui/kaction.h =================================================================== --- kdeui/kaction.h (revision 517411) +++ kdeui/kaction.h (working copy) @@ -315,7 +315,7 @@ * the KAccel configuration dialog (this is somehow deprecated since * there is now a KAction key configuration dialog). */ - virtual void plugAccel(KAccel *accel, bool configurable = true) KDE_DEPRECATED; + KDE_DEPRECATED virtual void plugAccel(KAccel *accel, bool configurable = true); /** * "Unplug" or remove this action from a given widget. @@ -335,7 +335,7 @@ * @deprecated. Complement method to plugAccel(). * Disconnect this action from the KAccel. */ - virtual void unplugAccel() KDE_DEPRECATED; + KDE_DEPRECATED virtual void unplugAccel(); /** * returns whether the action is plugged into any container widget or not. Index: kdeui/kactionclasses.h =================================================================== --- kdeui/kactionclasses.h (revision 517411) +++ kdeui/kactionclasses.h (working copy) @@ -473,7 +473,7 @@ /** * @deprecated See setMenuAccelsEnabled . */ - void setRemoveAmpersandsInCombo( bool b ) KDE_DEPRECATED; + KDE_DEPRECATED void setRemoveAmpersandsInCombo( bool b ); bool removeAmpersandsInCombo() const; Index: kdeui/kactioncollection.h =================================================================== --- kdeui/kactioncollection.h (revision 517411) +++ kdeui/kactioncollection.h (working copy) @@ -125,9 +125,9 @@ //bool ownsKAccel() const; /** @deprecated Deprecated because of ambiguous name. Use kaccel() */ - virtual KAccel* accel() KDE_DEPRECATED; + KDE_DEPRECATED virtual KAccel* accel(); /** @deprecated Deprecated because of ambiguous name. Use kaccel() */ - virtual const KAccel* accel() const KDE_DEPRECATED; + KDE_DEPRECATED virtual const KAccel* accel() const; /** Returns the KAccel object of the most recently set widget. */ KAccel* kaccel(); @@ -335,7 +335,7 @@ * * @deprecated just delete the action instead */ - void remove( KAction* action ) KDE_DEPRECATED; + KDE_DEPRECATED void remove( KAction* action ); /** * Removes an action from the collection. Index: kdeui/kdialogbase.h =================================================================== --- kdeui/kdialogbase.h (revision 517411) +++ kdeui/kdialogbase.h (working copy) @@ -191,7 +191,7 @@ bool separator=false, const KGuiItem &user1=KGuiItem(), const KGuiItem &user2=KGuiItem(), - const KGuiItem &user3=KGuiItem() ) KDE_DEPRECATED; + KDE_DEPRECATED const KGuiItem &user3=KGuiItem() ); /** * In KDE4 a WFlag paramater should be added after modal and next @@ -296,14 +296,14 @@ * @param no Text to use for the second button (defaults to i18n("No")) * @param cancel Text to use for the third button (defaults to i18n("Cancel")) */ - KDialogBase( const QString &caption, int buttonMask=Yes|No|Cancel, + KDE_DEPRECATED KDialogBase( const QString &caption, int buttonMask=Yes|No|Cancel, ButtonCode defaultButton=Yes, ButtonCode escapeButton=Cancel, QWidget *parent=0, const char *name=0, bool modal=true, bool separator=false, const KGuiItem &yes = KStdGuiItem::yes(), // i18n("&Yes") const KGuiItem &no = KStdGuiItem::no(), // i18n("&No"), const KGuiItem &cancel = KStdGuiItem::cancel() // i18n("&Cancel") - ) KDE_DEPRECATED ; + ); /** * Destructor. @@ -578,7 +578,7 @@ * @param state If @p true, display the button(s). * @deprecated use ShowButton */ - void showButtonOK( bool state ) KDE_DEPRECATED; + KDE_DEPRECATED void showButtonOK( bool state ); /** * Hide or display the Apply button. @@ -589,7 +589,7 @@ * @param state true display the button(s). * @deprecated use ShowButton */ - void showButtonApply( bool state ) KDE_DEPRECATED; + KDE_DEPRECATED void showButtonApply( bool state ); /** * Hide or display the Cancel button. The Cancel button must have @@ -598,7 +598,7 @@ * @param state @p true display the button(s). * @deprecated use ShowButton */ - void showButtonCancel( bool state ) KDE_DEPRECATED; + KDE_DEPRECATED void showButtonCancel( bool state ); /** * Sets the page with @p index to be displayed. @@ -675,7 +675,7 @@ * @param item KGuiItem. * @deprecated use setButtonGuiItem */ - void setButtonOK( const KGuiItem &item = KStdGuiItem::ok() ) KDE_DEPRECATED; + KDE_DEPRECATED void setButtonOK( const KGuiItem &item = KStdGuiItem::ok() ); /** @@ -687,7 +687,7 @@ * @param item KGuiItem. * @deprecated use setButtonGuiItem */ - void setButtonApply( const KGuiItem &item = KStdGuiItem::apply() ) KDE_DEPRECATED; + KDE_DEPRECATED void setButtonApply( const KGuiItem &item = KStdGuiItem::apply() ); /** @@ -699,7 +699,7 @@ * @param item KGuiItem. * @deprecated use setButtonGuiItem */ - void setButtonCancel( const KGuiItem &item = KStdGuiItem::cancel() ) KDE_DEPRECATED; + KDE_DEPRECATED void setButtonCancel( const KGuiItem &item = KStdGuiItem::cancel() ); @@ -861,7 +861,7 @@ * of KGlobal::config is preserved. * @deprecated use restoreDialogSize */ - QSize configDialogSize( const QString& groupName ) const KDE_DEPRECATED; + KDE_DEPRECATED QSize configDialogSize( const QString& groupName ) const; /** * read the dialogs size from the configuration according to the screen size. @@ -872,7 +872,7 @@ * of KGlobal::config is preserved. * @deprecated use restoreDialogSize */ - QSize configDialogSize( KConfig& config, const QString& groupName ) const KDE_DEPRECATED; + KDE_DEPRECATED QSize configDialogSize( KConfig& config, const QString& groupName ) const; /** * save the dialogs size dependant on the screen dimension either to the @@ -884,7 +884,7 @@ * than to the applications config. Default is false. * @deprecated use restoreDialogSize( KConfigBase ) */ - void saveDialogSize( const QString& groupName, bool global=false ) KDE_DEPRECATED; + KDE_DEPRECATED void saveDialogSize( const QString& groupName, bool global=false ); /** * save the dialogs size dependant on the screen dimension. @@ -896,8 +896,8 @@ * Default is false. * @deprecated use restoreDialogSize( KConfigBase ) */ - void saveDialogSize( KConfig& config, const QString& groupName, - bool global=false ) const KDE_DEPRECATED; + KDE_DEPRECATED void saveDialogSize( KConfig& config, const QString& groupName, + bool global=false ) const; Index: kdeui/kspell.h =================================================================== --- kdeui/kspell.h (revision 517411) +++ kdeui/kspell.h (working copy) @@ -311,7 +311,7 @@ * Your application's GUI will still be updated, however. * */ - static int modalCheck( QString& text ) KDE_DEPRECATED; + KDE_DEPRECATED static int modalCheck( QString& text ); /** * Performs a synchronous spellcheck. Index: khtml/dom/dom_node.h =================================================================== --- khtml/dom/dom_node.h (revision 517411) +++ khtml/dom/dom_node.h (working copy) @@ -866,12 +866,12 @@ * @internal returns the index of a node */ unsigned long index() const; - QString toHTML() KDE_DEPRECATED; + KDE_DEPRECATED QString toHTML(); void applyChanges(); /** * @deprecated without substitution since 3.2 */ - void getCursor(int offset, int &_x, int &_y, int &height) KDE_DEPRECATED; + KDE_DEPRECATED void getCursor(int offset, int &_x, int &_y, int &height); /** * not part of the DOM. * @returns the exact coordinates and size of this element. Index: khtml/dom/html_image.h =================================================================== --- khtml/dom/html_image.h (revision 517411) +++ khtml/dom/html_image.h (working copy) @@ -256,12 +256,12 @@ /** * @deprecated */ - long border() const KDE_DEPRECATED; + KDE_DEPRECATED long border() const; /** * @deprecated */ - void setBorder( long ) KDE_DEPRECATED; + KDE_DEPRECATED void setBorder( long ); /** * Override height. See the