summaryrefslogtreecommitdiffstats
path: root/kcontrol/componentchooser/componentchooser.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/componentchooser/componentchooser.cpp
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/componentchooser/componentchooser.cpp')
-rw-r--r--kcontrol/componentchooser/componentchooser.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index f67065c24..616c98a50 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -169,7 +169,7 @@ void CfgEmailClient::selectEmailClient()
TQString client = dlg.text();
// get the preferred Terminal Application
- KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
+ KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
preferredTerminal += TQString::fromLatin1(" -e ");
@@ -198,7 +198,7 @@ void CfgEmailClient::save(KConfig *)
}
// insure proper permissions -- contains sensitive data
- TQString cfgName(KGlobal::dirs()->findResource("config", "emails"));
+ TQString cfgName(TDEGlobal::dirs()->findResource("config", "emails"));
if (!cfgName.isEmpty())
::chmod(TQFile::encodeName(cfgName), 0600);
@@ -386,7 +386,7 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name):
latestEditedService="";
TQStringList dummy;
- TQStringList services=KGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy);
+ TQStringList services=TDEGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy);
for (TQStringList::Iterator it=services.begin();it!=services.end();++it)
{
KSimpleConfig cfg(*it);