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

4 files changed, 9 insertions, 9 deletions

diff --git a/src/projects/k3baudiotracktrmlookupdialog.cpp b/src/projects/k3baudiotracktrmlookupdialog.cpp
index 85a651b..d20838b 100644
--- a/src/projects/k3baudiotracktrmlookupdialog.cpp
+++ b/src/projects/k3baudiotracktrmlookupdialog.cpp
@@ -57,7 +57,7 @@ K3bAudioTrackTRMLookupDialog::K3bAudioTrackTRMLookupDialog( TQWidget* parent, co
 
   m_infoLabel = new TQLabel( plainPage() );
   TQLabel* pixLabel = new TQLabel( plainPage() );
-  pixLabel->setPixmap( KGlobal::iconLoader()->loadIcon( "musicbrainz", KIcon::NoGroup, 64 ) );
+  pixLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "musicbrainz", KIcon::NoGroup, 64 ) );
   pixLabel->setScaledContents( false );
 
   m_busyWidget = new K3bBusyWidget( plainPage() );
diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp
index 287191c..a471308 100644
--- a/src/projects/k3bdataurladdingdialog.cpp
+++ b/src/projects/k3bdataurladdingdialog.cpp
@@ -562,8 +562,8 @@ void K3bDataUrlAddingDialog::slotAddUrls()
       int dirFilter = TQDir::All|TQDir::Hidden|TQDir::System;
 
       TQStringList dlist = newDir.entryList( dirFilter );
-      const TQString& dot = KGlobal::staticQString( "." );
-      const TQString& dotdot = KGlobal::staticQString( ".." );
+      const TQString& dot = TDEGlobal::staticQString( "." );
+      const TQString& dotdot = TDEGlobal::staticQString( ".." );
       dlist.remove( dot );
       dlist.remove( dotdot );
 
diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp
index e71db6e..15534b5 100644
--- a/src/projects/k3bfillstatusdisplay.cpp
+++ b/src/projects/k3bfillstatusdisplay.cpp
@@ -287,7 +287,7 @@ public:
   void maybeTip( const TQPoint& ) {
     tip( parentWidget()->rect(),
 	 KIO::convertSize( m_doc->size() ) +
-	 " (" + KGlobal::locale()->formatNumber( m_doc->size(), 0 ) + "), " +
+	 " (" + TDEGlobal::locale()->formatNumber( m_doc->size(), 0 ) + "), " +
 	 m_doc->length().toString(false) + " " + i18n("min") +
 	 " (" + i18n("Right click for media sizes") + ")");
   }
@@ -542,13 +542,13 @@ void K3bFillStatusDisplay::slotCustomSize()
   TQString mbS = i18n("mb");
   TQString minS = i18n("min");
 
-  TQRegExp rx( "(\\d+\\" + KGlobal::locale()->decimalSymbol() + "?\\d*)(" + gbS + "|" + mbS + "|" + minS + ")?" );
+  TQRegExp rx( "(\\d+\\" + TDEGlobal::locale()->decimalSymbol() + "?\\d*)(" + gbS + "|" + mbS + "|" + minS + ")?" );
   bool ok;
   TQString size = KInputDialog::getText( i18n("Custom Size"),
 					i18n("<p>Please specify the size of the media. Use suffixes <b>gb</b>,<b>mb</b>, "
 					     "and <b>min</b> for <em>gigabytes</em>, <em>megabytes</em>, and <em>minutes</em>"
 					     " respectively."),
-					d->showDvdSizes ? TQString("4%14%2").arg(KGlobal::locale()->decimalSymbol()).arg(gbS) :
+					d->showDvdSizes ? TQString("4%14%2").arg(TDEGlobal::locale()->decimalSymbol()).arg(gbS) :
 					(d->showTime ? TQString("74")+minS : TQString("650")+mbS),
 					&ok, this, (const char*)0,
 					new TQRegExpValidator( rx, TQT_TQOBJECT(this) ) );
@@ -556,9 +556,9 @@ void K3bFillStatusDisplay::slotCustomSize()
     // determine size
     if( rx.exactMatch( size ) ) {
       TQString valStr = rx.cap(1);
-      if( valStr.endsWith( KGlobal::locale()->decimalSymbol() ) )
+      if( valStr.endsWith( TDEGlobal::locale()->decimalSymbol() ) )
 	valStr += "0";
-      double val = KGlobal::locale()->readNumber( valStr, &ok );
+      double val = TDEGlobal::locale()->readNumber( valStr, &ok );
       if( ok ) {
 	TQString s = rx.cap(2);
 	if( s == gbS || (s.isEmpty() && d->showDvdSizes) )
diff --git a/src/projects/k3bmovixoptionswidget.cpp b/src/projects/k3bmovixoptionswidget.cpp
index 5041244..094de6e 100644
--- a/src/projects/k3bmovixoptionswidget.cpp
+++ b/src/projects/k3bmovixoptionswidget.cpp
@@ -46,7 +46,7 @@ public:
       if( *it == i18n("default") )
 	m_box->insertItem( *it );
       else {
-	TQString lang = KGlobal::locale()->twoAlphaToLanguageName( *it );
+	TQString lang = TDEGlobal::locale()->twoAlphaToLanguageName( *it );
 	if( lang.isEmpty() )
 	  lang = *it;