diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
| commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
| tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdeprint/cups/cupsaddsmb2.cpp | |
| parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
| download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip | |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeprint/cups/cupsaddsmb2.cpp')
| -rw-r--r-- | kdeprint/cups/cupsaddsmb2.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kdeprint/cups/cupsaddsmb2.cpp b/kdeprint/cups/cupsaddsmb2.cpp index acb384abc..ef1b0f4e8 100644 --- a/kdeprint/cups/cupsaddsmb2.cpp +++ b/kdeprint/cups/cupsaddsmb2.cpp @@ -156,7 +156,7 @@ void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen) while (1) { // read a line - line = TQString::tqfromLatin1(""); + line = TQString::fromLatin1(""); partial = true; while (index < buflen) { @@ -191,7 +191,7 @@ void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen) if (line.startsWith("smb:") || line.startsWith("rpcclient $")) { kdDebug(500) << "END OF ACTION" << endl; - checkActiontqStatus(); + checkActionStatus(); if (m_status) nextAction(); else @@ -216,7 +216,7 @@ void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen) } } -void CupsAddSmb::checkActiontqStatus() +void CupsAddSmb::checkActionStatus() { m_status = false; // when checking the status, we need to take into account the @@ -231,7 +231,7 @@ void CupsAddSmb::checkActiontqStatus() m_status = (m_buffer.count() == 0); break; case MkDir: - m_status = (m_buffer.count() == 1 || m_buffer[1].tqfind("ERRfilexists") != -1); + m_status = (m_buffer.count() == 1 || m_buffer[1].find("ERRfilexists") != -1); break; case AddDriver: case AddPrinter: @@ -315,7 +315,7 @@ void CupsAddSmb::slotProcessExited(KProcess*) if (m_proc.normalExit() && m_state != Start && m_status) { // last process went OK. If it was smbclient, then switch to rpcclient - if (tqstrncmp(m_proc.args().first(), "smbclient", 9) == 0) + if (qstrncmp(m_proc.args().first(), "smbclient", 9) == 0) { doInstall(); return; @@ -433,7 +433,7 @@ bool CupsAddSmb::doExport() m_actions << "quit"; m_proc.clearArguments(); - m_proc << "smbclient" << TQString::tqfromLatin1("//")+m_servered->text()+"/print$"; + m_proc << "smbclient" << TQString::fromLatin1("//")+m_servered->text()+"/print$"; return startProcess(); } |