abstractrunner.h   abstractrunner.h 
skipping to change at line 67 skipping to change at line 67
* may be executed more than once at the same time. See match() for details . * may be executed more than once at the same time. See match() for details .
* To let krunner expose a global shortcut for the single runner query mode , the runner * To let krunner expose a global shortcut for the single runner query mode , the runner
* must set the "X-Plasma-AdvertiseSingleRunnerMode" key to true in the .de sktop file * must set the "X-Plasma-AdvertiseSingleRunnerMode" key to true in the .de sktop file
* and set a default syntax. See setDefaultSyntax() for details. * and set a default syntax. See setDefaultSyntax() for details.
* *
*/ */
class PLASMA_EXPORT AbstractRunner : public QObject class PLASMA_EXPORT AbstractRunner : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool matchingSuspended READ isMatchingSuspended WRITE suspen dMatching NOTIFY matchingSuspended) Q_PROPERTY(bool matchingSuspended READ isMatchingSuspended WRITE suspen dMatching NOTIFY matchingSuspended)
Q_PROPERTY(QString id READ id);
Q_PROPERTY(QString description READ description);
Q_PROPERTY(QString name READ name);
Q_PROPERTY(QIcon icon READ icon);
public: public:
/** Specifies a nominal speed for the runner */ /** Specifies a nominal speed for the runner */
enum Speed { enum Speed {
SlowSpeed, SlowSpeed,
NormalSpeed NormalSpeed
}; };
/** Specifies a priority for the runner */ /** Specifies a priority for the runner */
enum Priority { enum Priority {
LowestPriority = 0, LowestPriority = 0,
 End of changes. 1 change blocks. 
1 lines changed or deleted 4 lines changed or added


 applet.h   applet.h 
skipping to change at line 1118 skipping to change at line 1118
* @since 4.3 * @since 4.3
*/ */
Applet(const QString &packagePath, uint appletId, const QVariantLis t &args); Applet(const QString &packagePath, uint appletId, const QVariantLis t &args);
Q_PRIVATE_SLOT(d, void setFocus()) Q_PRIVATE_SLOT(d, void setFocus())
Q_PRIVATE_SLOT(d, void themeChanged()) Q_PRIVATE_SLOT(d, void themeChanged())
Q_PRIVATE_SLOT(d, void cleanUpAndDelete()) Q_PRIVATE_SLOT(d, void cleanUpAndDelete())
Q_PRIVATE_SLOT(d, void selectItemToDestroy()) Q_PRIVATE_SLOT(d, void selectItemToDestroy())
Q_PRIVATE_SLOT(d, void updateRect(const QRectF& rect)) Q_PRIVATE_SLOT(d, void updateRect(const QRectF& rect))
Q_PRIVATE_SLOT(d, void destroyMessageOverlay()) Q_PRIVATE_SLOT(d, void destroyMessageOverlay())
Q_PRIVATE_SLOT(d, void clearShortcutEditorPtr())
Q_PRIVATE_SLOT(d, void configDialogFinished()) Q_PRIVATE_SLOT(d, void configDialogFinished())
Q_PRIVATE_SLOT(d, void updateShortcuts()) Q_PRIVATE_SLOT(d, void updateShortcuts())
Q_PRIVATE_SLOT(d, void publishCheckboxStateChanged(int state)) Q_PRIVATE_SLOT(d, void publishCheckboxStateChanged(int state))
Q_PRIVATE_SLOT(d, void globalShortcutChanged()) Q_PRIVATE_SLOT(d, void globalShortcutChanged())
Q_PRIVATE_SLOT(d, void propagateConfigChanged()) Q_PRIVATE_SLOT(d, void propagateConfigChanged())
Q_PRIVATE_SLOT(d, void handleDisappeared(AppletHandle *handle)) Q_PRIVATE_SLOT(d, void handleDisappeared(AppletHandle *handle))
/** /**
* Reimplemented from QGraphicsItem * Reimplemented from QGraphicsItem
**/ **/
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 lines changed or added


