summaryrefslogtreecommitdiffstats
path: root/kded
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
commit703fb0c89c2eee56a1e613e67a446db9d4287929 (patch)
treedd8c5ca66075cd89c2638a2b48cf78386a9870a7 /kded
parent818e7abec3d5d3809b6b77293558678371c16b71 (diff)
downloadtdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz
tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kded')
-rw-r--r--kded/kded.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kded/kded.cpp b/kded/kded.cpp
index efbde0011..d06c44c38 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -155,7 +155,7 @@ bool Kded::process(const TQCString &obj, const TQCString &fun,
void Kded::initModules()
{
m_dontLoad.clear();
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
bool kde_running = !( getenv( "TDE_FULL_SESSION" ) == NULL || getenv( "TDE_FULL_SESSION" )[ 0 ] == '\0' );
// not the same user like the one running the session (most likely we're run via sudo or something)
if( getenv( "TDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "TDE_SESSION_UID" ))) != getuid())
@@ -225,7 +225,7 @@ void Kded::initModules()
void Kded::loadSecondPhase()
{
kdDebug(7020) << "Loading second phase autoload" << endl;
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
KService::List kdedModules = KServiceType::offers("KDEDModule");
for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it)
{
@@ -905,7 +905,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
}
TDEInstance *instance = new TDEInstance(&aboutData);
- KConfig *config = instance->config(); // Enable translations.
+ TDEConfig *config = instance->config(); // Enable translations.
if (args->isSet("check"))
{