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

8 files changed, 29 insertions, 29 deletions

diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
index 09252315..2006e1a0 100644
--- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
+++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
@@ -68,7 +68,7 @@ HiddenListViewItem::HiddenListViewItem( TQListView *parent, KFileItem *fi, bool
   setPixmap( COL_NAME, fi->pixmap(KIcon::SizeSmall));
 
   setText( COL_NAME, fi->text() );
-  setText( COL_SIZE, KGlobal::locale()->formatNumber( fi->size(), 0));
+  setText( COL_SIZE, TDEGlobal::locale()->formatNumber( fi->size(), 0));
   setText( COL_DATE,  fi->timeString() );
   setText( COL_PERM,  fi->permissionsString() );
   setText( COL_OWNER, fi->user() );
diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h b/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h
index 55b9df14..b90c47d5 100644
--- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h
+++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h
@@ -59,7 +59,7 @@ void KcmInterface::securityLevelCombo_activated( int i )
 
 void KcmInterface::KURLLabel1_leftClickedURL()
 {
-    KProcess* p = new KProcess();
+    TDEProcess* p = new TDEProcess();
     
     *p << "konqueror";
     *p << "man:smb.conf";
diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
index fcf691da..42b56fa0 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
@@ -1434,7 +1434,7 @@ extern "C"
 {
   KDE_EXPORT KCModule *create_KcmSambaConf(TQWidget *parent, const char *name)
   {
-    KGlobal::locale()->insertCatalogue("kfileshare");
+    TDEGlobal::locale()->insertCatalogue("kfileshare");
     return new KcmSambaConf(parent, name);
   }
 }
diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp
index 4703716b..3a865c62 100644
--- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp
+++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp
@@ -170,7 +170,7 @@ bool SambaFile::slotApply()
   KURL url(path);
 
   if (KURL(path).isLocalFile()) {
-    KProcess proc;
+    TDEProcess proc;
     kdDebug(5009) << "SambaFile::slotApply: is local file!" << endl;
     
     TQString suCommand=TQString("cp %1 %2; rm %3")
@@ -179,7 +179,7 @@ bool SambaFile::slotApply()
               .arg(_tempFile->name());
     proc << "tdesu" << "-d" << suCommand;
 
-    if (! proc.start(KProcess::Block)) {
+    if (! proc.start(TDEProcess::Block)) {
         kdDebug(5009) << "SambaFile::slotApply: saving to " << path << " failed!" << endl;
         //KMessageBox::sorry(0,i18n("Saving the results to %1 failed.").arg(path));
         delete _tempFile;
@@ -341,18 +341,18 @@ int SambaFile::getSambaVersion() {
   if (_sambaVersion > -1)
     return _sambaVersion;
     
-  KProcess testParam;
+  TDEProcess testParam;
   testParam << "testparm";
   testParam << "-V";
   _parmOutput = TQString("");
   _sambaVersion = 2;
       
-  connect( &testParam, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
-          this, TQT_SLOT(testParmStdOutReceived(KProcess*,char*,int)));
+  connect( &testParam, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+          this, TQT_SLOT(testParmStdOutReceived(TDEProcess*,char*,int)));
 
           
           
-  if (testParam.start(KProcess::Block,KProcess::Stdout)) {
+  if (testParam.start(TDEProcess::Block,TDEProcess::Stdout)) {
     if (_parmOutput.find("3") > -1)
       _sambaVersion = 3;
   } 
@@ -369,7 +369,7 @@ SambaShare* SambaFile::getTestParmValues(bool reload)
     return _testParmValues;
 
 
-  KProcess testParam;
+  TDEProcess testParam;
   testParam << "testparm";
   testParam << "-s"; 
   
@@ -380,10 +380,10 @@ SambaShare* SambaFile::getTestParmValues(bool reload)
   testParam << "/dev/null";
   _parmOutput = TQString("");
   
-  connect( &testParam, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
-          this, TQT_SLOT(testParmStdOutReceived(KProcess*,char*,int)));
+  connect( &testParam, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+          this, TQT_SLOT(testParmStdOutReceived(TDEProcess*,char*,int)));
 
-  if (testParam.start(KProcess::Block,KProcess::Stdout))
+  if (testParam.start(TDEProcess::Block,TDEProcess::Stdout))
   {
     parseParmStdOutput();
   } else
@@ -392,7 +392,7 @@ SambaShare* SambaFile::getTestParmValues(bool reload)
   return _testParmValues;
 }
 
-void SambaFile::testParmStdOutReceived(KProcess *, char *buffer, int buflen)
+void SambaFile::testParmStdOutReceived(TDEProcess *, char *buffer, int buflen)
 {
   _parmOutput+=TQString::fromLatin1(buffer,buflen);
 }
@@ -429,7 +429,7 @@ void SambaFile::parseParmStdOutput()
     }
 
     // we are only interested in the global section
-    if (section != KGlobal::staticQString("global"))
+    if (section != TDEGlobal::staticQString("global"))
       continue;
 
     // parameter
diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.h b/filesharing/advanced/kcm_sambaconf/sambafile.h
index 3d4f0a4d..3696b220 100644
--- a/filesharing/advanced/kcm_sambaconf/sambafile.h
+++ b/filesharing/advanced/kcm_sambaconf/sambafile.h
@@ -30,7 +30,7 @@
 
 
 class KSimpleConfig;
-class KProcess;
+class TDEProcess;
 class KConfig;
 class KTempFile;
 
@@ -166,7 +166,7 @@ public slots:
    **/
   bool slotApply();
 protected slots:
-  void testParmStdOutReceived(KProcess *proc, char *buffer, int buflen);
+  void testParmStdOutReceived(TDEProcess *proc, char *buffer, int buflen);
   void slotJobFinished( KIO::Job *);
   void slotSaveJobFinished( KIO::Job *);
 
diff --git a/filesharing/advanced/kcm_sambaconf/share.ui.h b/filesharing/advanced/kcm_sambaconf/share.ui.h
index edcb2f7c..4e0d73e6 100644
--- a/filesharing/advanced/kcm_sambaconf/share.ui.h
+++ b/filesharing/advanced/kcm_sambaconf/share.ui.h
@@ -249,7 +249,7 @@ void KcmShareDlg::storeDosAttributesChk_toggled( bool b)
 
 void KcmShareDlg::buttonHelp_clicked()
 {
-    KProcess* p = new KProcess();
+    TDEProcess* p = new TDEProcess();
     *p << "konqueror";
     *p << "man:smb.conf";
     p->start();
diff --git a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
index 8286cdf3..50bf2713 100644
--- a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
+++ b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
@@ -112,15 +112,15 @@ SambaUserList SmbPasswdFile::getSambaUserList()
 }
 
 bool SmbPasswdFile::executeSmbpasswd(const TQStringList & args) {
-  KProcess p;
+  TDEProcess p;
   p << "smbpasswd" << args;
 
-  connect( &p, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
-           this, TQT_SLOT(smbpasswdStdOutReceived(KProcess*,char*,int)));
+  connect( &p, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+           this, TQT_SLOT(smbpasswdStdOutReceived(TDEProcess*,char*,int)));
 
   _smbpasswdOutput = "";
 
-  bool result = p.start(KProcess::Block,KProcess::Stdout);
+  bool result = p.start(TDEProcess::Block,TDEProcess::Stdout);
 
   if (result)
   {
@@ -136,17 +136,17 @@ bool SmbPasswdFile::executeSmbpasswd(const TQStringList & args) {
  **/
 bool SmbPasswdFile::addUser(const SambaUser & user,const TQString & password)
 {
-  KProcess p;
+  TDEProcess p;
   p << "smbpasswd" << "-a" << user.name;
 
   p << password;
 
-  connect( &p, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
-           this, TQT_SLOT(smbpasswdStdOutReceived(KProcess*,char*,int)));
+  connect( &p, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+           this, TQT_SLOT(smbpasswdStdOutReceived(TDEProcess*,char*,int)));
 
   _smbpasswdOutput = "";
 
-  bool result = p.start(KProcess::Block,KProcess::Stdout);
+  bool result = p.start(TDEProcess::Block,TDEProcess::Stdout);
 
   if (result)
   {
@@ -173,7 +173,7 @@ bool SmbPasswdFile::changePassword(const SambaUser & user, const TQString & newP
 }
 
 
-void SmbPasswdFile::smbpasswdStdOutReceived(KProcess *, char *buffer, int buflen)
+void SmbPasswdFile::smbpasswdStdOutReceived(TDEProcess *, char *buffer, int buflen)
 {
   _smbpasswdOutput+=TQString::fromLatin1(buffer,buflen);
 }
diff --git a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.h b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.h
index 14ae0102..df737994 100644
--- a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.h
+++ b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.h
@@ -38,7 +38,7 @@
 #include <kurl.h>
 
 class SambaFile;
-class KProcess;
+class TDEProcess;
 
 /**
  * Simple class to store a Samba User
@@ -136,7 +136,7 @@ protected:
   TQString _smbpasswdOutput;
 
 protected slots:
-  void smbpasswdStdOutReceived(KProcess*,char*,int);
+  void smbpasswdStdOutReceived(TDEProcess*,char*,int);
 };
 
 #endif