 corona.h   corona.h 
skipping to change at line 108 skipping to change at line 108
* @param args argument list to pass to the containment * @param args argument list to pass to the containment
* *
* @return a pointer to the containment on success, or 0 on failure. Fa ilure can be * @return a pointer to the containment on success, or 0 on failure. Fa ilure can be
* caused by too restrictive of an Immutability type, as containments c annot be added * caused by too restrictive of an Immutability type, as containments c annot be added
* when widgets are locked, or if the requested containment plugin can not be located * when widgets are locked, or if the requested containment plugin can not be located
* or successfully loaded. * or successfully loaded.
*/ */
Containment *addContainment(const QString &name, const QVariantList &ar gs = QVariantList()); Containment *addContainment(const QString &name, const QVariantList &ar gs = QVariantList());
/** /**
* Loads a containment with delayed initialization, primarily useful
* for implementations of loadDefaultLayout. The caller is responsible
* for all initializating, saving and notification of a new containment
.
*
* @param name the plugin name for the containment, as given by
* KPluginInfo::pluginName(). If an empty string is passed in, t
he defalt
* containment plugin will be used (usually DesktopContainment).
If the
* string literal "null" is passed in, then no plugin will be lo
aded and
* a simple Containment object will be created instead.
* @param args argument list to pass to the containment
*
* @return a pointer to the containment on success, or 0 on failure. Fa
ilure can
* be caused by the Immutability type being too restrictive, as contain
ments can't be added
* when widgets are locked, or if the requested containment plugin can
not be located
* or successfully loaded.
* @see addContainment
**/
Containment *addContainmentDelayed(const QString &name,
const QVariantList &args = QVariantL
ist());
/**
* Returns the Containment, if any, for a given physical screen and des ktop * Returns the Containment, if any, for a given physical screen and des ktop
* *
* @param screen number of the physical screen to locate * @param screen number of the physical screen to locate
* @param desktop the virtual desktop) to locate; if < 0 then it will * @param desktop the virtual desktop) to locate; if < 0 then it will
* simply return the first Containment associated with screen * simply return the first Containment associated with screen
*/ */
Containment *containmentForScreen(int screen, int desktop = -1) const; Containment *containmentForScreen(int screen, int desktop = -1) const;
/** /**
* Returns the Containment for a given physical screen and desktop, cre ating one * Returns the Containment for a given physical screen and desktop, cre ating one
skipping to change at line 442 skipping to change at line 463
*/ */
void shortcutsChanged(); void shortcutsChanged();
protected: protected:
/** /**
* Loads the default (system wide) layout for this user * Loads the default (system wide) layout for this user
**/ **/
virtual void loadDefaultLayout(); virtual void loadDefaultLayout();
/** /**
* Loads a containment with delayed initialization, primarily useful
* for implementations of loadDefaultLayout. The caller is responsible
* for all initializating, saving and notification of a new containment
.
*
* @param name the plugin name for the containment, as given by
* KPluginInfo::pluginName(). If an empty string is passed in, t
he defalt
* containment plugin will be used (usually DesktopContainment).
If the
* string literal "null" is passed in, then no plugin will be lo
aded and
* a simple Containment object will be created instead.
* @param args argument list to pass to the containment
*
* @return a pointer to the containment on success, or 0 on failure. Fa
ilure can
* be caused by the Immutability type being too restrictive, as contain
ments can't be added
* when widgets are locked, or if the requested containment plugin can
not be located
* or successfully loaded.
* @see addContainment
**/
Containment *addContainmentDelayed(const QString &name,
const QVariantList &args = QVariantL
ist());
/**
* Maps a stock animation to one of the semantic animations. Used to co ntrol things such * Maps a stock animation to one of the semantic animations. Used to co ntrol things such
* as what animation is used to make a Plasma::Appear appear in a conta inment. * as what animation is used to make a Plasma::Appear appear in a conta inment.
* @param from the animation to map a new value to * @param from the animation to map a new value to
* @param to the animation value to map to from * @param to the animation value to map to from
* @since 4.5 * @since 4.5
*/ */
void mapAnimation(Animator::Animation from, Animator::Animation to); void mapAnimation(Animator::Animation from, Animator::Animation to);
/** /**
* Maps a loadable animation to one of the semantic animations. Used to control things such * Maps a loadable animation to one of the semantic animations. Used to control things such
 End of changes. 2 change blocks. 
29 lines changed or deleted 29 lines changed or added


 kaccelgen.h   kaccelgen.h 
skipping to change at line 182 skipping to change at line 182
// Main pass // Main pass
for (Iter i = begin; i != end; ++i) { for (Iter i = begin; i != end; ++i) {
QString item = Iter_Deref::deref(i); QString item = Iter_Deref::deref(i);
// Attempt to find a good accelerator, but only if the user // Attempt to find a good accelerator, but only if the user
// has not manually hardcoded one. // has not manually hardcoded one.
int user_ampersand = item.indexOf(QLatin1Char('&')); int user_ampersand = item.indexOf(QLatin1Char('&'));
if( user_ampersand < 0 || item[user_ampersand+1] == QLatin1Char('&' )) { if( user_ampersand < 0 || item[user_ampersand+1] == QLatin1Char('&' )) {
bool found = false; bool found = false;
int found_idx;
int j; int j;
// Check word-starting letters first. // Check word-starting letters first.
for( j=0; j < item.length(); ++j ) { for( j=0; j < item.length(); ++j ) {
if( isLegalAccelerator(item, j) if( isLegalAccelerator(item, j)
&& !used_accels.contains(item[j]) && !used_accels.contains(item[j])
&& (0 == j || (j > 0 && item[j-1].isSpace())) ) { && (0 == j || (j > 0 && item[j-1].isSpace())) ) {
found = true; found = true;
found_idx = j;
break; break;
} }
} }
if( !found ) { if( !found ) {
// No word-starting letter; search for any letter. // No word-starting letter; search for any letter.
for( j=0; j < item.length(); ++j ) { for( j=0; j < item.length(); ++j ) {
if( isLegalAccelerator(item, j) if( isLegalAccelerator(item, j)
&& !used_accels.contains(item[j]) ) { && !used_accels.contains(item[j]) ) {
found = true; found = true;
found_idx = j;
break; break;
} }
} }
} }
if( found ) { if( found ) {
// Both upper and lower case marked as used // Both upper and lower case marked as used
used_accels.insert(item[j].toUpper(),true); used_accels.insert(item[j].toUpper(),true);
used_accels.insert(item[j].toLower(),true); used_accels.insert(item[j].toLower(),true);
item.insert(j,QLatin1Char('&')); item.insert(j,QLatin1Char('&'));
 End of changes. 3 change blocks. 
3 lines changed or deleted 0 lines changed or added


 kcoreconfigskeleton.h   kcoreconfigskeleton.h 
skipping to change at line 315 skipping to change at line 315
/** /**
* \class KCoreConfigSkeleton kcoreconfigskeleton.h <KCoreConfigSkeleton> * \class KCoreConfigSkeleton kcoreconfigskeleton.h <KCoreConfigSkeleton>
* *
* @short Class for handling preferences settings for an application. * @short Class for handling preferences settings for an application.
* @author Cornelius Schumacher * @author Cornelius Schumacher
* @see KConfigSkeletonItem * @see KConfigSkeletonItem
* *
* This class provides an interface to preferences settings. Preferences items * This class provides an interface to preferences settings. Preferences items
* can be registered by the addItem() function corresponding to the data type of * can be registered by the addItem() function corresponding to the data type of
* the seetting. KCoreConfigSkeleton then handles reading and writing of config files and * the setting. KCoreConfigSkeleton then handles reading and writing of c onfig files and
* setting of default values. * setting of default values.
* *
* Normally you will subclass KCoreConfigSkeleton, add data members for t he preferences * Normally you will subclass KCoreConfigSkeleton, add data members for t he preferences
* settings and register the members in the constructor of the subclass. * settings and register the members in the constructor of the subclass.
* *
* Example: * Example:
* \code * \code
* class MyPrefs : public KCoreConfigSkeleton * class MyPrefs : public KCoreConfigSkeleton
* { * {
* public: * public:
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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.4 (4.7.4)" #define KDE_VERSION_STRING "4.8.00 (4.8.0"
/** /**
* @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 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 4 #define KDE_VERSION_RELEASE 00
/** /**
* @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. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 kglobalsettings.h   kglobalsettings.h 
skipping to change at line 594 skipping to change at line 594
* @overload * @overload
* *
* @since 4.6 * @since 4.6
*/ */
void activate(ActivateOptions options); void activate(ActivateOptions options);
/** /**
* Valid values for the settingsChanged signal * Valid values for the settingsChanged signal
*/ */
enum SettingsCategory { SETTINGS_MOUSE, SETTINGS_COMPLETION, SETTINGS_P ATHS, enum SettingsCategory { SETTINGS_MOUSE, SETTINGS_COMPLETION, SETTINGS_P ATHS,
SETTINGS_POPUPMENU, SETTINGS_QT, SETTINGS_SHORT SETTINGS_POPUPMENU, SETTINGS_QT, SETTINGS_SHORT
CUTS }; CUTS,
SETTINGS_LOCALE };
Q_SIGNALS: Q_SIGNALS:
/** /**
* Emitted when the application has changed its palette due to a KContr ol request. * Emitted when the application has changed its palette due to a KContr ol request.
* *
* Normally, widgets will update their palette automatically, but you * Normally, widgets will update their palette automatically, but you
* should connect to this to program special behavior. * should connect to this to program special behavior.
* *
* Note: If you derive from a QWidget-based class, a faster method is t o * Note: If you derive from a QWidget-based class, a faster method is t o
* reimplement QWidget::changeEvent() and catch QEvent::PaletteCh ange. * reimplement QWidget::changeEvent() and catch QEvent::PaletteCh ange.
 End of changes. 1 change blocks. 
2 lines changed or deleted 3 lines changed or added


 kiconloader.h   kiconloader.h 
skipping to change at line 391 skipping to change at line 391
/** /**
* Returns a list of all icons (*.png or *.xpm extension) in the * Returns a list of all icons (*.png or *.xpm extension) in the
* given directory. * given directory.
* @param iconsDir the directory to search in * @param iconsDir the directory to search in
* @return A QStringList containing the icon paths * @return A QStringList containing the icon paths
*/ */
QStringList queryIconsByDir( const QString& iconsDir ) const; QStringList queryIconsByDir( const QString& iconsDir ) const;
/** /**
* Returns the current size of the group. * Returns the current size of the icon group.
* Using e.g. KIconLoader::SmallIcon will retrieve the icon size
* that is currently set from System Settings->Appearance->Icon
* sizes. SmallIcon for instance, would typically be 16x16, but
* the user could increase it and this setting would change as well.
* @param group the group to check. * @param group the group to check.
* @return the current size for an icon group. * @return the current size for an icon group.
*/ */
int currentSize(KIconLoader::Group group) const; int currentSize(KIconLoader::Group group) const;
/** /**
* Returns a pointer to the current theme. Can be used to query * Returns a pointer to the current theme. Can be used to query
* available and default sizes for groups. * available and default sizes for groups.
* @note The KIconTheme will change if reconfigure() is called and * @note The KIconTheme will change if reconfigure() is called and
* therefore it's not recommended to store the pointer anywhere. * therefore it's not recommended to store the pointer anywhere.
 End of changes. 1 change blocks. 
1 lines changed or deleted 5 lines changed or added


 klocale.h   klocale.h 
skipping to change at line 702 skipping to change at line 702
* @param precision number of places after the decimal point to use. K DE uses * @param precision number of places after the decimal point to use. K DE uses
* 1 by default so when in doubt use 1. * 1 by default so when in doubt use 1.
* @param dialect binary unit standard to use. Use DefaultBinaryUnits to * @param dialect binary unit standard to use. Use DefaultBinaryUnits to
* use the localized user selection unless you need to use a spe cific * use the localized user selection unless you need to use a spe cific
* unit type (such as displaying a flash memory size in JEDEC). * unit type (such as displaying a flash memory size in JEDEC).
* @param specificUnit specific unit size to use in result. Use * @param specificUnit specific unit size to use in result. Use
* DefaultBinarySize to automatically select a unit that will re turn * DefaultBinarySize to automatically select a unit that will re turn
* a sanely-sized number. * a sanely-sized number.
* @return converted size as a translated string including the units. * @return converted size as a translated string including the units.
* E.g. "1.23 KiB", "2 GB" (JEDEC), "4.2 kB" (Metric). * E.g. "1.23 KiB", "2 GB" (JEDEC), "4.2 kB" (Metric).
* @see BinaryUnitDialect
*/ */
QString formatByteSize(double size, int precision, QString formatByteSize(double size, int precision,
BinaryUnitDialect dialect = KLocale::DefaultBina ryDialect, BinaryUnitDialect dialect = KLocale::DefaultBina ryDialect,
BinarySizeUnits specificUnit = KLocale::DefaultB inaryUnits) const; BinarySizeUnits specificUnit = KLocale::DefaultB inaryUnits) const;
/** /**
* Returns the user's default binary unit dialect. * Returns the user's configured binary unit dialect.
* e.g. if MetricBinaryDialect is returned then the values
* configured for how much a set of bytes are worth would
* be 10^(3*n) and KB (1000 bytes == 1 KB), in this case.
*
* Will never return DefaultBinaryDialect.
* *
* @since 4.4 * @since 4.4
* @return User's default binary unit dialect * @return User's configured binary unit dialect
* @see BinaryUnitDialect * @see BinaryUnitDialect
*/ */
BinaryUnitDialect binaryUnitDialect() const; BinaryUnitDialect binaryUnitDialect() const;
/** /**
* Sets @p newDialect to be the default dialect for this locale (and on ly * Sets @p newDialect to be the default dialect for this locale (and on ly
* this locale). Newly created KLocale objects will continue to defaul t * this locale). Newly created KLocale objects will continue to defaul t
* to the user's choice. * to the user's choice.
* *
* @param newDialect the new dialect to set as default for this locale object. * @param newDialect the new dialect to set as default for this locale object.
skipping to change at line 2117 skipping to change at line 2123
* @param digitSet the digit set identifier * @param digitSet the digit set identifier
* @param ignoreContext unconditional conversion if @c true * @param ignoreContext unconditional conversion if @c true
* *
* @return string with converted digits * @return string with converted digits
* *
* @see DigitSet * @see DigitSet
*/ */
QString convertDigits(const QString &str, DigitSet digitSet, QString convertDigits(const QString &str, DigitSet digitSet,
bool ignoreContext = false) const; bool ignoreContext = false) const;
/**
* @since 4.8
*
* Reparse locale configuration files for the current selected
* language.
*/
void reparseConfiguration();
private: private:
friend class KLocalePrivate; friend class KLocalePrivate;
friend class KLocaleTest; friend class KLocaleTest;
friend class KDateTimeFormatter; friend class KDateTimeFormatter;
KLocalePrivate * const d; KLocalePrivate * const d;
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS(KLocale::DateTimeFormatOptions) Q_DECLARE_OPERATORS_FOR_FLAGS(KLocale::DateTimeFormatOptions)
Q_DECLARE_OPERATORS_FOR_FLAGS(KLocale::DateTimeComponents) Q_DECLARE_OPERATORS_FOR_FLAGS(KLocale::DateTimeComponents)
Q_DECLARE_OPERATORS_FOR_FLAGS(KLocale::TimeFormatOptions) Q_DECLARE_OPERATORS_FOR_FLAGS(KLocale::TimeFormatOptions)
 End of changes. 4 change blocks. 
2 lines changed or deleted 16 lines changed or added


