Action   Action 
#include "../kross/core/action.h" #include "../../kauthaction.h"
 End of changes. 1 change blocks. 
lines changed or deleted lines changed or added


 abstractrunner.h   abstractrunner.h 
skipping to change at line 67 skipping to change at line 67
* may be executed more than once at the same time. See match() for details . * may be executed more than once at the same time. See match() for details .
* To let krunner expose a global shortcut for the single runner query mode , the runner * To let krunner expose a global shortcut for the single runner query mode , the runner
* must set the "X-Plasma-AdvertiseSingleRunnerMode" key to true in the .de sktop file * must set the "X-Plasma-AdvertiseSingleRunnerMode" key to true in the .de sktop file
* and set a default syntax. See setDefaultSyntax() for details. * and set a default syntax. See setDefaultSyntax() for details.
* *
*/ */
class PLASMA_EXPORT AbstractRunner : public QObject class PLASMA_EXPORT AbstractRunner : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool matchingSuspended READ isMatchingSuspended WRITE suspen dMatching NOTIFY matchingSuspended) Q_PROPERTY(bool matchingSuspended READ isMatchingSuspended WRITE suspen dMatching NOTIFY matchingSuspended)
Q_PROPERTY(QString id READ id); Q_PROPERTY(QString id READ id)
Q_PROPERTY(QString description READ description); Q_PROPERTY(QString description READ description)
Q_PROPERTY(QString name READ name); Q_PROPERTY(QString name READ name)
Q_PROPERTY(QIcon icon READ icon); Q_PROPERTY(QIcon icon READ icon)
public: public:
/** Specifies a nominal speed for the runner */ /** Specifies a nominal speed for the runner */
enum Speed { enum Speed {
SlowSpeed, SlowSpeed,
NormalSpeed NormalSpeed
}; };
/** Specifies a priority for the runner */ /** Specifies a priority for the runner */
enum Priority { enum Priority {
LowestPriority = 0, LowestPriority = 0,
 End of changes. 1 change blocks. 
4 lines changed or deleted 4 lines changed or added


