EBN Fixes
* Include own header file first * Make d-pointer const * Use references-to-const svn path=/trunk/KDE/kdebase/workspace/plasma/lib/; revision=667001
This commit is contained in:
parent
a4505ca37f
commit
dfb58b44c1
@ -16,12 +16,12 @@
|
|||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "abstractrunner.h"
|
||||||
|
|
||||||
#include <QAction>
|
#include <QAction>
|
||||||
#include <KActionCollection>
|
#include <KActionCollection>
|
||||||
#include <KServiceTypeTrader>
|
#include <KServiceTypeTrader>
|
||||||
|
|
||||||
#include "abstractrunner.h"
|
|
||||||
|
|
||||||
namespace Plasma
|
namespace Plasma
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -41,9 +41,9 @@ class AbstractRunner::Private
|
|||||||
};
|
};
|
||||||
|
|
||||||
AbstractRunner::AbstractRunner( QObject* parent )
|
AbstractRunner::AbstractRunner( QObject* parent )
|
||||||
: QObject( parent )
|
: QObject( parent ),
|
||||||
|
d( new Private( this ) )
|
||||||
{
|
{
|
||||||
d = new Private( this );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
AbstractRunner::~AbstractRunner()
|
AbstractRunner::~AbstractRunner()
|
||||||
|
@ -136,7 +136,7 @@ class PLASMA_EXPORT AbstractRunner : public QObject
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
class Private;
|
class Private;
|
||||||
Private* d;
|
Private* const d;
|
||||||
|
|
||||||
private Q_SLOTS:
|
private Q_SLOTS:
|
||||||
void runExactMatch();
|
void runExactMatch();
|
||||||
|
10
applet.cpp
10
applet.cpp
@ -16,6 +16,8 @@
|
|||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "applet.h"
|
||||||
|
|
||||||
#include <QEvent>
|
#include <QEvent>
|
||||||
#include <QList>
|
#include <QList>
|
||||||
#include <QSize>
|
#include <QSize>
|
||||||
@ -26,7 +28,6 @@
|
|||||||
#include <KStandardDirs>
|
#include <KStandardDirs>
|
||||||
#include <KService>
|
#include <KService>
|
||||||
|
|
||||||
#include "applet.h"
|
|
||||||
#include "interface.h"
|
#include "interface.h"
|
||||||
|
|
||||||
namespace Plasma
|
namespace Plasma
|
||||||
@ -59,13 +60,12 @@ class Applet::Private
|
|||||||
};
|
};
|
||||||
|
|
||||||
Applet::Applet( QGraphicsItem *parent,
|
Applet::Applet( QGraphicsItem *parent,
|
||||||
QString serviceID,
|
const QString& serviceID,
|
||||||
int appletId )
|
int appletId )
|
||||||
: QWidget( 0 ),
|
: QWidget( 0 ),
|
||||||
QGraphicsItemGroup( parent )
|
QGraphicsItemGroup( parent ),
|
||||||
|
d( new Private( KService::serviceByStorageId( serviceID ), appletId ) )
|
||||||
{
|
{
|
||||||
KService::Ptr service = KService::serviceByStorageId( serviceID );
|
|
||||||
d = new Private( service, appletId );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Applet::~Applet()
|
Applet::~Applet()
|
||||||
|
4
applet.h
4
applet.h
@ -37,7 +37,7 @@ class PLASMA_EXPORT Applet : public QWidget, public QGraphicsItemGroup
|
|||||||
typedef QList<Applet*> List;
|
typedef QList<Applet*> List;
|
||||||
|
|
||||||
Applet( QGraphicsItem* parent,
|
Applet( QGraphicsItem* parent,
|
||||||
QString serviceId,
|
const QString& serviceId,
|
||||||
int appletId );
|
int appletId );
|
||||||
~Applet();
|
~Applet();
|
||||||
|
|
||||||
@ -105,7 +105,7 @@ class PLASMA_EXPORT Applet : public QWidget, public QGraphicsItemGroup
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
class Private;
|
class Private;
|
||||||
Private* d;
|
Private* const d;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define K_EXPORT_PLASMA_APPLET(libname, classname) \
|
#define K_EXPORT_PLASMA_APPLET(libname, classname) \
|
||||||
|
@ -16,12 +16,13 @@
|
|||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "dataengine.h"
|
||||||
|
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
#include <QVariant>
|
#include <QVariant>
|
||||||
|
|
||||||
#include <KDebug>
|
#include <KDebug>
|
||||||
|
|
||||||
#include "dataengine.h"
|
|
||||||
#include "datasource.h"
|
#include "datasource.h"
|
||||||
#include "datavisualization.h"
|
#include "datavisualization.h"
|
||||||
|
|
||||||
|
@ -19,10 +19,10 @@
|
|||||||
#ifndef PLASMA_DATAENGINE_H
|
#ifndef PLASMA_DATAENGINE_H
|
||||||
#define PLASMA_DATAENGINE_H
|
#define PLASMA_DATAENGINE_H
|
||||||
|
|
||||||
#include <QAtomic>
|
#include <QtCore/QAtomic>
|
||||||
#include <QHash>
|
#include <QtCore/QHash>
|
||||||
#include <QObject>
|
#include <QtCore/QObject>
|
||||||
#include <QStringList>
|
#include <QtCore/QStringList>
|
||||||
|
|
||||||
#include <plasma_export.h>
|
#include <plasma_export.h>
|
||||||
|
|
||||||
|
@ -16,12 +16,12 @@
|
|||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "datasource.h"
|
||||||
|
|
||||||
#include <QVariant>
|
#include <QVariant>
|
||||||
|
|
||||||
#include <KDebug>
|
#include <KDebug>
|
||||||
|
|
||||||
#include "datasource.h"
|
|
||||||
|
|
||||||
namespace Plasma
|
namespace Plasma
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -16,7 +16,6 @@
|
|||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "datavisualization.h"
|
#include "datavisualization.h"
|
||||||
|
|
||||||
namespace Plasma
|
namespace Plasma
|
||||||
|
@ -39,7 +39,7 @@ class PLASMA_EXPORT DataVisualization : public QObject
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
class Private;
|
class Private;
|
||||||
Private* d;
|
Private* const d;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // Plasma namespace
|
} // Plasma namespace
|
||||||
|
@ -16,10 +16,10 @@
|
|||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <kdebug.h>
|
|
||||||
|
|
||||||
#include "interface.h"
|
#include "interface.h"
|
||||||
|
|
||||||
|
#include <kdebug.h>
|
||||||
|
|
||||||
Plasma::Interface* Plasma::Interface::m_interface;
|
Plasma::Interface* Plasma::Interface::m_interface;
|
||||||
|
|
||||||
namespace Plasma
|
namespace Plasma
|
||||||
|
4
svg.cpp
4
svg.cpp
@ -16,14 +16,14 @@
|
|||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "svg.h"
|
||||||
|
|
||||||
#include <QMatrix>
|
#include <QMatrix>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QPixmapCache>
|
#include <QPixmapCache>
|
||||||
|
|
||||||
#include <KDebug>
|
#include <KDebug>
|
||||||
#include <KSvgRenderer>
|
#include <KSvgRenderer>
|
||||||
|
|
||||||
#include "svg.h"
|
|
||||||
#include "theme.h"
|
#include "theme.h"
|
||||||
|
|
||||||
namespace Plasma
|
namespace Plasma
|
||||||
|
9
svg.h
9
svg.h
@ -25,8 +25,12 @@
|
|||||||
|
|
||||||
class QPainter;
|
class QPainter;
|
||||||
class QPoint;
|
class QPoint;
|
||||||
|
class QPointF;
|
||||||
class QRect;
|
class QRect;
|
||||||
|
class QRectF;
|
||||||
class QSize;
|
class QSize;
|
||||||
|
class QSizeF;
|
||||||
|
class QMatrix;
|
||||||
|
|
||||||
namespace Plasma
|
namespace Plasma
|
||||||
{
|
{
|
||||||
@ -45,10 +49,11 @@ class PLASMA_EXPORT Svg : public QObject
|
|||||||
*
|
*
|
||||||
* The size is initialized to be the SVG's native size.
|
* The size is initialized to be the SVG's native size.
|
||||||
*
|
*
|
||||||
* @related Plasma::Theme
|
|
||||||
* @arg imagePath the image to show, used to load the image from
|
* @arg imagePath the image to show, used to load the image from
|
||||||
* Plasma::Theme
|
* Plasma::Theme
|
||||||
* @arg parent options QObject to parent this to
|
* @arg parent options QObject to parent this to
|
||||||
|
*
|
||||||
|
* @related Plasma::Theme
|
||||||
*/
|
*/
|
||||||
explicit Svg( const QString& imagePath, QObject* parent = 0 );
|
explicit Svg( const QString& imagePath, QObject* parent = 0 );
|
||||||
~Svg();
|
~Svg();
|
||||||
@ -136,7 +141,7 @@ class PLASMA_EXPORT Svg : public QObject
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
class Private;
|
class Private;
|
||||||
Private* d;
|
Private* const d;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // Plasma namespace
|
} // Plasma namespace
|
||||||
|
@ -16,12 +16,12 @@
|
|||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "theme.h"
|
||||||
|
|
||||||
#include <KSharedConfig>
|
#include <KSharedConfig>
|
||||||
#include <KStandardDirs>
|
#include <KStandardDirs>
|
||||||
#include <kconfiggroup.h>
|
#include <kconfiggroup.h>
|
||||||
|
|
||||||
#include "theme.h"
|
|
||||||
|
|
||||||
namespace Plasma
|
namespace Plasma
|
||||||
{
|
{
|
||||||
|
|
||||||
|
2
theme.h
2
theme.h
@ -47,7 +47,7 @@ class PLASMA_EXPORT Theme : public QObject
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
class Private;
|
class Private;
|
||||||
Private* d;
|
Private* const d;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // Plasma namespace
|
} // Plasma namespace
|
||||||
|
@ -16,13 +16,14 @@
|
|||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "checkbox.h"
|
||||||
|
|
||||||
#include <QStyleOption>
|
#include <QStyleOption>
|
||||||
#include <QStyle>
|
#include <QStyle>
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QGraphicsSceneMouseEvent>
|
#include <QGraphicsSceneMouseEvent>
|
||||||
|
|
||||||
#include "checkbox.h"
|
|
||||||
#include "checkbox.moc"
|
#include "checkbox.moc"
|
||||||
|
|
||||||
namespace Plasma
|
namespace Plasma
|
||||||
|
@ -16,10 +16,10 @@
|
|||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <QStyleOptionFrameV2>
|
|
||||||
|
|
||||||
#include "lineedit.h"
|
#include "lineedit.h"
|
||||||
|
|
||||||
|
#include <QStyleOptionFrameV2>
|
||||||
|
|
||||||
namespace Plasma
|
namespace Plasma
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ class KDE_EXPORT LineEdit : public QGraphicsTextItem,
|
|||||||
public DataVisualization
|
public DataVisualization
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
LineEdit(QGraphicsItem *parent = 0, QGraphicsScene *scene = 0);
|
explicit LineEdit(QGraphicsItem *parent = 0, QGraphicsScene *scene = 0);
|
||||||
~LineEdit();
|
~LineEdit();
|
||||||
|
|
||||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
|
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
|
||||||
|
@ -16,6 +16,8 @@
|
|||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "pushbutton.h"
|
||||||
|
|
||||||
#include <QStyleOptionFrameV2>
|
#include <QStyleOptionFrameV2>
|
||||||
#include <QStyleOption>
|
#include <QStyleOption>
|
||||||
#include <QStyle>
|
#include <QStyle>
|
||||||
@ -23,8 +25,6 @@
|
|||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QGraphicsSceneMouseEvent>
|
#include <QGraphicsSceneMouseEvent>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
#include "pushbutton.h"
|
|
||||||
#include "pushbutton.moc"
|
#include "pushbutton.moc"
|
||||||
|
|
||||||
namespace Plasma
|
namespace Plasma
|
||||||
@ -177,7 +177,7 @@ QSize PushButton::size() const
|
|||||||
return QSize(d->width, d->height);
|
return QSize(d->width, d->height);
|
||||||
}
|
}
|
||||||
|
|
||||||
void PushButton::setSize(QSize s)
|
void PushButton::setSize(const QSize& s)
|
||||||
{
|
{
|
||||||
prepareGeometryChange();
|
prepareGeometryChange();
|
||||||
if (!d->maxWidth >= s.width())
|
if (!d->maxWidth >= s.width())
|
||||||
|
@ -64,7 +64,7 @@ class KDE_EXPORT PushButton : public DataVisualization,
|
|||||||
void setText(const QString &name);
|
void setText(const QString &name);
|
||||||
|
|
||||||
QSize size() const;
|
QSize size() const;
|
||||||
void setSize(QSize size);
|
void setSize(const QSize& size);
|
||||||
|
|
||||||
int height() const;
|
int height() const;
|
||||||
void setHeight(int height);
|
void setHeight(int height);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/**
|
/*
|
||||||
* Copyright (C) 2007 by Rafael Fernández López <ereslibre@gmail.com>
|
* Copyright (C) 2007 by Rafael Fernández López <ereslibre@gmail.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
@ -16,6 +16,9 @@
|
|||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
// Header Includes
|
||||||
|
#include "radiobutton.h"
|
||||||
|
|
||||||
// Qt includes
|
// Qt includes
|
||||||
#include <QtGui/QWidget>
|
#include <QtGui/QWidget>
|
||||||
#include <QtGui/QApplication>
|
#include <QtGui/QApplication>
|
||||||
@ -23,9 +26,6 @@
|
|||||||
#include <QtGui/QStyleOptionButton>
|
#include <QtGui/QStyleOptionButton>
|
||||||
#include <QtGui/QGraphicsSceneMouseEvent>
|
#include <QtGui/QGraphicsSceneMouseEvent>
|
||||||
|
|
||||||
// Radio button includes
|
|
||||||
#include "radiobutton.h"
|
|
||||||
|
|
||||||
namespace Plasma
|
namespace Plasma
|
||||||
{
|
{
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user