From 805781daef7a5af43065787637b1884207aa38b0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 08:16:29 -0600 Subject: Rename KLocale to enhance compatibility with KDE4 --- kviewshell/kviewpart.cpp | 2 +- kviewshell/pageSize.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kviewshell') diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index 017d3e17..23c68b2e 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -419,7 +419,7 @@ TQString KViewPart::pageSizeDescription() TQString size = " "; if (s.formatNumber() == -1) { - if (TDEGlobal::locale()-> measureSystem() == KLocale::Metric) + if (TDEGlobal::locale()-> measureSystem() == TDELocale::Metric) size += TQString("%1x%2 mm").arg(s.width().getLength_in_mm(), 0, 'f', 0).arg(s.height().getLength_in_mm(), 0, 'f', 0); else size += TQString("%1x%2 in").arg(s.width().getLength_in_inch(), 0, 'g', 2).arg(s.height().getLength_in_inch(), 0, 'g', 2); diff --git a/kviewshell/pageSize.cpp b/kviewshell/pageSize.cpp index c1a99744..9e59da04 100644 --- a/kviewshell/pageSize.cpp +++ b/kviewshell/pageSize.cpp @@ -210,7 +210,7 @@ TQString pageSize::preferredUnit() const return staticList[currentSize].preferredUnit; // User-defined size. Give a preferred unit depening on the locale. - if (TDEGlobal::locale()-> measureSystem() == KLocale::Metric) + if (TDEGlobal::locale()-> measureSystem() == TDELocale::Metric) return "mm"; else return "in"; @@ -333,7 +333,7 @@ int pageSize::defaultPageSize() // FIXME: static_cast(TDEGlobal::locale()->pageSize()) // is the proper solution here. Then you can determine the values // without using your hardcoded table too! - if (TDEGlobal::locale()-> measureSystem() == KLocale::Metric) + if (TDEGlobal::locale()-> measureSystem() == TDELocale::Metric) return defaultMetricPaperSize; else return defaultImperialPaperSize; -- cgit v1.2.1