 componentfactory.h   componentfactory.h 
skipping to change at line 31 skipping to change at line 31
#define KPARTS_COMPONENTFACTORY_H #define KPARTS_COMPONENTFACTORY_H
#include <kparts/factory.h> #include <kparts/factory.h>
#include <kparts/part.h> #include <kparts/part.h>
#include <kservicetypetrader.h> #include <kservicetypetrader.h>
#ifndef KDE_NO_DEPRECATED #ifndef KDE_NO_DEPRECATED
#include <klibloader.h> #include <klibloader.h>
#endif #endif
#include <kmimetypetrader.h> #include <kmimetypetrader.h>
#include <QtCore/QFile>
namespace KParts namespace KParts
{ {
namespace ComponentFactory namespace ComponentFactory
{ {
/** /**
* This template function allows to ask the given kparts factory to * This template function allows to ask the given kparts factory to
* create an instance of the given template type. * create an instance of the given template type.
* *
* Example of usage: * Example of usage:
* \code * \code
skipping to change at line 84 skipping to change at line 86
* @deprecated use KPluginFactory::create instead * @deprecated use KPluginFactory::create instead
*/ */
#ifndef KDE_NO_DEPRECATED #ifndef KDE_NO_DEPRECATED
template <class T> template <class T>
KDE_DEPRECATED T *createPartInstanceFromLibrary( const char *librar yName, KDE_DEPRECATED T *createPartInstanceFromLibrary( const char *librar yName,
QWidget *parentWidget = 0, QWidget *parentWidget = 0,
QObject *parent = 0, QObject *parent = 0,
const QStringList &args = QString List(), const QStringList &args = QString List(),
int *error = 0 ) int *error = 0 )
{ {
KLibrary *library = KLibLoader::self()->library( QString( libra ryName ) ); // compatibility hack KLibrary *library = KLibLoader::self()->library( QFile::decodeN ame( libraryName ) ); // compatibility hack
if ( !library ) if ( !library )
{ {
if ( error ) if ( error )
*error = KLibLoader::ErrNoLibrary; *error = KLibLoader::ErrNoLibrary;
return 0; return 0;
} }
KLibFactory *factory = library->factory(); KLibFactory *factory = library->factory();
if ( !factory ) if ( !factory )
{ {
library->unload(); library->unload();
skipping to change at line 138 skipping to change at line 140
int *error = 0 ) int *error = 0 )
{ {
QString library = service->library(); QString library = service->library();
if ( library.isEmpty() ) if ( library.isEmpty() )
{ {
if ( error ) if ( error )
*error = KLibLoader::ErrServiceProvidesNoLibrary; *error = KLibLoader::ErrServiceProvidesNoLibrary;
return 0; return 0;
} }
return createPartInstanceFromLibrary<T>( library.toLocal8Bit(). data(), parentWidget, return createPartInstanceFromLibrary<T>( QFile::encodeName( lib rary ).constData(), parentWidget,
parent, args, error ); parent, args, error );
} }
#endif #endif
#ifndef KDE_NO_DEPRECATED #ifndef KDE_NO_DEPRECATED
template <class T, class ServiceIterator> template <class T, class ServiceIterator>
KDE_DEPRECATED T *createPartInstanceFromServices( ServiceIterator b egin, KDE_DEPRECATED T *createPartInstanceFromServices( ServiceIterator b egin,
ServiceIterator end, ServiceIterator end,
QWidget *parentWidget = 0, QWidget *parentWidget = 0,
QObject *parent = 0, QObject *parent = 0,
 End of changes. 3 change blocks. 
2 lines changed or deleted 4 lines changed or added


 config-nepomuk.h   config-nepomuk.h 
#define HAVE_NEPOMUK /* #undef HAVE_NEPOMUK */
 End of changes. 1 change blocks. 
lines changed or deleted lines changed or added


 kde_terminal_interface.h   kde_terminal_interface.h 
skipping to change at line 35 skipping to change at line 35
/** /**
* TerminalInterface is an interface implemented by KonsolePart to * TerminalInterface is an interface implemented by KonsolePart to
* allow developers access to the KonsolePart in ways that are not * allow developers access to the KonsolePart in ways that are not
* possible through the normal KPart interface. * possible through the normal KPart interface.
* *
* Note that besides the functions below here, KonsolePart also has * Note that besides the functions below here, KonsolePart also has
* some signals you can connect to. They aren't in this class cause * some signals you can connect to. They aren't in this class cause
* we can't have signals without having a QObject, which * we can't have signals without having a QObject, which
* TerminalInterface is not. * TerminalInterface is not.
* These are the signals you can connect to: *
* void processExited( int status ); * These are some signals you can connect to:
* void receivedData( const QString& s ); * void currentDirectoryChanged(const QString& dir);
* See the example code below for how to connect to these.. *
* See the example code below for how to connect to these.
* *
* Use it like this: * Use it like this:
* \code * \code
* // fetch the Library.. * //query the .desktop file to get service information about konsolepart
* KLibFactory* factory = KLibLoader::self()->factory( "libkonsolepart" ); * KService::Ptr service = KService::serviceByDesktopName("konsolepart");
* if ( factory == 0L ) *
* if (!service)
* {
* QMessageBox::critical(this, tr("Konsole not installed"), tr("Please
install the kde konsole and try again!"), QMessageBox::Ok);
* return ;
* }
*
* // create one instance of konsolepart
* KParts::ReadOnlyPart* p = service->createInstance<KParts::ReadOnlyPart>
(parent, parentWidget, QVariantList());
*
* if (!p)
* { * {
* // inform the user that he should install konsole.. * return;
* return;
* } * }
* // fetch the part.. *
* KParts::Part* p = static_cast<KParts::Part*>( * // cast the konsolepart to the TerminalInterface..
* factory->create( this, "tralala", "QObject", * TerminalInterface* t = qobject_cast<TerminalInterface*>(p);
* "KParts::ReadOnlyPart" ) ); *
* assert( p ); * if (!t)
* setCentralWidget( p->widget() );
*
* // cast the part to the TerminalInterface..
* TerminalInterface* t = static_cast<TerminalInterface*>( p->qt_cast( "Te
rminalInterface" ) );
* if( ! t )
* { * {
* // This probably happens because the konsole that is installed * return;
* // comes from before KDE 3.2 , and the TerminalInterface is not
* // available.. What you can do here is either inform the user
* // that he needs a more recent konsole, or try to deliver the
* // functionality in some other way...
* return;
* } * }
*
* // now use the interface in all sorts of ways, e.g. * // now use the interface in all sorts of ways, e.g.
* // t->showShellInDir( QDir::home().path() ); * // t->showShellInDir( QDir::home().path() );
* // or: * // or:
* // QStrList l; * // QStringList l;
* // l.append( "python" ); * // l.append( "python" );
* // t->startProgram( QString::fromUtf8( "/usr/bin/python" ), l); * // t->startProgram( QString::fromUtf8( "/usr/bin/python" ), l);
* // or connect to one of the signals. Connect to the Part object, * // or connect to one of the signals. Connect to the Part object,
* // not to the TerminalInterface, since the latter is no QObject, * // not to the TerminalInterface, since the latter is no QObject,
* // and as such cannot have signals..: * // and as such cannot have signals..:
* // connect( p, SIGNAL( processExited( int ) ), * // connect(p, SIGNAL(currentDirectoryChanged(QString)),
* // this, SLOT( shellExited( int ) ) ); * // this, SLOT(currentDirectoryChanged(QString)));
* // etc. * // etc.
* *
* \endcode * \endcode
* *
* @author Dominique Devriese <devriese@kde.org> * @author Dominique Devriese <devriese@kde.org>
*/ */
class TerminalInterface class TerminalInterface
{ {
public: public:
virtual ~TerminalInterface(){} virtual ~TerminalInterface(){}
 End of changes. 8 change blocks. 
29 lines changed or deleted 31 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.8.4 (4.8.4)" #define KDE_VERSION_STRING "4.9.00"
/** /**
* @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 8 #define KDE_VERSION_MINOR 9
/** /**
* @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 4 #define KDE_VERSION_RELEASE 00
/** /**
* @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. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 kidentityproxymodel.h   kidentityproxymodel.h 
skipping to change at line 92 skipping to change at line 92
Q_PRIVATE_SLOT(d_func(), void _k_sourceColumnsAboutToBeRemoved(QModelInde x,int,int)) Q_PRIVATE_SLOT(d_func(), void _k_sourceColumnsAboutToBeRemoved(QModelInde x,int,int))
Q_PRIVATE_SLOT(d_func(), void _k_sourceColumnsRemoved(QModelIndex,int,int )) Q_PRIVATE_SLOT(d_func(), void _k_sourceColumnsRemoved(QModelIndex,int,int ))
Q_PRIVATE_SLOT(d_func(), void _k_sourceColumnsAboutToBeMoved(QModelIndex, int,int,QModelIndex,int)) Q_PRIVATE_SLOT(d_func(), void _k_sourceColumnsAboutToBeMoved(QModelIndex, int,int,QModelIndex,int))
Q_PRIVATE_SLOT(d_func(), void _k_sourceColumnsMoved(QModelIndex,int,int,Q ModelIndex,int)) Q_PRIVATE_SLOT(d_func(), void _k_sourceColumnsMoved(QModelIndex,int,int,Q ModelIndex,int))
Q_PRIVATE_SLOT(d_func(), void _k_sourceDataChanged(QModelIndex,QModelInde x)) Q_PRIVATE_SLOT(d_func(), void _k_sourceDataChanged(QModelIndex,QModelInde x))
Q_PRIVATE_SLOT(d_func(), void _k_sourceHeaderDataChanged(Qt::Orientation orientation, int first, int last)) Q_PRIVATE_SLOT(d_func(), void _k_sourceHeaderDataChanged(Qt::Orientation orientation, int first, int last))
Q_PRIVATE_SLOT(d_func(), void _k_sourceLayoutAboutToBeChanged()) Q_PRIVATE_SLOT(d_func(), void _k_sourceLayoutAboutToBeChanged())
Q_PRIVATE_SLOT(d_func(), void _k_sourceLayoutChanged()) Q_PRIVATE_SLOT(d_func(), void _k_sourceLayoutChanged())
Q_PRIVATE_SLOT(d_func(), void _k_sourceChildrenLayoutsAboutToBeChanged(co // Q_PRIVATE_SLOT(d_func(), void _k_sourceChildrenLayoutsAboutToBeChange
nst QModelIndex &parent1, const QModelIndex &parent2)) d(const QModelIndex &parent1, const QModelIndex &parent2))
Q_PRIVATE_SLOT(d_func(), void _k_sourceChildrenLayoutsChanged(const QMode // Q_PRIVATE_SLOT(d_func(), void _k_sourceChildrenLayoutsChanged(const Q
lIndex &parent1, const QModelIndex &parent2)) ModelIndex &parent1, const QModelIndex &parent2))
Q_PRIVATE_SLOT(d_func(), void _k_sourceModelAboutToBeReset()) Q_PRIVATE_SLOT(d_func(), void _k_sourceModelAboutToBeReset())
Q_PRIVATE_SLOT(d_func(), void _k_sourceModelReset()) Q_PRIVATE_SLOT(d_func(), void _k_sourceModelReset())
Q_PRIVATE_SLOT(d_func(), void _k_sourceModelDestroyed()) Q_PRIVATE_SLOT(d_func(), void _k_sourceModelDestroyed())
}; };
#endif // KIDENTITYPROXYMODEL_H #endif // KIDENTITYPROXYMODEL_H
 End of changes. 1 change blocks. 
4 lines changed or deleted 4 lines changed or added


 knewstuff_export.h   knewstuff_export.h 
/* This file is part of the KDE project /* This file is part of the KDE project
Copyright (C) 2007 David Faure <faure@kde.org> Copyright (C) 2007 David Faure <faure@kde.org>
Copyright (C) 2009 Jeremy Whiting <jpwhiting@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) any later version. version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful, This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details. Lesser General Public License for more details.
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_EXPORT_H #ifndef KNEWSTUFF2_EXPORT_H
#define KNEWSTUFF3_EXPORT_H #define KNEWSTUFF2_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */ /* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h> #include <kdemacros.h>
#ifndef KNEWSTUFF_EXPORT #ifndef KNEWSTUFF_EXPORT
# if defined(KDELIBS_STATIC_LIBS) # if defined(KDELIBS_STATIC_LIBS)
/* No export/import for static libraries */ /* No export/import for static libraries */
# define KNEWSTUFF_EXPORT # define KNEWSTUFF_EXPORT
# elif defined(MAKE_KNEWSTUFF3_LIB) # elif defined(MAKE_KNEWSTUFF2_LIB)
/* We are building this library */ /* We are building this library */
# define KNEWSTUFF_EXPORT KDE_EXPORT # define KNEWSTUFF_EXPORT KDE_EXPORT
# else # else
/* We are using this library */ /* We are using this library */
# define KNEWSTUFF_EXPORT KDE_IMPORT # define KNEWSTUFF_EXPORT KDE_IMPORT
# endif # endif
#endif #endif
# ifndef KNEWSTUFF_EXPORT_DEPRECATED # ifndef KNEWSTUFF_EXPORT_DEPRECATED
# define KNEWSTUFF_EXPORT_DEPRECATED KDE_DEPRECATED KNEWSTUFF_EXPORT # define KNEWSTUFF_EXPORT_DEPRECATED KDE_DEPRECATED KNEWSTUFF_EXPORT
 End of changes. 3 change blocks. 
4 lines changed or deleted 3 lines changed or added


 ktoolbar.h   ktoolbar.h 
skipping to change at line 179 skipping to change at line 179
KDE_DEPRECATED void setXMLGUIClient( KXMLGUIClient *client ); KDE_DEPRECATED void setXMLGUIClient( KXMLGUIClient *client );
#endif #endif
/** /**
* Adds an XML gui client that uses this toolbar * Adds an XML gui client that uses this toolbar
* @since 4.8.1 * @since 4.8.1
*/ */
void addXMLGUIClient( KXMLGUIClient *client ); void addXMLGUIClient( KXMLGUIClient *client );
/** /**
* Removes an XML gui client that uses this toolbar
* @since 4.8.5
*/
void removeXMLGUIClient( KXMLGUIClient *client );
/**
* Load state from an XML @param element, called by KXMLGUIBuilder. * Load state from an XML @param element, called by KXMLGUIBuilder.
*/ */
void loadState( const QDomElement &element ); void loadState( const QDomElement &element );
/** /**
* Save state into an XML @param element, called by KXMLGUIBuilder. * Save state into an XML @param element, called by KXMLGUIBuilder.
*/ */
void saveState( QDomElement &element ) const; void saveState( QDomElement &element ) const;
/** /**
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added


 toolbutton.h   toolbutton.h 
skipping to change at line 189 skipping to change at line 189
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);
void changeEvent(QEvent *event); void changeEvent(QEvent *event);
QVariant itemChange(GraphicsItemChange change, const QVariant &value); QVariant itemChange(GraphicsItemChange change, const QVariant &value);
QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const; QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const;
private slots: private Q_SLOTS:
void setAnimationUpdate(qreal progress); void setAnimationUpdate(qreal progress);
qreal animationUpdate() const; qreal animationUpdate() const;
private: private:
Q_PRIVATE_SLOT(d, void syncBorders()) Q_PRIVATE_SLOT(d, void syncBorders())
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()) Q_PRIVATE_SLOT(d, void setPixmap())
Q_PRIVATE_SLOT(d, void setPalette()) Q_PRIVATE_SLOT(d, void setPalette())
 End of changes. 1 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/