button.h   button.h 
/* /*
Copyright 2006 Davide Bettio <davbet@aliceposta.it> Copyright 2006 Davide Bettio <davide.bettio@kdemail.net>
Copyright 2007 Kevin Ottens <ervin@kde.org> Copyright 2007 Kevin Ottens <ervin@kde.org>
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.
skipping to change at line 40 skipping to change at line 40
{ {
class ButtonPrivate; class ButtonPrivate;
class Device; class Device;
/** /**
* This device interface is available on button devices. * This device interface is available on button devices.
* *
* A button is a device, like power button or lid switch, that can be p ressed by user. * A button is a device, like power button or lid switch, that can be p ressed by user.
* Some buttons can have two states (Enabled/Disabled, On/Off ...), oth er buttons haven't state. * Some buttons can have two states (Enabled/Disabled, On/Off ...), oth er buttons haven't state.
* *
* @author Davide Bettio <davbet@aliceposta.it> * @author Davide Bettio <davide.bettio@kdemail.net>
*/ */
class SOLID_EXPORT Button : public DeviceInterface class SOLID_EXPORT Button : public DeviceInterface
{ {
Q_OBJECT Q_OBJECT
Q_ENUMS(ButtonType) Q_ENUMS(ButtonType)
Q_PROPERTY(ButtonType type READ type) Q_PROPERTY(ButtonType type READ type)
Q_PROPERTY(bool hasState READ hasState) Q_PROPERTY(bool hasState READ hasState)
Q_PROPERTY(bool stateValue READ stateValue) Q_PROPERTY(bool stateValue READ stateValue)
Q_DECLARE_PRIVATE(Button) Q_DECLARE_PRIVATE(Button)
friend class Device; friend class Device;
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 datacontainer.h   datacontainer.h 
skipping to change at line 248 skipping to change at line 248
/** /**
* Check if the DataContainer is still in use. * Check if the DataContainer is still in use.
* *
* If not the signal "becameUnused" will be emitted. * If not the signal "becameUnused" will be emitted.
* *
* Warning: The DataContainer may be invalid after calling this fun ction, because a listener * Warning: The DataContainer may be invalid after calling this fun ction, because a listener
* to becameUnused() may have deleted it. * to becameUnused() may have deleted it.
**/ **/
void checkUsage(); void checkUsage();
/**
* @reimp from QObject
*/
void timerEvent(QTimerEvent * event);
private: private:
friend class SignalRelay; friend class SignalRelay;
friend class DataContainerPrivate; friend class DataContainerPrivate;
friend class DataEngineManager; friend class DataEngineManager;
DataContainerPrivate *const d; DataContainerPrivate *const d;
Q_PRIVATE_SLOT(d, void storeJobFinished(KJob *job)) Q_PRIVATE_SLOT(d, void storeJobFinished(KJob *job))
Q_PRIVATE_SLOT(d, void populateFromStoredData(KJob *job)) Q_PRIVATE_SLOT(d, void populateFromStoredData(KJob *job))
Q_PRIVATE_SLOT(d, void store())
Q_PRIVATE_SLOT(d, void retrieve()) Q_PRIVATE_SLOT(d, void retrieve())
}; };
} // Plasma namespace } // Plasma namespace
#endif // multiple inclusion guard #endif // multiple inclusion guard
 End of changes. 2 change blocks. 
1 lines changed or deleted 5 lines changed or added


 kcolorbutton.h   kcolorbutton.h 
