diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
| commit | c48e769eb275917717e2b55eb869f7e559293ac8 (patch) | |
| tree | 8f650b907e21c918b826f854dbe1c8174cc2c0c6 /filesharing/advanced/kcm_sambaconf/sambafile.cpp | |
| parent | 8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff) | |
| download | tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'filesharing/advanced/kcm_sambaconf/sambafile.cpp')
| -rw-r--r-- | filesharing/advanced/kcm_sambaconf/sambafile.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
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 |