browserrun.h   browserrun.h 
skipping to change at line 71 skipping to change at line 71
virtual ~BrowserRun(); virtual ~BrowserRun();
KParts::OpenUrlArguments& arguments(); KParts::OpenUrlArguments& arguments();
KParts::BrowserArguments& browserArguments(); KParts::BrowserArguments& browserArguments();
KParts::ReadOnlyPart* part() const; KParts::ReadOnlyPart* part() const;
KUrl url() const; KUrl url() const;
bool hideErrorDialog() const; bool hideErrorDialog() const;
/** /**
* @return Suggested disposition by the server (e.g. HTTP content-di * @return Suggested disposition by the server (e.g. HTTP content-d
sposition) isposition)
*/ */
QString contentDisposition() const; QString contentDisposition() const;
bool serverSuggestsSave() const { return contentDisposition() == QS /**
tring::fromLatin1("attachment"); } * @return Wheter the returned disposition suggests saving or openi
ng inline
*/
bool serverSuggestsSave() const;
enum AskSaveResult { Save, Open, Cancel }; enum AskSaveResult { Save, Open, Cancel };
/** /**
* Ask the user whether to save or open a url in another applicatio n. * Ask the user whether to save or open a url in another applicatio n.
* @param url the URL in question * @param url the URL in question
* @param offer the application that will be used to open the URL * @param offer the application that will be used to open the URL
* @param mimeType the mimetype of the URL * @param mimeType the mimetype of the URL
* @param suggestedFileName optional file name suggested by the ser ver * @param suggestedFileName optional file name suggested by the ser ver
* @return Save, Open or Cancel. * @return Save, Open or Cancel.
* @deprecated use BrowserOpenOrSaveQuestion * @deprecated use BrowserOpenOrSaveQuestion
 End of changes. 2 change blocks. 
5 lines changed or deleted 8 lines changed or added


 extender.h   extender.h 
skipping to change at line 306 skipping to change at line 306
void itemDetached(Plasma::ExtenderItem *); void itemDetached(Plasma::ExtenderItem *);
/** /**
* Fires when an extender's preferred size changes. * Fires when an extender's preferred size changes.
*/ */
void geometryChanged(); void geometryChanged();
private: private:
ExtenderPrivate *const d; ExtenderPrivate *const d;
Q_PRIVATE_SLOT(d, void extenderItemDestroyed(QObject *object)) Q_PRIVATE_SLOT(d, void extenderItemDestroyed(ExtenderItem *item))
friend class ExtenderPrivate; friend class ExtenderPrivate;
friend class ExtenderGroup; friend class ExtenderGroup;
friend class ExtenderGroupPrivate; friend class ExtenderGroupPrivate;
friend class ExtenderItem; friend class ExtenderItem;
friend class ExtenderItemPrivate; friend class ExtenderItemPrivate;
//dialog needs access to the extender's applet location. //dialog needs access to the extender's applet location.
friend class DialogPrivate; friend class DialogPrivate;
//applet should be able to call saveState(); //applet should be able to call saveState();
friend class Applet; friend class Applet;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 extenderitem.h   extenderitem.h 
skipping to change at line 257 skipping to change at line 257
* Shows a close button in this item's drag handle. By default a cl ose button will not be * Shows a close button in this item's drag handle. By default a cl ose button will not be
* shown. * shown.
*/ */
void showCloseButton(); void showCloseButton();
/** /**
* Hides the close button in this item's drag handle. * Hides the close button in this item's drag handle.
*/ */
void hideCloseButton(); void hideCloseButton();
Q_SIGNALS:
/**
* Emitted when the extender item is destroyed
* @since 4.4.1
*/
void destroyed(ExtenderItem *item);
protected: protected:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *optio n, QWidget *widget); void paint(QPainter *painter, const QStyleOptionGraphicsItem *optio n, QWidget *widget);
void moveEvent(QGraphicsSceneMoveEvent *event); void moveEvent(QGraphicsSceneMoveEvent *event);
void resizeEvent(QGraphicsSceneResizeEvent *event); void resizeEvent(QGraphicsSceneResizeEvent *event);
void mousePressEvent(QGraphicsSceneMouseEvent *event); void mousePressEvent(QGraphicsSceneMouseEvent *event);
void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
void mouseMoveEvent(QGraphicsSceneMouseEvent *event); void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 End of changes. 1 change blocks. 
0 lines changed or deleted 7 lines changed or added


 filequery.h   filequery.h 