skipping to change at line 119 skipping to change at line 119
virtual void dropEvent( QDropEvent *); virtual void dropEvent( QDropEvent *);
virtual void mousePressEvent( QMouseEvent *e ); virtual void mousePressEvent( QMouseEvent *e );
virtual void mouseMoveEvent( QMouseEvent *e); virtual void mouseMoveEvent( QMouseEvent *e);
virtual void keyPressEvent( QKeyEvent *e ); virtual void keyPressEvent( QKeyEvent *e );
private: private:
class KColorButtonPrivate; class KColorButtonPrivate;
KColorButtonPrivate * const d; KColorButtonPrivate * const d;
Q_PRIVATE_SLOT( d, void _k_chooseColor() ) Q_PRIVATE_SLOT( d, void _k_chooseColor() )
Q_PRIVATE_SLOT( d, void _k_colorChosen() )
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 kde_terminal_interface.h   kde_terminal_interface.h 
skipping to change at line 94 skipping to change at line 94
class TerminalInterface class TerminalInterface
{ {
public: public:
virtual ~TerminalInterface(){} virtual ~TerminalInterface(){}
/** /**
* This starts @p program, with arguments @p args * This starts @p program, with arguments @p args
*/ */
virtual void startProgram( const QString& program, virtual void startProgram( const QString& program,
const QStringList& args ) = 0; const QStringList& args ) = 0;
/** /**
* If a shell is currently shown, this sends it a cd * If no shell is running, this starts a shell with the
* command. Otherwise, this starts a shell, and sends it a cd * @dir as the starting directory.
* command too... * If a shell is already running, nothing is done.
*/ */
virtual void showShellInDir( const QString& dir ) = 0; virtual void showShellInDir( const QString& dir ) = 0;
/** /**
* This sends @param text as input to the currently running * This sends @param text as input to the currently running
* program.. * program..
*/ */
virtual void sendInput( const QString& text ) = 0; virtual void sendInput( const QString& text ) = 0;
}; };
 End of changes. 1 change blocks. 
