summaryrefslogtreecommitdiffstats
path: root/lib/kofficecore/KoDocument.cpp
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 /lib/kofficecore/KoDocument.cpp
parentfe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff)
downloadkoffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz
koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'lib/kofficecore/KoDocument.cpp')
-rw-r--r--lib/kofficecore/KoDocument.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index 7eebcbca..beb0b266 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -112,7 +112,7 @@ public:
{
m_confirmNonNativeSave[0] = true;
m_confirmNonNativeSave[1] = true;
- if ( KGlobal::locale()->measureSystem() == KLocale::Imperial ) {
+ if ( TDEGlobal::locale()->measureSystem() == KLocale::Imperial ) {
m_unit = KoUnit::U_INCH;
} else {
m_unit = KoUnit::U_CM;
@@ -168,9 +168,9 @@ public:
KoViewWrapperWidget( TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
- KGlobal::locale()->insertCatalogue("koffice");
+ TDEGlobal::locale()->insertCatalogue("koffice");
// Tell the iconloader about share/apps/koffice/icons
- KGlobal::iconLoader()->addAppDir("koffice");
+ TDEGlobal::iconLoader()->addAppDir("koffice");
m_view = 0L;
// Avoid warning from KParts - we'll have the KoView as focus proxy anyway
setFocusPolicy( TQ_ClickFocus );