diff options
Diffstat (limited to 'kcontrol/kfontinst/kcmfontinst')
-rw-r--r-- | kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp | 20 | ||||
-rw-r--r-- | kcontrol/kfontinst/kcmfontinst/KCmFontInst.h | 8 | ||||
-rw-r--r-- | kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp | 4 | ||||
-rw-r--r-- | kcontrol/kfontinst/kcmfontinst/KFileFontView.h | 4 | ||||
-rw-r--r-- | kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp | 6 |
5 files changed, 21 insertions, 21 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(); |