Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

1 files changed, 10 insertions, 10 deletions

diff --git a/tdeui/ksystemtray.h b/tdeui/ksystemtray.h
index 79d73d3e3..f7e81c9b1 100644
--- a/tdeui/ksystemtray.h
+++ b/tdeui/ksystemtray.h
@@ -18,11 +18,11 @@
 #ifndef KSYSTEMTRAY_H
 #define KSYSTEMTRAY_H
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqlabel.h>
 
-class KActionCollection;
-class KPopupMenu;
+class TDEActionCollection;
+class TDEPopupMenu;
 class KSystemTrayPrivate;
 
 /**
@@ -89,14 +89,14 @@ public:
        Access to the context menu. This makes it easy to add new items
        to it.
      */
-    KPopupMenu* contextMenu() const;
+    TDEPopupMenu* contextMenu() const;
 
     /**
        Easy access to the actions in the context menu
        Currently includes KStdAction::Quit and minimizeRestore
        @since 3.1
     */
-    KActionCollection* actionCollection();
+    TDEActionCollection* actionCollection();
 
     /**
      * Changes the tray's icon.
@@ -105,7 +105,7 @@ public:
 
     /**
      * Changes the tray's text description (which can be seen e.g. in the systray
-     * configuration dialog). The default value is KAboutData::programName().
+     * configuration dialog). The default value is TDEAboutData::programName().
      */
     virtual void setCaption( const TQString& title );
 
@@ -117,7 +117,7 @@ public:
      *
      * @since 3.2
      */
-    static TQPixmap loadIcon( const TQString &icon, KInstance *instance=KGlobal::instance() );
+    static TQPixmap loadIcon( const TQString &icon, TDEInstance *instance=TDEGlobal::instance() );
 
     /**
      * Loads an icon @p icon using the icon loader class of the given instance @p instance.
@@ -128,7 +128,7 @@ public:
      *
      * @since 3.5.12
      */
-    static TQPixmap loadSizedIcon( const TQString &icon, int iconWidth, KInstance *instance=KGlobal::instance() );
+    static TQPixmap loadSizedIcon( const TQString &icon, int iconWidth, TDEInstance *instance=TDEGlobal::instance() );
 
 signals:
     /**
@@ -183,7 +183,7 @@ protected:
        Makes it easy to adjust some menu items right before the
        context menu becomes visible.
      */
-    virtual void contextMenuAboutToShow( KPopupMenu* menu );
+    virtual void contextMenuAboutToShow( TDEPopupMenu* menu );
 
     /**
        Reimplemented for internal reasons.
@@ -202,7 +202,7 @@ private slots:
 private:
     void activateOrHide();
     void minimizeRestore( bool restore );
-    KPopupMenu* menu;
+    TDEPopupMenu* menu;
     // minimizeRestoreId is no longer needed. remove in KDE 4.0
     int minimizeRestoreId;
     uint hasQuit :1;