kdebug.h   kdebug.h 
skipping to change at line 290 skipping to change at line 290
* @param enabled whether debug output should be enabled by default * @param enabled whether debug output should be enabled by default
* (users can override this in kdebugdialog or with DisableAll=true in kdebugrc) * (users can override this in kdebugdialog or with DisableAll=true in kdebugrc)
* @return the area code that was allocated for this area * @return the area code that was allocated for this area
* *
* Typical usage: * Typical usage:
* If all uses of the debug area are restricted to a single class, add a method like this * If all uses of the debug area are restricted to a single class, add a method like this
* (e.g. into the Private class, if there's one) * (e.g. into the Private class, if there's one)
* <code> * <code>
* static int debugArea() { static int s_area = KDebug::registerArea(" areaName"); return s_area; } * static int debugArea() { static int s_area = KDebug::registerArea(" areaName"); return s_area; }
* </code> * </code>
* Please do not use a file-static int, it would (indirectly) create KG
lobal too early,
* create KConfig instances too early (breaking unittests which set KDE
HOME), etc.
* By using a function as shown above, you make it all happen on-demand
, rather than upfront.
* *
* If all uses of the debug area are restricted to a single .cpp file, do the same * If all uses of the debug area are restricted to a single .cpp file, do the same
* but outside any class, and then use a more specific name for the fun ction. * but outside any class, and then use a more specific name for the fun ction.
* *
* If however multiple classes and files need the debug area, then * If however multiple classes and files need the debug area, then
* declare it in one file without static, and use "extern int debugArea ();" * declare it in one file without static, and use "extern int debugArea ();"
* in other files (with a better name for the function of course). * in other files (with a better name for the function of course).
*/ */
static KDECORE_EXPORT int registerArea(const QByteArray& areaName, bool enabled = true); static KDECORE_EXPORT int registerArea(const QByteArray& areaName, bool enabled = true);
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 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.6.00 (4.6.0)" #define KDE_VERSION_STRING "4.6.1 (4.6.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 6 #define KDE_VERSION_MINOR 6
/** /**
* @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


 kfilefiltercombo.h   kfilefiltercombo.h 
skipping to change at line 97 skipping to change at line 97
* @return the default filter, used when an empty filter is set. * @return the default filter, used when an empty filter is set.
* @see setDefaultFilter * @see setDefaultFilter
*/ */
QString defaultFilter() const; QString defaultFilter() const;
/** /**
* @return all filters (this can be a list of patterns or a list of mim etypes) * @return all filters (this can be a list of patterns or a list of mim etypes)
*/ */
QStringList filters() const; QStringList filters() const;
/**
* Returns true if the filter has been set using setMimeFilter().
* @since 4.6.1
*/
bool isMimeFilter() const;
protected: protected:
virtual bool eventFilter( QObject*, QEvent* ); virtual bool eventFilter( QObject*, QEvent* );
Q_SIGNALS: Q_SIGNALS:
/** /**
* This signal is emitted whenever the filter has been changed. * This signal is emitted whenever the filter has been changed.
*/ */
void filterChanged(); void filterChanged();
private: private:
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added


 kfileitemactionplugin.h   kfileitemactionplugin.h 
skipping to change at line 34 skipping to change at line 34
#include <kio/kio_export.h> #include <kio/kio_export.h>
#include <QtCore/QObject> #include <QtCore/QObject>
class QAction; class QAction;
class QMenu; class QMenu;
class QWidget; class QWidget;
class KFileItemListProperties; class KFileItemListProperties;
/** /**
* @brief Base class for KFileItemAction plugins. * @deprecated use KAbstractFileItemActionPlugin instead
* * (introduced in kdelibs-4.6.1 in order to remove the erroneous
* Please try to use servicemenus first, if you simply need to add * "const" in the actions method)
* actions to the popup menu for one or more mimetypes.
*
* However if you need some dynamic logic, like "only show this item if
* two files are selected", or "show a submenu with a variable number of ac
tions",
* then you have to implement a KFileItemActionPlugin subclass.
*
* As always plugins need to be exported via the K_EXPORT_PLUGIN macro like
so:
*
* \code
* K_PLUGIN_FACTORY(MyActionPluginFactory, registerPlugin<MyActionPlugin>()
;)
* K_EXPORT_PLUGIN(MyActionPluginFactory("myactionplugin"))
* \endcode
*
* A desktop file is necessary to register the plugin with the KDE plugin s
ystem:
*
* \code
* [Desktop Entry]
* Encoding=UTF-8
* Type=Service
* Name=My fancy action plugin
* X-KDE-Library=myactionplugin
* ServiceTypes=KFileItemAction/Plugin
* MimeType=some/mimetype;
* \endcode
*
* Note the \p KFileItemAction/Plugin service type which is used by
* KFileItemActions::addServicePluginActionsTo() to load all available plug
ins
* and the \p MimeType field which specifies for which types of file items
* the setup() method should be called.
*
* As with all KDE plugins one needs to install the plugin as a module. In
* cmake terms this looks roughly as follows:
*
* \code
* kde4_add_plugin(myactionplugin myactionplugin.cpp)
* target_link_libraries(myactionplugin ${KDE4_KIO_LIBS})
* install(TARGETS myactionplugin DESTINATION ${PLUGIN_INSTALL_DIR})
* install(FILES myactionplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}
)
* \endcode
*
* @author Sebastian Trueg <trueg@kde.org>
*
* @since 4.6
*/ */
class KIO_EXPORT KFileItemActionPlugin : public QObject class KIO_EXPORT_DEPRECATED KFileItemActionPlugin : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
KFileItemActionPlugin(QObject *parent); KFileItemActionPlugin(QObject *parent);
virtual ~KFileItemActionPlugin(); virtual ~KFileItemActionPlugin();
/**
* Implement the actions method in the plugin in order to create action
s.
*
* @param fileItemInfos The information about the selected file items.
* (Which file items, their common mimetype, etc.)
* @param parentWidget A parent widget for error messages or the like.
* @return List of actions, that should added to e. g. the popup menu.
* It is recommended to use the KFileItemActionPlugin as parent
* of the actions.
*/
virtual QList<QAction*> actions(const KFileItemListProperties &fileItem Infos, virtual QList<QAction*> actions(const KFileItemListProperties &fileItem Infos,
QWidget *parentWidget) const = 0; QWidget *parentWidget) const = 0;
}; };
#endif #endif
 End of changes. 3 change blocks. 
