KRatingPainter   KRatingPainter 
#include "../../nepomuk/kratingpainter.h" #include "../kratingpainter.h"
 End of changes. 1 change blocks. 
lines changed or deleted lines changed or added


 copyjob.h   copyjob.h 
skipping to change at line 262 skipping to change at line 262
protected Q_SLOTS: protected Q_SLOTS:
virtual void slotResult( KJob *job ); virtual void slotResult( KJob *job );
protected: protected:
CopyJob(CopyJobPrivate &dd); CopyJob(CopyJobPrivate &dd);
void emitResult(); void emitResult();
private: private:
Q_PRIVATE_SLOT(d_func(), void slotStart()) Q_PRIVATE_SLOT(d_func(), void slotStart())
Q_PRIVATE_SLOT(d_func(), void slotEntries( KIO::Job*, const KIO::UD SEntryList& list )) Q_PRIVATE_SLOT(d_func(), void slotEntries( KIO::Job*, const KIO::UD SEntryList& list ))
Q_PRIVATE_SLOT(d_func(), void slotSubError( KIO::ListJob*, KIO::List Job* ))
Q_PRIVATE_SLOT(d_func(), void slotProcessedSize( KJob*, qulonglong data_size )) Q_PRIVATE_SLOT(d_func(), void slotProcessedSize( KJob*, qulonglong data_size ))
Q_PRIVATE_SLOT(d_func(), void slotTotalSize( KJob*, qulonglong size )) Q_PRIVATE_SLOT(d_func(), void slotTotalSize( KJob*, qulonglong size ))
Q_PRIVATE_SLOT(d_func(), void slotReport()) Q_PRIVATE_SLOT(d_func(), void slotReport())
Q_DECLARE_PRIVATE(CopyJob) Q_DECLARE_PRIVATE(CopyJob)
}; };
/** /**
* Copy a file or directory @p src into the destination @p dest, * Copy a file or directory @p src into the destination @p dest,
* which can be a file (including the final filename) or a directory * which can be a file (including the final filename) or a directory
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 declarativewidget.h   declarativewidget.h 
skipping to change at line 134 skipping to change at line 134
void finished(); void finished();
private: private:
friend class DeclarativeWidgetPrivate; friend class DeclarativeWidgetPrivate;
DeclarativeWidgetPrivate * const d; DeclarativeWidgetPrivate * const d;
Q_PRIVATE_SLOT(d, void finishExecute()) Q_PRIVATE_SLOT(d, void finishExecute())
Q_PRIVATE_SLOT(d, void scheduleExecutionEnd()) Q_PRIVATE_SLOT(d, void scheduleExecutionEnd())
Q_PRIVATE_SLOT(d, void minimumWidthChanged()) Q_PRIVATE_SLOT(d, void minimumWidthChanged())
Q_PRIVATE_SLOT(d, void minimumHeightChanged()) Q_PRIVATE_SLOT(d, void minimumHeightChanged())
Q_PRIVATE_SLOT(d, void maximumWidthChanged())
Q_PRIVATE_SLOT(d, void maximumHeightChanged())
Q_PRIVATE_SLOT(d, void preferredWidthChanged())
Q_PRIVATE_SLOT(d, void preferredHeightChanged())
}; };
} // namespace Plasma } // namespace Plasma
#endif // multiple inclusion guard #endif // multiple inclusion guard
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 jobclasses.h   jobclasses.h 
skipping to change at line 965 skipping to change at line 965
* This signal emits the entry found by the job while listing. * This signal emits the entry found by the job while listing.
* The progress signals aren't specific to ListJob. It simply * The progress signals aren't specific to ListJob. It simply
* uses SimpleJob's processedSize (number of entries listed) and * uses SimpleJob's processedSize (number of entries listed) and
* totalSize (total number of entries, if known), * totalSize (total number of entries, if known),
* as well as percent. * as well as percent.
* @param job the job that emitted this signal * @param job the job that emitted this signal
* @param list the list of UDSEntries * @param list the list of UDSEntries
*/ */
void entries( KIO::Job *job, const KIO::UDSEntryList& list); // TOD O KDE5: use KIO::ListJob* argument to avoid casting void entries( KIO::Job *job, const KIO::UDSEntryList& list); // TOD O KDE5: use KIO::ListJob* argument to avoid casting
/**
* This signal is emitted when a sub-directory could not be listed.
* The job keeps going, thus doesn't result in an overall error.
* @param job the job that emitted the signal
* @param subJob the job listing a sub-directory, which failed. Use
* url(), error() and errorText() on that job to find
* out more.
*/
void subError( KIO::ListJob *job, KIO::ListJob *subJob );
/** /**
* Signals a redirection. * Signals a redirection.
* Use to update the URL shown to the user. * Use to update the URL shown to the user.
* The redirection itself is handled internally. * The redirection itself is handled internally.
* @param job the job that is redirected * @param job the job that is redirected
* @param url the new url * @param url the new url
*/ */
void redirection( KIO::Job *job, const KUrl &url ); void redirection( KIO::Job *job, const KUrl &url );
/** /**
 End of changes. 1 change blocks. 
0 lines changed or deleted 10 lines changed or added


 kdeclarative.h   kdeclarative.h 
skipping to change at line 44 skipping to change at line 44
~KDeclarative(); ~KDeclarative();
void initialize(); void initialize();
void setupBindings(); void setupBindings();
void setDeclarativeEngine(QDeclarativeEngine *engine); void setDeclarativeEngine(QDeclarativeEngine *engine);
QDeclarativeEngine *declarativeEngine() const; QDeclarativeEngine *declarativeEngine() const;
QScriptEngine *scriptEngine() const; QScriptEngine *scriptEngine() const;
/**
* This method must be called very early at startup time to ensure the
* QDeclarativeDebugger is enabled. Ideally it should be called in main
(),
* after command-line options are defined.
*/
static void setupQmlJsDebugger();
private: private:
KDeclarativePrivate *const d; KDeclarativePrivate *const d;
friend class EngineAccess; friend class EngineAccess;
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 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.9.1" #define KDE_VERSION_STRING "4.9.2"
/** /**
* @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 9 #define KDE_VERSION_MINOR 9
/** /**
* @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 1 #define KDE_VERSION_RELEASE 2
/** /**
* @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


 kfontcombobox.h   kfontcombobox.h 
skipping to change at line 73 skipping to change at line 73
/** /**
* Toggle selectable fonts to be only those of fixed width or all. * Toggle selectable fonts to be only those of fixed width or all.
* *
* @param onlyFixed only fixed width fonts when @p true, * @param onlyFixed only fixed width fonts when @p true,
* all fonts when @p false * all fonts when @p false
*/ */
void setOnlyFixed (bool onlyFixed); void setOnlyFixed (bool onlyFixed);
/** /**
* Set selectable fonts to be only those present in the list.
*
* @param fontList a list of fonts as returned by QFontDatabase::famili
es() or
* QFontChooser::getFontList(). If this is empty (defa
ult), then the list
* of fonts is constructed according to the @p onlyFix
ed setting.
* @since 4.9.2
*/
void setFontList (const QStringList &fontList);
/**
* Destructor. * Destructor.
*/ */
virtual ~KFontComboBox (); virtual ~KFontComboBox ();
/** /**
* The font currently selected from the list. * The font currently selected from the list.
* *
* @return the selected font * @return the selected font
*/ */
QFont currentFont () const; QFont currentFont () const;
 End of changes. 1 change blocks. 
