diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
tree | d087071b1e8fcf79698938efec19f8e48bab0799 /kmobile/systemtray.cpp | |
parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmobile/systemtray.cpp')
-rw-r--r-- | kmobile/systemtray.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp index 7796a55b1..9f15f0551 100644 --- a/kmobile/systemtray.cpp +++ b/kmobile/systemtray.cpp @@ -38,7 +38,7 @@ SystemTray::SystemTray(KMainWindow *parent, const char *name) : KSystemTray(parent, name) { - m_appPix = KGlobal::instance()->iconLoader()->loadIcon("kmobile", KIcon::Small); + m_appPix = TDEGlobal::instance()->iconLoader()->loadIcon("kmobile", KIcon::Small); setPixmap(m_appPix); setToolTip(); @@ -72,7 +72,7 @@ void SystemTray::contextMenuAboutToShow(KPopupMenu *menu) for (unsigned int no=0; no<list.count(); no++) { TQString devName = list[no]; TQString iconName = main->mainView()->iconFileName(devName); - TQPixmap pm = KGlobal::instance()->iconLoader()->loadIcon(iconName, KIcon::Small); + TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon(iconName, KIcon::Small); menu->insertItem(pm, devName, SYSTEMTRAY_STARTID+no, 3+no); menu->connectItem(SYSTEMTRAY_STARTID+no, this, TQT_SLOT(menuItemSelected())); } |