3 lines changed or deleted 3 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.3 (4.7.3)" #define KDE_VERSION_STRING "4.7.4 (4.7.4)"
/** /**
* @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 7
/** /**
* @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 3 #define KDE_VERSION_RELEASE 4
/** /**
* @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 253 skipping to change at line 253
*/ */
bool isWritable() const; bool isWritable() const;
/** /**
* Checks whether the file is hidden. * Checks whether the file is hidden.
* @return true if the file is hidden. * @return true if the file is hidden.
*/ */
bool isHidden() const; bool isHidden() const;
/** /**
* @return true if the file is a remote URL, or a local file on a netwo
rk mount.
* It will return false only for really-local file systems.
* @since 4.7.4
*/
bool isSlow() const;
/**
* Checks whether the file is a readable local .desktop file, * Checks whether the file is a readable local .desktop file,
* i.e. a file whose path can be given to KDesktopFile * i.e. a file whose path can be given to KDesktopFile
* @return true if the file is a desktop file. * @return true if the file is a desktop file.
* @since 4.1 * @since 4.1
*/ */
bool isDesktopFile() const; bool isDesktopFile() const;
/** /**
* Returns the link destination if isLink() == true. * Returns the link destination if isLink() == true.
* @return the link destination. QString() if the item is not a link * @return the link destination. QString() if the item is not a link
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added


 kservice.h   kservice.h 
skipping to change at line 94 skipping to change at line 94
/** /**
* @internal * @internal
* Construct a service from a stream. * Construct a service from a stream.
* The stream must already be positionned at the correct offset. * The stream must already be positionned at the correct offset.
*/ */
KService( QDataStream& str, int offset ); KService( QDataStream& str, int offset );
virtual ~KService(); virtual ~KService();
// TODO KDE5: add mimeTypes() accessor
/** /**
* Services are either applications (executables) or dlopened libraries (plugins). * Services are either applications (executables) or dlopened libraries (plugins).
* @return true if this service is an application, i.e. it has Type=App lication in its * @return true if this service is an application, i.e. it has Type=App lication in its
* .desktop file and exec() will not be empty. * .desktop file and exec() will not be empty.
*/ */
bool isApplication() const; bool isApplication() const;
/** /**
* Returns the type of the service. * Returns the type of the service.
* @return the type of the service ("Application" or "Service") * @return the type of the service ("Application" or "Service")
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 ktabwidget.h   ktabwidget.h 
skipping to change at line 327 skipping to change at line 327
/** /**
* The right mouse button was pressed over empty space besides tabbar. * The right mouse button was pressed over empty space besides tabbar.
*/ */
void contextMenu( const QPoint & ); void contextMenu( const QPoint & );
/** /**
* The right mouse button was pressed over a widget. * The right mouse button was pressed over a widget.
*/ */
void contextMenu( QWidget *, const QPoint & ); void contextMenu( QWidget *, const QPoint & );
#ifndef KDE_NO_DEPRECATED
/** /**
* A tab was moved from first to second index. This signal is only * A tab was moved from first to second index. This signal is only
* possible after you have called setTabReorderingEnabled( true ). * possible after you have called setTabReorderingEnabled( true ).
*/ */
void movedTab( int, int ); void movedTab( int, int );
#endif
/** /**
* A double left mouse button click was performed over empty space besi des tabbar. * A double left mouse button click was performed over empty space besi des tabbar.
* The signal is emitted on the second press of the mouse button, befor e the release. * The signal is emitted on the second press of the mouse button, befor e the release.
*/ */
void mouseDoubleClick(); void mouseDoubleClick();
/** /**
* A double left mouse button click was performed over the widget. * A double left mouse button click was performed over the widget.
* The signal is emitted on the second press of the mouse button, befor e the release. * The signal is emitted on the second press of the mouse button, befor e the release.
skipping to change at line 399 skipping to change at line 401
virtual void mouseDoubleClick( int ); virtual void mouseDoubleClick( int );
virtual void mouseMiddleClick( int ); virtual void mouseMiddleClick( int );
virtual void closeRequest( int ); virtual void closeRequest( int );
#ifndef QT_NO_WHEELEVENT #ifndef QT_NO_WHEELEVENT
virtual void wheelDelta( int ); virtual void wheelDelta( int );
#endif #endif
private: private:
class Private; class Private;
Private * const d; Private * const d;
Q_PRIVATE_SLOT(d, void slotTabMoved(int, int))
}; };
#endif #endif
 End of changes. 3 change blocks. 
0 lines changed or deleted 4 lines changed or added


 kwallet.h   kwallet.h 
skipping to change at line 30 skipping to change at line 30
#ifndef _KWALLET_H #ifndef _KWALLET_H
#define _KWALLET_H #define _KWALLET_H
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtGui/qwindowdefs.h> // krazy:exclude=includes (for WId) #include <QtGui/qwindowdefs.h> // krazy:exclude=includes (for WId)
#include <kdeui_export.h> #include <kdeui_export.h>
/**
* NOTE: KSecretsService folder semantics
* The KWallet API uses folders for organising items. KSecretsService does
not
* have this notion. But it uses attributes that can be applied arbitrarily
on
* all the items. The KWallet code that maps to KSecretsService applies an
special
* attribute KSS_ATTR_ENTRYFOLDER to all items with the currentFolder() val
ue.
* The KWallet folder API's calls will always succeed and they'll only chan
ge the
* current folder value. The folderList() call will scan all the collection
* items and collect the KSS_ATTR_ENTRYFOLDER attributes into a list.
*/
/**
* NOTE: KWalet API distinguish KSecretsService collection items by attachi
ng
* them some specific attributes, defined below
*/
#define KSS_ATTR_ENTRYFOLDER "kwallet.folderName"
#define KSS_ATTR_WALLETTYPE "kwallet.type"
class QDBusError; class QDBusError;
namespace KWallet { namespace KWallet {
/** /**
* KDE Wallet * KDE Wallet
* *
* This class implements a generic system-wide Wallet for KDE. This is the * This class implements a generic system-wide Wallet for KDE. This is the
* ONLY public interface. * ONLY public interface.
* *
skipping to change at line 430 skipping to change at line 448
* if your data is certainly not in the wallet. * if your data is certainly not in the wallet.
* @param wallet The wallet to look in. * @param wallet The wallet to look in.
* @param folder The folder to look in. * @param folder The folder to look in.
* @param key The key to look up. * @param key The key to look up.
* @return Returns true if the key does NOT exist in the * @return Returns true if the key does NOT exist in the
* wallet, or the folder or wallet does not exist. * wallet, or the folder or wallet does not exist.
*/ */
static bool keyDoesNotExist(const QString& wallet, const QSt ring& folder, static bool keyDoesNotExist(const QString& wallet, const QSt ring& folder,
const QString& key); const QString& key);
/**
* Determine if the KWallet API is using the KSecretsService infras
tructure
* This can ben changed in system settings
* @return Returns true if the KSecretsService infrastructure is ac
tive
*/
static bool isUsingKSecretsService();
Q_SIGNALS: Q_SIGNALS:
/** /**
* Emitted when this wallet is closed. * Emitted when this wallet is closed.
*/ */
void walletClosed(); void walletClosed();
/** /**
* Emitted when a folder in this wallet is updated. * Emitted when a folder in this wallet is updated.
* @param folder The folder that was updated. * @param folder The folder that was updated.
*/ */
skipping to change at line 504 skipping to change at line 529
* DBUS error slot. * DBUS error slot.
*/ */
void emitWalletAsyncOpenError(); void emitWalletAsyncOpenError();
/** /**
* @internal * @internal
* Emits wallet opening success. * Emits wallet opening success.
*/ */
void emitWalletOpened(); void emitWalletOpened();
/**
* @internal
* Receives status changed notifications from KSecretsService infra
structure
*/
void slotCollectionStatusChanged( int );
/**
* @internal
* Received delete notification from KSecretsService infrastructure
*/
void slotCollectionDeleted();
private: private:
class WalletPrivate; class WalletPrivate;
WalletPrivate* const d; WalletPrivate* const d;
Q_PRIVATE_SLOT(d, void walletServiceUnregistered()) Q_PRIVATE_SLOT(d, void walletServiceUnregistered())
protected: protected:
/** /**
* @internal * @internal
*/ */
virtual void virtual_hook(int id, void *data); virtual void virtual_hook(int id, void *data);
 End of changes. 3 change blocks. 
0 lines changed or deleted 45 lines changed or added


