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

5 files changed, 17 insertions, 17 deletions

diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc
index b06baaf7d..188c3c394 100644
--- a/konqueror/listview/konq_infolistviewitem.cc
+++ b/konqueror/listview/konq_infolistviewitem.cc
@@ -87,7 +87,7 @@ void KonqInfoListViewItem::updateContents()
             break;
          case KIO::UDS_SIZE:
             if ( static_cast<KonqBaseListViewWidget *>(listView())->m_pSettings->fileSizeInBytes() )
-                setText(tmpColumn->displayInColumn,KGlobal::locale()->formatNumber( m_fileitem->size(),0)+" ");
+                setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber( m_fileitem->size(),0)+" ");
             else
                 setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+" ");
             break;
@@ -103,7 +103,7 @@ void KonqInfoListViewItem::updateContents()
                if ( _time != 0 )
                {
                    dt.setTime_t( _time );
-                   setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt));
+                   setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatDateTime(dt));
                }
             }
             break;
@@ -202,7 +202,7 @@ void KonqInfoListViewItem::setDisabled( bool disabled )
 {
     KonqBaseListViewItem::setDisabled( disabled );
     int iconSize = static_cast<KonqBaseListViewWidget *>(listView())->iconSize();
-    iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
+    iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
     setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
 }
 
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index b3b886d8d..94f9211ac 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -124,7 +124,7 @@ void ListViewBrowserExtension::updateActions()
   {
     canCopy++;
     KURL url = item->url();
-    if ( url.directory(false) == KGlobalSettings::trashPath() )
+    if ( url.directory(false) == TDEGlobalSettings::trashPath() )
       bInTrash = true;
     if (  KProtocolInfo::supportsDeleting(  url ) )
       canDel++;
diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc
index 016f3d77a..616559bad 100644
--- a/konqueror/listview/konq_listviewitems.cc
+++ b/konqueror/listview/konq_listviewitems.cc
@@ -119,7 +119,7 @@ void KonqListViewItem::updateContents()
             break;
          case KIO::UDS_SIZE:
             if ( m_pListViewWidget->m_pSettings->fileSizeInBytes() )
-                setText(tmpColumn->displayInColumn,KGlobal::locale()->formatNumber( m_fileitem->size(),0)+" ");
+                setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber( m_fileitem->size(),0)+" ");
             else
                 setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+" ");
             break;
@@ -135,7 +135,7 @@ void KonqListViewItem::updateContents()
                if ( _time != 0 )
                {
                    dt.setTime_t( _time );
-                   setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt));
+                   setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatDateTime(dt));
                }
             }
             break;
@@ -146,7 +146,7 @@ void KonqListViewItem::updateContents()
              {
                  TQDateTime dt = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr, Qt::ISODate ));
                  setText(tmpColumn->displayInColumn,
-                         KGlobal::locale()->formatDateTime(dt));
+                         TDEGlobal::locale()->formatDateTime(dt));
              }
              else // if ( tmpColumn->type == TQVariant::String )
                  setText(tmpColumn->displayInColumn, entryStr);
@@ -164,7 +164,7 @@ void KonqListViewItem::setDisabled( bool disabled )
 {
     KonqBaseListViewItem::setDisabled( disabled );
     int iconSize = m_pListViewWidget->iconSize();
-    iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
+    iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
     setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
 }
 
@@ -176,7 +176,7 @@ void KonqListViewItem::setActive( bool active )
     //#### Optimize away repaint if possible, like the iconview does?
     KonqBaseListViewItem::setActive( active );
     int iconSize = m_pListViewWidget->iconSize();
-    iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
+    iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
     setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
 }
 
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index 7156d10b3..8c4b17319 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -276,7 +276,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
                TQString str;
 
                if ( tmpColumn->udsId == KIO::UDS_SIZE )
-                  str = KGlobal::locale()->formatNumber( 888888888, 0 ) + "  ";
+                  str = TDEGlobal::locale()->formatNumber( 888888888, 0 ) + "  ";
                else if ( tmpColumn->udsId == KIO::UDS_ACCESS )
                   str = "--Permissions--";
                else if ( tmpColumn->udsId == KIO::UDS_USER )
@@ -296,7 +296,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
                              (tmpColumn->type & TQVariant::DateTime)) )
                {
                   TQDateTime dt( TQDate( 2000, 10, 10 ), TQTime( 20, 20, 20 ) );
-                  str = KGlobal::locale()->formatDateTime( dt ) + "--";
+                  str = TDEGlobal::locale()->formatDateTime( dt ) + "--";
                }
                else
                   str = "it_is_the_default_width";
@@ -492,7 +492,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e )
          vp.setY( itemRect( item ).y() );
          TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) );
          m_fileTip->setItem( item->item(), rect, item->pixmap( 0 ) );
-         m_fileTip->setPreview( KGlobalSettings::showFilePreview( item->item()->url() ) );
+         m_fileTip->setPreview( TDEGlobalSettings::showFilePreview( item->item()->url() ) );
          setShowToolTips( !m_pSettings->showFileTips() );
       }
       else
@@ -839,7 +839,7 @@ void KonqBaseListViewWidget::startDrag()
    if (( urls.count() > 1 ) || (pixmap0Invalid))
    {
       int iconSize = m_pBrowserView->m_pProps->iconSize();
-      iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
+      iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
       pixmap2 = DesktopIcon( "kmultiple", iconSize );
       if ( pixmap2.isNull() )
           kdWarning(1202) << "Could not find multiple pixmap" << endl;
@@ -977,7 +977,7 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item )
 
    KURL url = fileItem->url();
    url.cleanPath();
-   bool isIntoTrash =  url.isLocalFile() && url.path(1).startsWith(KGlobalSettings::trashPath());
+   bool isIntoTrash =  url.isLocalFile() && url.path(1).startsWith(TDEGlobalSettings::trashPath());
    if ( !isIntoTrash || (isIntoTrash && fileItem->isDir()) )
    {
          m_pBrowserView->lmbClicked( fileItem );
@@ -1010,7 +1010,7 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item )
 	   TQPixmap *pix = new TQPixmap(*(_item->pixmap(0)));
 
 	   // call the icon effect if enabled
-	   if (KGlobalSettings::showKonqIconActivationEffect() == true) {
+	   if (TDEGlobalSettings::showKonqIconActivationEffect() == true) {
 	       KIconEffect::visualActivate(viewport(), rect, pix);
 	   }
 
diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc
index 8e03e171e..e594e8a9a 100644
--- a/konqueror/listview/konq_textviewitem.cc
+++ b/konqueror/listview/konq_textviewitem.cc
@@ -171,7 +171,7 @@ void KonqTextViewItem::updateContents()
             break;
          case KIO::UDS_SIZE:
             if ( static_cast<KonqBaseListViewWidget *>(listView())->m_pSettings->fileSizeInBytes() )
-                setText(tmpColumn->displayInColumn,KGlobal::locale()->formatNumber(size, 0)+" ");
+                setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber(size, 0)+" ");
             else
                 setText(tmpColumn->displayInColumn,KIO::convertSize(size)+" ");
             break;
@@ -187,7 +187,7 @@ void KonqTextViewItem::updateContents()
                {
                   TQDateTime dt;
                   dt.setTime_t((time_t) (*it).m_long);
-                  setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt));
+                  setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatDateTime(dt));
                   break;
                };