 kopenwithdialog.h   kopenwithdialog.h 
skipping to change at line 137 skipping to change at line 137
*/ */
virtual void accept(); virtual void accept();
private: private:
friend class KOpenWithDialogPrivate; friend class KOpenWithDialogPrivate;
KOpenWithDialogPrivate* const d; KOpenWithDialogPrivate* const d;
Q_DISABLE_COPY(KOpenWithDialog) Q_DISABLE_COPY(KOpenWithDialog)
Q_PRIVATE_SLOT(d, void _k_slotDbClick()) Q_PRIVATE_SLOT(d, void _k_slotDbClick())
Q_PRIVATE_SLOT(d, void _k_slotFileSelected())
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 kstandarddirs.h   kstandarddirs.h 
skipping to change at line 63 skipping to change at line 63
* @c share/doc/HTML and @c share/doc/kde/HTML. * @c share/doc/HTML and @c share/doc/kde/HTML.
* The search algorithm tries to locate the file under each prefix-suffix * The search algorithm tries to locate the file under each prefix-suffix
* combination. * combination.
* *
* It is also possible to register * It is also possible to register
* absolute paths that KStandardDirs looks up after not finding anything * absolute paths that KStandardDirs looks up after not finding anything
* in the former steps. They can be useful if the user wants to provide * in the former steps. They can be useful if the user wants to provide
* specific directories that aren't in his <tt>$KDEHOME</tt> directory, for * specific directories that aren't in his <tt>$KDEHOME</tt> directory, for
* example for icons. * example for icons.
* *
* <b>Standard resources that kdelibs allocates are:</b>\n * <b>Standard resources that kdelibs allocates are:</b>
* *
* @li @c apps - Applications menu (.desktop files). * @li @c apps - Applications menu (.desktop files).
* @li @c autostart - Autostart directories (both XDG and kde-specific) * @li @c autostart - Autostart directories (both XDG and kde-specific)
* @li @c cache - Cached information (e.g. favicons, web-pages) * @li @c cache - Cached information (e.g. favicons, web-pages)
* @li @c cgi - CGIs to run from kdehelp. * @li @c cgi - CGIs to run from kdehelp.
* @li @c config - Configuration files. * @li @c config - Configuration files.
* @li @c data - Where applications store data. * @li @c data - Where applications store data.
* @li @c emoticons - Emoticons themes * @li @c emoticons - Emoticons themes
* @li @c exe - Executables in $prefix/bin. findExe() for a function that t akes $PATH into account. * @li @c exe - Executables in $prefix/bin. findExe() for a function that t akes $PATH into account.
* @li @c html - HTML documentation. * @li @c html - HTML documentation.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 ktcpsocket.h   ktcpsocket.h 
skipping to change at line 236 skipping to change at line 236
virtual bool canReadLine() const; virtual bool canReadLine() const;
virtual void close(); virtual void close();
virtual bool isSequential() const; virtual bool isSequential() const;
virtual bool open(QIODevice::OpenMode open); virtual bool open(QIODevice::OpenMode open);
virtual bool waitForBytesWritten(int msecs); virtual bool waitForBytesWritten(int msecs);
//### Document that this actually tries to read *more* data //### Document that this actually tries to read *more* data
virtual bool waitForReadyRead(int msecs = 30000); virtual bool waitForReadyRead(int msecs = 30000);
protected: protected:
virtual qint64 readData (char *data, qint64 maxSize); virtual qint64 readData (char *data, qint64 maxSize);
virtual qint64 writeData (const char *data, qint64 maxSize); virtual qint64 writeData (const char *data, qint64 maxSize);
signals:
/// @since 4.8.1
/// Forwarded from QSslSocket
void encryptedBytesWritten( qint64 written );
public: public:
//from QAbstractSocket //from QAbstractSocket
void abort(); void abort();
void connectToHost(const QString &hostName, quint16 port, ProxyPolicy p olicy = AutoProxy); void connectToHost(const QString &hostName, quint16 port, ProxyPolicy p olicy = AutoProxy);
void connectToHost(const QHostAddress &hostAddress, quint16 port, Proxy Policy policy = AutoProxy); void connectToHost(const QHostAddress &hostAddress, quint16 port, Proxy Policy policy = AutoProxy);
/** /**
* Take the hostname and port from @p url and connect to them. The info rmation from a * Take the hostname and port from @p url and connect to them. The info rmation from a
* full URL enables the most accurate choice of proxy in case of proxy rules that * full URL enables the most accurate choice of proxy in case of proxy rules that
* depend on high-level information like protocol or username. * depend on high-level information like protocol or username.
skipping to change at line 382 skipping to change at line 386
{ {
public: public:
/** /**
* Default construct an instance with no useful data. * Default construct an instance with no useful data.
*/ */
KSslErrorUiData(); KSslErrorUiData();
/** /**
* Create an instance and initialize it with SSL error data from @p soc ket. * Create an instance and initialize it with SSL error data from @p soc ket.
*/ */
KSslErrorUiData(const KTcpSocket *socket); KSslErrorUiData(const KTcpSocket *socket);
/**
* Create an instance and initialize it with SSL error data from @p soc
ket.
*/
KSslErrorUiData(const QSslSocket *socket);
KSslErrorUiData(const KSslErrorUiData &other); KSslErrorUiData(const KSslErrorUiData &other);
KSslErrorUiData &operator=(const KSslErrorUiData &); KSslErrorUiData &operator=(const KSslErrorUiData &);
/** /**
* Destructor * Destructor
* @since 4.7 * @since 4.7
*/ */
~KSslErrorUiData(); ~KSslErrorUiData();
class Private; class Private;
private: private:
friend class Private; friend class Private;
 End of changes. 2 change blocks. 
0 lines changed or deleted 9 lines changed or added


