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.1 (KDE 4.4.1)" #define KDE_VERSION_STRING "4.4.2 (KDE 4.4.2)"
/** /**
* @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 1 #define KDE_VERSION_RELEASE 2
/** /**
* @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


 kmimetype.h   kmimetype.h 
skipping to change at line 121 skipping to change at line 121
* *
* Also note that you get a new KMimeType pointer every time you call t his. * Also note that you get a new KMimeType pointer every time you call t his.
* Don't ever write code that compares mimetype pointers, compare names instead. * Don't ever write code that compares mimetype pointers, compare names instead.
* *
* @param name the name of the mime type * @param name the name of the mime type
* @param options controls how the mime type is searched for * @param options controls how the mime type is searched for
* @return the pointer to the KMimeType with the given @p name, or * @return the pointer to the KMimeType with the given @p name, or
* 0 if not found * 0 if not found
* @see KServiceType::serviceType * @see KServiceType::serviceType
*/ */
static Ptr mimeType( const QString& name, FindByNameOption options = Do ntResolveAlias ); static Ptr mimeType( const QString& name, FindByNameOption options = Re solveAliases );
/** /**
* Finds a KMimeType with the given @p url. * Finds a KMimeType with the given @p url.
* This function looks at mode_t first. * This function looks at mode_t first.
* If that does not help it looks at the extension (and the contents, f or local files). * If that does not help it looks at the extension (and the contents, f or local files).
* This method is fine for many protocols like ftp, file, fish, zip etc ., * This method is fine for many protocols like ftp, file, fish, zip etc .,
* but is not for http (e.g. cgi scripts * but is not for http (e.g. cgi scripts
* make extension-based checking unreliable). * make extension-based checking unreliable).
* For HTTP you should use KRun instead (to open the URL, in an app * For HTTP you should use KRun instead (to open the URL, in an app
* or internally), or a KIO::mimetype() job (to find the mimetype witho ut * or internally), or a KIO::mimetype() job (to find the mimetype witho ut
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 queryserviceclient.h   queryserviceclient.h 
/* /*
Copyright (c) 2008-2009 Sebastian Trueg <trueg@kde.org> Copyright (c) 2008-2010 Sebastian Trueg <trueg@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.
This library is distributed in the hope that it will be useful, This library is distributed in the hope that it will be useful,
skipping to change at line 100 skipping to change at line 100
/** /**
* \overload * \overload
* *
* \param query a SPARQL query which binds results to variable \p 'r'. * \param query a SPARQL query which binds results to variable \p 'r'.
* \param requestPropertyMap An optional mapping of variable bi nding names in \p query * \param requestPropertyMap An optional mapping of variable bi nding names in \p query
* to their corresponding properties. These bindings will then be reported via * to their corresponding properties. These bindings will then be reported via
* Result::requestProperties(). This map will be constructed au tomatically when using * Result::requestProperties(). This map will be constructed au tomatically when using
* query(const Query&). * query(const Query&).
* *
* Example: * \section sparql_query_examples Examples:
*
* Select a simple request property as can also be done via Que
ry::Query:
*
* \code * \code
* QString query = "select ?r ?mtime where { ?r a nfo:FileDataO * QString query = "select ?r ?mtime where { "
bject . ?r nie:lastModified ?mtime . }"; * "?r a nfo:FileDataObject . "
* "?r nie:lastModified ?mtime . "
* "}";
*
* QueryServiceClient::RequestPropertyMap requestPropertyMap; * QueryServiceClient::RequestPropertyMap requestPropertyMap;
* requestPropertyMap.insert( "mtime", Vocabulary::NIE::lastMod ified() ); * requestPropertyMap.insert( "mtime", Vocabulary::NIE::lastMod ified() );
*
* sparqlQuery( query, requestPropertyMap ); * sparqlQuery( query, requestPropertyMap );
* \endcode * \endcode
* *
* This will report the resources themselves and their modifica tion time in the result's request * This will report the resources themselves and their modifica tion time in the result's request
* properties: * properties:
* *
* \code * \code
* void handleResult( const Query::Result& results ) { * void handleResult( const Query::Result& results ) {
* QDateTime lastModified = result.requestProperty( Vocabul ary::NIE::lastModified() ).toDateTime(); * QDateTime lastModified = result.requestProperty( Vocabul ary::NIE::lastModified() ).toDateTime();
* [...] * [...]
* \endcode * \endcode
* *
* While using Query::Query restricts to request properties to
diret properties of the
* results using a custom SPARQL query allows to use any bindin
g as request property.
* The used property URI in the mapping does not even need to m
atch anything in the query:
*
* \code
* QString query = "select ?r ?phone where { "
* "?r a nco:PersonContact . "
* "?r nco:hasPhoneNumber ?n . "
* "?n nco:phoneNumber ?phone . "
* "}";
*
* QueryServiceClient::RequestPropertyMap requestPropertyMap;
* requestPropertyMap.insert( "phone", Vocabulary::NCO::hasPhon
eNumber() );
* \endcode
*
* \sa Query::requestPropertyMap() * \sa Query::requestPropertyMap()
*/ */
bool sparqlQuery( const QString& query, const Nepomuk::Query::R equestPropertyMap& requestPropertyMap = Nepomuk::Query::RequestPropertyMap( ) ); bool sparqlQuery( const QString& query, const Nepomuk::Query::R equestPropertyMap& requestPropertyMap = Nepomuk::Query::RequestPropertyMap( ) );
/** /**
* \overload * \overload
* *
* \param query a desktop query string which can be parsed by Q ueryParser. * \param query a desktop query string which can be parsed by Q ueryParser.
*/ */
bool desktopQuery( const QString& query ); bool desktopQuery( const QString& query );
 End of changes. 5 change blocks. 
