declarativewidget.h   declarativewidget.h 
skipping to change at line 136 skipping to change at line 136
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 maximumWidthChanged())
Q_PRIVATE_SLOT(d, void maximumHeightChanged()) Q_PRIVATE_SLOT(d, void maximumHeightChanged())
Q_PRIVATE_SLOT(d, void preferredWidthChanged()) Q_PRIVATE_SLOT(d, void implicitWidthChanged())
Q_PRIVATE_SLOT(d, void preferredHeightChanged()) Q_PRIVATE_SLOT(d, void implicitHeightChanged())
}; };
} // namespace Plasma } // namespace Plasma
#endif // multiple inclusion guard #endif // multiple inclusion guard
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 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.10.1" #define KDE_VERSION_STRING "4.10.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 10 #define KDE_VERSION_MINOR 10
/** /**
* @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


 kfileitem.h   kfileitem.h 
skipping to change at line 373 skipping to change at line 373
KMimeType::Ptr determineMimeType() const; KMimeType::Ptr determineMimeType() const;
/** /**
* Returns the currently known mimetype of the file item. * Returns the currently known mimetype of the file item.
* This will not try to determine the mimetype if unknown. * This will not try to determine the mimetype if unknown.
* @return the known mime type * @return the known mime type
*/ */
KMimeType::Ptr mimeTypePtr() const; KMimeType::Ptr mimeTypePtr() const;
/** /**
* @return true if we have determined the final icon of this file alrea
dy.
* @since 4.10.2
*/
bool isFinalIconKnown() const;
/**
* @return true if we have determined the mimetype of this file already , * @return true if we have determined the mimetype of this file already ,
* i.e. if determineMimeType() will be fast. Otherwise it will have to * i.e. if determineMimeType() will be fast. Otherwise it will have to
* find what the mimetype is, which is a possibly slow operation; usual ly * find what the mimetype is, which is a possibly slow operation; usual ly
* this is delayed until necessary. * this is delayed until necessary.
*/ */
bool isMimeTypeKnown() const; bool isMimeTypeKnown() const;
/** /**
* Returns the user-readable string representing the type of this file, * Returns the user-readable string representing the type of this file,
* like "OpenDocument Text File". * like "OpenDocument Text File".
 End of changes. 1 change blocks. 
0 lines changed or deleted 7 lines changed or added


 powermanagement.h   powermanagement.h 
/* /*
Copyright 2006-2007 Kevin Ottens <ervin@kde.org> Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
Copyright 2013 Lukas Tinkl <ltinkl@redhat.com>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) version 3, or any version 2.1 of the License, or (at your option) version 3, or any
later version accepted by the membership of KDE e.V. (or its later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), which shall successor approved by the membership of KDE e.V.), which shall
act as a proxy defined in Section 6 of version 3 of the license. act as a proxy defined in Section 6 of version 3 of the license.
This library is distributed in the hope that it will be useful, This library is distributed in the hope that it will be useful,
skipping to change at line 50 skipping to change at line 51
* @author Kevin Ottens <ervin@kde.org> * @author Kevin Ottens <ervin@kde.org>
*/ */
namespace PowerManagement namespace PowerManagement
{ {
/** /**
* This enum type defines the different suspend methods. * This enum type defines the different suspend methods.
* *
* - StandbyState: Processes are stopped, some hardware is deactiva ted (ACPI S1) * - StandbyState: Processes are stopped, some hardware is deactiva ted (ACPI S1)
* - SuspendState: Most devices are deactivated, only RAM is powere d (ACPI S3) * - SuspendState: Most devices are deactivated, only RAM is powere d (ACPI S3)
* - HibernateState: State of the machine is saved to disk, and the machine is powered down (ACPI S4) * - HibernateState: State of the machine is saved to disk, and the machine is powered down (ACPI S4)
* - HybridSleepState: The contents of RAM are first copied to non-
volatile storage like for regular hibernation,
* but then, instead of powering down, the computer enters sleep
mode
*/ */
enum SleepState { StandbyState = 1, SuspendState = 2, HibernateStat enum SleepState { StandbyState = 1, SuspendState = 2, HibernateStat
e = 4 }; e = 4,
/// @since 4.11
HybridSuspendState = 8 };
/** /**
* Retrieves a high level indication of how applications should beh ave according to the * Retrieves a high level indication of how applications should beh ave according to the
* power management subsystem. For example, when on battery power, this method will return * power management subsystem. For example, when on battery power, this method will return
* true. * true.
* *
* @return whether apps should conserve power * @return whether apps should conserve power
*/ */
SOLID_EXPORT bool appShouldConserveResources(); SOLID_EXPORT bool appShouldConserveResources();
/** /**
* Retrieves the set of suspend methods supported by the system. * Retrieves the set of suspend methods supported by the system.
* *
* @return the suspend methods supported by this system * @return the suspend methods supported by this system
* @see Solid::PowerManager::SuspendMethod * @see Solid::PowerManagement::SleepState
* @see Solid::PowerManager::SuspendMethods
*/ */
SOLID_EXPORT QSet<SleepState> supportedSleepStates(); SOLID_EXPORT QSet<SleepState> supportedSleepStates();
/** /**
* Requests that the system goes to sleep * Requests that the system go to sleep
* *
* @param state the sleep state use * @param state the sleep state use
* @param receiver the object to call a slot on once the operation completes * @param receiver the object to call a slot on once the operation completes
* @param member the slot to call * @param member the slot to call
*/ */
SOLID_EXPORT void requestSleep(SleepState state, QObject *receiver, const char *member); SOLID_EXPORT void requestSleep(SleepState state, QObject *receiver, const char *member);
/** /**
* Tell the power management subsystem to suppress automatic system sleep until further * Tell the power management subsystem to suppress automatic system sleep until further
* notice. * notice.
skipping to change at line 120 skipping to change at line 124
* @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 * @note Since 4.8, this function also inhibits 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.
* *
* @param newState the new state of the AC adapter, it's one of * @param newState whether the system runs on battery
the
* type @see Solid::PowerManager::AcAdapterState
*/ */
void appShouldConserveResourcesChanged(bool newState); void appShouldConserveResourcesChanged(bool newState);
/** /**
* This signal is emitted whenever the system is resuming from suspend. Applications should connect * This signal is emitted whenever the system is resuming from suspend. Applications should connect
* to this signal to perform actions due after a wake up (such as updating clocks, etc.). * to this signal to perform actions due after a wake up (such as updating clocks, etc.).
* *
* @since 4.7 * @since 4.7
*/ */
void resumingFromSuspend(); void resumingFromSuspend();
 End of changes. 8 change blocks. 
10 lines changed or deleted 14 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/