diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
| commit | 703fb0c89c2eee56a1e613e67a446db9d4287929 (patch) | |
| tree | dd8c5ca66075cd89c2638a2b48cf78386a9870a7 /kinit/kinit.cpp | |
| parent | 818e7abec3d5d3809b6b77293558678371c16b71 (diff) | |
| download | tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kinit/kinit.cpp')
| -rw-r--r-- | kinit/kinit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp index d7e7c7e1c..1f65658d9 100644 --- a/kinit/kinit.cpp +++ b/kinit/kinit.cpp @@ -171,7 +171,7 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err ); extern "C" KParts::Plugin* _kinit_init_kparts() { return new KParts::Plugin(); } /* These are to link libkio even if 'smart' linker is used */ #include <kio/authinfo.h> -extern "C" KIO::AuthInfo* _kioslave_init_kio() { return new KIO::AuthInfo(); } +extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); } /* * Close fd's which are only useful for the parent process. @@ -1758,7 +1758,7 @@ int main(int argc, char **argv, char **envp) tdeinit_initsetproctitle(argc, argv, envp); tdeinit_library_path(); // Don't make our instance the global instance - // (do it only after tdeinit_library_path, that one indirectly uses KConfig, + // (do it only after tdeinit_library_path, that one indirectly uses TDEConfig, // which seems to be buggy and always use TDEGlobal instead of the maching TDEInstance) TDEGlobal::_instance = 0L; // don't change envvars before tdeinit_initsetproctitle() |