skipping to change at line 38 skipping to change at line 38
/** /**
* \class FileQuery filequery.h Nepomuk/Query/FileQuery * \class FileQuery filequery.h Nepomuk/Query/FileQuery
* *
* \brief A Nepomuk desktop query specialized for file searches. * \brief A Nepomuk desktop query specialized for file searches.
* *
* FileQuery is an extension to Query which adds some syntactic sug ar * FileQuery is an extension to Query which adds some syntactic sug ar
* for dealing with file queries. This includes a restriction of th e * for dealing with file queries. This includes a restriction of th e
* results to files and the possibility to restrict the search to * results to files and the possibility to restrict the search to
* specific folders via setIncludeFolders() and setExcludeFolders() . * specific folders via setIncludeFolders() and setExcludeFolders() .
* *
* \warning %FileQuery does only return files and folders as result
s.
*
* \author Sebastian Trueg <trueg@kde.org> * \author Sebastian Trueg <trueg@kde.org>
* *
* \since 4.4 * \since 4.4
*/ */
class NEPOMUKQUERY_EXPORT FileQuery : public Query class NEPOMUKQUERY_EXPORT FileQuery : public Query
{ {
public: public:
/** /**
* Create an empty invalid file query object. * Create an empty invalid file query object.
*/ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 kauthactionreply.h   kauthactionreply.h 
skipping to change at line 211 skipping to change at line 211
- An asynchronous call, by setting Action::setExecutesAsync(true) and call ing ::execute(), will start the helper and return immediately. - An asynchronous call, by setting Action::setExecutesAsync(true) and call ing ::execute(), will start the helper and return immediately.
The asynchronous call is the most flexible alternative, but you need a way to obtain the reply. This is done by connecting to a signal, but the Actio n class is not a QObject subclass. Instead, you connect The asynchronous call is the most flexible alternative, but you need a way to obtain the reply. This is done by connecting to a signal, but the Actio n class is not a QObject subclass. Instead, you connect
to signals exposed by the ActionWatcher class. For every action id you use , there is one ActionWatcher object. You can retrieve it using the Action:: watcher() method. If you execute an action using to signals exposed by the ActionWatcher class. For every action id you use , there is one ActionWatcher object. You can retrieve it using the Action:: watcher() method. If you execute an action using
Action::executeAsync(), you can connect to the actionPerformed(ActionReply ) signal to be notified when the action has been completed (or failed). As a parameter, you'll get a reply object containing Action::executeAsync(), you can connect to the actionPerformed(ActionReply ) signal to be notified when the action has been completed (or failed). As a parameter, you'll get a reply object containing
all the data you need. As a convenience, you can also pass an object and a slot to the executeAsync() method to directly connect them to the signal, if you don't want to mess with watchers. all the data you need. As a convenience, you can also pass an object and a slot to the executeAsync() method to directly connect them to the signal, if you don't want to mess with watchers.
The piece of code that calls the action of the previous example is located in example/mainwindow.cpp in the on_readAction_triggered() slot. It looks like this: The piece of code that calls the action of the previous example is located in example/mainwindow.cpp in the on_readAction_triggered() slot. It looks like this:
@code @code
Action readAction = "org.kde.auth.example.read"; Action readAction = "org.kde.auth.example.read";
readAction.setHelperID("org.kde.auth.example");
readAction.arguments()["filename"] = filename; readAction.arguments()["filename"] = filename;
ActionReply reply = readAction.execute(); ActionReply reply = readAction.execute();
if (reply.failed()) if (reply.failed())
QMessageBox::information(this, "Error", QString("KAuth returned an erro r code: %1").arg(reply.errorCode())); QMessageBox::information(this, "Error", QString("KAuth returned an erro r code: %1").arg(reply.errorCode()));
else else
contents = reply.data()["contents"].toString(); contents = reply.data()["contents"].toString();
@endcode @endcode
First of all, it creates the action object specifying the action id. Then it loads the filename (we want to read a forbidden file) into the arguments () QVariantMap, which will be directly passed to the First of all, it creates the action object specifying the action id. Then it loads the filename (we want to read a forbidden file) into the arguments () QVariantMap, which will be directly passed to the
helper in the read() slot's parameter. This example code uses a synchronou s call to execute the action and retrieve the reply. If the reply succeeded , the reply data is retrieved from the returned QVariantMap helper in the read() slot's parameter. This example code uses a synchronou s call to execute the action and retrieve the reply. If the reply succeeded , the reply data is retrieved from the returned QVariantMap
object. Please note that, although the execute() method will return only w hen the action is completed, the GUI will remain responsive because an inte rnal event loop is entered. This means you should be object. Please note that, although the execute() method will return only w hen the action is completed, the GUI will remain responsive because an inte rnal event loop is entered. This means you should be
prepared to receive other events in the meanwhile. prepared to receive other events in the meanwhile. Also, notice that you h
ave to set explicitely the helper ID to the action: this is done for an add
ed safety, to prevent the caller from accidentally invoking
an helper, and also because KAuth actions may be used without an helper at
tached (the default). In this case, action.execute() will return ActionSucc
ess if the authentication went well. This is quite useful
if you want your user to authenticate before doing something, which howeve
r needs no privileged permissions implementation-wise.
@section kauth_async Asynchronous calls, data reporting, and action termin ation @section kauth_async Asynchronous calls, data reporting, and action termin ation
For a more advanced example, we look at the action "org.kde.auth.example.l ongaction" in the example helper. This is an action that takes a long time to execute, so we need some features: For a more advanced example, we look at the action "org.kde.auth.example.l ongaction" in the example helper. This is an action that takes a long time to execute, so we need some features:
- The helper needs to regularly send data to the application, to inform ab out the execution status. - The helper needs to regularly send data to the application, to inform ab out the execution status.
- The application needs to be able to stop the action execution if the use r stops it or close the application. - The application needs to be able to stop the action execution if the use r stops it or close the application.
The example code follows: The example code follows:
@code @code
ActionReply MyHelper::longaction(QVariantMap args) ActionReply MyHelper::longaction(QVariantMap args)
{ {
 End of changes. 2 change blocks. 
1 lines changed or deleted 9 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.4.00 (KDE 4.4.0)" #define KDE_VERSION_STRING "4.4.1 (KDE 4.4.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 4 #define KDE_VERSION_MINOR 4
/** /**
* @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


 kdirwatch.h   kdirwatch.h 
skipping to change at line 219 skipping to change at line 219
* @return true if the directory is being watched * @return true if the directory is being watched
*/ */
bool contains( const QString& path ) const; bool contains( const QString& path ) const;
/** /**
* Dump statistic information about all KDirWatch instances. * Dump statistic information about all KDirWatch instances.
* This checks for consistency, too. * This checks for consistency, too.
*/ */
static void statistics(); static void statistics();
/**
* Emits created().
* @param path the path of the file or directory
*/
void setCreated( const QString &path );
/**
* Emits dirty().
* @param path the path of the file or directory
*/
void setDirty( const QString &path );
/**
* Emits deleted().
* @param path the path of the file or directory
*/
void setDeleted( const QString &path );
enum Method { FAM, INotify, DNotify, Stat }; enum Method { FAM, INotify, DNotify, Stat };
/** /**
* Returns the preferred internal method to * Returns the preferred internal method to
* watch for changes. * watch for changes.
*/ */
Method internalMethod(); Method internalMethod();
/** /**
* The KDirWatch instance usually globally used in an application. * The KDirWatch instance usually globally used in an application.
* It is automatically deleted when the application exits. * It is automatically deleted when the application exits.
skipping to change at line 262 skipping to change at line 246
* @return a KDirWatch instance * @return a KDirWatch instance
*/ */
static KDirWatch* self(); static KDirWatch* self();
/** /**
* Returns true if there is an instance of KDirWatch. * Returns true if there is an instance of KDirWatch.
* @return true if there is an instance of KDirWatch. * @return true if there is an instance of KDirWatch.
* @see KDirWatch::self() * @see KDirWatch::self()
*/ */
static bool exists(); static bool exists();
public Q_SLOTS:
/**
* Emits created().
* @param path the path of the file or directory
*/
void setCreated( const QString &path );
/**
* Emits dirty().
* @param path the path of the file or directory
*/
void setDirty( const QString &path );
/**
* Emits deleted().
* @param path the path of the file or directory
*/
void setDeleted( const QString &path );
Q_SIGNALS: Q_SIGNALS:
/** /**
* Emitted when a watched object is changed. * Emitted when a watched object is changed.
* For a directory this signal is emitted when files * For a directory this signal is emitted when files
* therein are created or deleted. * therein are created or deleted.
* For a file this signal is emitted when its size or attributes change. * For a file this signal is emitted when its size or attributes change.
* *
* When you watch a directory, changes in the size or attributes of * When you watch a directory, changes in the size or attributes of
* contained files may or may not trigger this signal to be emitted * contained files may or may not trigger this signal to be emitted
 End of changes. 2 change blocks. 
16 lines changed or deleted 20 lines changed or added


 krandomsequence.h   krandomsequence.h 
skipping to change at line 110 skipping to change at line 110
*/ */
bool getBool(); bool getBool();
/** /**
* Put a list in random order. * Put a list in random order.
* *
* @param list the list whose order will be modified * @param list the list whose order will be modified
* @note modifies the list in place * @note modifies the list in place
*/ */
template<typename T> void randomize(QList<T>& list) { template<typename T> void randomize(QList<T>& list) {
QList<T> l; if (!list.isEmpty()) {
QList<T> l;
l.append(list.takeFirst()); l.append(list.takeFirst());
while (list.count()) while (list.count())
l.insert(int(getLong(l.count()+1)), list.takeFirst()); l.insert(int(getLong(l.count()+1)), list.takeFirst());
list = l; list = l;
}
} }
/** /**
* Modulate the random sequence. * Modulate the random sequence.
* *
* If S(i) is the sequence of numbers that will follow * If S(i) is the sequence of numbers that will follow
* given the current state after calling modulate(i), * given the current state after calling modulate(i),
* then S(i) != S(j) for i != j and * then S(i) != S(j) for i != j and
* S(i) == S(j) for i == j. * S(i) == S(j) for i == j.
* *
 End of changes. 2 change blocks. 
5 lines changed or deleted 7 lines changed or added


 label.h   label.h 
skipping to change at line 49 skipping to change at line 49
*/ */
class PLASMA_EXPORT Label : public QGraphicsProxyWidget class PLASMA_EXPORT Label : public QGraphicsProxyWidget
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget) Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)
Q_PROPERTY(QString text READ text WRITE setText) Q_PROPERTY(QString text READ text WRITE setText)
Q_PROPERTY(QString image READ image WRITE setImage) Q_PROPERTY(QString image READ image WRITE setImage)
Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment) Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
Q_PROPERTY(bool hasScaledContents READ hasScaledContents WRITE setScale dContents) Q_PROPERTY(bool hasScaledContents READ hasScaledContents WRITE setScale dContents)
Q_PROPERTY(bool textSelectable READ textSelectable WRITE setTextSelecta ble)
Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet) Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
Q_PROPERTY(QLabel *nativeWidget READ nativeWidget) Q_PROPERTY(QLabel *nativeWidget READ nativeWidget)
public: public:
/** /**
* Constructs a label with word wrap on by default * Constructs a label with word wrap on by default
* *
* @arg parent the parent of this widget * @arg parent the parent of this widget
*/ */
explicit Label(QGraphicsWidget *parent = 0); explicit Label(QGraphicsWidget *parent = 0);
skipping to change at line 150 skipping to change at line 151
Q_SIGNALS: Q_SIGNALS:
void linkActivated(const QString &link); void linkActivated(const QString &link);
void linkHovered(const QString &link); void linkHovered(const QString &link);
public Q_SLOTS: public Q_SLOTS:
void dataUpdated(const QString &sourceName, const Plasma::DataEngine::D ata &data); void dataUpdated(const QString &sourceName, const Plasma::DataEngine::D ata &data);
protected: protected:
void resizeEvent(QGraphicsSceneResizeEvent *event); void resizeEvent(QGraphicsSceneResizeEvent *event);
void mousePressEvent(QGraphicsSceneMouseEvent *event); void mousePressEvent(QGraphicsSceneMouseEvent *event);
void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
void paint(QPainter *painter, void paint(QPainter *painter,
const QStyleOptionGraphicsItem *option, const QStyleOptionGraphicsItem *option,
QWidget *widget); QWidget *widget);
void changeEvent(QEvent *event); void changeEvent(QEvent *event);
bool event(QEvent *event); bool event(QEvent *event);
void contextMenuEvent(QGraphicsSceneContextMenuEvent *event); void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);
private: private:
Q_PRIVATE_SLOT(d, void setPalette()) Q_PRIVATE_SLOT(d, void setPalette())
Q_PRIVATE_SLOT(d, void setPixmap()) Q_PRIVATE_SLOT(d, void setPixmap())
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 webview.h   webview.h 
skipping to change at line 214 skipping to change at line 214
void contextMenuEvent(QGraphicsSceneContextMenuEvent *event); void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);
void wheelEvent(QGraphicsSceneWheelEvent *event); void wheelEvent(QGraphicsSceneWheelEvent *event);
void keyPressEvent(QKeyEvent * event); void keyPressEvent(QKeyEvent * event);
void keyReleaseEvent(QKeyEvent * event); void keyReleaseEvent(QKeyEvent * event);
void focusInEvent(QFocusEvent * event); void focusInEvent(QFocusEvent * event);
void focusOutEvent(QFocusEvent * event); void focusOutEvent(QFocusEvent * event);
void dragEnterEvent(QGraphicsSceneDragDropEvent * event); void dragEnterEvent(QGraphicsSceneDragDropEvent * event);
void dragLeaveEvent(QGraphicsSceneDragDropEvent * event); void dragLeaveEvent(QGraphicsSceneDragDropEvent * event);
void dragMoveEvent(QGraphicsSceneDragDropEvent * event); void dragMoveEvent(QGraphicsSceneDragDropEvent * event);
void dropEvent(QGraphicsSceneDragDropEvent * event); void dropEvent(QGraphicsSceneDragDropEvent * event);
QVariant itemChange(GraphicsItemChange change, const QVariant &valu e);
QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const ; QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const ;
private: private:
Q_PRIVATE_SLOT(d, void loadingFinished(bool success)) Q_PRIVATE_SLOT(d, void loadingFinished(bool success))
Q_PRIVATE_SLOT(d, void updateRequested(const QRect& dirtyRect)) Q_PRIVATE_SLOT(d, void updateRequested(const QRect& dirtyRect))
Q_PRIVATE_SLOT(d, void scrollRequested(int dx, int dy, const QRect &scrollRect)) Q_PRIVATE_SLOT(d, void scrollRequested(int dx, int dy, const QRect &scrollRect))
WebViewPrivate * const d; WebViewPrivate * const d;
friend class WebViewPrivate; friend class WebViewPrivate;
}; };
 End of changes. 1 change blocks. 
0 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/