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

14 files changed, 28 insertions, 28 deletions

diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp
index 4560f871..1180f652 100644
--- a/kommander/widgets/aboutdialog.cpp
+++ b/kommander/widgets/aboutdialog.cpp
@@ -45,7 +45,7 @@ AboutDialog::AboutDialog(TQWidget *parent, const char *name)
   setDisplayStates(states);
   if (KommanderWidget::inEditor)
   {
-    setPixmap(KGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium));
+    setPixmap(TDEGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium));
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setLineWidth(1);
     setFixedSize(pixmap()->size());
@@ -122,7 +122,7 @@ void AboutDialog::initialize(const TQString& appName, const TQString &icon, cons
   m_aboutData = new TDEAboutData(m_appName, m_appName, m_version);
   m_aboutData->setCopyrightStatement(m_copyright);
   if (!m_icon.isEmpty())
-    m_aboutData->setProgramLogo(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeMedium).convertToImage());  
+    m_aboutData->setProgramLogo(TDEGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeMedium).convertToImage());  
 }
 
 void AboutDialog::addAuthor(const TQString& author, const TQString &task, const TQString& email, const TQString &webAddress)
diff --git a/kommander/widgets/closebutton.cpp b/kommander/widgets/closebutton.cpp
index 9ecbbaf6..4ad1c3c3 100644
--- a/kommander/widgets/closebutton.cpp
+++ b/kommander/widgets/closebutton.cpp
@@ -105,13 +105,13 @@ void CloseButton::startProcess()
     KShellProcess *process = new KShellProcess("/bin/sh");
     *process << at;
 
