[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/workspace/plasma/generic/applets/systemtray/protocols/dbussystemtray
From: Marco Martin <notmart () gmail ! com>
Date: 2009-09-16 19:20:28
Message-ID: 1253128828.443448.32119.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1024533 by mart:
not experimental anymore
M +17 -17 dbussystemtraytask.cpp
M +9 -9 systemtraytypes.cpp
M +13 -13 systemtraytypes.h
--- trunk/KDE/kdebase/workspace/plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp \
#1024532:1024533 @@ -64,8 +64,8 @@
delete blinkTimer;
}
- QPixmap ExperimentalKDbusImageStructToPixmap(const ExperimentalKDbusImageStruct \
&image) const;
- QIcon imageVectorToPixmap(const ExperimentalKDbusImageVector &vector) const;
+ QPixmap KDbusImageStructToPixmap(const KDbusImageStruct &image) const;
+ QIcon imageVectorToPixmap(const KDbusImageVector &vector) const;
void overlayIcon(QIcon *icon, QIcon *overlay);
void iconDestroyed(QObject *obj);
@@ -78,8 +78,8 @@
void syncStatus(QString status);
//callbacks
- void syncToolTip(const ExperimentalKDbusToolTipStruct &);
- void syncMovie(const ExperimentalKDbusImageVector &);
+ void syncToolTip(const KDbusToolTipStruct &);
+ void syncMovie(const KDbusImageVector &);
void refreshCallback(QDBusPendingCallWatcher *call);
@@ -107,9 +107,9 @@
d(new DBusSystemTrayTaskPrivate(this))
{
setObjectName("DBusSystemTrayTask");
- qDBusRegisterMetaType<ExperimentalKDbusImageStruct>();
- qDBusRegisterMetaType<ExperimentalKDbusImageVector>();
- qDBusRegisterMetaType<ExperimentalKDbusToolTipStruct>();
+ qDBusRegisterMetaType<KDbusImageStruct>();
+ qDBusRegisterMetaType<KDbusImageVector>();
+ qDBusRegisterMetaType<KDbusToolTipStruct>();
d->typeId = service;
d->name = service;
@@ -250,7 +250,7 @@
//Icon
{
- ExperimentalKDbusImageVector image;
+ KDbusImageVector image;
properties["OverlayIconPixmap"].value<QDBusArgument>() >> image;
if (image.isEmpty()) {
@@ -289,7 +289,7 @@
//Attention icon
{
- ExperimentalKDbusImageVector image;
+ KDbusImageVector image;
properties["AttentionIconPixmap"].value<QDBusArgument>() >> image;
if (image.isEmpty()) {
QString iconName = properties["AttentionIconName"].toString();
@@ -308,11 +308,11 @@
}
}
- ExperimentalKDbusImageVector movie;
+ KDbusImageVector movie;
properties["AttentionMovie"].value<QDBusArgument>() >> movie;
syncMovie(movie);
- ExperimentalKDbusToolTipStruct toolTip;
+ KDbusToolTipStruct toolTip;
properties["ToolTip"].value<QDBusArgument>() >> toolTip;
syncToolTip(toolTip);
@@ -323,7 +323,7 @@
delete call;
}
-QPixmap DBusSystemTrayTaskPrivate::ExperimentalKDbusImageStructToPixmap(const \
ExperimentalKDbusImageStruct &icon) const +QPixmap \
DBusSystemTrayTaskPrivate::KDbusImageStructToPixmap(const KDbusImageStruct &icon) \
const {
//swap from network byte order if we are little endian
if (QSysInfo::ByteOrder == QSysInfo::LittleEndian) {
@@ -339,12 +339,12 @@
return QPixmap::fromImage(iconImage);
}
-QIcon DBusSystemTrayTaskPrivate::imageVectorToPixmap(const \
ExperimentalKDbusImageVector &vector) const +QIcon \
DBusSystemTrayTaskPrivate::imageVectorToPixmap(const KDbusImageVector &vector) const \
{ QIcon icon;
for (int i = 0; i<vector.size(); ++i) {
- icon.addPixmap(ExperimentalKDbusImageStructToPixmap(vector[i]));
+ icon.addPixmap(KDbusImageStructToPixmap(vector[i]));
}
return icon;
@@ -406,13 +406,13 @@
blink = !blink;
}
-void DBusSystemTrayTaskPrivate::syncMovie(const ExperimentalKDbusImageVector \
&movieData) +void DBusSystemTrayTaskPrivate::syncMovie(const KDbusImageVector \
&movieData) {
movie = QVector<QPixmap>(movieData.size());
if (!movieData.isEmpty()) {
for (int i=0; i<movieData.size(); ++i) {
- movie[i] = ExperimentalKDbusImageStructToPixmap(movieData[i]);
+ movie[i] = KDbusImageStructToPixmap(movieData[i]);
}
}
}
@@ -430,7 +430,7 @@
//toolTip
-void DBusSystemTrayTaskPrivate::syncToolTip(const ExperimentalKDbusToolTipStruct \
&tipStruct) +void DBusSystemTrayTaskPrivate::syncToolTip(const KDbusToolTipStruct \
&tipStruct) {
if (tipStruct.title.isEmpty()) {
foreach (Plasma::IconWidget *iconWidget, iconWidgets) {
--- trunk/KDE/kdebase/workspace/plasma/generic/applets/systemtray/protocols/dbussystemtray/systemtraytypes.cpp \
#1024532:1024533 @@ -22,7 +22,7 @@
// Marshall the ImageStruct data into a D-BUS argument
-const QDBusArgument &operator<<(QDBusArgument &argument, const \
ExperimentalKDbusImageStruct &icon) +const QDBusArgument &operator<<(QDBusArgument \
&argument, const KDbusImageStruct &icon) {
argument.beginStructure();
argument << icon.width;
@@ -34,7 +34,7 @@
#include <KDebug>
// Retrieve the ImageStruct data from the D-BUS argument
-const QDBusArgument &operator>>(const QDBusArgument &argument, \
ExperimentalKDbusImageStruct &icon) +const QDBusArgument &operator>>(const \
QDBusArgument &argument, KDbusImageStruct &icon) {
qint32 width = 0;
qint32 height = 0;
@@ -60,9 +60,9 @@
}
// Marshall the ImageVector data into a D-BUS argument
-const QDBusArgument &operator<<(QDBusArgument &argument, const \
ExperimentalKDbusImageVector &iconVector) +const QDBusArgument \
&operator<<(QDBusArgument &argument, const KDbusImageVector &iconVector) {
- argument.beginArray(qMetaTypeId<ExperimentalKDbusImageStruct>());
+ argument.beginArray(qMetaTypeId<KDbusImageStruct>());
for (int i=0; i<iconVector.size(); ++i) {
argument << iconVector[i];
}
@@ -71,7 +71,7 @@
}
// Retrieve the ImageVector data from the D-BUS argument
-const QDBusArgument &operator>>(const QDBusArgument &argument, \
ExperimentalKDbusImageVector &iconVector) +const QDBusArgument &operator>>(const \
QDBusArgument &argument, KDbusImageVector &iconVector) {
iconVector.clear();
@@ -79,7 +79,7 @@
argument.beginArray();
while (!argument.atEnd()) {
- ExperimentalKDbusImageStruct element;
+ KDbusImageStruct element;
argument >> element;
iconVector.append(element);
}
@@ -91,7 +91,7 @@
}
// Marshall the ToolTipStruct data into a D-BUS argument
-const QDBusArgument &operator<<(QDBusArgument &argument, const \
ExperimentalKDbusToolTipStruct &toolTip) +const QDBusArgument \
&operator<<(QDBusArgument &argument, const KDbusToolTipStruct &toolTip) {
argument.beginStructure();
argument << toolTip.icon;
@@ -104,10 +104,10 @@
}
// Retrieve the ToolTipStruct data from the D-BUS argument
-const QDBusArgument &operator>>(const QDBusArgument &argument, \
ExperimentalKDbusToolTipStruct &toolTip) +const QDBusArgument &operator>>(const \
QDBusArgument &argument, KDbusToolTipStruct &toolTip) {
QString icon;
- ExperimentalKDbusImageVector image;
+ KDbusImageVector image;
QString title;
QString subTitle;
--- trunk/KDE/kdebase/workspace/plasma/generic/applets/systemtray/protocols/dbussystemtray/systemtraytypes.h \
#1024532:1024533 @@ -24,34 +24,34 @@
#include <QDBusArgument>
#include <QVector>
-struct ExperimentalKDbusImageStruct {
+struct KDbusImageStruct {
int width;
int height;
QByteArray data;
};
-const QDBusArgument &operator<<(QDBusArgument &argument, const \
ExperimentalKDbusImageStruct &icon);
-const QDBusArgument &operator>>(const QDBusArgument &argument, \
ExperimentalKDbusImageStruct &icon); +const QDBusArgument &operator<<(QDBusArgument \
&argument, const KDbusImageStruct &icon); +const QDBusArgument &operator>>(const \
QDBusArgument &argument, KDbusImageStruct &icon);
-Q_DECLARE_METATYPE(ExperimentalKDbusImageStruct)
+Q_DECLARE_METATYPE(KDbusImageStruct)
-typedef QVector<ExperimentalKDbusImageStruct> ExperimentalKDbusImageVector;
-const QDBusArgument &operator<<(QDBusArgument &argument, const \
ExperimentalKDbusImageVector &iconVector);
-const QDBusArgument &operator>>(const QDBusArgument &argument, \
ExperimentalKDbusImageVector &iconVector); +typedef QVector<KDbusImageStruct> \
KDbusImageVector; +const QDBusArgument &operator<<(QDBusArgument &argument, const \
KDbusImageVector &iconVector); +const QDBusArgument &operator>>(const QDBusArgument \
&argument, KDbusImageVector &iconVector);
-Q_DECLARE_METATYPE(ExperimentalKDbusImageVector)
+Q_DECLARE_METATYPE(KDbusImageVector)
-struct ExperimentalKDbusToolTipStruct {
+struct KDbusToolTipStruct {
QString icon;
- ExperimentalKDbusImageVector image;
+ KDbusImageVector image;
QString title;
QString subTitle;
};
-const QDBusArgument &operator<<(QDBusArgument &argument, const \
ExperimentalKDbusToolTipStruct &toolTip);
-const QDBusArgument &operator>>(const QDBusArgument &argument, \
ExperimentalKDbusToolTipStruct &toolTip); +const QDBusArgument \
&operator<<(QDBusArgument &argument, const KDbusToolTipStruct &toolTip); +const \
QDBusArgument &operator>>(const QDBusArgument &argument, KDbusToolTipStruct \
&toolTip);
-Q_DECLARE_METATYPE(ExperimentalKDbusToolTipStruct)
+Q_DECLARE_METATYPE(KDbusToolTipStruct)
#endif
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic