containment.h   containment.h 
skipping to change at line 666 skipping to change at line 666
Q_PRIVATE_SLOT(d, void mimeTypeRetrieved(KIO::Job *, const QString &)) Q_PRIVATE_SLOT(d, void mimeTypeRetrieved(KIO::Job *, const QString &))
Q_PRIVATE_SLOT(d, void dropJobResult(KJob *)) Q_PRIVATE_SLOT(d, void dropJobResult(KJob *))
friend class Applet; friend class Applet;
friend class AppletPrivate; friend class AppletPrivate;
friend class AppletScript; friend class AppletScript;
friend class CoronaPrivate; friend class CoronaPrivate;
friend class ContainmentPrivate; friend class ContainmentPrivate;
friend class ContainmentActions; friend class ContainmentActions;
friend class PopupApplet; friend class PopupApplet;
friend class View;
ContainmentPrivate *const d; ContainmentPrivate *const d;
}; };
} // Plasma namespace } // Plasma namespace
#endif // multiple inclusion guard #endif // multiple inclusion guard
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 htmlextension.h   htmlextension.h 
skipping to change at line 243 skipping to change at line 243
* To use this class simply cast an instance of the HTMLExtension object * To use this class simply cast an instance of the HTMLExtension object
* using qobject_cast<KParts::HtmlSettingsInterface>. * using qobject_cast<KParts::HtmlSettingsInterface>.
* *
* Example: * Example:
* <code> * <code>
* KParts::HTMLExtension* extension = KParts::HTMLExtension::childObject(p art); * KParts::HTMLExtension* extension = KParts::HTMLExtension::childObject(p art);
* KParts::HtmlSettingsInterface* settings = qobject_cast&lt;KParts::HtmlS ettingsInterface&gt;(extension); * KParts::HtmlSettingsInterface* settings = qobject_cast&lt;KParts::HtmlS ettingsInterface&gt;(extension);
* const bool autoLoadImages = settings->attribute(KParts::AutoLoadImages) ; * const bool autoLoadImages = settings->attribute(KParts::AutoLoadImages) ;
* </code> * </code>
* *
* @since 4.9.0 * @since 4.8.1
*/ */
class KPARTS_EXPORT HtmlSettingsInterface class KPARTS_EXPORT HtmlSettingsInterface
{ {
public: public:
/** /**
* Settings attribute types. * Settings attribute types.
*/ */
enum HtmlSettingsType { enum HtmlSettingsType {
AutoLoadImages, AutoLoadImages,
DnsPrefetchEnabled, DnsPrefetchEnabled,
skipping to change at line 266 skipping to change at line 266
MetaRefreshEnabled, MetaRefreshEnabled,
PluginsEnabled, PluginsEnabled,
PrivateBrowsingEnabled, PrivateBrowsingEnabled,
OfflineStorageDatabaseEnabled, OfflineStorageDatabaseEnabled,
OfflineWebApplicationCacheEnabled, OfflineWebApplicationCacheEnabled,
LocalStorageEnabled, LocalStorageEnabled,
UserDefinedStyleSheetURL UserDefinedStyleSheetURL
}; };
/** /**
* This enum specifies whether Java/JavaScript execution is allowed.
*
* @since 4.8.2
*/
enum JavaScriptAdvice {
JavaScriptDunno=0,
JavaScriptAccept,
JavaScriptReject
};
/**
* This enum specifies the policy for window.open
*
* @since 4.8.2
*/
enum JSWindowOpenPolicy {
JSWindowOpenAllow=0,
JSWindowOpenAsk,
JSWindowOpenDeny,
JSWindowOpenSmart
};
/**
* This enum specifies the policy for window.status and .defaultStatus
*
* @since 4.8.2
*/
enum JSWindowStatusPolicy {
JSWindowStatusAllow=0,
JSWindowStatusIgnore
};
/**
* This enum specifies the policy for window.moveBy and .moveTo
*
* @since 4.8.2
*/
enum JSWindowMovePolicy {
JSWindowMoveAllow=0,
JSWindowMoveIgnore
};
/**
* This enum specifies the policy for window.resizeBy and .resizeTo
*
* @since 4.8.2
*/
enum JSWindowResizePolicy {
JSWindowResizeAllow=0,
JSWindowResizeIgnore
};
/**
* This enum specifies the policy for window.focus
*
* @since 4.8.2
*/
enum JSWindowFocusPolicy {
JSWindowFocusAllow=0,
JSWindowFocusIgnore
};
/**
* Destructor * Destructor
*/ */
virtual ~HtmlSettingsInterface() {} virtual ~HtmlSettingsInterface() {}
/** /**
* Returns the value of the browser engine's attribute @p type. * Returns the value of the browser engine's attribute @p type.
*/ */
virtual QVariant htmlSettingsProperty(HtmlSettingsType type) const = 0; virtual QVariant htmlSettingsProperty(HtmlSettingsType type) const = 0;
/** /**
* Sets the value of the browser engine's attribute @p type to @p value . * Sets the value of the browser engine's attribute @p type to @p value .
*/ */
virtual bool setHtmlSettingsProperty(HtmlSettingsType type, const QVari ant& value) = 0; virtual bool setHtmlSettingsProperty(HtmlSettingsType type, const QVari ant& value) = 0;
/**
* A convenience function that returns the javascript advice for @p text
.
*
* If text is not either "accept" or "reject", this function returns
* @ref JavaScriptDunno.
*
* @since 4.8.2
*/
static JavaScriptAdvice textToJavascriptAdvice(const QString& text);
/**
* A convenience function Returns the text for the given JavascriptAdvic
e @p advice.
*
* If @p advice is not either JavaScriptAccept or JavaScriptReject, this
* function returns a NULL string.
*
* @since 4.8.2
*/
static const char* javascriptAdviceToText(JavaScriptAdvice advice);
/**
* A convenience function that splits @p text into @p domain, @p javaAdv
ice
* and @p jScriptAdvice.
*
* If @p text is empty or does not contain the proper delimiter (':'), t
his
* function will set @p domain to @p text and the other two parameters t
o
* JavaScriptDunno.
*
* @since 4.8.2
*/
static void splitDomainAdvice(const QString& text,
QString& domain,
JavaScriptAdvice& javaAdvice,
JavaScriptAdvice& javaScriptAdvice);
}; };
} // namespace KParts } // namespace KParts
inline void qSwap( KParts::SelectorInterface::Element & lhs, KParts::Select orInterface::Element & rhs ) inline void qSwap( KParts::SelectorInterface::Element & lhs, KParts::Select orInterface::Element & rhs )
{ {
lhs.swap( rhs ); lhs.swap( rhs );
} }
Q_DECLARE_OPERATORS_FOR_FLAGS(KParts::SelectorInterface::QueryMethods) Q_DECLARE_OPERATORS_FOR_FLAGS(KParts::SelectorInterface::QueryMethods)
 End of changes. 3 change blocks. 
