diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /tdeui/ksystemtray.h | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/ksystemtray.h')
| -rw-r--r-- | tdeui/ksystemtray.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdeui/ksystemtray.h b/tdeui/ksystemtray.h index a74dc9be6..151cf0166 100644 --- a/tdeui/ksystemtray.h +++ b/tdeui/ksystemtray.h @@ -117,7 +117,7 @@ public: * * @since 3.2 */ - static TQPixmap loadIcon( const TQString &icon, TDEInstance *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, TDEInstance *instance=KGlobal::instance() ); + static TQPixmap loadSizedIcon( const TQString &icon, int iconWidth, TDEInstance *instance=TDEGlobal::instance() ); signals: /** |