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

10 files changed, 22 insertions, 22 deletions

diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp
index a4cd5709..74c617c5 100644
--- a/lib/kofficeui/KoRuler.cpp
+++ b/lib/kofficeui/KoRuler.cpp
@@ -203,7 +203,7 @@ double KoRuler::lineDistance() const
 /*================================================================*/
 void KoRuler::drawHorizontal( TQPainter *_painter )
 {
-    TQFont font = KGlobalSettings::toolBarFont();
+    TQFont font = TDEGlobalSettings::toolBarFont();
     TQFontMetrics fm( font );
     resize( width(), TQMAX( fm.height() + 4, 20 ) );
 
@@ -366,7 +366,7 @@ void KoRuler::drawTabs( TQPainter &_painter )
 /*================================================================*/
 void KoRuler::drawVertical( TQPainter *_painter )
 {
-    TQFont font = KGlobalSettings::toolBarFont();
+    TQFont font = TDEGlobalSettings::toolBarFont();
     TQFontMetrics fm( font );
     resize( TQMAX( fm.height() + 4, 20 ), height() );
 
@@ -550,7 +550,7 @@ void KoRuler::mousePressEvent( TQMouseEvent *e )
                 break;
             case KoTabChooser::TAB_DEC_PNT:
                 tab.type = T_DEC_PNT;
-                tab.alignChar = KGlobal::locale()->decimalSymbol()[0];
+                tab.alignChar = TDEGlobal::locale()->decimalSymbol()[0];
                 break;
             default: break;
             }
@@ -1179,7 +1179,7 @@ void KoRuler::slotMenuActivated( int i )
 TQSize KoRuler::minimumSizeHint() const
 {
     TQSize size;
-    TQFont font = KGlobalSettings::toolBarFont();
+    TQFont font = TDEGlobalSettings::toolBarFont();
     TQFontMetrics fm( font );
 
     size.setWidth( TQMAX( fm.height() + 4, 20 ) );
diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp
index 4bda8821..171c455b 100644
--- a/lib/kofficeui/KoSelectAction.cpp
+++ b/lib/kofficeui/KoSelectAction.cpp
@@ -125,7 +125,7 @@ int KoSelectAction::plug(TQWidget* widget, int index)
       if ( m_parentCollection ) {
         instance = m_parentCollection->instance();
       } else {
-        instance = KGlobal::instance();
+        instance = TDEGlobal::instance();
       }
 
       bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index c3b206e8..b82efbb6 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -376,7 +376,7 @@ void KoTemplateCreateDia::slotSelect() {
         return;
     }
     // ### TODO: do a better remote loading without having to have d->m_tempFile
-    TQString path = KGlobal::iconLoader()->iconPath(name, KIcon::Desktop);
+    TQString path = TDEGlobal::iconLoader()->iconPath(name, KIcon::Desktop);
     d->m_customFile = path;
     d->m_customPixmap=TQPixmap();
     updatePixmap();
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index cc606584..cc04c714 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -727,7 +727,7 @@ void KoToolButton::drawButton(TQPainter *_painter)
         qDrawShadeLine( _painter, width() - ARROW_WIDTH - 1, 0, width() - ARROW_WIDTH - 1, height() - 1, colorGroup(), true );
 
     int dx, dy;
-    TQFont tmp_font( KGlobalSettings::toolBarFont() );
+    TQFont tmp_font( TDEGlobalSettings::toolBarFont() );
     TQFontMetrics fm( tmp_font );
     TQRect textRect;
     int textFlags = 0;
@@ -796,11 +796,11 @@ void KoToolButton::drawButton(TQPainter *_painter)
 
     // Draw the text at the position given by textRect, and using textFlags
     if (!textLabel().isNull() && !textRect.isNull()) {
-        _painter->setFont( KGlobalSettings::toolBarFont() );
+        _painter->setFont( TDEGlobalSettings::toolBarFont() );
         if ( !isEnabled() )
             _painter->setPen( palette().disabled().dark() );
         else if( KToolBarButton::isRaised() )
-            _painter->setPen( KGlobalSettings::toolBarHighlightColor() );
+            _painter->setPen( TDEGlobalSettings::toolBarHighlightColor() );
         else
             _painter->setPen( colorGroup().buttonText() );
         _painter->drawText( textRect, textFlags, textLabel() );
diff --git a/lib/kofficeui/KoTooluButton.h b/lib/kofficeui/KoTooluButton.h
index 4e1fab71..1f2ff03c 100644
--- a/lib/kofficeui/KoTooluButton.h
+++ b/lib/kofficeui/KoTooluButton.h
@@ -145,7 +145,7 @@ public:
      */
     KoToolButton( const TQString& icon, int id, TQWidget* parent,
                   const char* name = 0L, const TQString& txt = TQString(),
-                  TDEInstance* _instance = KGlobal::instance() );
+                  TDEInstance* _instance = TDEGlobal::instance() );
 
     /**
      * Construct a button with an existing pixmap.  It is not
diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp
index 2a2c854e..3599c76a 100644
--- a/lib/kofficeui/KoUnitWidgets.cpp
+++ b/lib/kofficeui/KoUnitWidgets.cpp
@@ -90,7 +90,7 @@ KoUnitDoubleValidator::validate( TQString &s, int &pos ) const
 
 TQString KoUnitDoubleBase::getVisibleText( double value ) const
 {
-    const TQString num ( TQString( "%1%2").arg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
+    const TQString num ( TQString( "%1%2").arg( TDEGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
     kdDebug(30004) << "getVisibleText: " << TQString::number( value, 'f', 12 ) << " => " << num << endl;
     return num;
 }
@@ -100,11 +100,11 @@ double KoUnitDoubleBase::toDouble( const TQString& str, bool* ok ) const
     TQString str2( str );
     /* KLocale::readNumber wants the thousand separator exactly at 1000.
        But when editing, it might be anywhere. So we need to remove it. */
-    const TQString sep( KGlobal::locale()->thousandsSeparator() );
+    const TQString sep( TDEGlobal::locale()->thousandsSeparator() );
     if ( !sep.isEmpty() )
         str2.remove( sep );
     str2.remove( KoUnit::unitName( m_unit ) );
-    const double dbl = KGlobal::locale()->readNumber( str2, ok );
+    const double dbl = TDEGlobal::locale()->readNumber( str2, ok );
     if ( ok )
       kdDebug(30004) << "toDouble:" << str << ": => :" << str2 << ": => " << TQString::number( dbl, 'f', 12 ) << endl;
     else
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index 201afa8e..b6dc0408 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -249,7 +249,7 @@ int KSelectColorAction::plug( TQWidget* w, int index )
             if ( parentCollection() )
                 instance = parentCollection()->instance();
             else
-                instance = KGlobal::instance();
+                instance = TDEGlobal::instance();
             */
             id = menu->insertItem( iconSet( KIcon::Small, 0 ), text(), this,//dsweet
                                    TQT_SLOT( slotActivated() ), 0, -1, index );
@@ -285,7 +285,7 @@ int KSelectColorAction::plug( TQWidget* w, int index )
         if ( parentCollection() )
             instance = parentCollection()->instance();
         else
-            instance = KGlobal::instance();
+            instance = TDEGlobal::instance();
 
         if ( icon().isEmpty() ) // old code using TQIconSet directly
         {
diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp
index 402c8d2c..7ab01d3f 100644
--- a/lib/kofficeui/tkaction.cpp
+++ b/lib/kofficeui/tkaction.cpp
@@ -61,7 +61,7 @@ int TKAction::plug(TQWidget* widget, int index)
     if ( parentCollection() )
       instance = parentCollection()->instance();
     else
-      instance = KGlobal::instance();
+      instance = TDEGlobal::instance();
 
     TKToolBarButton* b = new TKToolBarButton(icon(),plainText(),bar,name(),instance);
     // we don't need clicked() and buttonClicked(), do we?
diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp
index c1b2f8cb..92c42c10 100644
--- a/lib/kofficeui/tktoolbarbutton.cpp
+++ b/lib/kofficeui/tktoolbarbutton.cpp
@@ -58,7 +58,7 @@ public:
     m_disabledIconName = TQString();
     m_defaultIconName  = TQString();
 
-    m_instance = KGlobal::instance();
+    m_instance = TDEGlobal::instance();
   }
 
   ~TKToolBarButtonPrivate()
@@ -154,7 +154,7 @@ void TKToolBarButton::modeChange()
 
   if ((d->m_iconMode==TK::IconAndText||d->m_iconMode==TK::TextOnly) && !d->m_text.isEmpty())
   {
-    TQFont tmp_font = KGlobalSettings::toolBarFont();
+    TQFont tmp_font = TDEGlobalSettings::toolBarFont();
     TQFontMetrics fm(tmp_font);
 
     h = TQMAX(h,fm.lineSpacing()+2*border);
@@ -254,7 +254,7 @@ void TKToolBarButton::setDisabledPixmap( const TQPixmap &pixmap )
 void TKToolBarButton::setPopup(TQPopupMenu *p)
 {
   d->m_popup = p;
-  d->m_popup->setFont(KGlobalSettings::toolBarFont());
+  d->m_popup->setFont(TDEGlobalSettings::toolBarFont());
   p->installEventFilter(this);
 
   modeChange();
@@ -359,7 +359,7 @@ void TKToolBarButton::drawButton( TQPainter* p )
     }\
   }\
   if ((d->m_iconMode==TK::IconAndText||d->m_iconMode==TK::TextOnly) && !d->m_text.isEmpty()) {\
-    TQFontMetrics fm(KGlobalSettings::toolBarFont());\
+    TQFontMetrics fm(TDEGlobalSettings::toolBarFont());\
     style().drawItem( p, TQRect( x, 0, fm.width(d->m_text), height() ), AlignCenter, colorGroup(), isEnabled(), 0, d->m_text );\
   }
 
@@ -443,7 +443,7 @@ TQSize TKToolBarButton::minimumSizeHint() const
 void TKToolBarButton::showMenu()
 {
   TQPoint p ( mapToGlobal( TQPoint( 0, 0 ) ) );
-  const int deskHeight = KGlobalSettings::desktopGeometry(this).height();
+  const int deskHeight = TDEGlobalSettings::desktopGeometry(this).height();
   if ( p.y() + height() + d->m_popup->height() > deskHeight )
       p.setY( p.y() - d->m_popup->height() );
   else
diff --git a/lib/kofficeui/tktoolbarbutton.h b/lib/kofficeui/tktoolbarbutton.h
index bfa3a148..0e74b7e3 100644
--- a/lib/kofficeui/tktoolbarbutton.h
+++ b/lib/kofficeui/tktoolbarbutton.h
@@ -37,7 +37,7 @@ class TKToolBarButton : public TQToolButton
 public:
   TKToolBarButton(const TQString& icon, const TQString& txt,
                      TQWidget* parent = 0, const char *name=0L,
-                     TDEInstance *_instance = KGlobal::instance());
+                     TDEInstance *_instance = TDEGlobal::instance());
 
   TKToolBarButton(const TQPixmap&, const TQString&, TQWidget* parent=0, const char* name=0);
   ~TKToolBarButton();