accessmanager.h   accessmanager.h 
skipping to change at line 27 skipping to change at line 27
* along with this library; see the file COPYING.LIB. If not, write to * along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
* *
*/ */
#ifndef KIO_ACCESSMANAGER_H #ifndef KIO_ACCESSMANAGER_H
#define KIO_ACCESSMANAGER_H #define KIO_ACCESSMANAGER_H
#include <QtNetwork/QNetworkAccessManager> #include <QtNetwork/QNetworkAccessManager>
#include <QtNetwork/QNetworkRequest>
#include <kio/global.h> #include <kio/global.h>
/** /**
* KDE implementation of QNetworkAccessManager. Use this class instead of Q NetworkAccessManager * KDE implementation of QNetworkAccessManager. Use this class instead of Q NetworkAccessManager
* for any KDE application since it uses KIO for network operations. * for any KDE application since it uses KIO for network operations.
* Please note that this class is not though as replacement for KIO API! Ju st use if in places where * Please note that this class is not though as replacement for KIO API! Ju st use if in places where
* it is required, such as network binding with Qt classes (one example is QtWebKit); i.e. API * it is required, such as network binding with Qt classes (one example is QtWebKit); i.e. API
* requires a QNetworkAccessManager. * requires a QNetworkAccessManager.
* @since 4.3 * @since 4.3
*/ */
namespace KIO { namespace KIO {
class KIO_EXPORT AccessManager : public QNetworkAccessManager class KIO_EXPORT AccessManager : public QNetworkAccessManager
{ {
Q_OBJECT Q_OBJECT
public: public:
/*!
Extensions to QNetworkRequest::Attribute enums.
@since 4.3.2
*/
enum Attribute {
MetaData = QNetworkRequest::User, /** < Used to send KIO MetaData b
ack and forth. type: QVariant::Map. */
KioError /**< Used to send KIO error codes that cannot be mapped in
to QNetworkReply::NetworkError. type: QVariant::Int */
};
AccessManager(QObject *parent); AccessManager(QObject *parent);
virtual ~AccessManager(); virtual ~AccessManager();
/** /**
* Set @p allowed to false if you don't want any external content to be fetched, * Set @p allowed to false if you don't want any external content to be fetched,
* by default external content is allowed * by default external content is allowed
*/ */
void setExternalContentAllowed(bool allowed); void setExternalContentAllowed(bool allowed);
/** /**
* returns if external content will be fetched, see setExternalContentA llowed(). * returns if external content will be fetched, see setExternalContentA llowed().
 End of changes. 2 change blocks. 
0 lines changed or deleted 12 lines changed or added


 checkbox.h   checkbox.h 
skipping to change at line 115 skipping to change at line 115
bool isChecked() const; bool isChecked() const;
Q_SIGNALS: Q_SIGNALS:
void toggled(bool); void toggled(bool);
protected: protected:
void resizeEvent(QGraphicsSceneResizeEvent *event); void resizeEvent(QGraphicsSceneResizeEvent *event);
private: private:
Q_PRIVATE_SLOT(d, void setPalette()) Q_PRIVATE_SLOT(d, void setPalette())
Q_PRIVATE_SLOT(d, void setPixmap())
CheckBoxPrivate * const d; CheckBoxPrivate * const d;
}; };
} // namespace Plasma } // namespace Plasma
#endif // multiple inclusion guard #endif // multiple inclusion guard
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 job.h   job.h 
skipping to change at line 50 skipping to change at line 50
* @param permissions The permissions to set after creating the * @param permissions The permissions to set after creating the
* directory (unix-style), -1 for default permission s. * directory (unix-style), -1 for default permission s.
* @return A pointer to the job handling the operation. * @return A pointer to the job handling the operation.
*/ */
KIO_EXPORT SimpleJob * mkdir( const KUrl& url, int permissions = -1 ); KIO_EXPORT SimpleJob * mkdir( const KUrl& url, int permissions = -1 );
/** /**
* Removes a single directory. * Removes a single directory.
* *
* The directory is assumed to be empty. * The directory is assumed to be empty.
* * The job will fail if the directory is not empty.
* * Use KIO::del() (DeleteJob) to delete non-empty directories.
* *
* @param url The URL of the directory to remove. * @param url The URL of the directory to remove.
* @return A pointer to the job handling the operation. * @return A pointer to the job handling the operation.
*/ */
KIO_EXPORT SimpleJob * rmdir( const KUrl& url ); KIO_EXPORT SimpleJob * rmdir( const KUrl& url );
/** /**
* Changes permissions on a file or directory. * Changes permissions on a file or directory.
* See the other chmod in chmodjob.h for changing many files * See the other chmod in chmodjob.h for changing many files
* or directories. * or directories.
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 kbookmark.h   kbookmark.h 
skipping to change at line 76 skipping to change at line 76
*/ */
static QStringList mimeDataTypes(); static QStringList mimeDataTypes();
/** /**
* Extract a list of bookmarks from the contents of @p mimeData. * Extract a list of bookmarks from the contents of @p mimeData.
* Decoding will fail if @p mimeData does not contain any bookmarks . * Decoding will fail if @p mimeData does not contain any bookmarks .
* @param mimeData the mime data to extract from; cannot be 0 * @param mimeData the mime data to extract from; cannot be 0
* @return the list of bookmarks * @return the list of bookmarks
* @note those bookmarks are valid QDomElements, but their parent Q DomDocument * @note those bookmarks are valid QDomElements, but their parent Q DomDocument
* is already deleted, do not use ownerDocument() * is already deleted, do not use ownerDocument()
* @deprecated use fromMimeData(mimeData, doc), to avoid crashes
*/ */
static KBookmark::List fromMimeData( const QMimeData *mimeData ); static KDE_DEPRECATED KBookmark::List fromMimeData( const QMimeData
*mimeData );
/**
* Extract a list of bookmarks from the contents of @p mimeData.
* Decoding will fail if @p mimeData does not contain any bookmarks
.
* @param mimeData the mime data to extract from; cannot be 0
* @param parentDocument pass an empty QDomDocument here, it will b
e used as
* container for the bookmarks. You just need to make sure it stays
alive longer
* (or just as long) as the returned bookmarks.
* @return the list of bookmarks
* @since 4.3.2
*/
static KBookmark::List fromMimeData( const QMimeData *mimeData, QDo
mDocument& parentDocument );
}; };
/** /**
* Constructs a null bookmark, i.e. a bookmark for which isNull() retur ns true * Constructs a null bookmark, i.e. a bookmark for which isNull() retur ns true
* If you want to create a new bookmark use eitehr KBookmarkGroup.addBo okmark * If you want to create a new bookmark use eitehr KBookmarkGroup.addBo okmark
* or if you want an interactive dialog use KBookmarkDialog. * or if you want an interactive dialog use KBookmarkDialog.
*/ */
KBookmark( ); KBookmark( );
/** /**
 End of changes. 2 change blocks. 
1 lines changed or deleted 19 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.1 (KDE 4.3.1)" #define KDE_VERSION_STRING "4.3.4 (KDE 4.3.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 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 1 #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


 kglobalsettings.h   kglobalsettings.h 
skipping to change at line 525 skipping to change at line 525
*/ */
static void emitChange(ChangeType changeType, int arg = 0); static void emitChange(ChangeType changeType, int arg = 0);
/** /**
* Return the KGlobalSettings singleton. * Return the KGlobalSettings singleton.
* This is used to connect to its signals, to be notified of changes. * This is used to connect to its signals, to be notified of changes.
*/ */
static KGlobalSettings* self(); static KGlobalSettings* self();
/** /**
* Makes all globally applicable settings take effect
* and starts listening for changes to these settings.
*
* This is usually called only by the KApplication constructor.
*
* @since 4.3.3
*/
void activate();
/**
* 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 CUTS }; SETTINGS_POPUPMENU, SETTINGS_QT, SETTINGS_SHORT CUTS };
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
 End of changes. 1 change blocks. 
0 lines changed or deleted 10 lines changed or added


 kmainwindow.h   kmainwindow.h 
skipping to change at line 93 skipping to change at line 93
* KMainWindow will set icon, mini icon and caption, which it gets * KMainWindow will set icon, mini icon and caption, which it gets
* from KApplication. It provides full session management, and * from KApplication. It provides full session management, and
* will save its position, geometry and positions of toolbars and * will save its position, geometry and positions of toolbars and
* menubar on logout. If you want to save additional data, reimplement * menubar on logout. If you want to save additional data, reimplement
* saveProperties() and (to read them again on next login) * saveProperties() and (to read them again on next login)
* readProperties(). To save special data about your data, reimplement * readProperties(). To save special data about your data, reimplement
* saveGlobalProperties(). To warn user that application or * saveGlobalProperties(). To warn user that application or
* windows have unsaved data on close or logout, reimplement * windows have unsaved data on close or logout, reimplement
* queryClose() and/or queryExit(). * queryClose() and/or queryExit().
* *
* You have to implement session restoring also in your main() function.
* There are also kRestoreMainWindows convenience functions which * There are also kRestoreMainWindows convenience functions which
* can restore all your windows on next login. * can do this for you and restore all your windows on next login.
* *
* Note that KMainWindow uses KGlobal::ref() and KGlobal::deref() so that c losing * Note that KMainWindow uses KGlobal::ref() and KGlobal::deref() so that c losing
* the last mainwindow will quit the application unless there is still some thing * the last mainwindow will quit the application unless there is still some thing
* that holds a ref in KGlobal - like a KIO job, or a systray icon. * that holds a ref in KGlobal - like a KIO job, or a systray icon.
* *
* @see KApplication * @see KApplication
* @author Reginald Stadlbauer (reggie@kde.org) Stephan Kulow (coolo@kde.or g), Matthias Ettrich (ettrich@kde.org), Chris Schlaeger (cs@kde.org), Sven Radej (radej@kde.org). Maintained by David Faure (faure@kde.org) * @author Reginald Stadlbauer (reggie@kde.org) Stephan Kulow (coolo@kde.or g), Matthias Ettrich (ettrich@kde.org), Chris Schlaeger (cs@kde.org), Sven Radej (radej@kde.org). Maintained by David Faure (faure@kde.org)
*/ */
class KDEUI_EXPORT KMainWindow : public QMainWindow class KDEUI_EXPORT KMainWindow : public QMainWindow
skipping to change at line 210 skipping to change at line 211
* \endcode * \endcode
* *
* @param showWhatsThis Set this to @p false if you do not want to incl ude * @param showWhatsThis Set this to @p false if you do not want to incl ude
* the "What's This" menu entry. * the "What's This" menu entry.
* *
* @return A standard help menu. * @return A standard help menu.
*/ */
KMenu* customHelpMenu( bool showWhatsThis = true ); KMenu* customHelpMenu( bool showWhatsThis = true );
/** /**
* <b>Session Management</b> * If the session did contain so high a number, @p true is returned,
* else @p false.
* @see restore()
**/
static bool canBeRestored( int number );
/**
* Returns the className() of the @p number of the toplevel window whic
h
* should be restored.
* *
* Try to restore the toplevel widget as defined by the number (1..X). * This is only useful if your application uses
* different kinds of toplevel windows.
*/
static const QString classNameOfToplevel( int number );
/**
* Try to restore the toplevel widget as defined by @p number (1..X).
*
* You should call canBeRestored() first.
* *
* If the session did not contain so high a number, the configuration * If the session did not contain so high a number, the configuration
* is not changed and @p false returned. * is not changed and @p false returned.
* *
* That means clients could simply do the following: * That means clients could simply do the following:
* \code * \code
* if (qApp->isSessionRestored()){ * if (qApp->isSessionRestored()){
* int n = 1; * int n = 1;
* while (KMainWindow::canBeRestored(n)){ * while (KMainWindow::canBeRestored(n)){
* (new childMW)->restore(n); * (new childMW)->restore(n);
* n++; * n++;
* } * }
* } else { * } else {
* // create default application as usual * // create default application as usual
* } * }
* \endcode * \endcode
* Note that QWidget::show() is called implicitly in restore. * Note that if @p show is true (default), QWidget::show() is called
* implicitly in restore.
* *
* With this you can easily restore all toplevel windows of your * With this you can easily restore all toplevel windows of your
* application. * application.
* *
* If your application uses different kinds of toplevel * If your application uses different kinds of toplevel
* windows, then you can use KMainWindow::classNameOfToplevel(n) * windows, then you can use KMainWindow::classNameOfToplevel(n)
* to determine the exact type before calling the childMW * to determine the exact type before calling the childMW
* constructor in the example from above. * constructor in the example from above.
* *
* If your client has only one kind of toplevel widgets (which * <i>Note that you don't need to deal with this function. Use the
* should be pretty usual) then you should use the RESTORE-macro * kRestoreMainWindows() convenience template function instead!</i>
* for backwards compatibility with 3.1 and 3.0 branches: * @see kRestoreMainWindows()
* * @see #RESTORE
* \code * @see readProperties()
* if (qApp->isSessionRestored()) * @see canBeRestored()
* RESTORE(childMW)
* else {
* // create default application as usual
* }
* \endcode
*
* The macro expands to the term above but is easier to use and
* less code to write.
*
* For new code or if you have more than one kind of toplevel
* widget (each derived from KMainWindow, of course), you can
* use the templated kRestoreMainWindows global functions:
*
* \code
* if (qApp->isSessionRestored())
* kRestoreMainWindows< childMW1, childMW2, childMW3 >();
* else {
* // create default application as usual
* }
* \endcode
*
* Currently, these functions are provided for up to three
* template arguments. If you need more, tell us. To help you in
* deciding whether or not you can use kRestoreMainWindows, a
* define KDE_RESTORE_MAIN_WINDOWS_NUM_TEMPLATE_ARGS is provided.
*
* @see restore()
* @see classNameOfToplevel()
*
**/
static bool canBeRestored( int number );
/**
* Returns the className() of the @p number of the toplevel window whic
h
* should be restored.
*
* This is only useful if your application uses
* different kinds of toplevel windows.
*/
static const QString classNameOfToplevel( int number );
/**
* Restore the session specified by @p number.
*
* Returns @p false if this
* fails, otherwise returns @p true and shows the window.
* You should call canBeRestored() first.
* If @p show is true (default), this widget will be shown automaticall
y.
*/ */
bool restore( int number, bool show = true ); bool restore( int number, bool show = true );
/** /**
* Returns true, if there is a menubar * Returns true, if there is a menubar
*/ */
bool hasMenuBar(); bool hasMenuBar();
/** /**
* Returns a pointer to the menu bar. * Returns a pointer to the menu bar.
skipping to change at line 617 skipping to change at line 587
* Please reimplement these function in childclasses. * Please reimplement these function in childclasses.
* *
* Note: No user interaction is allowed * Note: No user interaction is allowed
* in this function! * in this function!
* *
*/ */
virtual void saveProperties( KConfigGroup & ) {} virtual void saveProperties( KConfigGroup & ) {}
/** /**
* Read your instance-specific properties. * Read your instance-specific properties.
*
* Is called indirectly by restore().
*/ */
virtual void readProperties( const KConfigGroup & ) {} virtual void readProperties( const KConfigGroup & ) {}
/** /**
* Save your application-wide properties. The function is * Save your application-wide properties. The function is
* invoked when the session manager requests your application * invoked when the session manager requests your application
* to save its state. * to save its state.
* *
* This function is similar to saveProperties() but is only called for * This function is similar to saveProperties() but is only called for
* the very first main window, regardless how many main window are open . * the very first main window, regardless how many main window are open .
skipping to change at line 724 skipping to change at line 696
protected: protected:
KMainWindow(KMainWindowPrivate &dd, QWidget *parent, Qt::WFlags f); KMainWindow(KMainWindowPrivate &dd, QWidget *parent, Qt::WFlags f);
KMainWindowPrivate * const k_ptr; KMainWindowPrivate * const k_ptr;
private: private:
Q_PRIVATE_SLOT(k_func(), void _k_shuttingDown()) Q_PRIVATE_SLOT(k_func(), void _k_shuttingDown())
Q_PRIVATE_SLOT(k_func(), void _k_slotSettingsChanged(int)) Q_PRIVATE_SLOT(k_func(), void _k_slotSettingsChanged(int))
Q_PRIVATE_SLOT(k_func(), void _k_slotSaveAutoSaveSize()) Q_PRIVATE_SLOT(k_func(), void _k_slotSaveAutoSaveSize())
}; };
/**
* Restores the last session. (To be used in your main function).
*
* If your client has only one kind of toplevel widgets (which
* should be pretty usual) then you can use this macro,
* which is provided for backwards compatibility with 3.1 and 3.0
* branches:
*
* \code
* if (qApp->isSessionRestored())
* RESTORE(childMW)
* else {
* // create default application as usual
* }
* \endcode
*
* The macro expects the type of your toplevel widget as argument.
*
* Since KDE4, you can also use kRestoreMainWindows(), which
* supports also clients with more than one kind of toplevel
* widgets.
*
* @see KMainWindow::restore()
* @see kRestoreMainWindows()
**/
#define RESTORE(type) { int n = 1;\ #define RESTORE(type) { int n = 1;\
while (KMainWindow::canBeRestored(n)){\ while (KMainWindow::canBeRestored(n)){\
(new type)->restore(n);\ (new type)->restore(n);\
n++;}} n++;}}
/**
* Returns the maximal number of arguments that are actually
* supported by kRestoreMainWindows().
**/
#define KDE_RESTORE_MAIN_WINDOWS_NUM_TEMPLATE_ARGS 3 #define KDE_RESTORE_MAIN_WINDOWS_NUM_TEMPLATE_ARGS 3
/** /**
* These global convenience functions (that come with a varying * Restores the last session. (To be used in your main function).
* number of template arguments) are a replacement for the RESTORE *
* macro provided in earlier versions of KDE. The old RESTORE macro * These functions work also if you have more than one kind of toplevel
* is still provided for backwards compatibility. See * widget (each derived from KMainWindow, of course).
* KMainWindow documentation for more. *
* Imagine you have three kinds of toplevel widgets: the classes childMW1,
* childMW2 and childMW3. Than you can just do:
*
* \code
* if (qApp->isSessionRestored())
* kRestoreMainWindows< childMW1, childMW2, childMW3 >();
* else {
* // create default application as usual
* }
* \endcode
*
* kRestoreMainWindows<>() will create (on the heap) as many instances
* of your main windows as have existed in the last session and
* call KMainWindow::restore() with the correct arguments. Note that
* also QWidget::show() is called implicitly.
*
* Currently, these functions are provided for up to three
* template arguments. If you need more, tell us. To help you in
* deciding whether or not you can use kRestoreMainWindows, a
* define #KDE_RESTORE_MAIN_WINDOWS_NUM_TEMPLATE_ARGS is provided.
*
* These global convenience functions (that come with a varying
* number of template arguments) are a replacement for the #RESTORE
* macro provided in earlier versions of KDE. The old #RESTORE macro
* is still provided for backwards compatibility.
*
* @see KMainWindow::restore()
* @see #RESTORE
* @see KMainWindow::classNameOfToplevel()
**/ **/
template <typename T> template <typename T>
inline void kRestoreMainWindows() { inline void kRestoreMainWindows() {
for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) { for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) {
const QString className = KMainWindow::classNameOfToplevel( n ); const QString className = KMainWindow::classNameOfToplevel( n );
if ( className == QLatin1String( T::staticMetaObject.className() ) ) if ( className == QLatin1String( T::staticMetaObject.className() ) )
(new T)->restore( n ); (new T)->restore( n );
} }
} }
 End of changes. 10 change blocks. 
