diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
| commit | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch) | |
| tree | fb31321c80b12ee8e2237bdcf8c228fe44e67772 /kivio/kiviopart/kivioglobal.cpp | |
| parent | fe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff) | |
| download | koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kivio/kiviopart/kivioglobal.cpp')
| -rw-r--r-- | kivio/kiviopart/kivioglobal.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kivio/kiviopart/kivioglobal.cpp b/kivio/kiviopart/kivioglobal.cpp index 201eea08..c794afea 100644 --- a/kivio/kiviopart/kivioglobal.cpp +++ b/kivio/kiviopart/kivioglobal.cpp @@ -85,7 +85,7 @@ KoPageLayout Kivio::loadPageLayout(const TQDomElement& e) layout.ptRight = XmlReadFloat(e, "marginRight", 0.0); layout.ptTop = XmlReadFloat(e, "marginTop", 0.0); layout.ptBottom = XmlReadFloat(e, "marginBottom", 0.0); - layout.format = KoPageFormat::formatFromString(XmlReadString(e, "format", pageSizeString(KGlobal::locale()->pageSize()))); + layout.format = KoPageFormat::formatFromString(XmlReadString(e, "format", pageSizeString(TDEGlobal::locale()->pageSize()))); layout.orientation = Kivio::orientationFromString(XmlReadString(e, "orientation", "Portrait")); } @@ -1285,7 +1285,7 @@ TQString Kivio::systemDefaultUnit() { TQString defMS = "cm"; - if(KGlobal::locale()->measureSystem() == KLocale::Imperial) { + if(TDEGlobal::locale()->measureSystem() == KLocale::Imperial) { defMS = "in"; } |