-    connect(process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(endProcess(KProcess *)));
-    connect(process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(appendOutput(KProcess *,
+    connect(process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(endProcess(TDEProcess *)));
+    connect(process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(appendOutput(TDEProcess *,
                 char *, int)));
-    connect(process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(appendOutput(KProcess *,
+    connect(process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(appendOutput(TDEProcess *,
                 char *, int)));
 
-    if (!process->start(KProcess::Block, KProcess::Stdout))
+    if (!process->start(TDEProcess::Block, TDEProcess::Stdout))
     {
       KMessageBox::error(this, i18n("Failed to start shell process."));
       endProcess(process);
@@ -121,7 +121,7 @@ void CloseButton::startProcess()
     endProcess(0);
 }
 
-void CloseButton::appendOutput(KProcess *, char *a_buffer, int a_len)
+void CloseButton::appendOutput(TDEProcess *, char *a_buffer, int a_len)
 {
   char *buffer = new char[a_len + 1];
   buffer[a_len] = 0;
@@ -138,7 +138,7 @@ void CloseButton::appendOutput(KProcess *, char *a_buffer, int a_len)
   delete[] buffer;
 }
 
-void CloseButton::endProcess(KProcess *a_process)
+void CloseButton::endProcess(TDEProcess *a_process)
 {
   emit widgetTextChanged(m_output);
   m_output = "";
diff --git a/kommander/widgets/closebutton.h b/kommander/widgets/closebutton.h
index d1b2535d..6bd608cc 100644
--- a/kommander/widgets/closebutton.h
+++ b/kommander/widgets/closebutton.h
@@ -57,8 +57,8 @@ public slots:
   virtual void setWriteStdout(bool);
   virtual void setWidgetText(const TQString &);
   virtual void startProcess();
-  virtual void appendOutput(KProcess*, char*, int);
-  virtual void endProcess(KProcess*);
+  virtual void appendOutput(TDEProcess*, char*, int);
+  virtual void endProcess(TDEProcess*);
   virtual void populate();
 signals:
   void widgetOpened();
diff --git a/kommander/widgets/execbutton.h b/kommander/widgets/execbutton.h
index d2774330..ad06fd59 100644
--- a/kommander/widgets/execbutton.h
+++ b/kommander/widgets/execbutton.h
@@ -29,7 +29,7 @@
 #include <kommander_export.h>
 
 class TQWidget;
-class KProcess;
+class TDEProcess;
 class MyProcess;
 
 class TQShowEvent;
diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp
index 26f885d0..fefd8d85 100644
--- a/kommander/widgets/fontdialog.cpp
+++ b/kommander/widgets/fontdialog.cpp
@@ -37,7 +37,7 @@ FontDialog::FontDialog(TQWidget *parent, const char *name)
   setDisplayStates(states);
   if (KommanderWidget::inEditor)
   {
-    setPixmap(KGlobal::iconLoader()->loadIcon("kfontcombo", KIcon::NoGroup, KIcon::SizeMedium));
+    setPixmap(TDEGlobal::iconLoader()->loadIcon("kfontcombo", KIcon::NoGroup, KIcon::SizeMedium));
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setLineWidth(1);
     setFixedSize(pixmap()->size());
diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp
index 5f9fdf02..bf6f8b4a 100644
--- a/kommander/widgets/listbox.cpp
+++ b/kommander/widgets/listbox.cpp
@@ -177,7 +177,7 @@ TQString ListBox::handleDCOP(int function, const TQStringList& args)
     }
     case DCOP::setPixmap:
     {
-      TQPixmap pixmap = KGlobal::iconLoader()->loadIcon(args[0], KIcon::Small);
+      TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(args[0], KIcon::Small);
       if (pixmap.isNull())
         pixmap.load(args[0]);
       int index = args[1].toInt();
diff --git a/kommander/widgets/pixmaplabel.cpp b/kommander/widgets/pixmaplabel.cpp
index 4ccf921b..f49a35ae 100644
--- a/kommander/widgets/pixmaplabel.cpp
+++ b/kommander/widgets/pixmaplabel.cpp
@@ -38,7 +38,7 @@ PixmapLabel::PixmapLabel(TQWidget *a_parent, const char *a_name)
   setStates(states);
   setDisplayStates(states);
   if (KommanderWidget::inEditor)
-    setPixmap(KGlobal::iconLoader()->loadIcon("tux", KIcon::NoGroup, 128));
+    setPixmap(TDEGlobal::iconLoader()->loadIcon("tux", KIcon::NoGroup, 128));
   setAutoResize(false);
 }
 
diff --git a/kommander/widgets/plugin.cpp b/kommander/widgets/plugin.cpp
index 97882f9c..aef6821e 100644
--- a/kommander/widgets/plugin.cpp
+++ b/kommander/widgets/plugin.cpp
@@ -80,7 +80,7 @@ KomStdPlugin::KomStdPlugin()
   addWidget("SpinBoxInt", group, "", 0);
   // addWidget("Wizard", group, "");
   addWidget("TabWidget", group, "", 0);
-  addWidget("ToolBox", group, "", new TQIconSet(KGlobal::iconLoader()->loadIcon("toolbox", KIcon::NoGroup, KIcon::SizeMedium)), "", true);
+  addWidget("ToolBox", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("toolbox", KIcon::NoGroup, KIcon::SizeMedium)), "", true);
   // addWidget("SubDialog", group, "");
   addWidget("ListBox", group, "", 0);
   addWidget("Timer", group, "", 0);
@@ -92,9 +92,9 @@ KomStdPlugin::KomStdPlugin()
   addWidget("Slider", group, "", 0);
   addWidget("Table", group, "", 0);
   addWidget("DatePicker", group, "", 0);
-  addWidget("PopupMenu", group, "", new TQIconSet(KGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium)));
-  addWidget("FontDialog", group, "", new TQIconSet(KGlobal::iconLoader()->loadIcon("kfontcombo", KIcon::NoGroup, KIcon::SizeMedium)));
-  addWidget("AboutDialog", group, "", new TQIconSet(KGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium)));
+  addWidget("PopupMenu", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium)));
+  addWidget("FontDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("kfontcombo", KIcon::NoGroup, KIcon::SizeMedium)));
+  addWidget("AboutDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium)));
 }
 
 TQWidget *KomStdPlugin::create( const TQString &key, TQWidget *parent, const char *name )
diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp
index 65bbdc7a..dfa7b325 100644
--- a/kommander/widgets/popupmenu.cpp
+++ b/kommander/widgets/popupmenu.cpp
@@ -41,7 +41,7 @@ PopupMenu::PopupMenu(TQWidget *parent, const char *name)
   setDisplayStates(states);
   if (KommanderWidget::inEditor)
   {
-    setPixmap(KGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium));
+    setPixmap(TDEGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium));
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setLineWidth(1);
     setFixedSize(pixmap()->size());
@@ -130,7 +130,7 @@ TQString PopupMenu::insertSubmenu(const TQString& title, const TQString &menuWid
     if (icon.isEmpty())
      return TQString::number(m_menu->insertItem(title, dynamic_cast<PopupMenu*>(w)->menu(), index));
     else
-     return TQString::number( m_menu->insertItem(KGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, KIcon::SizeMedium), title, dynamic_cast<PopupMenu*>(w)->menu(), index));
+     return TQString::number( m_menu->insertItem(TDEGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, KIcon::SizeMedium), title, dynamic_cast<PopupMenu*>(w)->menu(), index));
   }
   return TQString();
 }
@@ -159,7 +159,7 @@ TQString PopupMenu::handleDCOP(int function, const TQStringList& args)
       if (args[3].isEmpty())
         id = m_menu->insertItem(args[0], index);
       else
