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

2 files changed, 10 insertions, 10 deletions

diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index ee8eefdcd..bbd9be2b8 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -56,7 +56,7 @@ SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent,
 {
   TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
 
-  TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_date",
+  TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_date",
                    KIcon::Desktop, KIcon::SizeMedium );
   TQWidget *header = createHeader( this, icon, i18n( "Calendar" ) );
   mainLayout->addWidget( header );
@@ -167,15 +167,15 @@ void SummaryWidget::updateView()
                   ( sD.day()   == currentDate.addDays( 1 ).day() ) ) {
         datestr = i18n( "Tomorrow" );
       } else {
-        datestr = KGlobal::locale()->formatDate( sD );
+        datestr = TDEGlobal::locale()->formatDate( sD );
       }
 
       // Print the date span for multiday, floating events, for the
       // first day of the event only.
       if ( ev->isMultiDay() && ev->doesFloat() && dayof == 1 && span > 1 ) {
-        datestr = KGlobal::locale()->formatDate( ev->dtStart().date() );
+        datestr = TDEGlobal::locale()->formatDate( ev->dtStart().date() );
         datestr += " -\n " +
-                   KGlobal::locale()->formatDate( sD.addDays( span-1 ) );
+                   TDEGlobal::locale()->formatDate( sD.addDays( span-1 ) );
       }
 
       label = new TQLabel( datestr, this );
@@ -225,8 +225,8 @@ void SummaryWidget::updateView()
           }
         }
         datestr = i18n( "Time from - to", "%1 - %2" )
-                  .arg( KGlobal::locale()->formatTime( sST ) )
-                  .arg( KGlobal::locale()->formatTime( sET ) );
+                  .arg( TDEGlobal::locale()->formatTime( sST ) )
+                  .arg( TDEGlobal::locale()->formatTime( sET ) );
         label = new TQLabel( datestr, this );
         label->setAlignment( AlignLeft | AlignVCenter );
         mLayout->addWidget( label, counter, 3 );
@@ -270,7 +270,7 @@ void SummaryWidget::popupMenu( const TQString &uid )
   KPopupMenu popup( this );
   TQToolTip::remove( this );
   popup.insertItem( i18n( "&Edit Appointment..." ), 0 );
-  popup.insertItem( KGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small),
+  popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small),
                     i18n( "&Delete Appointment" ), 1 );
 
   switch ( popup.exec( TQCursor::pos() ) ) {
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 7171e539f..b0cbf7d93 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -58,7 +58,7 @@ TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin,
 {
   TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
 
-  TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_todo",
+  TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_todo",
                    KIcon::Desktop, KIcon::SizeMedium );
   TQWidget *header = createHeader( this, icon, i18n( "To-do" ) );
   mainLayout->addWidget( header );
@@ -227,11 +227,11 @@ void TodoSummaryWidget::popupMenu( const TQString &uid )
   KPopupMenu popup( this );
   TQToolTip::remove( this );
   popup.insertItem( i18n( "&Edit To-do..." ), 0 );
-  popup.insertItem( KGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small),
+  popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small),
                     i18n( "&Delete To-do" ), 1 );
   KCal::Todo *todo = mCalendar->todo( uid );
   if ( !todo->isCompleted() ) {
-    popup.insertItem( KGlobal::iconLoader()->loadIcon( "checkedbox", KIcon::Small),
+    popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "checkedbox", KIcon::Small),
                       i18n( "&Mark To-do Completed" ), 2 );
   }