[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-10-21 2:22:32
Message-ID: 1224555752.177850.4343.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 874255 by aseigo:

ToolTipManager::ToolTipContent -> ToolTipManager::Content


 M  +1 -1      analog-clock/CMakeLists.txt  
 M  +1 -1      analog-clock/clock.h  
 M  +2 -2      devicenotifier/devicenotifier.cpp  
 M  +1 -2      digital-clock/CMakeLists.txt  
 M  +1 -1      digital-clock/clock.cpp  
 M  +1 -1      digital-clock/clock.h  
 M  +1 -1      icon/icon.cpp  
 M  +1 -1      kickoff/applet/applet.cpp  
 M  +1 -1      system-monitor/hwinfo.cpp  
 M  +1 -1      tasks/abstracttaskitem.cpp  
 M  +1 -1      tasks/taskgroupitem.cpp  
 M  +1 -1      tasks/windowtaskitem.cpp  
 M  +2 -2      trash/trash.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/analog-clock/CMakeLists.txt \
#874254:874255 @@ -4,7 +4,7 @@
 
 kde4_add_ui_files(clock_SRCS clockConfig.ui )
 kde4_add_plugin(plasma_applet_clock ${clock_SRCS})
-include_directories( ../libplasmaclock/ \
${CMAKE_CURRENT_BINARY_DIR}/../libplasmaclock/) \
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/)  \
target_link_libraries(plasma_applet_clock plasma plasmaclock ${KDE4_KIO_LIBS})  
 install(TARGETS plasma_applet_clock DESTINATION ${PLUGIN_INSTALL_DIR})
--- trunk/KDE/kdebase/workspace/plasma/applets/analog-clock/clock.h #874254:874255
@@ -35,7 +35,7 @@
 #include <plasma/containment.h>
 #include <plasma/dataengine.h>
 
-#include "clockapplet.h"
+#include "libplasmaclock/clockapplet.h"
 #include "ui_clockConfig.h"
 #include "ui_calendar.h"
 