65 lines changed or deleted 94 lines changed or added


 kptyprocess.h   kptyprocess.h 
skipping to change at line 133 skipping to change at line 133
* @return the PTY device * @return the PTY device
*/ */
KPtyDevice *pty() const; KPtyDevice *pty() const;
protected: protected:
/** /**
* @reimp * @reimp
*/ */
virtual void setupChildProcess(); virtual void setupChildProcess();
private:
Q_PRIVATE_SLOT(d_func(), void _k_onStateChanged(QProcess::ProcessState)
)
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS(KPtyProcess::PtyChannels) Q_DECLARE_OPERATORS_FOR_FLAGS(KPtyProcess::PtyChannels)
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 ktabwidget.h   ktabwidget.h 
skipping to change at line 324 skipping to change at line 324
/** /**
* The close button of a widget's tab was clicked. This signal is * The close button of a widget's tab was clicked. This signal is
* only possible after you have called setCloseButtonEnabled( true ). * only possible after you have called setCloseButtonEnabled( true ).
*/ */
void closeRequest( QWidget * ); void closeRequest( QWidget * );
protected: protected:
virtual void mouseDoubleClickEvent( QMouseEvent* ); virtual void mouseDoubleClickEvent( QMouseEvent* );
virtual void mousePressEvent( QMouseEvent* ); virtual void mousePressEvent( QMouseEvent* );
virtual void mouseReleaseEvent( QMouseEvent* );
virtual void dragEnterEvent( QDragEnterEvent* ); virtual void dragEnterEvent( QDragEnterEvent* );
virtual void dragMoveEvent( QDragMoveEvent* ); virtual void dragMoveEvent( QDragMoveEvent* );
virtual void dropEvent( QDropEvent* ); virtual void dropEvent( QDropEvent* );
int tabBarWidthForMaxChars( int ); int tabBarWidthForMaxChars( int );
#ifndef QT_NO_WHEELEVENT #ifndef QT_NO_WHEELEVENT
virtual void wheelEvent( QWheelEvent* ); virtual void wheelEvent( QWheelEvent* );
#endif #endif
virtual void resizeEvent( QResizeEvent* ); virtual void resizeEvent( QResizeEvent* );
virtual void tabInserted( int ); virtual void tabInserted( int );
virtual void tabRemoved ( int ); virtual void tabRemoved ( int );
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 label.h   label.h 
skipping to change at line 138 skipping to change at line 138
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);
private: private:
Q_PRIVATE_SLOT(d, void setPalette()) Q_PRIVATE_SLOT(d, void setPalette())
Q_PRIVATE_SLOT(d, void setPixmap())
LabelPrivate * const d; LabelPrivate * const d;
}; };
} // namespace Plasma } // namespace Plasma
#endif // multiple inclusion guard #endif // multiple inclusion guard
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 netwm_def.h   netwm_def.h 
skipping to change at line 590 skipping to change at line 590
@li WMMoveResize @li WMMoveResize
Client window properties and protocols: Client window properties and protocols:
@li WMName @li WMName
@li WMVisibleName @li WMVisibleName
@li WMDesktop @li WMDesktop
@li WMWindowType @li WMWindowType
@li WMState @li WMState
@li WMStrut (obsoleted by WM2ExtendedStrut) @li WMStrut (obsoleted by WM2ExtendedStrut)
@li WMGeometry
@li WMFrameExtents
@li WMIconGeometry @li WMIconGeometry
@li WMIcon @li WMIcon
@li WMPid
@li WMVisibleIconName
@li WMIconName @li WMIconName
@li WMVisibleIconName
@li WMHandledIcons
@li WMPid
@li WMPing
ICCCM properties (provided for convenience): ICCCM properties (provided for convenience):
@li XAWMState @li XAWMState
**/ **/
enum Property { enum Property {
// root // root
Supported = 1<<0, Supported = 1<<0,
 End of changes. 3 change blocks. 
2 lines changed or deleted 6 lines changed or added


