From 6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:45:52 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 kpdf/ui/pageview.cpp           | 6 +++---
 kpdf/ui/presentationwidget.cpp | 2 +-
 kpdf/ui/propertiesdialog.cpp   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kpdf/ui')

diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index 9642f7a9..cc40fdb2 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -1513,7 +1513,7 @@ void PageView::updateZoom( ZoomMode newZoomMode )
     {
         case ZoomFixed:{ //ZoomFixed case
             TQString z = d->aZoom->currentText();
-            newFactor = KGlobal::locale()->readNumber( z.remove( z.find( '%' ), 1 ) ) / 100.0;
+            newFactor = TDEGlobal::locale()->readNumber( z.remove( z.find( '%' ), 1 ) ) / 100.0;
             }break;
         case ZoomIn:
             newFactor += (newFactor > 0.99) ? ( newFactor > 1.99 ? 0.5 : 0.2 ) : 0.1;
@@ -1597,8 +1597,8 @@ void PageView::updateZoomText()
             inserted = true;
         if ( !inserted )
             selIdx++;
-        TQString localValue( KGlobal::locale()->formatNumber( value * 100.0, 2 ) );
-        localValue.remove( KGlobal::locale()->decimalSymbol() + double_oh );
+        TQString localValue( TDEGlobal::locale()->formatNumber( value * 100.0, 2 ) );
+        localValue.remove( TDEGlobal::locale()->decimalSymbol() + double_oh );
         translated << TQString( "%1%" ).arg( localValue );
     }
     d->aZoom->setItems( translated );
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index 865d8e50..6639dbc5 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -299,7 +299,7 @@ void PresentationWidget::paintEvent( TQPaintEvent * pe )
 {
     if (m_width == -1)
     {
-        TQRect d = KGlobalSettings::desktopGeometry(this);
+        TQRect d = TDEGlobalSettings::desktopGeometry(this);
         m_width = d.width();
         m_height = d.height();
 
diff --git a/kpdf/ui/propertiesdialog.cpp b/kpdf/ui/propertiesdialog.cpp
index 718a0635..e00d8cfe 100644
--- a/kpdf/ui/propertiesdialog.cpp
+++ b/kpdf/ui/propertiesdialog.cpp
@@ -88,7 +88,7 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
     width = TQMAX( width, page2Layout->sizeHint().width() + marginHint() + spacingHint() + 31 );
   }
   // stay inside the 2/3 of the screen width
-  TQRect screenContainer = KGlobalSettings::desktopGeometry( this );
+  TQRect screenContainer = TDEGlobalSettings::desktopGeometry( this );
   width = TQMIN( width, 2*screenContainer.width()/3 );
   resize(width, 1);
 }
-- 
cgit v1.2.1