diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/kicker/menutab_impl.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 'kcontrol/kicker/menutab_impl.cpp')
| -rw-r--r-- | kcontrol/kicker/menutab_impl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index 8380efbdd..5b08627cb 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/kcontrol/kicker/menutab_impl.cpp @@ -84,7 +84,7 @@ MenuTab::MenuTab( TQWidget *parent, const char* name ) //connect(kcfg_ButtonFont, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(kmenuChanged())); connect(maxrecentdocs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(kmenuChanged())); - KIconLoader * ldr = KGlobal::iconLoader(); + KIconLoader * ldr = TDEGlobal::iconLoader(); TQPixmap kmenu_icon; m_kmenu_icon = KickerSettings::customKMenuIcon(); if (m_kmenu_icon.isNull() == true) { @@ -136,7 +136,7 @@ void MenuTab::load( bool useDefaults ) TQStringList ext_default; ext_default << "prefmenu.desktop" << "systemmenu.desktop"; TQStringList ext = c->readListEntry("Extensions", ext_default); - TQStringList dirs = KGlobal::dirs()->findDirs("data", "kicker/menuext"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "kicker/menuext"); kSubMenuItem* menuItem(0); for (TQStringList::ConstIterator dit=dirs.begin(); dit!=dirs.end(); ++dit) { @@ -312,7 +312,7 @@ void MenuTab::launchIconEditor() return; m_kmenu_icon = newIcon; - KIconLoader * ldr = KGlobal::iconLoader(); + KIconLoader * ldr = TDEGlobal::iconLoader(); TQPixmap kmenu_icon; kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall); btnCustomKMenuIcon->setPixmap(kmenu_icon); |