64 lines changed or deleted 4 lines changed or added


 kmimetype.h   kmimetype.h 
skipping to change at line 403 skipping to change at line 403
QString mainExtension() const; QString mainExtension() const;
/** /**
* Determines the extension from a filename (or full path) using the mi metype database. * Determines the extension from a filename (or full path) using the mi metype database.
* This allows to extract "tar.bz2" for foo.tar.bz2 * This allows to extract "tar.bz2" for foo.tar.bz2
* but still return "txt" for my.doc.with.dots.txt * but still return "txt" for my.doc.with.dots.txt
*/ */
static QString extractKnownExtension( const QString &fileName ); static QString extractKnownExtension( const QString &fileName );
/** /**
* Returns true if the given filename matches the given pattern.
* @since 4.6.1
*/
static bool matchFileName( const QString &filename, const QString &patt
ern );
/**
* Returns the version of the installed update-mime-database program * Returns the version of the installed update-mime-database program
* (from freedesktop.org shared-mime-info). This is used by unit tests * (from freedesktop.org shared-mime-info). This is used by unit tests
* and by the code that writes out icon definitions. * and by the code that writes out icon definitions.
* @since 4.3 * @since 4.3
* @return -1 on error, otherwise a version number to use like this: * @return -1 on error, otherwise a version number to use like this:
* @code * @code
* if (version >= KDE_MAKE_VERSION(0, 40, 0)) { ... } * if (version >= KDE_MAKE_VERSION(0, 40, 0)) { ... }
* @endcode * @endcode
*/ */
static int sharedMimeInfoVersion(); static int sharedMimeInfoVersion();
 End of changes. 1 change blocks. 
0 lines changed or deleted 7 lines changed or added


 krecursivefilterproxymodel.h   krecursivefilterproxymodel.h 