-        id = m_menu->insertItem(KGlobal::iconLoader()->loadIcon(args[3], KIcon::NoGroup, KIcon::SizeMedium), args[0], index);
+        id = m_menu->insertItem(TDEGlobal::iconLoader()->loadIcon(args[3], KIcon::NoGroup, KIcon::SizeMedium), args[0], index);
       m_associations[id] = args[1];
       return TQString::number(id);
       break;
@@ -175,7 +175,7 @@ TQString PopupMenu::handleDCOP(int function, const TQStringList& args)
       if (args[3].isEmpty())
         m_menu->changeItem(id, args[1]);
       else
-        m_menu->changeItem(id, KGlobal::iconLoader()->loadIcon(args[3], KIcon::NoGroup, KIcon::SizeMedium), args[1]);
+        m_menu->changeItem(id, TDEGlobal::iconLoader()->loadIcon(args[3], KIcon::NoGroup, KIcon::SizeMedium), args[1]);
       m_associations[id] = args[2];
       break;
     }
diff --git a/kommander/widgets/scriptobject.cpp b/kommander/widgets/scriptobject.cpp
index ddc7d32a..28f7ad5c 100644
--- a/kommander/widgets/scriptobject.cpp
+++ b/kommander/widgets/scriptobject.cpp
@@ -38,7 +38,7 @@ ScriptObject::ScriptObject(TQWidget *a_parent, const char *a_name)
   setDisplayStates(states);
   if (KommanderWidget::inEditor)
   {
-    setPixmap(KGlobal::iconLoader()->loadIcon("shellscript", KIcon::NoGroup, KIcon::SizeMedium));
+    setPixmap(TDEGlobal::iconLoader()->loadIcon("shellscript", KIcon::NoGroup, KIcon::SizeMedium));
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setLineWidth(1);
     setFixedSize(pixmap()->size());
diff --git a/kommander/widgets/tabwidget.cpp b/kommander/widgets/tabwidget.cpp
index 1574ba9e..04f3cb41 100644
--- a/kommander/widgets/tabwidget.cpp
+++ b/kommander/widgets/tabwidget.cpp
@@ -137,7 +137,7 @@ TQString TabWidget::handleDCOP(int function, const TQStringList& args)
     case TAB_setTabIcon:
     {
       TQWidget *w = page(args[0].toInt());
-      setTabIconSet(w, KGlobal::iconLoader()->loadIcon(args[1], KIcon::NoGroup, KIcon::SizeMedium));
+      setTabIconSet(w, TDEGlobal::iconLoader()->loadIcon(args[1], KIcon::NoGroup, KIcon::SizeMedium));
       break;
     }
     case TAB_isTabEnabled:
diff --git a/kommander/widgets/timer.cpp b/kommander/widgets/timer.cpp
index 01a7991c..c11e6c4a 100644
--- a/kommander/widgets/timer.cpp
+++ b/kommander/widgets/timer.cpp
@@ -46,7 +46,7 @@ Timer::Timer(TQWidget *a_parent, const char *a_name)
   setDisplayStates(states);
   if (KommanderWidget::inEditor)
   {
-    setPixmap(KGlobal::iconLoader()->loadIcon("kalarm", KIcon::NoGroup, KIcon::SizeMedium));
+    setPixmap(TDEGlobal::iconLoader()->loadIcon("kalarm", KIcon::NoGroup, KIcon::SizeMedium));
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setLineWidth(1);
     setFixedSize(pixmap()->size());
diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp
index 914d6b7c..8a1aabf6 100644
--- a/kommander/widgets/treewidget.cpp
+++ b/kommander/widgets/treewidget.cpp
@@ -431,7 +431,7 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args)
     }
     case DCOP::setPixmap:
     {
-      TQPixmap pixmap = KGlobal::iconLoader()->loadIcon(args[0], KIcon::Small);
+      TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(args[0], KIcon::Small);
       if (args[1].toInt() == -1)
         for (TQListViewItemIterator it(this); it.current(); ++it)
           it.current()->setPixmap(0, pixmap);
diff --git a/kommander/widgets/wizard.cpp b/kommander/widgets/wizard.cpp
index b5fabc20..797ed009 100644
--- a/kommander/widgets/wizard.cpp
+++ b/kommander/widgets/wizard.cpp
@@ -130,9 +130,9 @@ void Wizard::runHelp()
 {
   if (helpAction() == Command)
   {
-    KProcess proc;
+    TDEProcess proc;
     proc << helpActionText();
-    proc.start(KProcess::DontCare, KProcess::NoCommunication);
+    proc.start(TDEProcess::DontCare, TDEProcess::NoCommunication);
   }
   else if (helpAction() == Dialog)
   {