diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kdesktop/init.cc | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/init.cc')
| -rw-r--r-- | kdesktop/init.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kdesktop/init.cc b/kdesktop/init.cc index 27990245c..cf45c71d4 100644 --- a/kdesktop/init.cc +++ b/kdesktop/init.cc @@ -134,7 +134,7 @@ static TQString realDesktopPath() */ static void copyDesktopLinks() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General"); if (!config->readBoolEntry("CopyDesktopLinks", true)) return; @@ -230,8 +230,8 @@ void testLocalInstallation() TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int)2; - KIO::Job* job = KIO::special( "trash:/", packedArgs ); - (void)KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::Job* job = TDEIO::special( "trash:/", packedArgs ); + (void)TDEIO::NetAccess::synchronousRun( job, 0 ); // OK the only thing missing is to convert the icon position... KSimpleConfig cfg( locateLocal("appdata", "IconPositions") ); |