SVN commit 1030626 by dfaure: -Woverloaded-virtual detected that this method wasn't reimplementing the method from SlaveBase like it intended (copy/paste error). M +5 -5 KioFonts.cpp M +1 -1 KioFonts.h --- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/kio/KioFonts.cpp #1030625:1030626 @@ -224,7 +224,7 @@ if(!Misc::root() && FOLDER_ROOT==folder) error(KIO::ERR_SLAVE_DEFINED, i18n("Can only install fonts to either \"%1\" or \"%2\".", - i18n(KFI_KIO_FONTS_USER), i18n(KFI_KIO_FONTS_SYS))); + i18n(KFI_KIO_FONTS_USER), i18n(KFI_KIO_FONTS_SYS))); else if(Misc::isPackage(url.fileName())) error(KIO::ERR_SLAVE_DEFINED, i18n("You cannot install a fonts package directly.\n" "Please extract %1, and install the components individually.", @@ -377,7 +377,7 @@ for(; ait!=aend; ++ait) files.insert(*ait); } - + if(1==files.count()) realPath=(*files.begin()); else // Font is made up of multiple files - so create .zip of them all! @@ -477,7 +477,7 @@ error(KIO::ERR_SLAVE_DEFINED, i18n("Cannot copy fonts")); } -void CKioFonts::rename(const KUrl &, const KUrl &, int, KIO::JobFlags) +void CKioFonts::rename(const KUrl &, const KUrl &, KIO::JobFlags) { error(KIO::ERR_SLAVE_DEFINED, i18n("Cannot move fonts")); } @@ -494,7 +494,7 @@ else if(!Misc::root() && FOLDER_ROOT==folder) error(KIO::ERR_SLAVE_DEFINED, i18n("Can only remove fonts from either \"%1\" or \"%2\".", - i18n(KFI_KIO_FONTS_USER), i18n(KFI_KIO_FONTS_SYS))); + i18n(KFI_KIO_FONTS_USER), i18n(KFI_KIO_FONTS_SYS))); else if(!name.isEmpty()) handleResp(itsInterface->uninstall(name, Misc::root() || FOLDER_SYS==folder), name); else @@ -807,7 +807,7 @@ default: error(resp, file); } - + if(FontInst::STATUS_OK==resp) setTimeoutSpecialCommand(constReconfigTimeout); } --- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/kio/KioFonts.h #1030625:1030626 @@ -57,7 +57,7 @@ void get(const KUrl &url); void del(const KUrl &url, bool isFile); void copy(const KUrl &src, const KUrl &dest, int mode, KIO::JobFlags flags); - void rename(const KUrl &src, const KUrl &dest, int mode, KIO::JobFlags flags); + void rename(const KUrl &src, const KUrl &dest, KIO::JobFlags flags); void stat(const KUrl &url); void special(const QByteArray &a);