skipping to change at line 103 skipping to change at line 103
explicit KRecursiveFilterProxyModel(QObject* parent = 0); explicit KRecursiveFilterProxyModel(QObject* parent = 0);
/** /**
Destructor Destructor
*/ */
virtual ~KRecursiveFilterProxyModel(); virtual ~KRecursiveFilterProxyModel();
/** @reimp */ /** @reimp */
void setSourceModel( QAbstractItemModel *model ); void setSourceModel( QAbstractItemModel *model );
/**
* @reimplemented
*/
virtual QModelIndexList match( const QModelIndex& start, int role, const
QVariant& value, int hits = 1,
Qt::MatchFlags flags = Qt::MatchFlags( Qt:
:MatchStartsWith | Qt::MatchWrap ) ) const;
protected: protected:
/** /**
Reimplement this method for custom filtering strategies. Reimplement this method for custom filtering strategies.
*/ */
virtual bool acceptRow(int sourceRow, const QModelIndex &sourceParent) co nst; virtual bool acceptRow(int sourceRow, const QModelIndex &sourceParent) co nst;
private: private:
/** @reimp */ /** @reimp */
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) con st; bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) con st;
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added


 popupapplet.h   popupapplet.h 
skipping to change at line 232 skipping to change at line 232
PopupApplet(const QString &packagePath, uint appletId, const QVariantLi st &args); PopupApplet(const QString &packagePath, uint appletId, const QVariantLi st &args);
Q_PRIVATE_SLOT(d, void internalTogglePopup()) Q_PRIVATE_SLOT(d, void internalTogglePopup())
Q_PRIVATE_SLOT(d, void hideTimedPopup()) Q_PRIVATE_SLOT(d, void hideTimedPopup())
Q_PRIVATE_SLOT(d, void clearPopupLostFocus()) Q_PRIVATE_SLOT(d, void clearPopupLostFocus())
Q_PRIVATE_SLOT(d, void dialogSizeChanged()) Q_PRIVATE_SLOT(d, void dialogSizeChanged())
Q_PRIVATE_SLOT(d, void dialogStatusChanged(bool)) Q_PRIVATE_SLOT(d, void dialogStatusChanged(bool))
Q_PRIVATE_SLOT(d, void updateDialogPosition()) Q_PRIVATE_SLOT(d, void updateDialogPosition())
Q_PRIVATE_SLOT(d, void appletActivated()) Q_PRIVATE_SLOT(d, void appletActivated())
Q_PRIVATE_SLOT(d, void iconSizeChanged(int)) Q_PRIVATE_SLOT(d, void iconSizeChanged(int))
Q_PRIVATE_SLOT(d, void statusChangeWhileShown(Plasma::ItemStatus status ))
friend class Applet; friend class Applet;
friend class AppletPrivate; friend class AppletPrivate;
friend class Extender; friend class Extender;
friend class PopupAppletPrivate; friend class PopupAppletPrivate;
PopupAppletPrivate * const d; PopupAppletPrivate * const d;
}; };
} // Plasma namespace } // Plasma namespace
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 query.h   query.h 
skipping to change at line 403 skipping to change at line 403
* \since 4.6 * \since 4.6
*/ */
CreateAskQuery = 0x4 CreateAskQuery = 0x4
}; };
Q_DECLARE_FLAGS( SparqlFlags, SparqlFlag ) Q_DECLARE_FLAGS( SparqlFlags, SparqlFlag )
/** /**
* Convert the query into a SPARQL query which can be used with the * Convert the query into a SPARQL query which can be used with the
* Nepomuk query service or directly in Soprano::Model::execute Query. * Nepomuk query service or directly in Soprano::Model::execute Query.
* *
* It is recommended to use QueryServiceClient instead of creat
ing
* the SPARQL query this way.
*
* The resulting query will bind the results to variable \p 'r' . Request * The resulting query will bind the results to variable \p 'r' . Request
* properties will be bound to variables \p 'reqProp1' through \p 'reqPropN' * properties will be bound to variables \p 'reqProp1' through \p 'reqPropN'
* (the only exception is a count query created via the CreateC ountQuery flag). * (the only exception is a count query created via the CreateC ountQuery flag).
* *
* If you are looking for a serialization of a Query which can be parsed again * If you are looking for a serialization of a Query which can be parsed again
* use toString() instead. * use toString() instead.
* *
* \warning The SPARQL queries created by this method contain S PARQL extensions * \warning The SPARQL queries created by this method contain S PARQL extensions
* from Virtuoso and will not work with other RDF storage solut ions! * from Virtuoso and will not work with other RDF storage solut ions!
* *
 End of changes. 1 change blocks. 
0 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/