action.h   action.h 
skipping to change at line 146 skipping to change at line 146
* execute or the used interpreter. * execute or the used interpreter.
* \todo BIC merge * \todo BIC merge
*/ */
void fromDomElement(const QDomElement& element); void fromDomElement(const QDomElement& element);
/** /**
* Method to read settings from the QDomElement \p element that * Method to read settings from the QDomElement \p element that
* contains details about e.g. the displayed text, the file to * contains details about e.g. the displayed text, the file to
* execute or the used interpreter. * execute or the used interpreter.
* *
* \param searchPath List of directories where to search the sc ript if it's path is relative * \param searchPath List of directories where to search the sc ript if its path is relative
* First item is given the highest priority. * First item is given the highest priority.
*/ */
void fromDomElement(const QDomElement& element, const QStringLi st& searchPath/* = QStringList()*/); void fromDomElement(const QDomElement& element, const QStringLi st& searchPath/* = QStringList()*/);
/** /**
* \return a QDomElement that contains the settings like e.g. t he * \return a QDomElement that contains the settings like e.g. t he
* displayed text, the file to execute or the used interpreter * displayed text, the file to execute or the used interpreter
* of this \a Action instance. * of this \a Action instance.
*/ */
QDomElement toDomElement() const; QDomElement toDomElement() const;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 appletscript.h   appletscript.h 
skipping to change at line 183 skipping to change at line 183
const Package *package() const; const Package *package() const;
/** /**
* @return a standard Plasma applet configuration dialog, ready * @return a standard Plasma applet configuration dialog, ready
* to have pages added to it. * to have pages added to it.
* *
* Note that the dialog returned is set to delete on close. * Note that the dialog returned is set to delete on close.
*/ */
KConfigDialog *standardConfigurationDialog(); KConfigDialog *standardConfigurationDialog();
/**
* This method should be called after a scripting applet has added
* its own pages to a configuration dialog
*
* @since 4.3.1
*/
void addStandardConfigurationPages(KConfigDialog *dialog);
private: private:
AppletScriptPrivate *const d; AppletScriptPrivate *const d;
}; };
#define K_EXPORT_PLASMA_APPLETSCRIPTENGINE(libname, classname) \ #define K_EXPORT_PLASMA_APPLETSCRIPTENGINE(libname, classname) \
K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \ K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \
K_EXPORT_PLUGIN(factory("plasma_appletscriptengine_" #libname)) K_EXPORT_PLUGIN(factory("plasma_appletscriptengine_" #libname))
} //Plasma namespace } //Plasma namespace
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added


 button.h   button.h 
skipping to change at line 58 skipping to change at line 58
Q_DECLARE_PRIVATE(Button) Q_DECLARE_PRIVATE(Button)
friend class Device; friend class Device;
public: public:
/** /**
* This enum type defines the type of button. * This enum type defines the type of button.
* *
* - LidButton : The switch on a laptop that senses whether the lid is open or closed. * - LidButton : The switch on a laptop that senses whether the lid is open or closed.
* - PowerButton : The main power button on the computer. * - PowerButton : The main power button on the computer.
* - SleepButton : The sleep button on a computer capable of puttin g the computer into a suspend state. * - SleepButton : The sleep button on a computer capable of puttin g the computer into a suspend state.
* - TabletButton : The tablet switch on a laptop that senses if the monitor is rotated or not.
* - UnknownButtonType : The type of the button is unknow. * - UnknownButtonType : The type of the button is unknow.
*/ */
enum ButtonType{ LidButton, PowerButton, SleepButton, UnknownButto nType }; enum ButtonType{ LidButton, PowerButton, SleepButton, UnknownButto nType, TabletButton };
private: private:
/** /**
* Creates a new Button object. * Creates a new Button object.
* You generally won't need this. It's created when necessary using * You generally won't need this. It's created when necessary using
* Device::as(). * Device::as().
* *
* @param backendObject the device interface object provided by the backend * @param backendObject the device interface object provided by the backend
* @see Solid::Device::as() * @see Solid::Device::as()
*/ */
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 containerinterface.h   containerinterface.h 
skipping to change at line 282 skipping to change at line 282
/** Virtual destructor */ /** Virtual destructor */
virtual ~ViewBarContainer(); virtual ~ViewBarContainer();
/** At this point the views parent window has to be already set, so thi s has to be called after any reparentings /** At this point the views parent window has to be already set, so thi s has to be called after any reparentings
* eg.: The implementation in Kate uses view->window() to determine wher e to place of the container * eg.: The implementation in Kate uses view->window() to determine wher e to place of the container
* if 0 is returned, the view has to handle the bar internally * if 0 is returned, the view has to handle the bar internally
*/ */
virtual QWidget* getViewBarParent(View *view,enum Position position)=0; virtual QWidget* getViewBarParent(View *view,enum Position position)=0;
/** It is advisable to store only QPointers to the bar and it's childre n in the caller after this point. /** It is advisable to store only QPointers to the bar and its children in the caller after this point.
* The container may at any point delete the bar, eg if the container is destroyed * The container may at any point delete the bar, eg if the container is destroyed
* The caller has to ensure that bar->parentWidget() is the widget ret urned by the previous function * The caller has to ensure that bar->parentWidget() is the widget ret urned by the previous function
*/ */
virtual void addViewBarToLayout(View *view,QWidget *bar,enum Position p osition)=0; virtual void addViewBarToLayout(View *view,QWidget *bar,enum Position p osition)=0;
///show hide a view bar. The implementor of this interface has to take care for not showing ///show hide a view bar. The implementor of this interface has to take care for not showing
/// the bars of unfocused views, if needed /// the bars of unfocused views, if needed
virtual void showViewBarForView(View *view,enum Position position)=0; virtual void showViewBarForView(View *view,enum Position position)=0;
virtual void hideViewBarForView(View *view,enum Position position)=0; virtual void hideViewBarForView(View *view,enum Position position)=0;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 containment.h   containment.h 
skipping to change at line 427 skipping to change at line 427
void configureRequested(Plasma::Containment *containment); void configureRequested(Plasma::Containment *containment);
/** /**
* The activity associated to this containemnt has changed * The activity associated to this containemnt has changed
*/ */
void contextChanged(Plasma::Context *context); void contextChanged(Plasma::Context *context);
public Q_SLOTS: public Q_SLOTS:
/** /**
* Informs the Corona as to what position it is in. This is informa tional * Informs the Corona as to what position it is in. This is informa tional
* only, as the Corona doesn't change it's actual location. This is , * only, as the Corona doesn't change its actual location. This is,
* however, passed on to Applets that may be managed by this Corona . * however, passed on to Applets that may be managed by this Corona .
* *
* @param location the new location of this Corona * @param location the new location of this Corona
*/ */
void setLocation(Plasma::Location location); void setLocation(Plasma::Location location);
/** /**
* Sets the form factor for this Containment. This may cause change s in both * Sets the form factor for this Containment. This may cause change s in both
* the arrangement of Applets as well as the display choices of ind ividual * the arrangement of Applets as well as the display choices of ind ividual
* Applets. * Applets.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 css_value.h   css_value.h 
skipping to change at line 262 skipping to change at line 262
* *
* All CSS2 constants are not supposed to be required by the * All CSS2 constants are not supposed to be required by the
* implementation since all CSS2 interfaces are optionals. * implementation since all CSS2 interfaces are optionals.
* *
*/ */
enum UnitTypes { enum UnitTypes {
CSS_INHERIT = 0, CSS_INHERIT = 0,
CSS_PRIMITIVE_VALUE = 1, CSS_PRIMITIVE_VALUE = 1,
CSS_VALUE_LIST = 2, CSS_VALUE_LIST = 2,
CSS_CUSTOM = 3, CSS_CUSTOM = 3,
CSS_INITIAL = 4 CSS_INITIAL = 4,
CSS_SVG_VALUE = 1001 ///< Not part of DOM
}; };
/** /**
* A string representation of the current value. * A string representation of the current value.
* *
*/ */
DOM::DOMString cssText() const; DOM::DOMString cssText() const;
/** /**
* see cssText * see cssText
 End of changes. 1 change blocks. 
1 lines changed or deleted 3 lines changed or added


 engine.h   engine.h 
skipping to change at line 132 skipping to change at line 132
* *
* @see downloadDialogModal() * @see downloadDialogModal()
*/ */
void downloadDialog(); void downloadDialog();
/** /**
* @brief Asynchronous way of starting the download workflow and gettin g feedback to a slot when the dialog closes. * @brief Asynchronous way of starting the download workflow and gettin g feedback to a slot when the dialog closes.
* *
* This method should be used whenever a blocking application with a * This method should be used whenever a blocking application with a
* non-blocking GUI during GHNS operations is not suitable. * non-blocking GUI during GHNS operations is not suitable.
* the slot passed in should have the signature (KNS::Entry::List) as i t's parameter * the slot passed in should have the signature (KNS::Entry::List) as i ts parameter
* *
* @see downloadDialogModal() * @see downloadDialogModal()
*/ */
void downloadDialog(QObject * receiver, const char * slot); void downloadDialog(QObject * receiver, const char * slot);
/** /**
* @brief Asynchronous way of starting the upload workflow. * @brief Asynchronous way of starting the upload workflow.
* *
* This method should be used whenever a blocking application with a * This method should be used whenever a blocking application with a
* non-blocking GUI during GHNS operations is not suitable. * non-blocking GUI during GHNS operations is not suitable.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 extender.h   extender.h 
skipping to change at line 166 skipping to change at line 166
*/ */
bool hasItem(const QString &name) const; bool hasItem(const QString &name) const;
/** /**
* @return true if the Extender is visually empty (though it may ha ve items such as * @return true if the Extender is visually empty (though it may ha ve items such as
* empty groups or detached items associatd with it) * empty groups or detached items associatd with it)
*/ */
bool isEmpty() const; bool isEmpty() const;
/** /**
* Use this function to instruct the extender on how to render it's items. Usually you will * Use this function to instruct the extender on how to render its items. Usually you will
* want to call this function in your applet's constraintsEvent, al lthough this is already * want to call this function in your applet's constraintsEvent, al lthough this is already
* done for you when using PopupApplet as base class for your apple t. Defaults to NoBorders. * done for you when using PopupApplet as base class for your apple t. Defaults to NoBorders.
* @param appearance the way this extender should look. * @param appearance the way this extender should look.
*/ */
void setAppearance(Appearance appearance); void setAppearance(Appearance appearance);
/** /**
* @returns the current way of rendering extender items that is use d. * @returns the current way of rendering extender items that is use d.
*/ */
Appearance appearance() const; Appearance appearance() const;
skipping to change at line 236 skipping to change at line 236
* This function get's called for every extender when plasma exits. Implement this function * This function get's called for every extender when plasma exits. Implement this function
* to store the current state of this extender (position in a layou t for example), so this * to store the current state of this extender (position in a layou t for example), so this
* can be restored when applet starts again. The default implementa tion stores the y * can be restored when applet starts again. The default implementa tion stores the y
* coordinate of every extender item in the config field extenderIt emPos. * coordinate of every extender item in the config field extenderIt emPos.
*/ */
virtual void saveState(); virtual void saveState();
/** /**
* This function get's called on every item to determine which back ground border's to * This function get's called on every item to determine which back ground border's to
* render. * render.
* @param item the item for which it's position or extender has cha * @param item the item for which its position or extender has chan
nged. ged.
* @return the borders that have to be enabled on it's background. * @return the borders that have to be enabled on its background.
*/ */
virtual FrameSvg::EnabledBorders enabledBordersForItem(ExtenderItem *item) const; virtual FrameSvg::EnabledBorders enabledBordersForItem(ExtenderItem *item) const;
/** /**
* Reimplemented from QGraphicsWidget * Reimplemented from QGraphicsWidget
*/ */
QVariant itemChange(GraphicsItemChange change, const QVariant &valu e); QVariant itemChange(GraphicsItemChange change, const QVariant &valu e);
/** /**
* Reimplemented from QGraphicsWidget * Reimplemented from QGraphicsWidget
 End of changes. 2 change blocks. 
4 lines changed or deleted 4 lines changed or added


 extenderitem.h   extenderitem.h 
skipping to change at line 206 skipping to change at line 206
* in which case this extender stays around. 0 means forever and is the default. * in which case this extender stays around. 0 means forever and is the default.
*/ */
void setAutoExpireDelay(uint time); void setAutoExpireDelay(uint time);
/** /**
* @return whether or not this extender item has an auto expire del ay. * @return whether or not this extender item has an auto expire del ay.
*/ */
uint autoExpireDelay() const; uint autoExpireDelay() const;
/** /**
* @return whether or not this item is detached from it's original source. * @return whether or not this item is detached from its original s ource.
*/ */
bool isDetached() const; bool isDetached() const;
/** /**
* @return whether or not the extender item is collapsed. * @return whether or not the extender item is collapsed.
*/ */
bool isCollapsed() const; bool isCollapsed() const;
/** /**
* @param name the name to store the action under in our collection . * @param name the name to store the action under in our collection .
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 global.h   global.h 
skipping to change at line 28 skipping to change at line 28
*/ */
#ifndef KIO_GLOBAL_H #ifndef KIO_GLOBAL_H
#define KIO_GLOBAL_H #define KIO_GLOBAL_H
#include <kio/kio_export.h> #include <kio/kio_export.h>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QHash> #include <QtCore/QHash>
#include <QtCore/QMap> #include <QtCore/QMap>
#include <QtCore/QList> #include <QtCore/QList>
#include <QtCore/QVariant>
#include <kiconloader.h> #include <kiconloader.h>
#include <QtGui/QPixmap> // for pixmapForUrl #include <QtGui/QPixmap> // for pixmapForUrl
#include <sys/stat.h> // S_ISDIR #include <sys/stat.h> // S_ISDIR
#include <sys/types.h> // mode_t #include <sys/types.h> // mode_t
#include <kjob.h> #include <kjob.h>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
skipping to change at line 391 skipping to change at line 392
* Creates an empty meta data map. * Creates an empty meta data map.
*/ */
MetaData() : QMap<QString, QString>() { } MetaData() : QMap<QString, QString>() { }
/** /**
* Copy constructor. * Copy constructor.
*/ */
MetaData(const QMap<QString, QString>&metaData) : MetaData(const QMap<QString, QString>&metaData) :
QMap<QString, QString>(metaData) { } QMap<QString, QString>(metaData) { }
/** /**
* Creates a meta data map from a QVaraint map.
* @since 4.3.1
*/
MetaData(const QMap<QString,QVariant> &);
/**
* Adds the given meta data map to this map. * Adds the given meta data map to this map.
* @param metaData the map to add * @param metaData the map to add
* @return this map * @return this map
*/ */
MetaData & operator+= ( const QMap<QString,QString> &metaData ) MetaData & operator += ( const QMap<QString,QString> &metaData )
{ {
QMap<QString,QString>::ConstIterator it; QMap<QString,QString>::ConstIterator it;
for(it = metaData.constBegin(); it != metaData.constEnd(); ++it) for(it = metaData.constBegin(); it != metaData.constEnd(); ++it)
{ {
insert(it.key(), it.value()); insert(it.key(), it.value());
} }
return *this; return *this;
} }
/**
* Same as above except the value in the map is a QVariant.
*
* This convenience function allows you to easily assign the values
* of a QVariant to this meta data class.
*
* @param metaData the map to add
* @return this map
* @since 4.3.1
*/
MetaData & operator += ( const QMap<QString,QVariant> &metaData );
/**
* Sets the given meta data map to this map.
* @param metaData the map to add
* @return this map
* @since 4.3.1
*/
MetaData & operator = ( const QMap<QString,QVariant> &metaData );
/**
* Returns the contents of the map as a QVariant.
*
* @return a QVariant representation of the meta data map.
* @since 4.3.1
*/
QVariant toVariant() const;
}; };
} }
#endif #endif
 End of changes. 4 change blocks. 
