Couldn't find wdiff. Falling back to builtin diff colouring... KDE Libs: headers diff between 4.7.2 and 4.7.3 versions
 abstractrunner.h   abstractrunner.h 
skipping to change at line 12 skipping to change at line 12
* Copyright 2006-2007 Aaron Seigo <aseigo@kde.org> * Copyright 2006-2007 Aaron Seigo <aseigo@kde.org>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2, or * published by the Free Software Foundation; either version 2, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details * GNU Library General Public License for more details
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the * License along with this program; if not, write to the
* Free Software Foundation, Inc., * Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef PLASMA_ABSTRACTRUNNER_H #ifndef PLASMA_ABSTRACTRUNNER_H
#define PLASMA_ABSTRACTRUNNER_H #define PLASMA_ABSTRACTRUNNER_H
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 config-nepomuk.h   config-nepomuk.h 
/* #undef HAVE_NEPOMUK */ #define HAVE_NEPOMUK
 End of changes. 1 change blocks. 
lines changed or deleted lines changed or added


 job.h   job.h 
skipping to change at line 332 skipping to change at line 332
* @param size Size of the encoded post data. * @param size Size of the encoded post data.
* @param flags Can be HideProgressInfo here * @param flags Can be HideProgressInfo here
* @return the job handling the operation. * @return the job handling the operation.
* *
* @since 4.7 * @since 4.7
*/ */
KIO_EXPORT TransferJob *http_post( const KUrl& url, QIODevice* device, KIO_EXPORT TransferJob *http_post( const KUrl& url, QIODevice* device,
qint64 size = -1, JobFlags flags = D efaultFlags ); qint64 size = -1, JobFlags flags = D efaultFlags );
/** /**
* HTTP DELETE.
*
* Though this function servers the same purpose as KIO::file_delete, u nlike
* file_delete it accomodates HTTP sepecific actions such as redirectio ns.
*
* @param src url resource to delete.
* @param flags Can be HideProgressInfo here
* @return the job handling the operation.
*
* @since 4.7.3
*/
KIO_EXPORT TransferJob *http_delete( const KUrl& url, JobFlags flags = DefaultFlags );
/**
* Get (a.k.a. read), into a single QByteArray. * Get (a.k.a. read), into a single QByteArray.
* @see StoredTransferJob * @see StoredTransferJob
* *
* @param url the URL of the file * @param url the URL of the file
* @param reload: Reload to reload the file, NoReload if it can be take n from the cache * @param reload: Reload to reload the file, NoReload if it can be take n from the cache
* @param flags Can be HideProgressInfo here * @param flags Can be HideProgressInfo here
* @return the job handling the operation. * @return the job handling the operation.
*/ */
KIO_EXPORT StoredTransferJob *storedGet( const KUrl& url, LoadType relo ad = NoReload, JobFlags flags = DefaultFlags ); KIO_EXPORT StoredTransferJob *storedGet( const KUrl& url, LoadType relo ad = NoReload, JobFlags flags = DefaultFlags );
 End of changes. 1 change blocks. 
0 lines changed or deleted 14 lines changed or added


 kdebug.h   kdebug.h 
