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.4.2 (KDE 4.4.2)" | #define KDE_VERSION_STRING "4.4.3 (KDE 4.4.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 4 | #define KDE_VERSION_MINOR 4 | |||
/** | /** | |||
* @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 | |||
kfileitem.h | kfileitem.h | |||
---|---|---|---|---|
skipping to change at line 552 | skipping to change at line 552 | |||
/** | /** | |||
* Sets the metainfo of this item to @p info. | * Sets the metainfo of this item to @p info. | |||
* | * | |||
* Made const to avoid deep copy. | * Made const to avoid deep copy. | |||
* @param info the new meta info | * @param info the new meta info | |||
*/ | */ | |||
void setMetaInfo( const KFileMetaInfo & info ) const; | void setMetaInfo( const KFileMetaInfo & info ) const; | |||
/** | /** | |||
* Returns the metainfo of this item. | * Returns the metainfo of this item. | |||
* | ||||
* (since 4.4.3) By default it uses the KFileMetaInfo::ContentInfo | KF | ||||
ileMetaInfo::TechnicalInfo. | ||||
* If you need more information, create your own KFileMetaInfo object a | ||||
nd set it using setMetaInfo() | ||||
* @param autoget if true, the metainfo will automatically be created | * @param autoget if true, the metainfo will automatically be created | |||
* @param what ignored | * @param what how much metainfo you need to retrieve from the file (KF ileMetaInfo::WhatFlag) | |||
*/ | */ | |||
KFileMetaInfo metaInfo(bool autoget = true, | KFileMetaInfo metaInfo(bool autoget = true, | |||
int what = KFileMetaInfo::Fastest) const ; | int what = KFileMetaInfo::ContentInfo | KFileMet aInfo::TechnicalInfo) const; | |||
/** | /** | |||
* @deprecated simply use '=' | * @deprecated simply use '=' | |||
*/ | */ | |||
KDE_DEPRECATED void assign( const KFileItem & item ); | KDE_DEPRECATED void assign( const KFileItem & item ); | |||
/** | /** | |||
* Reinitialize KFileItem with a new UDSEntry. | * Reinitialize KFileItem with a new UDSEntry. | |||
* | * | |||
* Note: extra-data set with setExtraData() is not changed or deleted, so | * Note: extra-data set with setExtraData() is not changed or deleted, so | |||
End of changes. 3 change blocks. | ||||
2 lines changed or deleted | 7 lines changed or added | |||
kwebwallet.h | kwebwallet.h | |||
---|---|---|---|---|
skipping to change at line 94 | skipping to change at line 94 | |||
/** | /** | |||
* Returns a list of forms in @p frame that have cached data in the | * Returns a list of forms in @p frame that have cached data in the | |||
* peristent storage. | * peristent storage. | |||
* | * | |||
* If @p recursive is set to true, the default, then this function will | * If @p recursive is set to true, the default, then this function will | |||
* will also return the cached form data for all the children frames of | * will also return the cached form data for all the children frames of | |||
* @p frame. | * @p frame. | |||
* | * | |||
* If the site currently rendered in @p frame does not contain any form s | * If the site currently rendered in @p frame does not contain any form s | |||
* or there is not cached data for the forms found in @p frame, then th is | * or there is no cached data for the forms found in @p frame, then thi s | |||
* function will return an empty list. | * function will return an empty list. | |||
* | * | |||
* Note that this function will only return the information about the f orms | * Note that this function will only return the information about the f orms | |||
* in @p frame and not their cached data, i.e. the fields member variab le in | * in @p frame and not their cached data, i.e. the fields member variab le in | |||
* the returned @ref WebForm list will always be empty. | * the returned @ref WebForm list will always be empty. | |||
*/ | */ | |||
WebFormList formsWithCachedData(QWebFrame* frame, bool recursive = true ) const; | WebFormList formsWithCachedData(QWebFrame* frame, bool recursive = true ) const; | |||
/** | /** | |||
* Attempts to save the form data from @p frame and its children frames . | * Attempts to save the form data from @p frame and its children frames . | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||