 pushbutton.h   pushbutton.h 
skipping to change at line 162 skipping to change at line 162
protected: protected:
void paint(QPainter *painter, void paint(QPainter *painter,
const QStyleOptionGraphicsItem *option, const QStyleOptionGraphicsItem *option,
QWidget *widget = 0); QWidget *widget = 0);
void resizeEvent(QGraphicsSceneResizeEvent *event); void resizeEvent(QGraphicsSceneResizeEvent *event);
void hoverEnterEvent(QGraphicsSceneHoverEvent *event); void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
private: private:
PushButtonPrivate *const d;
friend class PushButtonPrivate;
Q_PRIVATE_SLOT(d, void syncBorders()) Q_PRIVATE_SLOT(d, void syncBorders())
Q_PRIVATE_SLOT(d, void animationUpdate(qreal progress)) Q_PRIVATE_SLOT(d, void animationUpdate(qreal progress))
Q_PRIVATE_SLOT(d, void setPixmap())
friend class PushButtonPrivate;
PushButtonPrivate *const d;
}; };
} // namespace Plasma } // namespace Plasma
#endif // multiple inclusion guard #endif // multiple inclusion guard
 End of changes. 2 change blocks. 
3 lines changed or deleted 4 lines changed or added


 radiobutton.h   radiobutton.h 
