khtml_settings.h		khtml_settings.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KHTML_SETTINGS_H		#ifndef KHTML_SETTINGS_H
	#define KHTML_SETTINGS_H		#define KHTML_SETTINGS_H
	class KConfig;		class KConfig;
	class KConfigGroup;		class KConfigGroup;
	#include <khtml_export.h>		#include <khtml_export.h>
			#include <kparts/htmlextension.h>
	#include <QtGui/QColor>		#include <QtGui/QColor>
	#include <QtGui/QFont> // ### KDE 5: remove		#include <QtGui/QFont> // ### KDE 5: remove
	#include <QtCore/QMap> // ### KDE 5: remove		#include <QtCore/QMap> // ### KDE 5: remove
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
	#include <QtCore/QPair>		#include <QtCore/QPair>
	struct KPerDomainSettings;		struct KPerDomainSettings;
	class KHTMLSettingsPrivate;		class KHTMLSettingsPrivate;
	/**		/**
	* Settings for the HTML view.		* Settings for the HTML view.
	*/		*/
	class KHTML_EXPORT KHTMLSettings		class KHTML_EXPORT KHTMLSettings
	{		{
	public:		public:
	/**		/**
	* This enum specifies whether Java/JavaScript execution is allowed.		* This enum specifies whether Java/JavaScript execution is allowed.
	*/		*/
	enum KJavaScriptAdvice {		enum KJavaScriptAdvice { // ### KDE 5: Remove. Use KParts::HtmlSetting sInterface::JavaScriptAdvice instead
	KJavaScriptDunno=0,		KJavaScriptDunno=0,
	KJavaScriptAccept,		KJavaScriptAccept,
	KJavaScriptReject		KJavaScriptReject
	};		};
	enum KAnimationAdvice {		enum KAnimationAdvice {
	KAnimationDisabled=0,		KAnimationDisabled=0,
	KAnimationLoopOnce,		KAnimationLoopOnce,
	KAnimationEnabled		KAnimationEnabled
	};		};
	skipping to change at line 74		skipping to change at line 75
	enum KDNSPrefetch {		enum KDNSPrefetch {
	KDNSPrefetchDisabled=0,		KDNSPrefetchDisabled=0,
	KDNSPrefetchOnlyWWWAndSLD,		KDNSPrefetchOnlyWWWAndSLD,
	KDNSPrefetchEnabled		KDNSPrefetchEnabled
	};		};
	/**		/**
	* This enum specifies the policy for window.open		* This enum specifies the policy for window.open
	*/		*/
	enum KJSWindowOpenPolicy {		enum KJSWindowOpenPolicy { // ### KDE 5: Remove. Use KParts::HtmlSettin
	KJSWindowOpenAllow=0,		gsInterface::JSWindowOpenPolicy instead.
	KJSWindowOpenAsk,		KJSWindowOpenAllow=0,
	KJSWindowOpenDeny,		KJSWindowOpenAsk,
	KJSWindowOpenSmart		KJSWindowOpenDeny,
			KJSWindowOpenSmart
	};		};
	/**		/**
	* This enum specifies the policy for window.status and .defaultStatus		* This enum specifies the policy for window.status and .defaultStatus
	*/		*/
	enum KJSWindowStatusPolicy {		enum KJSWindowStatusPolicy { // ### KDE 5: Remove. Use KParts::HtmlSett
	KJSWindowStatusAllow=0,		ingsInterface::JSWindowStatusPolicy instead.
	KJSWindowStatusIgnore		KJSWindowStatusAllow=0,
			KJSWindowStatusIgnore
	};		};
	/**		/**
	* This enum specifies the policy for window.moveBy and .moveTo		* This enum specifies the policy for window.moveBy and .moveTo
	*/		*/
	enum KJSWindowMovePolicy {		enum KJSWindowMovePolicy { // ### KDE 5: Remove. Use KParts::HtmlSettin
	KJSWindowMoveAllow=0,		gsInterface::JSWindowMovePolicy instead.
	KJSWindowMoveIgnore		KJSWindowMoveAllow=0,
			KJSWindowMoveIgnore
	};		};
	/**		/**
	* This enum specifies the policy for window.resizeBy and .resizeTo		* This enum specifies the policy for window.resizeBy and .resizeTo
	*/		*/
	enum KJSWindowResizePolicy {		enum KJSWindowResizePolicy { // ### KDE 5: Remove. Use KParts::HtmlSett
	KJSWindowResizeAllow=0,		ingsInterface::JSWindowStatusPolicy insead.
	KJSWindowResizeIgnore		KJSWindowResizeAllow=0,
			KJSWindowResizeIgnore
	};		};
	/**		/**
	* This enum specifies the policy for window.focus		* This enum specifies the policy for window.focus
	*/		*/
	enum KJSWindowFocusPolicy {		enum KJSWindowFocusPolicy { // ### KDE 5: Remove. Use KParts::HtmlSetti
	KJSWindowFocusAllow=0,		ngsInterface::JSWindowStatusPolicy instead.
	KJSWindowFocusIgnore		KJSWindowFocusAllow=0,
			KJSWindowFocusIgnore
	};		};
	/**		/**
	* @internal Constructor		* @internal Constructor
	*/		*/
	KHTMLSettings();		KHTMLSettings();
	KHTMLSettings(const KHTMLSettings &other);		KHTMLSettings(const KHTMLSettings &other);
	/**		/**
	* Called by constructor and reparseConfiguration		* Called by constructor and reparseConfiguration
	skipping to change at line 214		skipping to change at line 215
	*/		*/
	QString adFilteredBy( const QString &url, bool *isWhiteListed = 0 ) con st;		QString adFilteredBy( const QString &url, bool *isWhiteListed = 0 ) con st;
	bool isAdFilterEnabled() const;		bool isAdFilterEnabled() const;
	bool isHideAdsEnabled() const;		bool isHideAdsEnabled() const;
	void addAdFilter( const QString &url );		void addAdFilter( const QString &url );
	// Access Keys		// Access Keys
	bool accessKeysEnabled() const;		bool accessKeysEnabled() const;
			// ### KDE 5: Replace KJSWindowOpenPolicy with KParts::HtmlSettingsInte rface::JSWindowOpenPolicy
	KJSWindowOpenPolicy windowOpenPolicy( const QString& hostname = QString () ) const;		KJSWindowOpenPolicy windowOpenPolicy( const QString& hostname = QString () ) const;
	KJSWindowMovePolicy windowMovePolicy( const QString& hostname = QString () ) const;		KJSWindowMovePolicy windowMovePolicy( const QString& hostname = QString () ) const;
	KJSWindowResizePolicy windowResizePolicy( const QString& hostname = QSt ring() ) const;		KJSWindowResizePolicy windowResizePolicy( const QString& hostname = QSt ring() ) const;
	KJSWindowStatusPolicy windowStatusPolicy( const QString& hostname = QSt ring() ) const;		KJSWindowStatusPolicy windowStatusPolicy( const QString& hostname = QSt ring() ) const;
	KJSWindowFocusPolicy windowFocusPolicy( const QString& hostname = QStri ng() ) const;		KJSWindowFocusPolicy windowFocusPolicy( const QString& hostname = QStri ng() ) const;
	// helpers for parsing domain-specific configuration, used in KControl module as well		// helpers for parsing domain-specific configuration, used in KControl module as well
			// ### KDE 5: Replace KJavaScriptAdvice with KParts::HtmlSettingsInterf
			ace::JavaScriptAdvice.
			// ### KDE 5: Remove ? Equivalent functions now exist in KParts::HtmlSe
			ttingsInterface.
	static KJavaScriptAdvice strToAdvice(const QString& _str);		static KJavaScriptAdvice strToAdvice(const QString& _str);
	static void splitDomainAdvice(const QString& configStr, QString &domain ,		static void splitDomainAdvice(const QString& configStr, QString &domain ,
	KJavaScriptAdvice &javaAdvice, KJavaScript		KJavaScriptAdvice &javaAdvice,
	Advice& javaScriptAdvice);		KJavaScriptAdvice& javaScriptAdvice);
	static const char* adviceToStr(KJavaScriptAdvice _advice);		static const char* adviceToStr(KJavaScriptAdvice _advice);
	/** reads from @p config's current group, forcing initialization		/** reads from @p config's current group, forcing initialization
	* if @p reset is true.		* if @p reset is true.
	* @param config is a pointer to KConfig object.		* @param config is a pointer to KConfig object.
	* @param reset true if initialization is to be forced.		* @param reset true if initialization is to be forced.
	* @param global true if the global domain is to be read.		* @param global true if the global domain is to be read.
	* @param pd_settings will be initialised with the computed (inherited )		* @param pd_settings will be initialised with the computed (inherited )
	* settings.		* settings.
	*/		*/
End of changes. 10 change blocks.
	20 lines changed or deleted		31 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/