summaryrefslogtreecommitdiffstats
path: root/chalk/ui/kis_config.cc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:23:24 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:23:24 -0600
commit5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch)
treefb31321c80b12ee8e2237bdcf8c228fe44e67772 /chalk/ui/kis_config.cc
parentfe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff)
downloadkoffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz
koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'chalk/ui/kis_config.cc')
-rw-r--r--chalk/ui/kis_config.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chalk/ui/kis_config.cc b/chalk/ui/kis_config.cc
index 6d07790b..4c823ba5 100644
--- a/chalk/ui/kis_config.cc
+++ b/chalk/ui/kis_config.cc
@@ -44,7 +44,7 @@ namespace {
KisConfig::KisConfig()
{
- m_cfg = KGlobal::config();
+ m_cfg = TDEGlobal::config();
if (!m_cfg) {
// Allow unit tests to test parts of the code without having to run the
// full application.
@@ -330,7 +330,7 @@ float KisConfig::dockerFontSize()
float KisConfig::getDefaultDockerFontSize()
{
- float ps = TQMIN(9, KGlobalSettings::generalFont().pointSize() * 0.8);
+ float ps = TQMIN(9, TDEGlobalSettings::generalFont().pointSize() * 0.8);
if (ps < 6) ps = 6;
return ps;
}