diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:45:52 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:45:52 -0600 |
| commit | 6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef (patch) | |
| tree | 44659d1cc0c37eb995e572bc1b979e75a74210fb /kviewshell/pageSize.cpp | |
| parent | e2385b701b464dc2259fcd5f3819c98f2c8c4438 (diff) | |
| download | tdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.tar.gz tdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kviewshell/pageSize.cpp')
| -rw-r--r-- | kviewshell/pageSize.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kviewshell/pageSize.cpp b/kviewshell/pageSize.cpp index d9182d6b..c1a99744 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 (KGlobal::locale()-> measureSystem() == KLocale::Metric) + if (TDEGlobal::locale()-> measureSystem() == KLocale::Metric) return "mm"; else return "in"; @@ -330,10 +330,10 @@ void pageSize::reconstructCurrentSize() int pageSize::defaultPageSize() { - // FIXME: static_cast<TQPrinter::PageSize>(KGlobal::locale()->pageSize()) + // FIXME: static_cast<TQPrinter::PageSize>(TDEGlobal::locale()->pageSize()) // is the proper solution here. Then you can determine the values // without using your hardcoded table too! - if (KGlobal::locale()-> measureSystem() == KLocale::Metric) + if (TDEGlobal::locale()-> measureSystem() == KLocale::Metric) return defaultMetricPaperSize; else return defaultImperialPaperSize; |