--- trunk/KDE/kdebase/workspace/plasma/applets/devicenotifier/devicenotifier.cpp \
#874254:874255 @@ -213,7 +213,7 @@
 
 void DeviceNotifier::toolTipAboutToShow()
 {
-    Plasma::ToolTipManager::ToolTipContent toolTip;
+    Plasma::ToolTipManager::Content toolTip;
     if (!m_lastPlugged.isEmpty()) {
         Solid::Device *device = new Solid::Device(m_lastPlugged.last());
 
@@ -231,7 +231,7 @@
 
 void DeviceNotifier::toolTipHidden()
 {
-    Plasma::ToolTipManager::self()->setContent(this, \
Plasma::ToolTipManager::ToolTipContent()); +    \
Plasma::ToolTipManager::self()->setContent(this, Plasma::ToolTipManager::Content());  \
}  
 void DeviceNotifier::removeLastDeviceNotification(const QString &name)
--- trunk/KDE/kdebase/workspace/plasma/applets/digital-clock/CMakeLists.txt \
#874254:874255 @@ -1,7 +1,6 @@
 project(plasma-dig-clock)
 
-include_directories( ../libplasmaclock/
-${CMAKE_CURRENT_BINARY_DIR}/../libplasmaclock/)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/)
 
 set(clock_SRCS
     clock.cpp)
--- trunk/KDE/kdebase/workspace/plasma/applets/digital-clock/clock.cpp #874254:874255
@@ -140,7 +140,7 @@
     m_date = data["Date"].toDate();
 
     if (Plasma::ToolTipManager::self()->isVisible(this)) {
-        updateToolTipContent();
+        updateContent();
     }
 
     // avoid unnecessary repaints
--- trunk/KDE/kdebase/workspace/plasma/applets/digital-clock/clock.h #874254:874255
@@ -30,7 +30,7 @@
 
 #include "ui_clockConfig.h"
 #include "ui_calendar.h"
-#include "clockapplet.h"
+#include "libplasmaclock/clockapplet.h"
 
 class Clock : public ClockApplet
 {
--- trunk/KDE/kdebase/workspace/plasma/applets/icon/icon.cpp #874254:874255
@@ -159,7 +159,7 @@
             //in the panel the icon behaves like a button
             connect(m_icon, SIGNAL(clicked()), this, SLOT(openUrl()));
             m_icon->setText(QString());
-            Plasma::ToolTipManager::ToolTipContent data;
+            Plasma::ToolTipManager::Content data;
             data.mainText = m_text;
             data.subText = m_genericName;
             data.image = m_icon->icon().pixmap(IconSize(KIconLoader::Desktop));
--- trunk/KDE/kdebase/workspace/plasma/applets/kickoff/applet/applet.cpp \
#874254:874255 @@ -79,7 +79,7 @@
 
 void LauncherApplet::Private::initToolTip()
 {
-    Plasma::ToolTipManager::ToolTipContent data;
+    Plasma::ToolTipManager::Content data;
     data.mainText = i18n("Kickoff Application Launcher");
     data.subText = i18n("Favorites, applications, computer places, recently used \
items and desktop sessions");  data.image = \
                q->popupIcon().pixmap(IconSize(KIconLoader::Desktop));
--- trunk/KDE/kdebase/workspace/plasma/applets/system-monitor/hwinfo.cpp \
#874254:874255 @@ -137,7 +137,7 @@
         m_info->setHtml(html);
     } else if (m_icon) {
         html = START_BASIC START_TABLE + html;
-        Plasma::ToolTipManager::ToolTipContent data;
+        Plasma::ToolTipManager::Content data;
         data.mainText = i18n("Hardware Info");
         data.subText = html;
         Plasma::ToolTipManager::self()->setContent(m_icon, data);
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/abstracttaskitem.cpp \
#874254:874255 @@ -139,7 +139,7 @@
 void AbstractTaskItem::toolTipHidden()
 {
     m_showingTooltip = false;
-    Plasma::ToolTipManager::ToolTipContent data;
+    Plasma::ToolTipManager::Content data;
     Plasma::ToolTipManager::self()->setContent(this, data);
 }
 
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/taskgroupitem.cpp #874254:874255
@@ -235,7 +235,7 @@
         return;
     }
 
-    Plasma::ToolTipManager::ToolTipContent data;
+    Plasma::ToolTipManager::Content data;
     data.mainText = m_group->name();
     data.subText = i18nc("Which virtual desktop a window is currently on", "On %1",
                          KWindowSystem::desktopName(m_group->desktop()));
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/windowtaskitem.cpp \
#874254:874255 @@ -189,7 +189,7 @@
         return;
     }
 
-    Plasma::ToolTipManager::ToolTipContent data;
+    Plasma::ToolTipManager::Content data;
     data.mainText = m_task->name();
     data.subText = i18nc("Which virtual desktop a window is currently on", "On %1",
                          KWindowSystem::desktopName(m_task->desktop()));
--- trunk/KDE/kdebase/workspace/plasma/applets/trash/trash.cpp #874254:874255
@@ -210,7 +210,7 @@
 
 void Trash::updateIcon()
 {
-    Plasma::ToolTipManager::ToolTipContent data;
+    Plasma::ToolTipManager::Content data;
     data.mainText = i18n("Trash");
 
     if (m_count > 0) {
@@ -236,7 +236,7 @@
     if (!m_showText) {
         Plasma::ToolTipManager::self()->setContent(this, data);
     } else {
-        Plasma::ToolTipManager::self()->setContent(this, \
Plasma::ToolTipManager::ToolTipContent()); +        \
Plasma::ToolTipManager::self()->setContent(this, Plasma::ToolTipManager::Content());  \
}  
     emptyTrash->setEnabled(m_count>0);


[prev in list] [next in list] [prev in thread] [next in thread]