skipping to change at line 114 skipping to change at line 114
*/ */
bool isChecked() const; bool isChecked() const;
Q_SIGNALS: Q_SIGNALS:
void toggled(bool); void toggled(bool);
protected: protected:
void resizeEvent(QGraphicsSceneResizeEvent *event); void resizeEvent(QGraphicsSceneResizeEvent *event);
private: private:
Q_PRIVATE_SLOT(d, void setPixmap())
RadioButtonPrivate * const d; RadioButtonPrivate * const d;
}; };
} // namespace Plasma } // namespace Plasma
#endif // multiple inclusion guard #endif // multiple inclusion guard
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 resource.h   resource.h 
skipping to change at line 103 skipping to change at line 103
* Copy constructor * Copy constructor
*/ */
Resource( const Resource& ); Resource( const Resource& );
/** /**
* Creates a new Resource object. * Creates a new Resource object.
* *
* The actual resource data is loaded on demand. Thus, it is possib le to work * The actual resource data is loaded on demand. Thus, it is possib le to work
* with Resources as if they were in memory all the time. * with Resources as if they were in memory all the time.
* *
* \param uriOrIdentifier The unique URI or an arbitrary identifier * \param pathOrIdentifier The path to a file or an arbitrary ident
of the resource. ifier of the resource.
* If it exists as a resource URI in the RDF * The following cases are handled:
store it is used to load the * \li A local file path is converted to a local file URL
* related properties. If not the passed str * \li A URI which already exist in Nepomuk results in loading of t
ing is treated hat particular resource.
* as an identifier. * \li A string which already exists as the nao:identifier of a res
* If a resource exists in the store which h ource results in loading
as this identifier * of that particular resource.
* set this resource's properties are loaded * \li A URI which does not exist yet is used to create a new resou
. Otherwise the rce (Caution: due to
* resource is created in the store * encoding weirdness using KUrl::url or QUrl::toString here might
* with a new random URI which can be access result in unwanted
ed through \a uri * behaviour. It is recommended to always use the Resource(QUrl,QUr
* after the resource has been synced. The r l) constructor if
esource can later * possible)
* again be found through the same identifie * \li Any other string is used as nao:identifier for a new resourc
r. e. This resource can
* In Nepomuk there are two ways of identify * later be loaded again by using the same identifier with this con
ing a resource structor.
* uniquely:
* \li The URI of the resource which is gene
rated randomly
* by the framework and can only be accessed
in a read-only
* fashion.
* \li An identifier in combination with the
resource type (Be
* aware that this identification can only b
e guaranteed if identifiers
* are never set manually via addIdentifier
but only through the
* constructor.)
* *
* \param type The URI identifying the type of the resource. If it is empty * \param type The URI identifying the type of the resource. If it is empty
* Resource falls back to http://www.w3.org/2000/01/rdf -schema\#Resource or * Resource falls back to http://www.w3.org/2000/01/rdf -schema\#Resource or
* in case the resource already exists the type will be read from the * in case the resource already exists the type will be read from the
* store. (This is a QString instead of a QUrl for hist orical reasons) * store.
* *
* Example: * Example:
* *
* The best way to understand the URI and identifier system is thro * The best way to understand the path or identifier system is thro
ugh file resources. ugh tags.
* When a Resource object is created with the local path of the fil * There are two ways to create a resource that represents an exist
e as an identifier: ing tag. The first is the
* low level one: use the unique URI of the tag with the Resource(Q
Url,QUrl) constructor.
* The second one is to use this constructor with the name of the t
ag as its identifier:
* *
* \code * \code
* Resource myfile( "/tmp/testfile.txt" ); * Resource myTag( "Nepomuk" );
* \endcode * \endcode
* *
* Now the URI of the resource in the store representing metadata f * This will result in Resource loading the tag with nao:identifier
or the file /tmp/testfile.txt "Nepomuk".
* is referred to by myfile.uri() which differs from the path of th
e file. However, the path of
* the file is saved as a \a hasIdentifier relation which means tha
t it can be used to easily find
* the related resource.
*/ */
Resource( const QString& uriOrIdentifier, const QUrl& type = QUrl() ); Resource( const QString& pathOrIdentifier, const QUrl& type = QUrl( ) );
/** /**
* \overload * \overload
* *
* \param manager The resource manager to use. This allows to mix r esources from different * \param manager The resource manager to use. This allows to mix r esources from different
* managers and, thus, different models. * managers and, thus, different models.
* *
* \since 4.3 * \since 4.3
*/ */
Resource( const QString& uriOrIdentifier, const QUrl& type, Resourc eManager* manager ); Resource( const QString& pathOrIdentifier, const QUrl& type, Resour ceManager* manager );
/** /**
* \deprecated use Resource( const QString&, const QUrl& ) * \deprecated use Resource( const QString&, const QUrl& )
*/ */
KDE_DEPRECATED Resource( const QString& uriOrIdentifier, const QStr ing& type ); KDE_DEPRECATED Resource( const QString& pathOrIdentifier, const QSt ring& type );
/** /**
* Creates a new Resource object. * Creates a new Resource object.
* *
* \param uri The URI of the resource. If no resource with this URI exists, a new one is * \param uri The URI of the resource. If no resource with this URI exists, a new one is
* created. * created. Using an empty QUrl will result in a new resource with
a random URI being created
* on the first call to setProperty.
*
* \param type The URI identifying the type of the resource. If it is empty * \param type The URI identifying the type of the resource. If it is empty
* Resource falls back to http://www.w3.org/2000/01/rdf -schema\#Resource or * Resource falls back to http://www.w3.org/2000/01/rdf -schema\#Resource or
* in case the resource already exists the type will be read from the * in case the resource already exists the type will be read from the
* store. * store.
*/ */
Resource( const QUrl& uri, const QUrl& type = QUrl() ); Resource( const QUrl& uri, const QUrl& type = QUrl() );
/** /**
* \overload * \overload
* *
 End of changes. 9 change blocks. 
50 lines changed or deleted 39 lines changed or added


 textbrowser.h   textbrowser.h 
skipping to change at line 102 skipping to change at line 102
KTextBrowser *nativeWidget() const; KTextBrowser *nativeWidget() const;
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);
Q_SIGNALS: Q_SIGNALS:
void textChanged(); void textChanged();
protected: protected:
void resizeEvent(QGraphicsSceneResizeEvent *event); void resizeEvent(QGraphicsSceneResizeEvent *event);
void wheelEvent(QGraphicsSceneWheelEvent *event);
private: private:
TextBrowserPrivate * const d; TextBrowserPrivate * const d;
Q_PRIVATE_SLOT(d, void setFixedHeight()) Q_PRIVATE_SLOT(d, void setFixedHeight())
}; };
} // namespace Plasma } // namespace Plasma
#endif // multiple inclusion guard #endif // multiple inclusion guard
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 toolbutton.h   toolbutton.h 
skipping to change at line 152 skipping to change at line 152
protected: protected:
void paint(QPainter *painter, void paint(QPainter *painter,
const QStyleOptionGraphicsItem *option, const QStyleOptionGraphicsItem *option,
QWidget *widget = 0); QWidget *widget = 0);
void resizeEvent(QGraphicsSceneResizeEvent *event); void resizeEvent(QGraphicsSceneResizeEvent *event);
void hoverEnterEvent(QGraphicsSceneHoverEvent *event); void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
private: private:
ToolButtonPrivate *const d;
friend class ToolButtonPrivate;
Q_PRIVATE_SLOT(d, void syncBorders()) Q_PRIVATE_SLOT(d, void syncBorders())
Q_PRIVATE_SLOT(d, void animationUpdate(qreal progress)) Q_PRIVATE_SLOT(d, void animationUpdate(qreal progress))
Q_PRIVATE_SLOT(d, void syncToAction()) Q_PRIVATE_SLOT(d, void syncToAction())
Q_PRIVATE_SLOT(d, void clearAction()) Q_PRIVATE_SLOT(d, void clearAction())
Q_PRIVATE_SLOT(d, void setPixmap())
friend class ToolButtonPrivate;
ToolButtonPrivate *const d;
}; };
} // namespace Plasma } // namespace Plasma
#endif // multiple inclusion guard #endif // multiple inclusion guard
 End of changes. 2 change blocks. 
3 lines changed or deleted 4 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/