diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/kfontinst/lib | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kfontinst/lib')
| -rw-r--r-- | kcontrol/kfontinst/lib/FcEngine.cpp | 12 | ||||
| -rw-r--r-- | kcontrol/kfontinst/lib/KfiConstants.h | 2 | ||||
| -rw-r--r-- | kcontrol/kfontinst/lib/Misc.cpp | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp index 3c2320588..57fb765f1 100644 --- a/kcontrol/kfontinst/lib/FcEngine.cpp +++ b/kcontrol/kfontinst/lib/FcEngine.cpp @@ -687,7 +687,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b TQString CFcEngine::getPreviewString() { - KConfig cfg(KFI_UI_CFG_FILE); + TDEConfig cfg(KFI_UI_CFG_FILE); cfg.setGroup(KFI_PREVIEW_GROUP); @@ -700,7 +700,7 @@ TQString CFcEngine::getPreviewString() void CFcEngine::setPreviewString(const TQString &str) { - KConfig cfg(KFI_UI_CFG_FILE); + TDEConfig cfg(KFI_UI_CFG_FILE); cfg.setGroup(KFI_PREVIEW_GROUP); cfg.writeEntry(KFI_PREVIEW_STRING_KEY, str); @@ -911,17 +911,17 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all) // if(KFI_KIO_FONTS_PROTOCOL==url.protocol()) { - KIO::UDSEntry udsEntry; + TDEIO::UDSEntry udsEntry; TQString name; FcInitReinitialize(); - if(KIO::NetAccess::stat(url, udsEntry, NULL)) // Need to stat the url to get its font name... + if(TDEIO::NetAccess::stat(url, udsEntry, NULL)) // Need to stat the url to get its font name... { - KIO::UDSEntry::Iterator it(udsEntry.begin()), + TDEIO::UDSEntry::Iterator it(udsEntry.begin()), end(udsEntry.end()); for( ; it != end; ++it) - if (KIO::UDS_NAME==(*it).m_uds) + if (TDEIO::UDS_NAME==(*it).m_uds) { name=(*it).m_str; break; diff --git a/kcontrol/kfontinst/lib/KfiConstants.h b/kcontrol/kfontinst/lib/KfiConstants.h index fa7f6f1a0..e50acb5fb 100644 --- a/kcontrol/kfontinst/lib/KfiConstants.h +++ b/kcontrol/kfontinst/lib/KfiConstants.h @@ -21,7 +21,7 @@ #define KFI_DEFAULT_CFG_X true #define KFI_DEFAULT_CFG_GS false -// KIO::special +// TDEIO::special namespace KFI { diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp index fe6054cd5..a2c150a08 100644 --- a/kcontrol/kfontinst/lib/Misc.cpp +++ b/kcontrol/kfontinst/lib/Misc.cpp @@ -190,11 +190,11 @@ void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm, TQWidg for(e=0; afm[e]; ++e) { KURL statUrl(url); - KIO::UDSEntry uds; + TDEIO::UDSEntry uds; statUrl.setPath(changeExt(url.path(), afm[e])); - if(localFile ? fExists(statUrl.path()) : KIO::NetAccess::stat(statUrl, uds, widget)) + if(localFile ? fExists(statUrl.path()) : TDEIO::NetAccess::stat(statUrl, uds, widget)) { list.append(statUrl); gotAfm=true; @@ -206,10 +206,10 @@ void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm, TQWidg for(e=0; pfm[e]; ++e) { KURL statUrl(url); - KIO::UDSEntry uds; + TDEIO::UDSEntry uds; statUrl.setPath(changeExt(url.path(), pfm[e])); - if(localFile ? fExists(statUrl.path()) : KIO::NetAccess::stat(statUrl, uds, widget)) + if(localFile ? fExists(statUrl.path()) : TDEIO::NetAccess::stat(statUrl, uds, widget)) { list.append(statUrl); break; |