summaryrefslogtreecommitdiffstats
path: root/kcontrol/kfontinst
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/kfontinst
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kfontinst')
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp20
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KCmFontInst.h8
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp4
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KFileFontView.h4
-rw-r--r--kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp6
-rw-r--r--kcontrol/kfontinst/kfile-plugin/KFileFont.cpp4
-rw-r--r--kcontrol/kfontinst/kio/KioFonts.cpp198
-rw-r--r--kcontrol/kfontinst/kio/KioFonts.h4
-rw-r--r--kcontrol/kfontinst/lib/FcEngine.cpp12
-rw-r--r--kcontrol/kfontinst/lib/KfiConstants.h2
-rw-r--r--kcontrol/kfontinst/lib/Misc.cpp8
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewPart.cpp12
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewerApp.cpp4
13 files changed, 143 insertions, 143 deletions
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
index 814703b0f..c5db61ecc 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -76,7 +76,7 @@ namespace KFI
{
CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
- : KCModule(parent, "kfontinst"),
+ : TDECModule(parent, "kfontinst"),
#ifdef HAVE_XFT
itsPreview(NULL),
#endif
@@ -464,8 +464,8 @@ void CKCmFontInst::removeFonts()
if(doIt)
{
- KIO::DeleteJob *job = KIO::del(urls, false, true);
- connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(delResult(KIO::Job *)));
+ TDEIO::DeleteJob *job = TDEIO::del(urls, false, true);
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(delResult(TDEIO::Job *)));
job->setWindow(this);
job->setAutoErrorHandlingEnabled(true, this);
}
@@ -558,7 +558,7 @@ static TQString family(const TQString &name)
void CKCmFontInst::updateInformation(int, int fonts)
{
- KIO::filesize_t size=0;
+ TDEIO::filesize_t size=0;
TQString text(i18n("One Font", "%n Fonts", fonts));
TQStringList families;
@@ -579,14 +579,14 @@ void CKCmFontInst::updateInformation(int, int fonts)
if(fonts>0)
{
text+=" ";
- text+=i18n("(%1 Total)").arg(KIO::convertSize(size));
+ text+=i18n("(%1 Total)").arg(TDEIO::convertSize(size));
}
text+=" - ";
text+=i18n("One Family", "%n Families", families.count());
itsStatusLabel->setText(text);
}
-void CKCmFontInst::delResult(KIO::Job *job)
+void CKCmFontInst::delResult(TDEIO::Job *job)
{
//
// To speed up font deletion, we dont rescan font list each time - so after this has completed, we need
@@ -596,11 +596,11 @@ void CKCmFontInst::delResult(KIO::Job *job)
stream << KFI::SPECIAL_RESCAN;
- KIO::NetAccess::synchronousRun(KIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
+ TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
jobResult(job);
}
-void CKCmFontInst::jobResult(KIO::Job *job)
+void CKCmFontInst::jobResult(TDEIO::Job *job)
{
//
// Force an update of the view. For some reason the view is not automatically updated when
@@ -636,8 +636,8 @@ void CKCmFontInst::addFonts(const KURL::List &src, const KURL &dest)
copy+=associatedUrls;
}
- KIO::CopyJob *job=KIO::copy(copy, dest, true);
- connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(jobResult(KIO::Job *)));
+ TDEIO::CopyJob *job=TDEIO::copy(copy, dest, true);
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(jobResult(TDEIO::Job *)));
job->setWindow(this);
job->setAutoErrorHandlingEnabled(true, this);
}
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
index b304e0a1a..1483ee4de 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
@@ -56,7 +56,7 @@ class KFileItem;
namespace KFI
{
-class CKCmFontInst : public KCModule
+class CKCmFontInst : public TDECModule
{
Q_OBJECT
@@ -84,8 +84,8 @@ class CKCmFontInst : public KCModule
void dropped(const KFileItem *i, TQDropEvent *e, const KURL::List &urls);
void infoMessage(const TQString &msg);
void updateInformation(int dirs, int fonts);
- void delResult(KIO::Job *job);
- void jobResult(KIO::Job *job);
+ void delResult(TDEIO::Job *job);
+ void jobResult(TDEIO::Job *job);
private:
@@ -106,7 +106,7 @@ class CKCmFontInst : public KCModule
KParts::ReadOnlyPart *itsPreview;
#endif
TQSplitter *itsSplitter;
- KConfig itsConfig;
+ TDEConfig itsConfig;
bool itsEmbeddedAdmin;
TQLabel *itsStatusLabel;
};
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
index df50e81a3..03158eff7 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
@@ -614,13 +614,13 @@ void CKFileFontView::contentsDropEvent(TQDropEvent *e)
}
}
-void CKFileFontView::readConfig(KConfig *kc, const TQString &group)
+void CKFileFontView::readConfig(TDEConfig *kc, const TQString &group)
{
restoreLayout(kc, group.isEmpty() ? TQString("CFileFontView") : group);
slotSortingChanged(sortColumn());
}
-void CKFileFontView::writeConfig(KConfig *kc, const TQString &group)
+void CKFileFontView::writeConfig(TDEConfig *kc, const TQString &group)
{
saveLayout(kc, group.isEmpty() ? TQString("CFileFontView") : group);
}
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
index b4766c5c4..c160175be 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
@@ -142,8 +142,8 @@ class CKFileFontView : public KListView, public KFileView
virtual KFileItem * prevItem(const KFileItem *i) const;
virtual void insertItem( KFileItem *i);
- void readConfig(KConfig *kc, const TQString &group);
- void writeConfig(KConfig *kc, const TQString &group);
+ void readConfig(TDEConfig *kc, const TQString &group);
+ void writeConfig(TDEConfig *kc, const TQString &group);
// implemented to get noticed about sorting changes (for sortingIndicator)
virtual void setSorting(TQDir::SortSpec s);
diff --git a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
index 8b8a88167..c4a0d26b1 100644
--- a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
@@ -63,7 +63,7 @@ CSettingsDialog::CSettingsDialog(TQWidget *parent)
"that this will also slow down the installation process.</p><p>As most applications can, and do, embed "
"the fonts into the PostScript before sending this to Ghostscript, this option can safely be disabled."));
- KConfig cfg(Misc::root() ? KFI_ROOT_CFG_FILE : KFI_CFG_FILE);
+ TDEConfig cfg(Misc::root() ? KFI_ROOT_CFG_FILE : KFI_CFG_FILE);
itsDoX->setChecked(cfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X));
itsDoGs->setChecked(cfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS));
@@ -71,7 +71,7 @@ CSettingsDialog::CSettingsDialog(TQWidget *parent)
void CSettingsDialog::slotOk()
{
- KConfig cfg(Misc::root() ? KFI_ROOT_CFG_FILE : KFI_CFG_FILE);
+ TDEConfig cfg(Misc::root() ? KFI_ROOT_CFG_FILE : KFI_CFG_FILE);
bool oldDoX=cfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X),
oldDoGs=cfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS);
@@ -90,7 +90,7 @@ void CSettingsDialog::slotOk()
stream << KFI::SPECIAL_RECONFIG;
- KIO::NetAccess::synchronousRun(KIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
+ TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
}
hide();
diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
index a4f09cb56..46339fc4f 100644
--- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
+++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
@@ -327,7 +327,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what)
what=0;
- if(!fontsProt && !fileProt && KIO::NetAccess::download(url, fName, NULL))
+ if(!fontsProt && !fileProt && TDEIO::NetAccess::download(url, fName, NULL))
{
downloaded=true;
url=KURL(fName);
@@ -413,7 +413,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what)
}
if(downloaded)
- KIO::NetAccess::removeTempFile(fName);
+ TDEIO::NetAccess::removeTempFile(fName);
}
return status;
diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp
index 15531901f..c7c03d107 100644
--- a/kcontrol/kfontinst/kio/KioFonts.cpp
+++ b/kcontrol/kfontinst/kio/KioFonts.cpp
@@ -231,16 +231,16 @@ static int getSize(TQValueList<FcPattern *> &patterns)
return size;
}
-static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, const TQString &s=TQString::null)
+static void addAtom(TDEIO::UDSEntry &entry, unsigned int ID, long l, const TQString &s=TQString::null)
{
- KIO::UDSAtom atom;
+ TDEIO::UDSAtom atom;
atom.m_uds = ID;
atom.m_long = l;
atom.m_str = s;
entry.append(atom);
}
-static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, const TQString &path, bool sys)
+static bool createFolderUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, const TQString &path, bool sys)
{
KFI_DBUG << "createFolderUDSEntry " << name << ' ' << path << ' ' << sys << ' ' << endl;
@@ -251,7 +251,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con
if(-1!=KDE_lstat(cPath, &buff))
{
- addAtom(entry, KIO::UDS_NAME, 0, name);
+ addAtom(entry, TDEIO::UDS_NAME, 0, name);
if (S_ISLNK(buff.st_mode))
{
@@ -262,49 +262,49 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con
if(n!= -1)
buffer2[n]='\0';
- addAtom(entry, KIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2));
+ addAtom(entry, TDEIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2));
if(-1==KDE_stat(cPath, &buff))
{
// It is a link pointing to nowhere
- addAtom(entry, KIO::UDS_FILE_TYPE, S_IFMT - 1);
- addAtom(entry, KIO::UDS_ACCESS, S_IRWXU | S_IRWXG | S_IRWXO);
- addAtom(entry, KIO::UDS_SIZE, 0);
+ addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFMT - 1);
+ addAtom(entry, TDEIO::UDS_ACCESS, S_IRWXU | S_IRWXG | S_IRWXO);
+ addAtom(entry, TDEIO::UDS_SIZE, 0);
goto notype;
}
}
- addAtom(entry, KIO::UDS_FILE_TYPE, buff.st_mode&S_IFMT);
- addAtom(entry, KIO::UDS_ACCESS, buff.st_mode&07777);
- addAtom(entry, KIO::UDS_SIZE, buff.st_size);
+ addAtom(entry, TDEIO::UDS_FILE_TYPE, buff.st_mode&S_IFMT);
+ addAtom(entry, TDEIO::UDS_ACCESS, buff.st_mode&07777);
+ addAtom(entry, TDEIO::UDS_SIZE, buff.st_size);
notype:
- addAtom(entry, KIO::UDS_MODIFICATION_TIME, buff.st_mtime);
+ addAtom(entry, TDEIO::UDS_MODIFICATION_TIME, buff.st_mtime);
struct passwd *user = getpwuid(buff.st_uid);
- addAtom(entry, KIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1());
+ addAtom(entry, TDEIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1());
struct group *grp = getgrgid(buff.st_gid);
- addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1());
+ addAtom(entry, TDEIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1());
- addAtom(entry, KIO::UDS_ACCESS_TIME, buff.st_atime);
- addAtom(entry, KIO::UDS_MIME_TYPE, 0, sys
+ addAtom(entry, TDEIO::UDS_ACCESS_TIME, buff.st_atime);
+ addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, sys
? KFI_KIO_FONTS_PROTOCOL"/system-folder"
: KFI_KIO_FONTS_PROTOCOL"/folder");
- addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
+ addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
return true;
}
else if (sys && !Misc::root()) // Default system fonts folder does not actually exist yet!
{
KFI_DBUG << "Default system folder (" << path << ") does not yet exist, so create dummy entry" << endl;
- addAtom(entry, KIO::UDS_NAME, 0, name);
- addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR);
- addAtom(entry, KIO::UDS_ACCESS, 0744);
- addAtom(entry, KIO::UDS_USER, 0, "root");
- addAtom(entry, KIO::UDS_GROUP, 0, "root");
- addAtom(entry, KIO::UDS_MIME_TYPE, 0, KFI_KIO_FONTS_PROTOCOL"/system-folder");
- addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
+ addAtom(entry, TDEIO::UDS_NAME, 0, name);
+ addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR);
+ addAtom(entry, TDEIO::UDS_ACCESS, 0744);
+ addAtom(entry, TDEIO::UDS_USER, 0, "root");
+ addAtom(entry, TDEIO::UDS_GROUP, 0, "root");
+ addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KFI_KIO_FONTS_PROTOCOL"/system-folder");
+ addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
return true;
}
@@ -313,7 +313,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con
return false;
}
-static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQValueList<FcPattern *> &patterns, bool sys)
+static bool createFontUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, TQValueList<FcPattern *> &patterns, bool sys)
{
KFI_DBUG << "createFontUDSEntry " << name << ' ' << patterns.count() << endl;
@@ -344,7 +344,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
end=sortedPatterns.end();
entry.clear();
- addAtom(entry, KIO::UDS_SIZE, getSize(patterns));
+ addAtom(entry, TDEIO::UDS_SIZE, getSize(patterns));
for(it=sortedPatterns.begin(); it!=end; ++it)
{
@@ -354,7 +354,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
if(-1!=KDE_lstat(cPath, &buff))
{
- addAtom(entry, KIO::UDS_NAME, 0, name);
+ addAtom(entry, TDEIO::UDS_NAME, 0, name);
if (S_ISLNK(buff.st_mode))
{
@@ -366,32 +366,32 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
if(n!= -1)
buffer2[n]='\0';
- addAtom(entry, KIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2));
+ addAtom(entry, TDEIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2));
if(-1==KDE_stat(cPath, &buff))
{
// It is a link pointing to nowhere
- addAtom(entry, KIO::UDS_FILE_TYPE, S_IFMT - 1);
- addAtom(entry, KIO::UDS_ACCESS, S_IRWXU | S_IRWXG | S_IRWXO);
+ addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFMT - 1);
+ addAtom(entry, TDEIO::UDS_ACCESS, S_IRWXU | S_IRWXG | S_IRWXO);
goto notype;
}
}
- addAtom(entry, KIO::UDS_FILE_TYPE, buff.st_mode&S_IFMT);
- addAtom(entry, KIO::UDS_ACCESS, buff.st_mode&07777);
+ addAtom(entry, TDEIO::UDS_FILE_TYPE, buff.st_mode&S_IFMT);
+ addAtom(entry, TDEIO::UDS_ACCESS, buff.st_mode&07777);
notype:
- addAtom(entry, KIO::UDS_MODIFICATION_TIME, buff.st_mtime);
+ addAtom(entry, TDEIO::UDS_MODIFICATION_TIME, buff.st_mtime);
struct passwd *user = getpwuid(buff.st_uid);
- addAtom(entry, KIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1());
+ addAtom(entry, TDEIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1());
struct group *grp = getgrgid(buff.st_gid);
- addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1());
+ addAtom(entry, TDEIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1());
- addAtom(entry, KIO::UDS_ACCESS_TIME, buff.st_atime);
- addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name());
- addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
+ addAtom(entry, TDEIO::UDS_ACCESS_TIME, buff.st_atime);
+ addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name());
+ addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
@@ -404,7 +404,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
url+=name+TQString::fromLatin1(constMultipleExtension);
else
url+=Misc::getFile(path);
- addAtom(entry, KIO::UDS_URL, 0, url);
+ addAtom(entry, TDEIO::UDS_URL, 0, url);
return true; // This file was OK, so use its values...
}
}
@@ -706,7 +706,7 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma
}
CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app)
- : KIO::SlaveBase(KFI_KIO_FONTS_PROTOCOL, pool, app),
+ : TDEIO::SlaveBase(KFI_KIO_FONTS_PROTOCOL, pool, app),
itsRoot(Misc::root()),
itsUsingFcFpe(false),
itsUsingXfsFpe(false),
@@ -830,7 +830,7 @@ void CKioFonts::listDir(const KURL &url)
if(updateFontList() && checkUrl(url, true))
{
- KIO::UDSEntry entry;
+ TDEIO::UDSEntry entry;
int size=0;
if(itsRoot || TQStringList::split('/', url.path(), false).count()!=0)
@@ -861,7 +861,7 @@ void CKioFonts::listDir(const KURL &url)
listEntry(entry, false);
}
- listEntry(size ? entry : KIO::UDSEntry(), true);
+ listEntry(size ? entry : TDEIO::UDSEntry(), true);
finished();
}
@@ -878,12 +878,12 @@ void CKioFonts::stat(const KURL &url)
if(path.isEmpty())
{
- error(KIO::ERR_COULD_NOT_STAT, url.prettyURL());
+ error(TDEIO::ERR_COULD_NOT_STAT, url.prettyURL());
return;
}
TQStringList pathList(TQStringList::split('/', path, false));
- KIO::UDSEntry entry;
+ TDEIO::UDSEntry entry;
bool err=false;
switch(pathList.count())
@@ -901,7 +901,7 @@ void CKioFonts::stat(const KURL &url)
err=!createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_SYS), itsFolders[FOLDER_USER].location, true);
else
{
- error(KIO::ERR_SLAVE_DEFINED,
+ error(TDEIO::ERR_SLAVE_DEFINED,
i18n("Please specify \"%1\" or \"%2\".").arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)));
return;
}
@@ -912,7 +912,7 @@ void CKioFonts::stat(const KURL &url)
if(err)
{
- error(KIO::ERR_DOES_NOT_EXIST, url.prettyURL());
+ error(TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL());
return;
}
@@ -921,7 +921,7 @@ void CKioFonts::stat(const KURL &url)
}
}
-bool CKioFonts::createStatEntry(KIO::UDSEntry &entry, const KURL &url, EFolder folder)
+bool CKioFonts::createStatEntry(TDEIO::UDSEntry &entry, const KURL &url, EFolder folder)
{
KFI_DBUG << "createStatEntry " << url.path() << endl;
@@ -1003,17 +1003,17 @@ void CKioFonts::get(const KURL &url)
KFI_DBUG << "real: " << realPathC << endl;
if (-2==KDE_stat(realPathC.data(), &buff))
- error(EACCES==errno ? KIO::ERR_ACCESS_DENIED : KIO::ERR_DOES_NOT_EXIST, url.prettyURL());
+ error(EACCES==errno ? TDEIO::ERR_ACCESS_DENIED : TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL());
else if (S_ISDIR(buff.st_mode))
- error(KIO::ERR_IS_DIRECTORY, url.prettyURL());
+ error(TDEIO::ERR_IS_DIRECTORY, url.prettyURL());
else if (!S_ISREG(buff.st_mode))
- error(KIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
+ error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
else
{
int fd = KDE_open(realPathC.data(), O_RDONLY);
if (fd < 0)
- error(KIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
+ error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
else
{
// Determine the mimetype of the file to be retrieved, and emit it.
@@ -1022,7 +1022,7 @@ void CKioFonts::get(const KURL &url)
totalSize(buff.st_size);
- KIO::filesize_t processed=0;
+ TDEIO::filesize_t processed=0;
char buffer[MAX_IPC_SIZE];
TQByteArray array;
@@ -1033,7 +1033,7 @@ void CKioFonts::get(const KURL &url)
{
if (errno == EINTR)
continue;
- error(KIO::ERR_COULD_NOT_READ, url.prettyURL());
+ error(TDEIO::ERR_COULD_NOT_READ, url.prettyURL());
close(fd);
if(multiple)
::unlink(realPathC);
@@ -1068,7 +1068,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
if(isHidden(u))
{
- error(KIO::ERR_WRITE_ACCESS_DENIED, u.prettyURL());
+ error(TDEIO::ERR_WRITE_ACCESS_DENIED, u.prettyURL());
return;
}
@@ -1088,7 +1088,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
if (destExists && !overwrite && !resume)
{
- error(KIO::ERR_FILE_ALREADY_EXIST, url.prettyURL());
+ error(TDEIO::ERR_FILE_ALREADY_EXIST, url.prettyURL());
return;
}
@@ -1098,7 +1098,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
if(passwd.isEmpty())
{
- error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
return;
}
}
@@ -1150,7 +1150,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
}
else
{
- error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
return;
}
}
@@ -1165,7 +1165,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
}
else
{
- error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_USER)));
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_USER)));
return;
}
}
@@ -1205,7 +1205,7 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo
partExists = false;
else
{
- error(KIO::ERR_CANNOT_DELETE_PARTIAL, destPart);
+ error(TDEIO::ERR_CANNOT_DELETE_PARTIAL, destPart);
return false;
}
}
@@ -1236,7 +1236,7 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo
if (fd < 0)
{
- error(EACCES==errno ? KIO::ERR_WRITE_ACCESS_DENIED : KIO::ERR_CANNOT_OPEN_FOR_WRITING, dest);
+ error(EACCES==errno ? TDEIO::ERR_WRITE_ACCESS_DENIED : TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, dest);
return false;
}
@@ -1252,12 +1252,12 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo
{
if(ENOSPC==errno) // disk full
{
- error(KIO::ERR_DISK_FULL, destOrig);
+ error(TDEIO::ERR_DISK_FULL, destOrig);
result = -2; // means: remove dest file
}
else
{
- error(KIO::ERR_COULD_NOT_WRITE, destOrig);
+ error(TDEIO::ERR_COULD_NOT_WRITE, destOrig);
result = -1;
}
}
@@ -1288,14 +1288,14 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo
if (close(fd))
{
- error(KIO::ERR_COULD_NOT_WRITE, destOrig);
+ error(TDEIO::ERR_COULD_NOT_WRITE, destOrig);
return false;
}
// after full download rename the file back to original name
if (markPartial && ::rename(destC.data(), destOrigC.data()))
{
- error(KIO::ERR_CANNOT_RENAME_PARTIAL, destOrig);
+ error(TDEIO::ERR_CANNOT_RENAME_PARTIAL, destOrig);
return false;
}
@@ -1313,7 +1313,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
if(isHidden(d))
{
- error(KIO::ERR_WRITE_ACCESS_DENIED, d.prettyURL());
+ error(TDEIO::ERR_WRITE_ACCESS_DENIED, d.prettyURL());
return;
}
@@ -1390,7 +1390,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
}
else
{
- error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
return;
}
}
@@ -1407,7 +1407,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
if(-1==KDE_stat(realSrc.data(), &buffSrc))
{
- error(EACCES==errno ? KIO::ERR_ACCESS_DENIED : KIO::ERR_DOES_NOT_EXIST, src.prettyURL());
+ error(EACCES==errno ? TDEIO::ERR_ACCESS_DENIED : TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL());
return;
}
@@ -1415,7 +1415,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
if (srcFd<0)
{
- error(KIO::ERR_CANNOT_OPEN_FOR_READING, src.prettyURL());
+ error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, src.prettyURL());
return;
}
@@ -1428,14 +1428,14 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
if (destFd<0)
{
- error(EACCES==errno ? KIO::ERR_WRITE_ACCESS_DENIED : KIO::ERR_CANNOT_OPEN_FOR_WRITING, dest.prettyURL());
+ error(EACCES==errno ? TDEIO::ERR_WRITE_ACCESS_DENIED : TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, dest.prettyURL());
close(srcFd);
return;
}
totalSize(buffSrc.st_size);
- KIO::filesize_t processed = 0;
+ TDEIO::filesize_t processed = 0;
char buffer[MAX_IPC_SIZE];
TQByteArray array;
@@ -1447,7 +1447,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
{
if (errno == EINTR)
continue;
- error(KIO::ERR_COULD_NOT_READ, src.prettyURL());
+ error(TDEIO::ERR_COULD_NOT_READ, src.prettyURL());
close(srcFd);
close(destFd);
return;
@@ -1461,11 +1461,11 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
close(destFd);
if (ENOSPC==errno) // disk full
{
- error(KIO::ERR_DISK_FULL, dest.prettyURL());
+ error(TDEIO::ERR_DISK_FULL, dest.prettyURL());
remove(realDest.data());
}
else
- error(KIO::ERR_COULD_NOT_WRITE, dest.prettyURL());
+ error(TDEIO::ERR_COULD_NOT_WRITE, dest.prettyURL());
return;
}
@@ -1477,7 +1477,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
if(close(destFd))
{
- error(KIO::ERR_COULD_NOT_WRITE, dest.prettyURL());
+ error(TDEIO::ERR_COULD_NOT_WRITE, dest.prettyURL());
return;
}
@@ -1512,9 +1512,9 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
KFI_DBUG << "rename " << src.prettyURL() << " - " << d.prettyURL() << ", " << overwrite << endl;
if(src.directory()==d.directory())
- error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, fonts cannot be renamed."));
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("Sorry, fonts cannot be renamed."));
else if(itsRoot) // Should never happen...
- error(KIO::ERR_UNSUPPORTED_ACTION, unsupportedActionErrorString(mProtocol, KIO::CMD_RENAME));
+ error(TDEIO::ERR_UNSUPPORTED_ACTION, unsupportedActionErrorString(mProtocol, TDEIO::CMD_RENAME));
else
{
//
@@ -1595,7 +1595,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
}
else
{
- error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
return;
}
}
@@ -1656,7 +1656,7 @@ void CKioFonts::del(const KURL &url, bool)
if(doRootCmd(cmd))
modified(FOLDER_SYS, clearList, modifiedDirs);
else
- error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
}
else
{
@@ -1666,10 +1666,10 @@ void CKioFonts::del(const KURL &url, bool)
if (0!=unlink(TQFile::encodeName(file).data()))
error(EACCES==errno || EPERM==errno
- ? KIO::ERR_ACCESS_DENIED
+ ? TDEIO::ERR_ACCESS_DENIED
: EISDIR==errno
- ? KIO::ERR_IS_DIRECTORY
- : KIO::ERR_CANNOT_DELETE,
+ ? TDEIO::ERR_IS_DIRECTORY
+ : TDEIO::ERR_CANNOT_DELETE,
file);
else
{
@@ -1760,7 +1760,7 @@ void CKioFonts::special(const TQByteArray &a)
finished();
break;
default:
- error( KIO::ERR_UNSUPPORTED_ACTION, TQString::number(cmd));
+ error( TDEIO::ERR_UNSUPPORTED_ACTION, TQString::number(cmd));
}
}
else
@@ -1899,7 +1899,7 @@ void CKioFonts::doModified()
TQString CKioFonts::getRootPasswd(bool askPasswd)
{
KFI_DBUG << "getRootPasswd" << endl;
- KIO::AuthInfo authInfo;
+ TDEIO::AuthInfo authInfo;
SuProcess proc(SYS_USER);
bool error=false;
int attempts=0;
@@ -2064,7 +2064,7 @@ bool CKioFonts::updateFontList()
if(NULL==itsFontList)
{
- error(KIO::ERR_SLAVE_DEFINED, i18n("Internal fontconfig error."));
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("Internal fontconfig error."));
return false;
}
@@ -2099,7 +2099,7 @@ TQValueList<FcPattern *> * CKioFonts::getEntries(const KURL &url)
if(it!=itsFolders[getFolder(url)].fontMap.end())
return &(it.data());
- error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\".").arg(url.prettyURL()));
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\".").arg(url.prettyURL()));
return NULL;
}
@@ -2143,7 +2143,7 @@ bool CKioFonts::checkFile(const TQString &file)
return true;
}
- error(KIO::ERR_SLAVE_DEFINED, i18n("<p>Only fonts may be installed.</p><p>If installing a fonts package (*%1), then "
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("<p>Only fonts may be installed.</p><p>If installing a fonts package (*%1), then "
"extract the components, and install individually.</p>").arg(constMultipleExtension));
return false;
}
@@ -2205,24 +2205,24 @@ bool CKioFonts::getSourceFiles(const KURL &src, TQStringList &files)
if (-1==KDE_stat(realSrc.data(), &buffSrc))
{
- error(EACCES==errno ? KIO::ERR_ACCESS_DENIED : KIO::ERR_DOES_NOT_EXIST, src.prettyURL());
+ error(EACCES==errno ? TDEIO::ERR_ACCESS_DENIED : TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL());
return false;
}
if(S_ISDIR(buffSrc.st_mode))
{
- error(KIO::ERR_IS_DIRECTORY, src.prettyURL());
+ error(TDEIO::ERR_IS_DIRECTORY, src.prettyURL());
return false;
}
if(S_ISFIFO(buffSrc.st_mode) || S_ISSOCK(buffSrc.st_mode))
{
- error(KIO::ERR_CANNOT_OPEN_FOR_READING, src.prettyURL());
+ error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, src.prettyURL());
return false;
}
}
}
else
{
- error(KIO::ERR_DOES_NOT_EXIST, src.prettyURL());
+ error(TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL());
return false;
}
@@ -2234,7 +2234,7 @@ bool CKioFonts::checkDestFile(const KURL &src, const KURL &dest, EFolder destFol
if(!overwrite && (Misc::fExists(itsFolders[destFolder].location+src.fileName()) ||
Misc::fExists(itsFolders[destFolder].location+modifyName(src.fileName())) ) )
{
- error(KIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
+ error(TDEIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
return false;
}
@@ -2250,7 +2250,7 @@ bool CKioFonts::checkDestFiles(const KURL &src, TQMap<TQString, TQString> &map,
dest.directory()==src.directory()) // Check whether confirmUrl changed a "cp fonts:/System fonts:/"
// to "cp fonts:/System fonts:/System"
{
- error(KIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
+ error(TDEIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
return false;
}
@@ -2262,7 +2262,7 @@ bool CKioFonts::checkDestFiles(const KURL &src, TQMap<TQString, TQString> &map,
for(; fIt!=fEnd; ++fIt)
if(NULL!=getEntry(destFolder, fIt.data()) || NULL!=getEntry(destFolder, modifyName(fIt.data())))
{
- error(KIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
+ error(TDEIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
return false;
}
}
@@ -2320,7 +2320,7 @@ bool CKioFonts::confirmMultiple(const KURL &url, const TQStringList &files, EFol
"The other affected fonts are:</p><ul>%1</ul><p>\n Do you wish to "
"delete all of these?</p>").arg(out)))
{
- error(KIO::ERR_USER_CANCELED, url.prettyURL());
+ error(TDEIO::ERR_USER_CANCELED, url.prettyURL());
return false;
}
}
@@ -2368,7 +2368,7 @@ bool CKioFonts::checkUrl(const KURL &u, bool rootOk)
else
if(!isSysFolder(sect) && !isUserFolder(sect))
{
- error(KIO::ERR_SLAVE_DEFINED, i18n("Please specify \"%1\" or \"%2\".")
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("Please specify \"%1\" or \"%2\".")
.arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)));
return false;
}
@@ -2388,7 +2388,7 @@ bool CKioFonts::checkAllowed(const KURL &u)
ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) ||
ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/')))
{
- error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".")
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".")
.arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \
return false;
}
@@ -2460,7 +2460,7 @@ void CKioFonts::reparseConfig()
if(itsRoot)
{
- KConfig cfg(KFI_ROOT_CFG_FILE);
+ TDEConfig cfg(KFI_ROOT_CFG_FILE);
bool doX=cfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X),
doGs=cfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS);
@@ -2483,7 +2483,7 @@ void CKioFonts::reparseConfig()
}
else
{
- KConfig rootCfg(KFI_ROOT_CFG_FILE);
+ TDEConfig rootCfg(KFI_ROOT_CFG_FILE);
bool rootDoX=rootCfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X),
rootDoGs=rootCfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS);
@@ -2517,7 +2517,7 @@ void CKioFonts::reparseConfig()
if(0==itsNrsKfiParams[1])
itsNrsKfiParams[0]=0;
- KConfig cfg(KFI_CFG_FILE);
+ TDEConfig cfg(KFI_CFG_FILE);
bool doX=cfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X),
doGs=cfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS);
diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/kio/KioFonts.h
index 66a2b01b9..1de87f5f1 100644
--- a/kcontrol/kfontinst/kio/KioFonts.h
+++ b/kcontrol/kfontinst/kio/KioFonts.h
@@ -44,7 +44,7 @@
namespace KFI
{
-class CKioFonts : public KIO::SlaveBase
+class CKioFonts : public TDEIO::SlaveBase
{
private:
@@ -101,7 +101,7 @@ class CKioFonts : public KIO::SlaveBase
void listDir(const KURL &url);
void stat(const KURL &url);
- bool createStatEntry(KIO::UDSEntry &entry, const KURL &url, EFolder folder);
+ bool createStatEntry(TDEIO::UDSEntry &entry, const KURL &url, EFolder folder);
void get(const KURL &url);
void put(const KURL &url, int mode, bool overwrite, bool resume);
void copy(const KURL &src, const KURL &dest, int mode, bool overwrite);
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;
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
index 7d9d9d3f4..1eeb2396c 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
@@ -141,7 +141,7 @@ bool CFontViewPart::openURL(const KURL &url)
bool CFontViewPart::openFile()
{
- // NOTE: Cant do the real open here, as dont seem to be able to use KIO::NetAccess functions during initial start-up.
+ // NOTE: Cant do the real open here, as dont seem to be able to use TDEIO::NetAccess functions during initial start-up.
// Bug report 111535 indicates that calling "konqueror <font>" crashes.
TQTimer::singleShot(0, this, TQT_SLOT(timeout()));
return true;
@@ -165,17 +165,17 @@ void CFontViewPart::timeout()
if(Misc::root())
{
destUrl=TQString("fonts:/")+itsPreview->engine().getName(m_url);
- itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
+ itsShowInstallButton=!TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
}
else
{
destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url);
- if(KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()))
+ if(TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()))
itsShowInstallButton=false;
else
{
destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url);
- itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
+ itsShowInstallButton=!TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
}
}
}
@@ -220,7 +220,7 @@ void CFontViewPart::install()
{
KURL destUrl(getDest(m_url, KMessageBox::No==resp));
- if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->parentWidget()))
+ if(TDEIO::NetAccess::copy(m_url, destUrl, itsFrame->parentWidget()))
{
//
// OK file copied, now look for any AFM or PFM file...
@@ -236,7 +236,7 @@ void CFontViewPart::install()
for(it=urls.begin(); it!=end; ++it)
{
destUrl=getDest(*it, KMessageBox::No==resp);
- KIO::NetAccess::copy(*it, destUrl, itsFrame->parentWidget());
+ TDEIO::NetAccess::copy(*it, destUrl, itsFrame->parentWidget());
}
}
diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
index 28dbd0f1f..f4b57bde0 100644
--- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
@@ -72,7 +72,7 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
itsPreview->openURL(openURL);
TQSize defSize(450, 380);
- KConfigGroupSaver saver(kapp->config(), CFG_GROUP);
+ TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP);
resize(kapp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize));
show();
@@ -83,7 +83,7 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
CFontViewerAppMainWindow::~CFontViewerAppMainWindow()
{
- KConfigGroupSaver saver(kapp->config(), CFG_GROUP);
+ TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP);
kapp->config()->writeEntry(CFG_SIZE_KEY, size());
kapp->config()->sync();
}