service_p.h   service_p.h 
skipping to change at line 26 skipping to change at line 26
* Free Software Foundation, Inc., * Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef SERVICE_P_H #ifndef SERVICE_P_H
#define SERVICE_P_H #define SERVICE_P_H
#include "servicejob.h" #include "servicejob.h"
#include "service.h" #include "service.h"
#include <QGraphicsWidget> #include <QGraphicsObject>
#include <QMap> #include <QMap>
#include <QMultiHash> #include <QMultiHash>
#include <QWidget> #include <QWidget>
#include <QSet> #include <QSet>
#include <dnssd/publicservice.h> #include <dnssd/publicservice.h>
#include <dnssd/servicebrowser.h> #include <dnssd/servicebrowser.h>
#include "plasma/configloader.h" #include "plasma/configloader.h"
#include "accessmanager_p.h" #include "accessmanager_p.h"
skipping to change at line 117 skipping to change at line 117
Service *q; Service *q;
QString destination; QString destination;
QString name; QString name;
QString resourcename; QString resourcename;
ConfigLoader *config; ConfigLoader *config;
KConfig *dummyConfig; KConfig *dummyConfig;
DNSSD::PublicService *publicService; DNSSD::PublicService *publicService;
ServiceProvider *serviceProvider; ServiceProvider *serviceProvider;
QMultiHash<QWidget *, QString> associatedWidgets; QMultiHash<QWidget *, QString> associatedWidgets;
QMultiHash<QGraphicsWidget *, QString> associatedGraphicsWidgets; QMultiHash<QGraphicsObject *, QString> associatedGraphicsWidgets;
QSet<QString> disabledOperations; QSet<QString> disabledOperations;
}; };
} // namespace Plasma } // namespace Plasma
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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/