diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:23:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:23:24 -0600 |
| commit | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch) | |
| tree | fb31321c80b12ee8e2237bdcf8c228fe44e67772 /chalk/ui/kis_controlframe.cc | |
| parent | fe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff) | |
| download | koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'chalk/ui/kis_controlframe.cc')
| -rw-r--r-- | chalk/ui/kis_controlframe.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc index 74f3cd0a..b75de805 100644 --- a/chalk/ui/kis_controlframe.cc +++ b/chalk/ui/kis_controlframe.cc @@ -96,7 +96,7 @@ KisControlFrame::KisControlFrame( KMainWindow * /*window*/, KisView * view, cons { KisConfig cfg; - m_font = KGlobalSettings::generalFont(); + m_font = TDEGlobalSettings::generalFont(); m_font.setPointSize((int)cfg.dockerFontSize()); m_brushWidget = new KisIconWidget(view, "brushes"); |