0 lines changed or deleted 13 lines changed or added


 kwebpage.h   kwebpage.h 
skipping to change at line 38 skipping to change at line 38
#include <kdewebkit_export.h> #include <kdewebkit_export.h>
#include <QtWebKit/QWebPage> #include <QtWebKit/QWebPage>
class KWebWallet; class KWebWallet;
class KUrl; class KUrl;
class KJob; class KJob;
namespace KIO { namespace KIO {
class MetaData; class MetaData;
class Job;
} }
/** /**
* @short An enhanced QWebPage that provides integration into the KDE envir onment. * @short An enhanced QWebPage that provides integration into the KDE envir onment.
* *
* This is a convenience class that provides full integration with KDE * This is a convenience class that provides full integration with KDE
* technologies such as KIO for network request handling, KCookiejar for co okie * technologies such as KIO for network request handling, KCookiejar for co okie
* handling, KParts for embedding non-html content and KWallet for storing * handling, KParts for embedding non-html content and KWallet for storing
* form data. It also sets standard icons for many of the actions provided by * form data. It also sets standard icons for many of the actions provided by
* QWebPage. * QWebPage.
skipping to change at line 360 skipping to change at line 361
* @param reply the QNetworkReply object to be handled. * @param reply the QNetworkReply object to be handled.
* @param contentType if not null, it will be set to the content-type specified in @p reply, if any. * @param contentType if not null, it will be set to the content-type specified in @p reply, if any.
* @param metaData if not null, it will be set to the KIO meta-data specified in @p reply, if any. * @param metaData if not null, it will be set to the KIO meta-data specified in @p reply, if any.
* @since 4.6.3 * @since 4.6.3
*/ */
bool handleReply (QNetworkReply* reply, QString* contentType = 0, KIO:: MetaData* metaData = 0); bool handleReply (QNetworkReply* reply, QString* contentType = 0, KIO:: MetaData* metaData = 0);
private: private:
class KWebPagePrivate; class KWebPagePrivate;
KWebPagePrivate* const d; KWebPagePrivate* const d;
Q_PRIVATE_SLOT(d, void _k_copyResultToTempFile(KJob *)) Q_PRIVATE_SLOT(d, void _k_copyResultToTempFile(KJob*))
Q_PRIVATE_SLOT(d, void _k_receivedContentType(KIO::Job*, const QString&
))
Q_PRIVATE_SLOT(d, void _k_contentTypeCheckFailed(KJob*))
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS(KWebPage::Integration) Q_DECLARE_OPERATORS_FOR_FLAGS(KWebPage::Integration)
#endif // KWEBPAGE_H #endif // KWEBPAGE_H
 End of changes. 2 change blocks. 
1 lines changed or deleted 5 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/