From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- tdeui/ksystemtray.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tdeui/ksystemtray.h') diff --git a/tdeui/ksystemtray.h b/tdeui/ksystemtray.h index 79d73d3e3..a74dc9be6 100644 --- a/tdeui/ksystemtray.h +++ b/tdeui/ksystemtray.h @@ -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=KGlobal::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=KGlobal::instance() ); signals: /** -- cgit v1.2.1