summaryrefslogtreecommitdiffstats
path: root/kmenuedit
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kmenuedit
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kmenuedit')
-rw-r--r--kmenuedit/kmenuedit.cpp4
-rw-r--r--kmenuedit/menuinfo.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp
index f0903d70b..018b69f0e 100644
--- a/kmenuedit/kmenuedit.cpp
+++ b/kmenuedit/kmenuedit.cpp
@@ -53,7 +53,7 @@ KMenuEdit::KMenuEdit (bool controlCenter, TQWidget *, const char *name)
KMenuEdit::~KMenuEdit()
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
config->writeEntry("SplitterSizes", m_splitter->sizes());
@@ -101,7 +101,7 @@ void KMenuEdit::setupView()
m_tree, TQT_SLOT(findServiceShortcut(const KShortcut&, KService::Ptr &)));
// restore splitter sizes
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
TQValueList<int> sizes = config->readIntListEntry("SplitterSizes");
if (sizes.isEmpty())
diff --git a/kmenuedit/menuinfo.cpp b/kmenuedit/menuinfo.cpp
index 68aae34ba..e04f92c18 100644
--- a/kmenuedit/menuinfo.cpp
+++ b/kmenuedit/menuinfo.cpp
@@ -193,15 +193,15 @@ void MenuFolderInfo::save(MenuFile *menuFile)
{
TQString local = KDesktopFile::locateLocal(directoryFile);
- KConfig *df = 0;
+ TDEConfig *df = 0;
if (directoryFile != local)
{
- KConfig orig(directoryFile, true, false, "apps");
+ TDEConfig orig(directoryFile, true, false, "apps");
df = orig.copyTo(local);
}
else
{
- df = new KConfig(directoryFile, false, false, "apps");
+ df = new TDEConfig(directoryFile, false, false, "apps");
}
df->setDesktopGroup();