kbookmark.h   kbookmark.h 
skipping to change at line 27 skipping to change at line 27
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 __kbookmark_h #ifndef __kbookmark_h
#define __kbookmark_h #define __kbookmark_h
#include <kio/kio_export.h> #include <kio/kio_export.h>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QList> #include <QtCore/QList>
#include <QtCore/QMetaType>
#include <QtXml/QDomElement> #include <QtXml/QDomElement>
#include <kurl.h> #include <kurl.h>
class KBookmarkManager; class KBookmarkManager;
class KBookmarkGroup; class KBookmarkGroup;
class KIO_EXPORT KBookmark class KIO_EXPORT KBookmark
{ {
friend class KBookmarkGroup; friend class KBookmarkGroup;
public: public:
skipping to change at line 461 skipping to change at line 462
class KIO_EXPORT KBookmarkGroupTraverser { class KIO_EXPORT KBookmarkGroupTraverser {
protected: protected:
virtual ~KBookmarkGroupTraverser(); virtual ~KBookmarkGroupTraverser();
void traverse(const KBookmarkGroup &); void traverse(const KBookmarkGroup &);
virtual void visit(const KBookmark &); virtual void visit(const KBookmark &);
virtual void visitEnter(const KBookmarkGroup &); virtual void visitEnter(const KBookmarkGroup &);
virtual void visitLeave(const KBookmarkGroup &); virtual void visitLeave(const KBookmarkGroup &);
}; };
#define KIO_KBOOKMARK_METATYPE_DEFINED 1
Q_DECLARE_METATYPE( KBookmark )
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 4 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.5.00 (KDE 4.5.0)" #define KDE_VERSION_STRING "4.5.1 (KDE 4.5.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 5 #define KDE_VERSION_MINOR 5
/** /**
* @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


 kfilemetadatawidget.h   kfilemetadatawidget.h 
skipping to change at line 54 skipping to change at line 54
class KIO_EXPORT KFileMetaDataWidget : public QWidget class KIO_EXPORT KFileMetaDataWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit KFileMetaDataWidget(QWidget* parent = 0); explicit KFileMetaDataWidget(QWidget* parent = 0);
virtual ~KFileMetaDataWidget(); virtual ~KFileMetaDataWidget();
/** /**
* Sets the items for which the meta data should be shown. * Sets the items for which the meta data should be shown.
* The signal metaDataRequestFinished() will be emitted,
* as soon as the meta data for the items has been received.
*/ */
void setItems(const KFileItemList& items); void setItems(const KFileItemList& items);
KFileItemList items() const; KFileItemList items() const;
/** /**
* If set to true, data such as the comment, tag or rating cannot be * If set to true, data such as the comment, tag or rating cannot be
* changed by the user. Per default read-only is disabled. * changed by the user. Per default read-only is disabled.
*/ */
void setReadOnly(bool readOnly); void setReadOnly(bool readOnly);
bool isReadOnly() const; bool isReadOnly() const;
skipping to change at line 75 skipping to change at line 77
/** @see QWidget::sizeHint() */ /** @see QWidget::sizeHint() */
virtual QSize sizeHint() const; virtual QSize sizeHint() const;
Q_SIGNALS: Q_SIGNALS:
/** /**
* Is emitted, if a meta data represents an URL that has * Is emitted, if a meta data represents an URL that has
* been clicked by the user. * been clicked by the user.
*/ */
void urlActivated(const KUrl& url); void urlActivated(const KUrl& url);
/**
* Is emitted after the meta data has been received for the items
* set by KFileMetaDataWidget::setItems().
* @since 4.5.1
*/
void metaDataRequestFinished(const KFileItemList& items);
protected: protected:
virtual bool event(QEvent* event); virtual bool event(QEvent* event);
private: private:
class Private; class Private;
Private* d; Private* d;
Q_PRIVATE_SLOT(d, void slotLoadingFinished()) Q_PRIVATE_SLOT(d, void slotLoadingFinished())
Q_PRIVATE_SLOT(d, void removeOutdatedRows()) Q_PRIVATE_SLOT(d, void removeOutdatedRows())
Q_PRIVATE_SLOT(d, void slotLinkActivated(QString)) Q_PRIVATE_SLOT(d, void slotLinkActivated(QString))
 End of changes. 2 change blocks. 
0 lines changed or deleted 9 lines changed or added


 kpageview.h   kpageview.h 
skipping to change at line 195 skipping to change at line 195
* views. * views.
*/ */
virtual Qt::Alignment viewPosition() const; virtual Qt::Alignment viewPosition() const;
KPageView(KPageViewPrivate &dd, QWidget *parent); KPageView(KPageViewPrivate &dd, QWidget *parent);
KPageViewPrivate *const d_ptr; KPageViewPrivate *const d_ptr;
private: private:
Q_PRIVATE_SLOT(d_func(), void _k_rebuildGui()) Q_PRIVATE_SLOT(d_func(), void _k_rebuildGui())
Q_PRIVATE_SLOT(d_func(), void _k_modelChanged()) Q_PRIVATE_SLOT(d_func(), void _k_modelChanged())
Q_PRIVATE_SLOT(d_func(), void _k_pageSelected(const QModelIndex &, const QModelIndex &)) Q_PRIVATE_SLOT(d_func(), void _k_pageSelected(const QItemSelection &, const QItemSelection &))
Q_PRIVATE_SLOT(d_func(), void _k_dataChanged(const QModelIndex &, c onst QModelIndex &)) Q_PRIVATE_SLOT(d_func(), void _k_dataChanged(const QModelIndex &, c onst QModelIndex &))
}; };
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 kselectionproxymodel.h   kselectionproxymodel.h 
skipping to change at line 313 skipping to change at line 313
Q_PRIVATE_SLOT(d_func(), void sourceRowsRemoved(const QModelIndex &, in t, int)) Q_PRIVATE_SLOT(d_func(), void sourceRowsRemoved(const QModelIndex &, in t, int))
Q_PRIVATE_SLOT(d_func(), void sourceRowsAboutToBeMoved(const QModelInde x &, int, int, const QModelIndex &, int)) Q_PRIVATE_SLOT(d_func(), void sourceRowsAboutToBeMoved(const QModelInde x &, int, int, const QModelIndex &, int))
Q_PRIVATE_SLOT(d_func(), void sourceRowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)) Q_PRIVATE_SLOT(d_func(), void sourceRowsMoved(const QModelIndex &, int, int, const QModelIndex &, int))
Q_PRIVATE_SLOT(d_func(), void sourceModelAboutToBeReset()) Q_PRIVATE_SLOT(d_func(), void sourceModelAboutToBeReset())
Q_PRIVATE_SLOT(d_func(), void sourceModelReset()) Q_PRIVATE_SLOT(d_func(), void sourceModelReset())
Q_PRIVATE_SLOT(d_func(), void sourceLayoutAboutToBeChanged()) Q_PRIVATE_SLOT(d_func(), void sourceLayoutAboutToBeChanged())
Q_PRIVATE_SLOT(d_func(), void sourceLayoutChanged()) Q_PRIVATE_SLOT(d_func(), void sourceLayoutChanged())
Q_PRIVATE_SLOT(d_func(), void sourceDataChanged(const QModelIndex &, co nst QModelIndex &)) Q_PRIVATE_SLOT(d_func(), void sourceDataChanged(const QModelIndex &, co nst QModelIndex &))
Q_PRIVATE_SLOT(d_func(), void selectionChanged(const QItemSelection & s elected, const QItemSelection & deselected)) Q_PRIVATE_SLOT(d_func(), void selectionChanged(const QItemSelection & s elected, const QItemSelection & deselected))
Q_PRIVATE_SLOT(d_func(), void sourceModelDestroyed()) Q_PRIVATE_SLOT(d_func(), void sourceModelDestroyed())
Q_PRIVATE_SLOT(d_func(), void selectionModelSourceAboutToBeReset())
Q_PRIVATE_SLOT(d_func(), void selectionModelSourceReset())
//@endcond //@endcond
}; };
#endif #endif
 End of changes. 1 change blocks. 
2 lines changed or deleted 0 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/