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/menuext/konsole | |
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/menuext/konsole')
-rw-r--r-- | kicker/menuext/konsole/konsole_mnu.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index 093b4fc5e..16e11a039 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -54,7 +54,7 @@ KonsoleMenu::KonsoleMenu(TQWidget *parent, const char *name, const TQStringList& KonsoleMenu::~KonsoleMenu() { - KGlobal::locale()->removeCatalogue("libkickermenu_konsole"); + TDEGlobal::locale()->removeCatalogue("libkickermenu_konsole"); } static void insertItemSorted(KPopupMenu *menu, @@ -96,7 +96,7 @@ void KonsoleMenu::initialize() setInitialized(true); - TQStringList list = KGlobal::dirs()->findAllResources("data", + TQStringList list = TDEGlobal::dirs()->findAllResources("data", "konsole/*.desktop", false, true); @@ -126,7 +126,7 @@ void KonsoleMenu::initialize() exec = KRun::binaryName(exec, false); exec = KShell::tildeExpand(exec); - TQString pexec = KGlobal::dirs()->findExe(exec); + TQString pexec = TDEGlobal::dirs()->findExe(exec); if (text.isEmpty() || conf.readEntry("Type") != "KonsoleApplication" || (!exec.isEmpty() && pexec.isEmpty())) @@ -197,7 +197,7 @@ void KonsoleMenu::initialize() delete m_profileMenu; m_profileMenu = new KPopupMenu(this); - TQStringList profiles = KGlobal::dirs()->findAllResources("data", + TQStringList profiles = TDEGlobal::dirs()->findAllResources("data", "konsole/profiles/*", false, true ); m_profiles.resize(profiles.count()); |