diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /tdeui/ksystemtray.cpp | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/ksystemtray.cpp')
| -rw-r--r-- | tdeui/ksystemtray.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index 1ae786d67..668f070dd 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -312,7 +312,7 @@ KActionCollection* KSystemTray::actionCollection() return d->actionCollection; } -TQPixmap KSystemTray::loadIcon( const TQString &icon, KInstance *instance ) +TQPixmap KSystemTray::loadIcon( const TQString &icon, TDEInstance *instance ) { KConfig *appCfg = kapp->config(); KConfigGroupSaver configSaver(appCfg, "System Tray"); @@ -320,7 +320,7 @@ TQPixmap KSystemTray::loadIcon( const TQString &icon, KInstance *instance ) return instance->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth ); } -TQPixmap KSystemTray::loadSizedIcon( const TQString &icon, int iconWidth, KInstance *instance ) +TQPixmap KSystemTray::loadSizedIcon( const TQString &icon, int iconWidth, TDEInstance *instance ) { return instance->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth ); } |