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/kviewpart.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/kviewpart.cpp')
| -rw-r--r-- | kviewshell/kviewpart.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index e4dbf633..c09ebeb8 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -61,7 +61,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p : KViewPart_Iface(parent, name), showSidebar(0), saveAction(0), partManager(0), multiPageLibrary(TQString()), aboutDialog(0) { - KGlobal::locale()->insertCatalogue("kviewshell"); + TDEGlobal::locale()->insertCatalogue("kviewshell"); tmpUnzipped = 0L; pageChangeIsConnected = false; @@ -419,7 +419,7 @@ TQString KViewPart::pageSizeDescription() TQString size = " "; if (s.formatNumber() == -1) { - if (KGlobal::locale()-> measureSystem() == KLocale::Metric) + if (TDEGlobal::locale()-> measureSystem() == KLocale::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); |