diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:10:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:10:32 -0600 |
| commit | 3fe437def8063926892bddf2dcc733861308836d (patch) | |
| tree | 021d66ad023a32bc8ea0074a1ab3d01316aff8b0 /chalk/ui | |
| 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/ui')
| -rw-r--r-- | chalk/ui/kis_config.cc | 2 | ||||
| -rw-r--r-- | chalk/ui/kis_config.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chalk/ui/kis_config.cc b/chalk/ui/kis_config.cc index 4c823ba5..91d31d5b 100644 --- a/chalk/ui/kis_config.cc +++ b/chalk/ui/kis_config.cc @@ -48,7 +48,7 @@ KisConfig::KisConfig() if (!m_cfg) { // Allow unit tests to test parts of the code without having to run the // full application. - m_cfg = new KConfig(); + m_cfg = new TDEConfig(); } m_cfg->setGroup(""); } diff --git a/chalk/ui/kis_config.h b/chalk/ui/kis_config.h index 4fe971df..7d1425b1 100644 --- a/chalk/ui/kis_config.h +++ b/chalk/ui/kis_config.h @@ -137,7 +137,7 @@ private: KisConfig& operator=(const KisConfig&); private: - mutable KConfig *m_cfg; + mutable TDEConfig *m_cfg; }; #endif // KIS_CONFIG_H_ |