 kurl.h   kurl.h 
skipping to change at line 621 skipping to change at line 621
/** /**
* Checks whether there is a HTML reference. * Checks whether there is a HTML reference.
* @return true if the URL has an HTML-style reference. * @return true if the URL has an HTML-style reference.
* @see htmlRef() * @see htmlRef()
*/ */
bool hasHTMLRef() const; bool hasHTMLRef() const;
/** /**
* Checks whether the file is local. * Checks whether the file is local.
* @return true if the file is a plain local file and has no filter proto * @return true if the file is a plain local file (i.e. uses the file pro
cols tocol
* attached to it. * and no hostname, or the local hostname).
* When isLocalFile returns true, you can use toLocalFile to read the fi
le contents.
* Otherwise you need to use KIO (e.g. KIO::get).
*/ */
bool isLocalFile() const; bool isLocalFile() const;
/** /**
* Adds encoding information to url by adding a "charset" parameter. If t here * Adds encoding information to url by adding a "charset" parameter. If t here
* is already a charset parameter, it will be replaced. * is already a charset parameter, it will be replaced.
* @param encoding the encoding to add or QString() to remove the * @param encoding the encoding to add or QString() to remove the
* encoding. * encoding.
*/ */
void setFileEncoding(const QString &encoding); void setFileEncoding(const QString &encoding);
 End of changes. 1 change blocks. 
3 lines changed or deleted 6 lines changed or added


