diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kicker/kicker/ui/service_mnu.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kicker/kicker/ui/service_mnu.cpp')
| -rw-r--r-- | kicker/kicker/ui/service_mnu.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index 8a483f086..64f779807 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -330,7 +330,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root, // menus. We can't update the menu while torn off, and we don't know // when it is torn off. if ( count() > 0 && !relPath_.isEmpty() ) - if (KGlobalSettings::insertTearOffHandle()) + if (TDEGlobalSettings::insertTearOffHandle()) insertTearOffHandle(); #endif } @@ -662,7 +662,7 @@ extern int kicker_screen_number; void PanelServiceMenu::slotContextMenu(int selected) { - KProcess *proc; + TDEProcess *proc; KService::Ptr service; KServiceGroup::Ptr g; TQByteArray ba; @@ -676,8 +676,8 @@ void PanelServiceMenu::slotContextMenu(int selected) case AddItemToDesktop: service = static_cast<KService *>(contextKSycocaEntry_); - src.setPath( KGlobal::dirs()->findResource( "apps", service->desktopEntryPath() ) ); - dest.setPath( KGlobalSettings::desktopPath() ); + src.setPath( TDEGlobal::dirs()->findResource( "apps", service->desktopEntryPath() ) ); + dest.setPath( TDEGlobalSettings::desktopPath() ); dest.setFileName( src.fileName() ); job = KIO::copyAs( src, dest ); @@ -694,7 +694,7 @@ void PanelServiceMenu::slotContextMenu(int selected) } case EditItem: - proc = new KProcess(TQT_TQOBJECT(this)); + proc = new TDEProcess(TQT_TQOBJECT(this)); *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId(); proc->start(); @@ -713,7 +713,7 @@ void PanelServiceMenu::slotContextMenu(int selected) case AddMenuToDesktop: g = static_cast<KServiceGroup *>(contextKSycocaEntry_); - dest.setPath( KGlobalSettings::desktopPath() ); + dest.setPath( TDEGlobalSettings::desktopPath() ); dest.setFileName( g->caption() ); df = new KDesktopFile( dest.path() ); @@ -738,7 +738,7 @@ void PanelServiceMenu::slotContextMenu(int selected) } case EditMenu: - proc = new KProcess(TQT_TQOBJECT(this)); + proc = new TDEProcess(TQT_TQOBJECT(this)); *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath(); proc->start(); @@ -795,7 +795,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev) case KST_KServiceGroup: { - icon = KGlobal::iconLoader() + icon = TDEGlobal::iconLoader() ->loadIcon(static_cast<KServiceGroup *>(e)->icon(), KIcon::Small); url = "programs:/" + static_cast<KServiceGroup *>(e)->relPath(); break; |