diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:10:32 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:10:32 -0600 |
commit | 3fe437def8063926892bddf2dcc733861308836d (patch) | |
tree | 021d66ad023a32bc8ea0074a1ab3d01316aff8b0 /chalk/core | |
parent | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (diff) | |
download | koffice-3fe437def8063926892bddf2dcc733861308836d.tar.gz koffice-3fe437def8063926892bddf2dcc733861308836d.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'chalk/core')
-rw-r--r-- | chalk/core/kis_thread_pool.cc | 2 | ||||
-rw-r--r-- | chalk/core/tiles/kis_tilemanager.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chalk/core/kis_thread_pool.cc b/chalk/core/kis_thread_pool.cc index cb537738..9295915c 100644 --- a/chalk/core/kis_thread_pool.cc +++ b/chalk/core/kis_thread_pool.cc @@ -29,7 +29,7 @@ KisThreadPool::KisThreadPool() KisThreadPool::m_singleton = this; - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); cfg->setGroup(""); m_maxThreads = cfg->readNumEntry("maxthreads", 10); m_numberOfRunningThreads = 0; diff --git a/chalk/core/tiles/kis_tilemanager.cc b/chalk/core/tiles/kis_tilemanager.cc index f734f594..8f793d4a 100644 --- a/chalk/core/tiles/kis_tilemanager.cc +++ b/chalk/core/tiles/kis_tilemanager.cc @@ -64,7 +64,7 @@ KisTileManager::KisTileManager() { } m_currentInMem = 0; - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); cfg->setGroup(""); m_maxInMem = cfg->readNumEntry("maxtilesinmem", 4000); m_swappiness = cfg->readNumEntry("swappiness", 100); @@ -533,7 +533,7 @@ void KisTileManager::reclaimTileToPool(TQ_UINT8* data, TQ_INT32 pixelSize) { } void KisTileManager::configChanged() { - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); cfg->setGroup(""); m_maxInMem = cfg->readNumEntry("maxtilesinmem", 4000); m_swappiness = cfg->readNumEntry("swappiness", 100); |