diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:28:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:28:14 -0600 |
| commit | 6379d18e0ec321e0e08a1389ee4a12f0eaa5992e (patch) | |
| tree | dd3e6f3b6c190bc5ea47516ddbe04c6777fa6a04 /kmag | |
| parent | 0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4 (diff) | |
| download | tdeaccessibility-6379d18e0ec321e0e08a1389ee4a12f0eaa5992e.tar.gz tdeaccessibility-6379d18e0ec321e0e08a1389ee4a12f0eaa5992e.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kmag')
| -rw-r--r-- | kmag/kmag.cpp | 2 | ||||
| -rw-r--r-- | kmag/kmag.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp index af844a3..6bcf106 100644 --- a/kmag/kmag.cpp +++ b/kmag/kmag.cpp @@ -567,7 +567,7 @@ void KmagApp::saveZoomPixmap() KMessageBox::error(0, i18n("Unable to save temporary file (before uploading to the network file you specified)."), i18n("Error Writing File")); } else { - if(!KIO::NetAccess::upload(tempFile.name(), url, this)) { + if(!TDEIO::NetAccess::upload(tempFile.name(), url, this)) { KMessageBox::error(0, i18n("Unable to upload file over the network."), i18n("Error Writing File")); } else { diff --git a/kmag/kmag.h b/kmag/kmag.h index 51de1b8..a834da5 100644 --- a/kmag/kmag.h +++ b/kmag/kmag.h @@ -49,7 +49,7 @@ * full session management as well as using KActions. * @see KMainWindow * @see TDEApplication - * @see KConfig + * @see TDEConfig * * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team. * @version KDevelop version 1.2 code generation @@ -190,7 +190,7 @@ class KmagApp : public KMainWindow int edgesize; /// the configuration object of the application - KConfig *config; + TDEConfig *config; // KAction pointers to enable/disable actions KAction *fileNewWindow, *m_pSnapshot, *m_pCopy, *m_keyConf, *m_toolConf; |