4 lines changed or deleted 31 lines changed or added


 svgwidget.h   svgwidget.h 
skipping to change at line 31 skipping to change at line 31
#define PLASMA_SVGWIDGET_H #define PLASMA_SVGWIDGET_H
#include <QtGui/QGraphicsWidget> #include <QtGui/QGraphicsWidget>
#include <plasma/plasma_export.h> #include <plasma/plasma_export.h>
#include <plasma/plasma.h> #include <plasma/plasma.h>
namespace Plasma namespace Plasma
{ {
class Svg; class Svg;
class SvgWidgetPrivate; class SvgWidgetPrivate;
}
Q_DECLARE_METATYPE(Plasma::Svg*)
namespace Plasma
{
class PLASMA_EXPORT SvgWidget : public QGraphicsWidget class PLASMA_EXPORT SvgWidget : public QGraphicsWidget
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(Svg *svg READ svg WRITE setSvg) Q_PROPERTY(Plasma::Svg *svg READ svg WRITE setSvg)
Q_PROPERTY(QString elementID READ elementID WRITE setElementID) Q_PROPERTY(QString elementID READ elementID WRITE setElementID)
public: public:
explicit SvgWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlag s = 0); explicit SvgWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlag s = 0);
explicit SvgWidget(Svg *svg, const QString & elementID = QString(), explicit SvgWidget(Svg *svg, const QString & elementID = QString(),
QGraphicsItem *parent = 0, Qt::WindowFlags wFlag s = 0); QGraphicsItem *parent = 0, Qt::WindowFlags wFlag s = 0);
virtual ~SvgWidget(); virtual ~SvgWidget();
virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) ; virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) ;
 End of changes. 4 change blocks. 
2 lines changed or deleted 6 lines changed or added


 uploaddialog.h   uploaddialog.h 
skipping to change at line 28 skipping to change at line 28
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
*/ */
#ifndef KNEWSTUFF3_UI_UPLOADDIALOG_H #ifndef KNEWSTUFF3_UI_UPLOADDIALOG_H
#define KNEWSTUFF3_UI_UPLOADDIALOG_H #define KNEWSTUFF3_UI_UPLOADDIALOG_H
#include <kdialog.h> #include <kdialog.h>
#include <kurl.h> #include <kurl.h>
#include <knewstuff3/knewstuff_export.h> #include <knewstuff3/knewstuff_export.h>
#include <attica/provider.h>
class KComboBox; class KComboBox;
class KLineEdit; class KLineEdit;
class KUrlRequester; class KUrlRequester;
class KTextEdit; class KTextEdit;
namespace Attica { namespace Attica {
class BaseJob; class BaseJob;
class Provider;
} }
namespace KNS3 namespace KNS3
{ {
/** /**
* @short KNewStuff file upload dialog. * @short KNewStuff file upload dialog.
* *
* Using this dialog, data can easily be uploaded to the Hotstuff servers. * Using this dialog, data can easily be uploaded to the Hotstuff servers.
* *
* \par Maintainer: * \par Maintainer:
 End of changes. 2 change blocks. 
1 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/