diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:32:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:32:27 -0600 |
| commit | 9f2c757e1a1694373c11427a00502c2ff4c2d403 (patch) | |
| tree | 7d90e91214976a7d23d89ec3474515cf46069704 /ktouch/src/ktouchkeyboard.cpp | |
| parent | cee429821aa6f1acc97fb482d325fb4eb37376ca (diff) | |
| download | tdeedu-9f2c757e1a1694373c11427a00502c2ff4c2d403.tar.gz tdeedu-9f2c757e1a1694373c11427a00502c2ff4c2d403.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'ktouch/src/ktouchkeyboard.cpp')
| -rw-r--r-- | ktouch/src/ktouchkeyboard.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ktouch/src/ktouchkeyboard.cpp b/ktouch/src/ktouchkeyboard.cpp index 476a8502..8d9fd4b9 100644 --- a/ktouch/src/ktouchkeyboard.cpp +++ b/ktouch/src/ktouchkeyboard.cpp @@ -41,7 +41,7 @@ bool KTouchKeyboard::load(TQWidget * window, const KURL& url) { TQString target; bool result = false; //kdDebug() << "[KTouchKeyboard::load] " << url << endl; - if (KIO::NetAccess::download(url, target, window)) { + if (TDEIO::NetAccess::download(url, target, window)) { // Ok, that was successful, store the lectureURL and read the file TQFile infile(target); if ( !infile.open( IO_ReadOnly ) ) @@ -49,7 +49,7 @@ bool KTouchKeyboard::load(TQWidget * window, const KURL& url) { TQTextStream in( &infile ); result = read(in); }; - KIO::NetAccess::removeTempFile(target); + TDEIO::NetAccess::removeTempFile(target); return result; } // ---------------------------------------------------------------------------- @@ -60,7 +60,7 @@ bool KTouchKeyboard::loadXML(TQWidget * window, const KURL& url) { // File is only downloaded if not local, otherwise it's just opened TQString target; bool result = false; - if (KIO::NetAccess::download(url, target, window)) { + if (TDEIO::NetAccess::download(url, target, window)) { // Ok, that was successful, store the lectureURL and read the file TQFile infile(target); if ( !infile.open( IO_ReadOnly ) ) @@ -69,7 +69,7 @@ bool KTouchKeyboard::loadXML(TQWidget * window, const KURL& url) { doc.setContent( &infile ); result = read(doc); } - KIO::NetAccess::removeTempFile(target); + TDEIO::NetAccess::removeTempFile(target); return result; } // ---------------------------------------------------------------------------- @@ -103,7 +103,7 @@ bool KTouchKeyboard::saveXML(TQWidget * window, const KURL& url) const { outfile.close(); // if we have a temporary file, we still need to upload it if (temp) { - KIO::NetAccess::upload(tmpFile, url, window); + TDEIO::NetAccess::upload(tmpFile, url, window); delete temp; } return true; @@ -347,10 +347,10 @@ void KTouchKeyboard::updateConnections() { bool KTouchKeyboard::loadKeyboard(TQWidget * window, const KURL& url, TQString* errorMsg) { TQString target; - if (KIO::NetAccess::download(url, target, window)) { + if (TDEIO::NetAccess::download(url, target, window)) { TQString msg; bool result = readKeyboard(target, msg); - KIO::NetAccess::removeTempFile(target); + TDEIO::NetAccess::removeTempFile(target); if (!result && errorMsg!=NULL) *errorMsg = i18n("Could not read the keyboard layout file '%1'. ").arg(url.url()) + msg; return result; @@ -401,7 +401,7 @@ void KTouchKeyboard::saveKeyboard(TQWidget * window, const KURL& url) { } if (temp) { - KIO::NetAccess::upload(tmpFile, url, window); + TDEIO::NetAccess::upload(tmpFile, url, window); temp->unlink(); delete temp; } |