1 lines changed or deleted 36 lines changed or added


 k3spell.h   k3spell.h 
skipping to change at line 348 skipping to change at line 348
/** /**
* Emitted whenever a misspelled word is found by check() or * Emitted whenever a misspelled word is found by check() or
* by checkWord(). * by checkWord().
* If it is emitted by checkWord(), @p pos=0. * If it is emitted by checkWord(), @p pos=0.
* If it is emitted by check(), then @p pos indicates the position of * If it is emitted by check(), then @p pos indicates the position of
* the misspelled word in the (original) @p _buffer. * the misspelled word in the (original) @p _buffer.
* (The first position is zero.) * (The first position is zero.)
* If it is emitted by checkList(), @p pos is the index to * If it is emitted by checkList(), @p pos is the index to
* the misspelled * the misspelled
* word in the QStringList passed to checkList(). * word in the QStringList passed to checkList().
* Note, that @p originalword can be only a word part, if it's * Note, that @p originalword can be only a word part, if it's a
* word with hyphens. * word with hyphens.
* *
* These are called _before_ the dialog is opened, so that the * These are called _before_ the dialog is opened, so that the
* calling program's GUI may be updated. (e.g. the misspelled word may * calling program's GUI may be updated. (e.g. the misspelled word may
* be highlighted). * be highlighted).
*/ */
void misspelling (const QString & originalword, const QStringList & sugge stions, void misspelling (const QString & originalword, const QStringList & sugge stions,
unsigned int pos); unsigned int pos);
/** /**
 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.3.00 (KDE 4.3.0)" #define KDE_VERSION_STRING "4.3.1 (KDE 4.3.1)"
/** /**
* @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 3 #define KDE_VERSION_MINOR 3
/** /**
* @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 00 #define KDE_VERSION_RELEASE 1
/** /**
* @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


 kglobalaccel.h   kglobalaccel.h 
skipping to change at line 104 skipping to change at line 104
* Clean the shortcuts for component @a componentUnique. * Clean the shortcuts for component @a componentUnique.
* *
* If the component is not active all global shortcut registrations are * If the component is not active all global shortcut registrations are
* purged and the component is removed completely. * purged and the component is removed completely.
* *
* If the component is active all global shortcut registrations not in use * If the component is active all global shortcut registrations not in use
* will be purged. If there is no shortcut registration left the compon ent * will be purged. If there is no shortcut registration left the compon ent
* is purged too. * is purged too.
* *
* If a purged component or shortcut is activated the next time it will * If a purged component or shortcut is activated the next time it will
* reregister itself. All you probably will loose on wrong usage are th * reregister itself. All you probably will lose on wrong usage are the
e * user's set shortcuts.
* users set shortcuts.
* *
* If you make sure your component is running and all global shortcuts it * If you make sure your component is running and all global shortcuts it
* has are active this function can be used to clean up the registry. * has are active this function can be used to clean up the registry.
* *
* Handle with care! * Handle with care!
* *
* If the method return @c true at least one shortcut was purged so han dle * If the method return @c true at least one shortcut was purged so han dle
* all previously acquired information with care. * all previously acquired information with care.
*/ */
static bool cleanComponent(const QString &componentUnique); static bool cleanComponent(const QString &componentUnique);
 End of changes. 1 change blocks. 