 kwebpage.h   kwebpage.h 
skipping to change at line 208 skipping to change at line 208
* resource and then downloads it using KIO. * resource and then downloads it using KIO.
*/ */
virtual void downloadUrl(const KUrl &url); virtual void downloadUrl(const KUrl &url);
/** /**
* Download the resource specified by @p reply using KIO. * Download the resource specified by @p reply using KIO.
* *
* This slot first prompts the user where to save the requested resourc e * This slot first prompts the user where to save the requested resourc e
* and then downloads it using KIO. * and then downloads it using KIO.
* *
* 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
* specified by that property to download the specified resource.
*
* If the "DownloadManagerExe" property is not defined or the command
* specified by it could not be successfully executed, then the user wi
ll
* be prompted for the action to take.
*
* @since 4.5 * @since 4.5
* @see handleReply
*/ */
void downloadResponse(QNetworkReply *reply); void downloadResponse(QNetworkReply *reply);
protected: protected:
/** /**
* Get an item of session metadata. * Get an item of session metadata.
* *
* Retrieves the value of the permanent (per-session) metadata for @p k ey. * Retrieves the value of the permanent (per-session) metadata for @p k ey.
* *
* If KIO integration is disabled, this will always return an empty str ing. * If KIO integration is disabled, this will always return an empty str ing.
skipping to change at line 333 skipping to change at line 342
* 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 on how * QWebPage::acceptNavigationRequest * linkDelegationPolicy on how * QWebPage::acceptNavigationRequest
* behaves. * 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 @ref reply and returns true on success, false oth * Attempts to handle @p reply and returns true on success, false other
erwise. wise.
*
* 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
* specified by that property to download the specified resource.
*
* If the "DownloadManagerExe" property is not defined or the command
* specified by it could not be successfully executed, then the user wi
ll
* 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
*/ */
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;
 End of changes. 3 change blocks. 
2 lines changed or deleted 23 lines changed or added


