ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 96
committer: Aurelien Gateau <aurelien.gateau@xxxxxxxxxxxxx>
branch nick: plasma-indicatordisplay
timestamp: Mon 2009-09-28 10:36:10 +0200
message:
  Use libindicate defines for property names.
modified:
  CMakeLists.txt
  src/CMakeLists.txt
  src/listenermodel.cpp


--
lp:plasma-indicatordisplay
https://code.launchpad.net/~agateau/plasma-indicatordisplay/trunk

Your team ayatana-commits is subscribed to branch lp:plasma-indicatordisplay.
To unsubscribe from this branch go to https://code.launchpad.net/~agateau/plasma-indicatordisplay/trunk/+edit-subscription.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2009-09-17 13:46:42 +0000
+++ CMakeLists.txt	2009-09-28 08:36:10 +0000
@@ -13,16 +13,17 @@
 find_package(KDE4 REQUIRED)
 include(KDE4Defaults)
 find_package(PkgConfig REQUIRED)
-
-# Find libindicate-qt
+pkg_check_modules(INDICATE REQUIRED indicate>=0.2.1)
 pkg_check_modules(INDICATEQT REQUIRED indicate-qt>=0.2.2)
 
 include_directories(
     ${KDE4_INCLUDES}
+    ${INDICATE_INCLUDE_DIRS}
     ${INDICATEQT_INCLUDE_DIRS}
     )
 
 link_directories(
+    ${INDICATE_LIBRARY_DIRS}
     ${INDICATEQT_LIBRARY_DIRS}
     )
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2009-09-15 14:42:06 +0000
+++ src/CMakeLists.txt	2009-09-28 08:36:10 +0000
@@ -18,6 +18,7 @@
     ${KDE4_PLASMA_LIBS}
     ${KDE4_KIO_LIBS}
     ${INDICATEQT_LIBRARIES}
+    ${INDICATE_LIBRARIES}
     )
 
 install(TARGETS plasma_applet_indicatordisplay

=== modified file 'src/listenermodel.cpp'
--- src/listenermodel.cpp	2009-09-17 13:48:34 +0000
+++ src/listenermodel.cpp	2009-09-28 08:36:10 +0000
@@ -20,6 +20,9 @@
 #include <KIcon>
 #include <KIconLoader>
 
+// libindicate
+#include <libindicate/indicator-messages.h>
+
 // libindicate-qt
 #include <qindicatedecode.h>
 
@@ -222,7 +225,12 @@
 void ListenerModel::slotIndicatorAdded(QIndicate::Listener::Server* server,
                                        QIndicate::Listener::Indicator* indicator)
 {
-    static QVariant outdatedKeyList = QStringList() << "name" << "icon" << "time" << "draw_attention" << "count";
+    static QVariant outdatedKeyList = QStringList()
+        << INDICATE_INDICATOR_MESSAGES_PROP_NAME
+        << INDICATE_INDICATOR_MESSAGES_PROP_ICON
+        << INDICATE_INDICATOR_MESSAGES_PROP_TIME
+        << INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION
+        << INDICATE_INDICATOR_MESSAGES_PROP_COUNT;
 
     QStandardItem* serverItem = d->mItemForServer.value(server);
     if (!serverItem) {
@@ -314,23 +322,23 @@
         return;
     }
 
-    if (key == "name") {
+    if (key == INDICATE_INDICATOR_MESSAGES_PROP_NAME) {
         item->setText(QIndicate::Decode::stringFromValue(value));
-    } else if (key == "icon") {
+    } else if (key == INDICATE_INDICATOR_MESSAGES_PROP_ICON) {
         QImage image = QIndicate::Decode::imageFromValue(value);
         QPixmap pix = QPixmap::fromImage(image);
         item->setData(KIcon(pix), Qt::DecorationRole);
-    } else if (key == "time") {
+    } else if (key == INDICATE_INDICATOR_MESSAGES_PROP_TIME) {
         QDateTime dateTime = QIndicate::Decode::dateTimeFromValue(value);
         item->setData(QVariant(dateTime), IndicatorDateTimeRole);
-    } else if (key == "draw_attention") {
+    } else if (key == INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION) {
         QVariant oldAttention = item->data(IndicatorDrawAttentionRole).toBool();
         bool attention = QIndicate::Decode::boolFromValue(value);
         item->setData(QVariant(attention), IndicatorDrawAttentionRole);
         if (oldAttention != attention) {
             emit drawAttentionChanged(indexFromItem(item));
         }
-    } else if (key == "count") {
+    } else if (key == INDICATE_INDICATOR_MESSAGES_PROP_COUNT) {
         int count = QIndicate::Decode::intFromValue(value);
         item->setData(QVariant(count), CountRole);
     } else {