3 lines changed or deleted 2 lines changed or added


 kiconloader.h   kiconloader.h 
skipping to change at line 389 skipping to change at line 389
* Returns the current size of the group. * Returns the current size of the group.
* @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 recommed to store the pointer somewhere. * therefore it's not recommended to store the pointer anywhere.
* @return a pointer to the current theme. 0 if no theme set. * @return a pointer to the current theme. 0 if no theme set.
*/ */
KIconTheme *theme() const; KIconTheme *theme() const;
/** /**
* Returns a pointer to the KIconEffect object used by the icon loader. * Returns a pointer to the KIconEffect object used by the icon loader.
* @return the KIconEffect. * @return the KIconEffect.
*/ */
KIconEffect *iconEffect() const; KIconEffect *iconEffect() const;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 kkeysequencewidget.h   kkeysequencewidget.h 
skipping to change at line 121 skipping to change at line 121
* *
* There are two ways to react to a user agreeing to steal a shortcut: * There are two ways to react to a user agreeing to steal a shortcut:
* *
* 1. Listen to the stealShortcut() signal and steal the sho rtcuts * 1. Listen to the stealShortcut() signal and steal the sho rtcuts
* manually. It's your responsibility to save that change la ter when * manually. It's your responsibility to save that change la ter when
* you think it is appropriate. * you think it is appropriate.
* *
* 2. Call applyStealShortcut and KKeySequenceWidget will st eal the * 2. Call applyStealShortcut and KKeySequenceWidget will st eal the
* shortcut. This will save the actionCollections the shortc ut is part * shortcut. This will save the actionCollections the shortc ut is part
* of so make sure it doesn't inadvertly save some unwanted changes * of so make sure it doesn't inadvertly save some unwanted changes
* too. Read it's documentation for some limitation when han dling * too. Read its documentation for some limitation when hand ling
* global shortcuts. * global shortcuts.
* *
* If you want to do the conflict checking yourself here are some code * If you want to do the conflict checking yourself here are some code
* snippets for global ... * snippets for global ...
* *
* \code * \code
* QStringList conflicting = KGlobalAccel::findActionNameSys temwide(keySequence); * QStringList conflicting = KGlobalAccel::findActionNameSys temwide(keySequence);
* if (!conflicting.isEmpty()) { * if (!conflicting.isEmpty()) {
* // Inform and ask the user about the conflict and rea ssigning * // Inform and ask the user about the conflict and rea ssigning
* // the keys sequence * // the keys sequence
skipping to change at line 229 skipping to change at line 229
/** /**
* @deprecated since 4.1 * @deprecated since 4.1
* use setCheckActionCollections so that KKeySequenceWidget knows * use setCheckActionCollections so that KKeySequenceWidget knows
* in which action collection to call the writeSettings method after st ealing * in which action collection to call the writeSettings method after st ealing
* a shortcut from an action. * a shortcut from an action.
*/ */
KDE_DEPRECATED void setCheckActionList(const QList<QAction*> &checkList ); KDE_DEPRECATED void setCheckActionList(const QList<QAction*> &checkList );
/** /**
* If the component using this widget supports shortcuts contexts, i t has * If the component using this widget supports shortcuts contexts, i t has
* to set the it's component name so we can check conflicts correctl y. * to set its component name so we can check conflicts correctly.
*/ */
void setComponentName(const QString &componentName); void setComponentName(const QString &componentName);
Q_SIGNALS: Q_SIGNALS:
/** /**
* This signal is emitted when the current key sequence has changed, be it by user * This signal is emitted when the current key sequence has changed, be it by user
* input or programmatically. * input or programmatically.
*/ */
void keySequenceChanged(const QKeySequence &seq); void keySequenceChanged(const QKeySequence &seq);
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 kratingwidget.h   kratingwidget.h 
skipping to change at line 185 skipping to change at line 185
* Set the pixap to be used to display a rating step. * Set the pixap to be used to display a rating step.
* By default the "rating" pixmap is loaded. * By default the "rating" pixmap is loaded.
* *
* \deprecated use setCustomPixmap * \deprecated use setCustomPixmap
*/ */
KDE_DEPRECATED void setPixmap( const QPixmap& ); KDE_DEPRECATED void setPixmap( const QPixmap& );
/** /**
* Set the recommended size of the pixmaps. This is * Set the recommended size of the pixmaps. This is
* only used for the sizeHint. The actual size is always * only used for the sizeHint. The actual size is always
* dependant on the size of the widget itself. * dependent on the size of the widget itself.
*/ */
void setPixmapSize( int size ); void setPixmapSize( int size );
protected: protected:
void mousePressEvent( QMouseEvent* e ); void mousePressEvent( QMouseEvent* e );
void mouseMoveEvent( QMouseEvent* e ); void mouseMoveEvent( QMouseEvent* e );
void leaveEvent( QEvent* e ); void leaveEvent( QEvent* e );
void paintEvent( QPaintEvent* e ); void paintEvent( QPaintEvent* e );
void resizeEvent( QResizeEvent* e ); void resizeEvent( QResizeEvent* e );
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 stub.h   stub.h 
skipping to change at line 55 skipping to change at line 55
void setUser(const QByteArray &user); void setUser(const QByteArray &user);
/** /**
* Set to "X only mode": Sycoca is not built and kdeinit is not launche d. * Set to "X only mode": Sycoca is not built and kdeinit is not launche d.
*/ */
void setXOnly(bool xonly); void setXOnly(bool xonly);
/** /**
* Set the priority of the process. The priority value must be between 0 * Set the priority of the process. The priority value must be between 0
* and 100, 0 being the lowest priority. This value is mapped to the * and 100, 0 being the lowest priority. This value is mapped to the
* scheduler and system dependant priority range of the OS. * scheduler and system dependent priority range of the OS.
*/ */
void setPriority(int prio); void setPriority(int prio);
/** /**
* Different schedulers. SchedNormal is the normal Unix timesharing * Different schedulers. SchedNormal is the normal Unix timesharing
* scheduler, while SchedRealtime is a POSIX.1b realtime scheduler. * scheduler, while SchedRealtime is a POSIX.1b realtime scheduler.
*/ */
enum Scheduler { SchedNormal, SchedRealtime }; enum Scheduler { SchedNormal, SchedRealtime };
/** /**
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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/