 portablemediaplayer.h   portablemediaplayer.h 
/* /*
Copyright 2006 Davide Bettio <davbet@aliceposta.it> Copyright 2006 Davide Bettio <davide.bettio@kdemail.net>
Copyright 2007 Kevin Ottens <ervin@kde.org> Copyright 2007 Kevin Ottens <ervin@kde.org>
Copyright 2007 Jeff Mitchell <kde-dev@emailgoeshere.com> Copyright 2007 Jeff Mitchell <kde-dev@emailgoeshere.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.
skipping to change at line 43 skipping to change at line 43
namespace Solid namespace Solid
{ {
class PortableMediaPlayerPrivate; class PortableMediaPlayerPrivate;
class Device; class Device;
/** /**
* This class implements Portable Media Player device interface and rep resents * This class implements Portable Media Player device interface and rep resents
* a portable media player attached to the system. * a portable media player attached to the system.
* A portable media player is a portable device able to play multimedia files. * A portable media player is a portable device able to play multimedia files.
* Some of them have even recording capabilities. * Some of them have even recording capabilities.
* @author Davide Bettio <davbet@aliceposta.it> * @author Davide Bettio <davide.bettio@kdemail.net>
*/ */
class SOLID_EXPORT PortableMediaPlayer : public DeviceInterface class SOLID_EXPORT PortableMediaPlayer : public DeviceInterface
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QStringList supportedProtocols READ supportedProtocols) Q_PROPERTY(QStringList supportedProtocols READ supportedProtocols)
Q_PROPERTY(QStringList supportedDrivers READ supportedDrivers) Q_PROPERTY(QStringList supportedDrivers READ supportedDrivers)
Q_DECLARE_PRIVATE(PortableMediaPlayer) Q_DECLARE_PRIVATE(PortableMediaPlayer)
friend class Device; friend class Device;
public: public:
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 renamedialog.h   renamedialog.h 
skipping to change at line 140 skipping to change at line 140
void suggestNewNamePressed(); void suggestNewNamePressed();
protected Q_SLOTS: protected Q_SLOTS:
void enableRenameButton(const QString &); void enableRenameButton(const QString &);
private Q_SLOTS: private Q_SLOTS:
void applyAllPressed(); void applyAllPressed();
void showSrcIcon(const KFileItem &); void showSrcIcon(const KFileItem &);
void showDestIcon(const KFileItem &); void showDestIcon(const KFileItem &);
void showSrcPreview(const KFileItem &, const QPixmap &); void showSrcPreview(const KFileItem &, const QPixmap &);
void showDestPreview(const KFileItem &, const QPixmap &); void showDestPreview(const KFileItem &, const QPixmap &);
void resizePanels();
private: private:
QScrollArea* createContainerLayout(QWidget* parent, const KFileItem& it em, QLabel* preview); QScrollArea* createContainerLayout(QWidget* parent, const KFileItem& it em, QLabel* preview);
QLabel* createLabel(QWidget* parent, const QString& text, const bool co ntainerTitle); QLabel* createLabel(QWidget* parent, const QString& text, const bool co ntainerTitle);
KSqueezedTextLabel* createSqueezedLabel(QWidget* parent, const QString& text); KSqueezedTextLabel* createSqueezedLabel(QWidget* parent, const QString& text);
class RenameDialogPrivate; class RenameDialogPrivate;
RenameDialogPrivate* const d; RenameDialogPrivate* const d;
}; };
} }
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 wallpaper.h   wallpaper.h 
skipping to change at line 488 skipping to change at line 488
* ResizeMethod * ResizeMethod
* @param color the color to use to pad the rendered image if it do esn't take up the * @param color the color to use to pad the rendered image if it do esn't take up the
* entire size with the given ResizeMethod * entire size with the given ResizeMethod
* @since 4.3 * @since 4.3
*/ */
void render(const QString &sourceImagePath, const QSize &size, void render(const QString &sourceImagePath, const QSize &size,
Wallpaper::ResizeMethod resizeMethod = ScaledResize, Wallpaper::ResizeMethod resizeMethod = ScaledResize,
const QColor &color = QColor(0, 0, 0)); const QColor &color = QColor(0, 0, 0));
/** /**
* Renders the wallpaper asyncronously with the given parameters. W
hen the rendering is
* complete, the renderCompleted signal is emitted.
*
* @param image the raw QImage
* @param size the size to render the image as
* @param resizeMethod the method to use when resizing the image to
fit size, @see
* ResizeMethod
* @param color the color to use to pad the rendered image if it do
esn't take up the
* entire size with the given ResizeMethod
* @since 4.7.4
*/
void render(const QImage &image, const QSize &size,
Wallpaper::ResizeMethod resizeMethod = ScaledResize,
const QColor &color = QColor(0, 0, 0));
/**
* Sets whether or not to cache on disk the results of calls to ren der. If the wallpaper * Sets whether or not to cache on disk the results of calls to ren der. If the wallpaper
* changes often or is innexpensive to render, then it's probably b est not to cache them. * changes often or is innexpensive to render, then it's probably b est not to cache them.
* *
* The default is not to cache. * The default is not to cache.
* *
* @see render * @see render
* @param useCache true to cache rendered papers on disk, false not to cache * @param useCache true to cache rendered papers on disk, false not to cache
* @since 4.3 * @since 4.3
*/ */
void setUsingRenderingCache(bool useCache); void setUsingRenderingCache(bool useCache);
 End of changes. 1 change blocks. 
0 lines changed or deleted 19 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/