skipping to change at line 360 skipping to change at line 360
* Alternatively, use the KDEBUG_BLOCK macro, for automatic naming. * Alternatively, use the KDEBUG_BLOCK macro, for automatic naming.
*/ */
class KDECORE_EXPORT KDebug::Block class KDECORE_EXPORT KDebug::Block
{ {
public: public:
Block(const char* label, int area = KDE_DEFAULT_DEBUG_AREA); Block(const char* label, int area = KDE_DEFAULT_DEBUG_AREA);
~Block(); ~Block();
private: private:
QElapsedTimer m_startTime; QElapsedTimer m_startTime;
const char *m_label; const char *m_label; // KDE5 TODO: REMOVE
int m_area; int m_area;
int m_color; int m_color;
class Private; class Private;
Private* const d; Private* d;
}; };
/** /**
* Convenience macro for making a standard KDebug::Block * Convenience macro for making a standard KDebug::Block
*/ */
#define KDEBUG_BLOCK KDebug::Block _kDebugBlock(Q_FUNC_INFO); #define KDEBUG_BLOCK KDebug::Block _kDebugBlock(Q_FUNC_INFO);
#else #else
class KDECORE_EXPORT KDebug::Block class KDECORE_EXPORT KDebug::Block
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 kdeversion.h   kdeversion.h 
skipping to change at line 47 skipping to change at line 47
* This macro contains the KDE version in string form. As it is a macro, * This macro contains the KDE version in string form. As it is a macro,
* it contains the version at compile time. See versionString() if you need * it contains the version at compile time. See versionString() if you need
* the KDE version used at runtime. * the KDE version used at runtime.
* *
* @note The version string might contain a section in parentheses, * @note The version string might contain a section in parentheses,
* especially for development versions of KDE. * especially for development versions of KDE.
* If you use that macro directly for a file format (e.g. OASIS Open Docume nt) * If you use that macro directly for a file format (e.g. OASIS Open Docume nt)
* or for a protocol (e.g. http) be careful that it is appropriate. * or for a protocol (e.g. http) be careful that it is appropriate.
* (Fictional) example: "4.0.90 (>=20070101)" * (Fictional) example: "4.0.90 (>=20070101)"
*/ */
#define KDE_VERSION_STRING "4.7.2 (4.7.2)" #define KDE_VERSION_STRING "4.7.3 (4.7.3)"
/** /**
* @def KDE_VERSION_MAJOR * @def KDE_VERSION_MAJOR
* @ingroup KDEMacros * @ingroup KDEMacros
* @brief Major version of KDE, at compile time * @brief Major version of KDE, at compile time
*/ */
#define KDE_VERSION_MAJOR 4 #define KDE_VERSION_MAJOR 4
/** /**
* @def KDE_VERSION_MINOR * @def KDE_VERSION_MINOR
* @ingroup KDEMacros * @ingroup KDEMacros
* @brief Minor version of KDE, at compile time * @brief Minor version of KDE, at compile time
*/ */
#define KDE_VERSION_MINOR 7 #define KDE_VERSION_MINOR 7
/** /**
* @def KDE_VERSION_RELEASE * @def KDE_VERSION_RELEASE
* @ingroup KDEMacros * @ingroup KDEMacros
* @brief Release version of KDE, at compile time * @brief Release version of KDE, at compile time
*/ */
#define KDE_VERSION_RELEASE 2 #define KDE_VERSION_RELEASE 3
/** /**
* @ingroup KDEMacros * @ingroup KDEMacros
* @brief Make a number from the major, minor and release number of a KDE v ersion * @brief Make a number from the major, minor and release number of a KDE v ersion
* *
* This function can be used for preprocessing when KDE_IS_VERSION is not * This function can be used for preprocessing when KDE_IS_VERSION is not
* appropriate. * appropriate.
*/ */
#define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 knewpassworddialog.h   knewpassworddialog.h 
skipping to change at line 35 skipping to change at line 35
// ### KDE 5: remove // ### KDE 5: remove
#include <QtGui/QLineEdit> #include <QtGui/QLineEdit>
#include <kdialog.h> #include <kdialog.h>
class QWidget; class QWidget;
/** /**
* @short A password input dialog. * @short A password input dialog.
* *
* This dialog asks the user to enter a password. * This dialog asks the user to enter a new password.
* *
* \section usage Usage Exemple * The password has to be entered twice to check if the passwords
* match. A hint about the strength of the entered password is also
* shown.
*
* \section usage Usage Example
* \subsection asynchronous Asynchronous * \subsection asynchronous Asynchronous
* *
* \code * \code
* KNewPasswordDialog *dlg = new KNewPasswordDialog( parent ); * KNewPasswordDialog *dlg = new KNewPasswordDialog( parent );
* dlg->setPrompt( i18n( "Enter a password" ) ); * dlg->setPrompt( i18n( "Enter a password" ) );
* connect( dlg, SIGNAL( newPassword( const QString& ) ) , this, SLOT( se tPassword( const QString &) ) ); * connect( dlg, SIGNAL( newPassword(QString) ) , this, SLOT( setPassword (QString) ) );
* connect( dlg, SIGNAL( rejected() ) , this, SLOT( slotCancel() ) ); * connect( dlg, SIGNAL( rejected() ) , this, SLOT( slotCancel() ) );
* dlg->show(); * dlg->show();
* \endcode * \endcode
* *
* \subsection synchronous Synchronous * \subsection synchronous Synchronous
* *
* \code * \code
* KNewPasswordDialog dlg( parent ); * KNewPasswordDialog dlg( parent );
* dlg.setPrompt( i18n( "Enter a password" ) ); * dlg.setPrompt( i18n( "Enter a password" ) );
* if( dlg.exec() ) * if( dlg.exec() )
skipping to change at line 122 skipping to change at line 126
* *
* @return true if minimumPasswordLength() == 0 * @return true if minimumPasswordLength() == 0
*/ */
bool allowEmptyPasswords() const; bool allowEmptyPasswords() const;
/** /**
* Minimum acceptable password length. * Minimum acceptable password length.
* *
* Default: 0 * Default: 0
* *
* @param minLength: The new minimum password length * @param minLength The new minimum password length
*/ */
void setMinimumPasswordLength(int minLength); void setMinimumPasswordLength(int minLength);
/** /**
* Minimum acceptable password length. * Minimum acceptable password length.
*/ */
int minimumPasswordLength() const; int minimumPasswordLength() const;
/** /**
* Maximum acceptable password length. * Maximum acceptable password length.
* *
* @param maxLength: The new maximum password length. * @param maxLength The new maximum password length.
*/ */
void setMaximumPasswordLength(int maxLength); void setMaximumPasswordLength(int maxLength);
/** /**
* Maximum acceptable password length. * Maximum acceptable password length.
*/ */
int maximumPasswordLength() const; int maximumPasswordLength() const;
/** /**
* Password length that is expected to be reasonably safe. * Password length that is expected to be reasonably safe.
* *
* Used to compute the strength level * Used to compute the strength level
* *
* Default: 8 - the standard UNIX password length * Default: 8 - the standard UNIX password length
* *
* @param reasonableLength: The new reasonable password length. * @param reasonableLength The new reasonable password length.
*/ */
void setReasonablePasswordLength(int reasonableLength); void setReasonablePasswordLength(int reasonableLength);
/** /**
* Password length that is expected to be reasonably safe. * Password length that is expected to be reasonably safe.
*/ */
int reasonablePasswordLength() const; int reasonablePasswordLength() const;
/** /**
* Set the password strength level below which a warning is given * Set the password strength level below which a warning is given
* Value is in the range 0 to 99. Empty passwords score 0; * Value is in the range 0 to 99. Empty passwords score 0;
* non-empty passwords score up to 100, depending on their length and w hether they * non-empty passwords score up to 100, depending on their length and w hether they
* contain numbers, mixed case letters and punctuation. * contain numbers, mixed case letters and punctuation.
* *
* Default: 1 - warn if the password has no discernable strength whatso ever * Default: 1 - warn if the password has no discernable strength whatso ever
* @param warningLevel: The level below which a warning should be given . * @param warningLevel The level below which a warning should be given.
*/ */
void setPasswordStrengthWarningLevel(int warningLevel); void setPasswordStrengthWarningLevel(int warningLevel);
/** /**
* Password strength level below which a warning is given * Password strength level below which a warning is given
*/ */
int passwordStrengthWarningLevel() const; int passwordStrengthWarningLevel() const;
/** /**
* Returns the password entered. * Returns the password entered.
 End of changes. 7 change blocks. 
7 lines changed or deleted 11 lines changed or added


 statusbarextension.h   statusbarextension.h 
skipping to change at line 77 skipping to change at line 77
* but you can create a KStatusBarLabel with a dummy id instead, and use * but you can create a KStatusBarLabel with a dummy id instead, and use
* it directly in order to get the same look and feel. * it directly in order to get the same look and feel.
* *
* @param widget the widget to add * @param widget the widget to add
* @param stretch the stretch factor. 0 for a minimum size. * @param stretch the stretch factor. 0 for a minimum size.
* @param permanent passed to QStatusBar::addWidget as the "permanent " bool. * @param permanent passed to QStatusBar::addWidget as the "permanent " bool.
* Note that the item isn't really permanent though, it goes away whe n * Note that the item isn't really permanent though, it goes away whe n
* the part is unactivated. This simply controls where temporary mess ages * the part is unactivated. This simply controls where temporary mess ages
* hide the @p widget, and whether it's added to the left or to the r ight side. * hide the @p widget, and whether it's added to the left or to the r ight side.
* *
* @Note that the widget does not technically become a child of the
* StatusBarExtension in a QObject sense. However, it @em will be deleted
* when the StatusBarExtension is deleted.
*
* IMPORTANT: do NOT add any items immediately after constructing the extension. * IMPORTANT: do NOT add any items immediately after constructing the extension.
* Give the application time to set the statusbar in the extension if necessary. * Give the application time to set the statusbar in the extension if necessary.
*/ */
void addStatusBarItem( QWidget * widget, int stretch, bool permanent ); void addStatusBarItem( QWidget * widget, int stretch, bool permanent );
/** /**
* Remove a widget from the statusbar for this part. * Remove a widget from the statusbar for this part.
*/ */
void removeStatusBarItem( QWidget * widget ); void removeStatusBarItem( QWidget * widget );
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 tcpslavebase.h   tcpslavebase.h 
skipping to change at line 116 skipping to change at line 116
* @param host hostname * @param host hostname
* @param port port number * @param port port number
* *
* @return on succes, true is returned. * @return on succes, true is returned.
* on failure, false is returned and an appropriate * on failure, false is returned and an appropriate
* error message is sent to the application. * error message is sent to the application.
*/ */
bool connectToHost(const QString &protocol, const QString& host, quint1 6 port); bool connectToHost(const QString &protocol, const QString& host, quint1 6 port);
/** /**
* Same as above function except * Connects to the specified host and port.
* *
* @param host hostname * @param host host name
* @param port port number * @param port port number
* @param errorString if not NULL, the error string will be set. * @param errorString if not NULL, this string will contain error infor mation
* on why the connection request failed.
* *
* @return on success, 0 is returned. on failure, a KIO::Error code is returned. * @return on success, 0 is returned. on failure, a KIO::Error code is returned.
* @ref errorString, if not NULL, will contain the appropriate error message * @ref errorString, if not NULL, will contain the appropriate error message
* that can be sent back to the client. * that can be sent back to the client.
* *
* @since 4.7.2 * @since 4.7.2
*/ */
int connectToHost(const QString& host, quint16 port, QString* errorStri ng = 0); int connectToHost(const QString& host, quint16 port, QString* errorStri ng = 0);
/** /**
 End of changes. 3 change blocks. 
3 lines changed or deleted 4 lines changed or added


 udsentry.h   udsentry.h 
skipping to change at line 255 skipping to change at line 255
/// ///
/// @since 4.6 /// @since 4.6
UDS_NEPOMUK_QUERY = 27 | UDS_STRING, UDS_NEPOMUK_QUERY = 27 | UDS_STRING,
/// A comment which will be displayed as is to the user. The st ring /// A comment which will be displayed as is to the user. The st ring
/// value may contain plain text or Qt-style rich-text extensio ns. /// value may contain plain text or Qt-style rich-text extensio ns.
/// ///
/// @since 4.6 /// @since 4.6
UDS_COMMENT = 28 | UDS_STRING, UDS_COMMENT = 28 | UDS_STRING,
/// Device number for this file, used to detect hardlinks
/// @since 4.7.3
UDS_DEVICE_ID = 29 | UDS_NUMBER,
/// Inode number for this file, used to detect hardlinks
/// @since 4.7.3
UDS_INODE = 30 | UDS_NUMBER,
/// Extra data (used only if you specified Columns/ColumnsTypes ) /// Extra data (used only if you specified Columns/ColumnsTypes )
/// KDE 4.0 change: you cannot repeat this entry anymore, use U DS_EXTRA + i /// KDE 4.0 change: you cannot repeat this entry anymore, use U DS_EXTRA + i
/// until UDS_EXTRA_END. /// until UDS_EXTRA_END.
UDS_EXTRA = 100 | UDS_STRING, UDS_EXTRA = 100 | UDS_STRING,
/// Extra data (used only if you specified Columns/ColumnsTypes ) /// Extra data (used only if you specified Columns/ColumnsTypes )
/// KDE 4.0 change: you cannot repeat this entry anymore, use U DS_EXTRA + i /// KDE 4.0 change: you cannot repeat this entry anymore, use U DS_EXTRA + i
/// until UDS_EXTRA_END. /// until UDS_EXTRA_END.
UDS_EXTRA_END = 140 | UDS_STRING UDS_EXTRA_END = 140 | UDS_STRING
}; };
 End of changes. 1 change blocks. 
0 lines changed or deleted 7 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/