1 lines changed or deleted 104 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.8.1 (4.8.1)" #define KDE_VERSION_STRING "4.8.2 (4.8.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 8 #define KDE_VERSION_MINOR 8
/** /**
* @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


 kfileitemactions.h   kfileitemactions.h 
skipping to change at line 134 skipping to change at line 134
* - servicemenus actions, defined in .desktop files and selected based on the mimetype of the url * - servicemenus actions, defined in .desktop files and selected based on the mimetype of the url
* *
* When KFileItemListProperties::supportsWriting() is false, actions th at modify the files are not shown. * When KFileItemListProperties::supportsWriting() is false, actions th at modify the files are not shown.
* This is controlled by Require=Write in the servicemenu desktop files . * This is controlled by Require=Write in the servicemenu desktop files .
* *
* All actions are created as children of the menu. * All actions are created as children of the menu.
* @return the number of actions added * @return the number of actions added
*/ */
int addServiceActionsTo(QMenu* menu); int addServiceActionsTo(QMenu* menu);
Q_SIGNALS:
/**
* Emitted before the "Open With" dialog is shown
* This is used e.g in folderview to close the folder peek popups on in
voking the "Open With" menu action
* @since 4.8.2
*/
void openWithDialogAboutToBeShown();
public Q_SLOTS: public Q_SLOTS:
/** /**
* Slot used to execute a list of files in their respective preferred a pplication. * Slot used to execute a list of files in their respective preferred a pplication.
* @param fileOpenList the list of KFileItems to open. * @param fileOpenList the list of KFileItems to open.
* @param traderConstraint this optional constraint allows to exclude t he current application * @param traderConstraint this optional constraint allows to exclude t he current application
* @since 4.5 * @since 4.5
*/ */
void runPreferredApplications(const KFileItemList& fileOpenList, const QString& traderConstraint); void runPreferredApplications(const KFileItemList& fileOpenList, const QString& traderConstraint);
private: private:
KFileItemActionsPrivate* const d; KFileItemActionsPrivate* const d;
friend class KFileItemActionsPrivate;
}; };
#endif /* KFILEITEMACTIONS_H */ #endif /* KFILEITEMACTIONS_H */
 End of changes. 2 change blocks. 
