Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

1 files changed, 8 insertions, 8 deletions

diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index e4a75744..c72768a7 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -227,7 +227,7 @@ bool KPrCanvas::eventFilter( TQObject *o, TQEvent *e )
     case TQEvent::KeyPress:
     {
         TQKeyEvent * keyev = TQT_TQKEYEVENT(e);
-        if ( keyev->key() == KGlobalSettings::contextMenuKey() ) {
+        if ( keyev->key() == TDEGlobalSettings::contextMenuKey() ) {
             popupContextMenu();
             return true;
         }
@@ -333,7 +333,7 @@ void KPrCanvas::paintEvent( TQPaintEvent* paintEvent )
 #if 0 // this works but isn't enough - e.g. object effects need the same offsets
                 // so we should store them, but they don't work like diffx/diffy...
                 // (e.g. the painter mustn't be translated when painting the background)
-                TQRect desk = KGlobalSettings::desktopGeometry(this);
+                TQRect desk = TDEGlobalSettings::desktopGeometry(this);
                 TQRect pgRect = m_view->kPresenterDoc()->pageList().at(0)->getZoomPageRect();
                 int offx = 0, offy = 0;
                 if ( desk.width() > pgRect.width() )
@@ -488,7 +488,7 @@ void KPrCanvas::drawBackground( TQPainter *painter, const TQRect& rect, KPrPage
         // Old code, left a black area if zoomX != zoomY
         //page->background()->draw( painter, m_view->zoomHandler(), rect, false );
 
-        TQRect desk = KGlobalSettings::desktopGeometry(getView());
+        TQRect desk = TDEGlobalSettings::desktopGeometry(getView());
         TQRect crect = desk.intersect( rect );
         if ( crect.isEmpty() || !page->displayBackground())
             return;
@@ -2213,7 +2213,7 @@ void KPrCanvas::resizeEvent( TQResizeEvent *e )
         TQWidget::resizeEvent( e );
     }
     else
-        TQWidget::resizeEvent( new TQResizeEvent( KGlobalSettings::desktopGeometry(this).size(),
+        TQWidget::resizeEvent( new TQResizeEvent( TDEGlobalSettings::desktopGeometry(this).size(),
                                                 e->oldSize() ) );
     buffer.resize( size() );
 }
@@ -3075,7 +3075,7 @@ bool KPrCanvas::pNext( bool gotoNextPage )
         }
         m_setPageTimer = true;
 
-        TQRect desk = KGlobalSettings::desktopGeometry(this);
+        TQRect desk = TDEGlobalSettings::desktopGeometry(this);
         TQPixmap _pix1( desk.width(), desk.height() );
         drawCurrentPageInPix( _pix1 );
 
@@ -3132,7 +3132,7 @@ bool KPrCanvas::pNext( bool gotoNextPage )
     {
         m_view->setPageDuration( m_step.m_pageNumber );
 
-        TQRect desk = KGlobalSettings::desktopGeometry(this);
+        TQRect desk = TDEGlobalSettings::desktopGeometry(this);
         TQPixmap lastSlide( desk.width(), desk.height() );
         TQFont font( m_view->kPresenterDoc()->defaultFont().family() );
         TQPainter p( &lastSlide );
@@ -4113,7 +4113,7 @@ void KPrCanvas::gotoPage( int pg )
         m_step.m_step = *m_pageEffectSteps.begin();
         m_step.m_subStep = 0;
 #if 0
-        TQRect desk = KGlobalSettings::desktopGeometry(this);
+        TQRect desk = TDEGlobalSettings::desktopGeometry(this);
         resize( desk.width(), desk.height() );
 #endif
         doObjEffects();
@@ -4452,7 +4452,7 @@ void KPrCanvas::picViewOrigFactor()
 void KPrCanvas::scalePixmapToBeOrigIn( const KoSize &currentSize, const KoSize &pgSize,
                                        const TQSize &presSize, KPrPixmapObject *obj )
 {
-    TQRect desk = KGlobalSettings::desktopGeometry(this);
+    TQRect desk = TDEGlobalSettings::desktopGeometry(this);
     double faktX = (double)presSize.width() / (double)desk.width();
     double faktY = (double)presSize.height() / (double)desk.height();
     double w = pgSize.width() * faktX;