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

3 files changed, 17 insertions, 17 deletions

diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp
index 5b796823..15007fdb 100644
--- a/filesharing/simple/fileshare.cpp
+++ b/filesharing/simple/fileshare.cpp
@@ -63,7 +63,7 @@ K_EXPORT_COMPONENT_FACTORY (kcm_fileshare, ShareFactory("kcmfileshare") )
 KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQStringList &):
     KCModule(ShareFactory::instance(), parent, name)
 {
-  KGlobal::locale()->insertCatalogue("kfileshare");                            
+  TDEGlobal::locale()->insertCatalogue("kfileshare");                            
 
   TQBoxLayout* layout = new TQVBoxLayout(this,0,
 				       KDialog::spacingHint());
@@ -221,18 +221,18 @@ void KFileShareConfig::load()
 }
 
 bool KFileShareConfig::addGroupAccessesToFile(const TQString & file) {
-  KProcess chgrp;
+  TDEProcess chgrp;
   chgrp << "chgrp" << m_fileShareGroup << file;
-  KProcess chmod;
+  TDEProcess chmod;
   chmod << "chmod" << "g=rw" << file;
   
-  if (!chgrp.start(KProcess::Block) && chgrp.normalExit()) {
+  if (!chgrp.start(TDEProcess::Block) && chgrp.normalExit()) {
       kdDebug(FILESHARE_DEBUG) << "KFileShareConfig::addGroupAccessesToFile: chgrp failed" << endl;
       return false;
       
   }      
       
-  if(!chmod.start(KProcess::Block) && chmod.normalExit()) {
+  if(!chmod.start(TDEProcess::Block) && chmod.normalExit()) {
       kdDebug(FILESHARE_DEBUG) << "KFileShareConfig::addGroupAccessesToFile: chmod failed" << endl;
       return false;
   }
@@ -242,18 +242,18 @@ bool KFileShareConfig::addGroupAccessesToFile(const TQString & file) {
 }
 
 bool KFileShareConfig::removeGroupAccessesFromFile(const TQString & file) {
-  KProcess chgrp;
+  TDEProcess chgrp;
   chgrp << "chgrp" << "root" << file;
-  KProcess chmod;
+  TDEProcess chmod;
   chmod << "chmod" << "g=r" << file;
   
-  if (!chgrp.start(KProcess::Block) && chgrp.normalExit()) {
+  if (!chgrp.start(TDEProcess::Block) && chgrp.normalExit()) {
       kdDebug(FILESHARE_DEBUG) << "KFileShareConfig::removeGroupAccessesFromFile: chgrp failed" << endl;
       return false;
       
   }      
       
-  if(!chmod.start(KProcess::Block) && chmod.normalExit()) {
+  if(!chmod.start(TDEProcess::Block) && chmod.normalExit()) {
       kdDebug(FILESHARE_DEBUG) << "KFileShareConfig::removeGroupAccessesFromFile: chmod failed" << endl;
       return false;
   }
diff --git a/filesharing/simple/groupconfigdlg.cpp b/filesharing/simple/groupconfigdlg.cpp
index a57d0f79..86173f2b 100644
--- a/filesharing/simple/groupconfigdlg.cpp
+++ b/filesharing/simple/groupconfigdlg.cpp
@@ -222,9 +222,9 @@ void GroupConfigDlg::slotOk() {
 }
 
 bool userMod(const TQString & user, const TQValueList<KUserGroup> & groups) {
-  KProcess proc;
+  TDEProcess proc;
   proc << "usermod" << "-G" << groupListToString(groups) << user;
-  return proc.start(KProcess::Block) && proc.normalExit();
+  return proc.start(TDEProcess::Block) && proc.normalExit();
 }
 
 void GroupConfigDlg::slotRemoveUser() {
@@ -381,9 +381,9 @@ bool GroupConfigDlg::deleteGroup(const TQString & s) {
       return false;        
   }
         
-  KProcess proc;
+  TDEProcess proc;
   proc << "groupdel" << s;
-  bool result = proc.start(KProcess::Block) && proc.normalExit();
+  bool result = proc.start(TDEProcess::Block) && proc.normalExit();
   if (!result) {
     KMessageBox::sorry(this,i18n("Deleting group '%1' failed.").arg(s));
   } 
@@ -402,9 +402,9 @@ bool GroupConfigDlg::createFileShareGroup(const TQString & s) {
       return false;
       
   //debug("CreateFileShareGroup: "+s);
-  KProcess proc;
+  TDEProcess proc;
   proc << "groupadd" << s;
-  bool result = proc.start(KProcess::Block) && proc.normalExit();
+  bool result = proc.start(TDEProcess::Block) && proc.normalExit();
   if (!result) {
     KMessageBox::sorry(this,i18n("Creation of group '%1' failed.").arg(s));
   } else {
diff --git a/filesharing/simple/krichtextlabel.cpp b/filesharing/simple/krichtextlabel.cpp
index 499577b0..0df5a95f 100644
--- a/filesharing/simple/krichtextlabel.cpp
+++ b/filesharing/simple/krichtextlabel.cpp
@@ -40,14 +40,14 @@ static TQString qrichtextify( const TQString& text )
 
 KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
-  m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
+  m_defaultWidth = TQMIN(400, TDEGlobalSettings::desktopGeometry(this).width()*2/5);
   setAlignment( TQt::WordBreak );
   setText(text);
 }
 
 KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
-  m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
+  m_defaultWidth = TQMIN(400, TDEGlobalSettings::desktopGeometry(this).width()*2/5);
   setAlignment( TQt::WordBreak );
 }