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 /lanbrowsing/kio_lan | |
| parent | 8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff) | |
| download | tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'lanbrowsing/kio_lan')
| -rw-r--r-- | lanbrowsing/kio_lan/kio_lan.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lanbrowsing/kio_lan/kio_lan.cpp b/lanbrowsing/kio_lan/kio_lan.cpp index 442957ad..7e296694 100644 --- a/lanbrowsing/kio_lan/kio_lan.cpp +++ b/lanbrowsing/kio_lan/kio_lan.cpp @@ -76,9 +76,9 @@ int kdemain( int argc, char **argv ) int isLanIoslave=(strcmp("lan",argv[1])==0); // Trigger creation to make sure we pick up KIOSK settings correctly. - (void)KGlobal::dirs(); - (void)KGlobal::locale(); - (void)KGlobal::config(); + (void)TDEGlobal::dirs(); + (void)TDEGlobal::locale(); + (void)TDEGlobal::config(); kdDebug(7101) << "LAN: kdemain: starting" << endl; @@ -94,7 +94,7 @@ LANProtocol::LANProtocol(int isLanIoslave, const TQCString &pool, const TQCStrin ,m_maxAge(15*60) ,m_isLanIoslave(isLanIoslave?true:false) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); m_protocolInfo[KIOLAN_FTP].enabled=config->readNumEntry("Support_FTP",PORTSETTINGS_CHECK); m_protocolInfo[KIOLAN_HTTP].enabled=config->readNumEntry("Support_HTTP",PORTSETTINGS_CHECK); @@ -292,10 +292,10 @@ int LANProtocol::rlanReadDataFromServer() if (result!=0) { ::close(sockFD); - KProcess proc; + TDEProcess proc; proc<<"reslisa"; - bool ok=proc.start(KProcess::DontCare); + bool ok=proc.start(TDEProcess::DontCare); if (!ok) { error( ERR_CANNOT_LAUNCH_PROCESS, "reslisa" ); |