summaryrefslogtreecommitdiffstats
path: root/chalk/ui/kis_view.cc
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:23:24 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:23:24 -0600
commit5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch)
treefb31321c80b12ee8e2237bdcf8c228fe44e67772 /chalk/ui/kis_view.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_view.cc')
-rw-r--r--chalk/ui/kis_view.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index 26a657c3..cf3542b2 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -868,7 +868,7 @@ void KisView::resizeEvent(TQResizeEvent *)
}
}
- int fontheight = TQFontMetrics(KGlobalSettings::generalFont()).height() * 3;
+ int fontheight = TQFontMetrics(TDEGlobalSettings::generalFont()).height() * 3;
m_vScroll->setPageStep(drawH);
m_vScroll->setLineStep(fontheight);
m_hScroll->setPageStep(drawW);