diff options
Diffstat (limited to 'lanbrowsing/lisa/netmanager.cpp')
-rw-r--r-- | lanbrowsing/lisa/netmanager.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lanbrowsing/lisa/netmanager.cpp b/lanbrowsing/lisa/netmanager.cpp index e652ce97..43742564 100644 --- a/lanbrowsing/lisa/netmanager.cpp +++ b/lanbrowsing/lisa/netmanager.cpp @@ -142,11 +142,11 @@ void NetManager::configure(Config& config) MyString netAddressStr=tmp.left(tmp.find('/')); tmp=tmp.mid(tmp.find('/')+1); tmp=tmp.left(tmp.find(';')); - mdcerr<<"NetManager::readConfig: broadcastNet "<<netAddressStr<<" with mask "<<tmp<<std::endl; + mdcerr<<"NetManager::readConfig: broadcastNet "<<netAddressStr<<" with tqmask "<<tmp<<std::endl; int netMask=inet_addr(tmp.c_str()); int netAddress=inet_addr(netAddressStr.c_str()); m_broadcastAddress= netAddress | (~netMask); - mdcerr<<"NetManager::readConfig: net "<<std::ios::hex<<netAddress<<" with mask "<<netMask<<" gives "<<m_broadcastAddress<<std::endl; + mdcerr<<"NetManager::readConfig: net "<<std::ios::hex<<netAddress<<" with tqmask "<<netMask<<" gives "<<m_broadcastAddress<<std::endl; //maybe this way we can avoid that all servers on the net send //their requests synchronously, since now the refreshtime isn't @@ -365,10 +365,10 @@ MyString NetManager::getConfigFileName() int length=strlen(buf); if (buf[length-1]=='\n') buf[length-1]='\0'; MyString kdeDirs(buf); - while (kdeDirs.contains(':')) + while (kdeDirs.tqcontains(':')) { - MyString nextDir=kdeDirs.left(kdeDirs.find(':')); - kdeDirs=kdeDirs.mid(kdeDirs.find(':')+1); + MyString nextDir=kdeDirs.left(kdeDirs.tqfind(':')); + kdeDirs=kdeDirs.mid(kdeDirs.tqfind(':')+1); nextDir=nextDir+tmpBase; mdcerr<<"trying to open "<<nextDir<<std::endl; if (fileReadable(nextDir)) @@ -602,7 +602,7 @@ void NetManager::scan() } else if (pid!=0) { - //parent + //tqparent ::close(fileDescr[1]); m_pipeFD=fileDescr[0]; m_childPid=pid; @@ -617,7 +617,7 @@ void NetManager::scan() doScan(); //in the child we don't have to call setServerServer() //since this opens the listening socket, what has to be done - //in the parent process + //in the tqparent process m_serverServer=1; } else @@ -629,7 +629,7 @@ void NetManager::scan() doScan(); //in the child we don't have to call setServerServer() //since this opens the listening socket, what has to be done - //in the parent process + //in the tqparent process m_serverServer=1; } else @@ -639,7 +639,7 @@ void NetManager::scan() m_serverServer=0; } } - mdcerr<<" NetScanner::scan: sending information to parent process"<<std::endl; + mdcerr<<" NetScanner::scan: sending information to tqparent process"<<std::endl; writeDataToFD(fileDescr[1],m_serverServer); mdcerr<<" NetScanner::scan: closed FD: "<<::close(fileDescr[1])<<std::endl; mdcerr<<" NetScanner::scan: exiting now"<<std::endl; |