0 lines changed or deleted 10 lines changed or added


 kwebpage.h   kwebpage.h 
skipping to change at line 327 skipping to change at line 327
* default user agent is returned. * default user agent is returned.
* *
* @see KProtocolManager::userAgentForHost. * @see KProtocolManager::userAgentForHost.
* @see QWebPage::userAgentForUrl. * @see QWebPage::userAgentForUrl.
*/ */
virtual QString userAgentForUrl(const QUrl& url) const; virtual QString userAgentForUrl(const QUrl& url) const;
/** /**
* @reimp * @reimp
* *
* This performs various integration-related actions when navigation * This performs various integration-related actions when navigation is
* is requested. If you override this method, you should ensure you * requested. If you override this method, make sure you call the pare
* call KWebPage::acceptNaviationRequest (unless you want to block nt's
* the request outright), even if you do not use the return value. * implementation unless you want to block the request outright.
* *
* If you do override acceptNavigationRequest and call this method, * If you do override acceptNavigationRequest and call this method,
* however, be aware of the effect of the page's * however, be aware of the effect of the page's linkDelegationPolicy o
* linkDelegationPolicy on how * QWebPage::acceptNavigationRequest n
* behaves. * how * QWebPage::acceptNavigationRequest behaves.
* *
* @see QWebPage::acceptNavigationRequest * @see QWebPage::acceptNavigationRequest
*/ */
virtual bool acceptNavigationRequest(QWebFrame * frame, const QNetworkR equest & request, NavigationType type); virtual bool acceptNavigationRequest(QWebFrame * frame, const QNetworkR equest & request, NavigationType type);
/** /**
* Attempts to handle @p reply and returns true on success, false other wise. * Attempts to handle @p reply and returns true on success, false other wise.
* *
* In KDE 4.8 and higher, if @p reply contains a QObject property calle d * In KDE 4.8 and higher, if @p reply contains a QObject property calle d
* "DownloadManagerExe", then an attempt will be made to the command * "DownloadManagerExe", then an attempt will be made to let the comman
* specified by that property to download the specified resource. d
* specified by that property to download the requested resource.
* *
* If the "DownloadManagerExe" property is not defined or the command * If the "DownloadManagerExe" property is not defined or the command
* specified by it could not be successfully executed, then the user wi ll * specified by it could not be successfully executed, then the user wi ll
* be prompted for the action to take. * be prompted for the action to take.
* *
* @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
*/ */
 End of changes. 3 change blocks. 
9 lines changed or deleted 10 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/