 powermanagement.h   powermanagement.h 
skipping to change at line 120 skipping to change at line 120
* @since 4.6 * @since 4.6
*/ */
SOLID_EXPORT int beginSuppressingScreenPowerManagement(const QStrin g &reason = QString()); SOLID_EXPORT int beginSuppressingScreenPowerManagement(const QStrin g &reason = QString());
/** /**
* Tell the power management that a particular screen power managem ent suppression is no longer needed. When * Tell the power management that a particular screen power managem ent suppression is no longer needed. When
* no more suppressions are active, the system will be free to hand le screen power management automatically * no more suppressions are active, the system will be free to hand le screen power management automatically
* @param cookie The cookie acquired when requesting screen power m anagement suppression * @param cookie The cookie acquired when requesting screen power m anagement suppression
* @return true if the suppression was stopped, false if an invalid cookie was given * @return true if the suppression was stopped, false if an invalid cookie was given
* *
* @note Since 4.8, this function also inhibites screensaver
*
* @since 4.6 * @since 4.6
*/ */
SOLID_EXPORT bool stopSuppressingScreenPowerManagement(int cookie); SOLID_EXPORT bool stopSuppressingScreenPowerManagement(int cookie);
class SOLID_EXPORT Notifier : public QObject class SOLID_EXPORT Notifier : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_SIGNALS: Q_SIGNALS:
/** /**
* This signal is emitted when the AC adapter is plugged or unp lugged. * This signal is emitted when the AC adapter is plugged or unp lugged.
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 theme.h   theme.h 
skipping to change at line 381 skipping to change at line 381
* @param image the path to the image the cache is assoiated with * @param image the path to the image the cache is assoiated with
*/ */
void releaseRectsCache(const QString &image); void releaseRectsCache(const QString &image);
/** /**
* @return the default homepage to use in conjunction with the bran ding svg content * @return the default homepage to use in conjunction with the bran ding svg content
* @since 4.7 * @since 4.7
*/ */
KUrl homepage() const; KUrl homepage() const;
/**
* @return the default tool tip delay; -1 means "no tooltips"
*/
int toolTipDelay() const;
Q_SIGNALS: Q_SIGNALS:
/** /**
* Emitted when the user changes the theme. SVGs should be reloaded at * Emitted when the user changes the theme. SVGs should be reloaded at
* that point * that point
*/ */
void themeChanged(); void themeChanged();
public Q_SLOTS: public Q_SLOTS:
/** /**
* Notifies the Theme object that the theme settings have changed * Notifies the Theme object that the theme settings have changed
skipping to change at line 406 skipping to change at line 411
friend class ThemeSingleton; friend class ThemeSingleton;
friend class ThemePrivate; friend class ThemePrivate;
ThemePrivate *const d; ThemePrivate *const d;
Q_PRIVATE_SLOT(d, void compositingChanged(bool)) Q_PRIVATE_SLOT(d, void compositingChanged(bool))
Q_PRIVATE_SLOT(d, void colorsChanged()) Q_PRIVATE_SLOT(d, void colorsChanged())
Q_PRIVATE_SLOT(d, void blurBehindChanged(bool blur)) Q_PRIVATE_SLOT(d, void blurBehindChanged(bool blur))
Q_PRIVATE_SLOT(d, void settingsFileChanged(const QString &)) Q_PRIVATE_SLOT(d, void settingsFileChanged(const QString &))
Q_PRIVATE_SLOT(d, void scheduledCacheUpdate()) Q_PRIVATE_SLOT(d, void scheduledCacheUpdate())
Q_PRIVATE_SLOT(d, void onAppExitCleanup()) Q_PRIVATE_SLOT(d, void onAppExitCleanup())
Q_PRIVATE_SLOT(d, void notifyOfChanged())
}; };
} // Plasma namespace } // Plasma namespace
#endif // multiple inclusion guard #endif // multiple inclusion guard
 End of changes. 2 change blocks. 
0 lines changed or deleted 6 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/