diff options
Diffstat (limited to 'src')
80 files changed, 684 insertions, 684 deletions
diff --git a/src/calendarhandler.cpp b/src/calendarhandler.cpp index dedcd73..5f7893c 100644 --- a/src/calendarhandler.cpp +++ b/src/calendarhandler.cpp @@ -156,7 +156,7 @@ bool CalendarHandler::checkCalendar(KCal::CalendarResources* resources) { KCal::CalendarResourceManager* manager = resources->resourceManager(); if(manager->isEmpty()) { kdWarning() << "Tellico::CalendarHandler::checkCalendar() - adding default calendar" << endl; - KConfig config(TQString::fromLatin1("korganizerrc")); + TDEConfig config(TQString::fromLatin1("korganizerrc")); config.setGroup("General"); TQString fileName = config.readPathEntry("Active Calendar"); @@ -228,7 +228,7 @@ void CalendarHandler::populateTodo(KCal::Todo* todo_, Data::LoanPtr loan_) { TQString CalendarHandler::timezone() { TQString zone; - KConfig korgcfg(locate(TQString::fromLatin1("config"), TQString::fromLatin1("korganizerrc"))); + TDEConfig korgcfg(locate(TQString::fromLatin1("config"), TQString::fromLatin1("korganizerrc"))); korgcfg.setGroup("Time & Date"); TQString tz(korgcfg.readEntry("TimeZoneId")); if(!tz.isEmpty()) { diff --git a/src/cite/openoffice.cpp b/src/cite/openoffice.cpp index 17b0f76..9daabf4 100644 --- a/src/cite/openoffice.cpp +++ b/src/cite/openoffice.cpp @@ -82,7 +82,7 @@ bool OpenOffice::connect() { StatusBar::self()->setStatus(i18n("Connecting to OpenOffice.org...")); if(d->port == -1) { - KConfigGroup config(kapp->config(), "OpenOffice.org"); + TDEConfigGroup config(kapp->config(), "OpenOffice.org"); d->host = config.readEntry("Host", TQString::fromLatin1("localhost")); d->port = config.readNumEntry("Port", 2083); d->pipe = config.readPathEntry("Pipe"); @@ -253,7 +253,7 @@ bool OpenOffice::connectionDialog() { d->handler->setPipe(TQFile::encodeName(d->pipe)); } - KConfigGroup config(kapp->config(), "OpenOffice.org"); + TDEConfigGroup config(kapp->config(), "OpenOffice.org"); config.writeEntry("Host", d->host); config.writeEntry("Port", d->port); config.writePathEntry("Pipe", d->pipe); diff --git a/src/configdialog.cpp b/src/configdialog.cpp index c5bdfac..a9c6478 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -696,7 +696,7 @@ void ConfigDialog::saveConfiguration() { } m_removedConfigWidgets.clear(); - KConfig* masterConfig = TDEGlobal::config(); + TDEConfig* masterConfig = TDEGlobal::config(); bool reloadFetchers = false; int count = 0; // start group numbering at 0 @@ -710,7 +710,7 @@ void ConfigDialog::saveConfiguration() { TQString group = TQString::fromLatin1("Data Source %1").arg(count); // in case we later change the order, clear the group now masterConfig->deleteGroup(group); - KConfigGroup configGroup(masterConfig, group); + TDEConfigGroup configGroup(masterConfig, group); configGroup.writeEntry("Name", item->text(0)); configGroup.writeEntry("Type", item->fetchType()); configGroup.writeEntry("UpdateOverwrite", item->updateOverwrite()); @@ -721,7 +721,7 @@ void ConfigDialog::saveConfiguration() { reloadFetchers = true; } // now update total number of sources - KConfigGroup sourceGroup(masterConfig, "Data Sources"); + TDEConfigGroup sourceGroup(masterConfig, "Data Sources"); sourceGroup.writeEntry("Sources Count", count); // and purge old config groups TQString group = TQString::fromLatin1("Data Source %1").arg(count); @@ -908,7 +908,7 @@ void ConfigDialog::slotNewStuffClicked() { continue; } - KConfig spec(info.specFile, false, false); + TDEConfig spec(info.specFile, false, false); cw->readConfig(&spec); cw->slotSetModified(); cw->setAccepted(true); diff --git a/src/configdialog.h b/src/configdialog.h index 4204c11..d547b65 100644 --- a/src/configdialog.h +++ b/src/configdialog.h @@ -19,7 +19,7 @@ #include <kdialogbase.h> #include <klistview.h> -class KConfig; +class TDEConfig; class KLineEdit; class KIntSpinBox; class KPushButton; @@ -63,14 +63,14 @@ public: * Reads the current configuration. Only the options which are not saved somewhere * else are read at this point. * - * @param config A pointer to the KConfig object + * @param config A pointer to the TDEConfig object */ void readConfiguration(); /** - * Saves the configuration. @ref KConfigBase::sync is called. This method is called + * Saves the configuration. @ref TDEConfigBase::sync is called. This method is called * from the main Tellico object. * - * @param config A pointer to the KConfig object + * @param config A pointer to the TDEConfig object */ void saveConfiguration(); diff --git a/src/core/netaccess.cpp b/src/core/netaccess.cpp index b9d2799..2187735 100644 --- a/src/core/netaccess.cpp +++ b/src/core/netaccess.cpp @@ -33,10 +33,10 @@ TQStringList* NetAccess::s_tmpFiles = 0; bool NetAccess::download(const KURL& url_, TQString& target_, TQWidget* window_) { if(url_.isLocalFile()) { - return KIO::NetAccess::download(url_, target_, window_); + return TDEIO::NetAccess::download(url_, target_, window_); } -// if(!KIO::NetAccess::exists(url_, true, window_)) { +// if(!TDEIO::NetAccess::exists(url_, true, window_)) { // myDebug() << "NetAccess::download() - does not exist: " << url_ << endl; // return false; // } @@ -53,8 +53,8 @@ bool NetAccess::download(const KURL& url_, TQString& target_, TQWidget* window_) KURL dest; dest.setPath(target_); - KIO::Job* job = KIO::file_copy(url_, dest, -1, true /*overwrite*/, false /*resume*/, false /*showProgress*/); - return KIO::NetAccess::synchronousRun(job, window_); + TDEIO::Job* job = TDEIO::file_copy(url_, dest, -1, true /*overwrite*/, false /*resume*/, false /*showProgress*/); + return TDEIO::NetAccess::synchronousRun(job, window_); } void NetAccess::removeTempFile(const TQString& name_) { @@ -72,11 +72,11 @@ TQPixmap NetAccess::filePreview(const KURL& url, int size) { KURL::List list; list.append(url); - KIO::Job* previewJob = KIO::filePreview(list, size, size); + TDEIO::Job* previewJob = TDEIO::filePreview(list, size, size); connect(previewJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), &netaccess, TQT_SLOT(slotPreview(const KFileItem*, const TQPixmap&))); - KIO::NetAccess::synchronousRun(previewJob, Kernel::self()->widget()); + TDEIO::NetAccess::synchronousRun(previewJob, Kernel::self()->widget()); return netaccess.m_preview; } @@ -85,11 +85,11 @@ TQPixmap NetAccess::filePreview(KFileItem* item, int size) { KFileItemList list; list.append(item); - KIO::Job* previewJob = KIO::filePreview(list, size, size); + TDEIO::Job* previewJob = TDEIO::filePreview(list, size, size); connect(previewJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), &netaccess, TQT_SLOT(slotPreview(const KFileItem*, const TQPixmap&))); - KIO::NetAccess::synchronousRun(previewJob, Kernel::self()->widget()); + TDEIO::NetAccess::synchronousRun(previewJob, Kernel::self()->widget()); return netaccess.m_preview; } diff --git a/src/core/netaccess.h b/src/core/netaccess.h index 65c1bf6..0e247e8 100644 --- a/src/core/netaccess.h +++ b/src/core/netaccess.h @@ -19,7 +19,7 @@ class KURL; class KFileItem; -namespace KIO { +namespace TDEIO { class Job; } diff --git a/src/core/tellico_config.cpp b/src/core/tellico_config.cpp index c41fdc9..20c0a4b 100644 --- a/src/core/tellico_config.cpp +++ b/src/core/tellico_config.cpp @@ -21,429 +21,429 @@ Config *Config::self() } Config::Config( ) - : KConfigSkeleton( TQString::fromLatin1( "tellicorc" ) ) + : TDEConfigSkeleton( TQString::fromLatin1( "tellicorc" ) ) { mSelf = this; setCurrentGroup( TQString::fromLatin1( "TipOfDay" ) ); - KConfigSkeleton::ItemBool *itemShowTipOfDay; - itemShowTipOfDay = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "RunOnStart" ), mShowTipOfDay, true ); + TDEConfigSkeleton::ItemBool *itemShowTipOfDay; + itemShowTipOfDay = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "RunOnStart" ), mShowTipOfDay, true ); addItem( itemShowTipOfDay, TQString::fromLatin1( "showTipOfDay" ) ); setCurrentGroup( TQString::fromLatin1( "Main Window Options" ) ); TQValueList<int> defaultMainSplitterSizes; - KConfigSkeleton::ItemIntList *itemMainSplitterSizes; - itemMainSplitterSizes = new KConfigSkeleton::ItemIntList( currentGroup(), TQString::fromLatin1( "Main Splitter Sizes" ), mMainSplitterSizes, defaultMainSplitterSizes ); + TDEConfigSkeleton::ItemIntList *itemMainSplitterSizes; + itemMainSplitterSizes = new TDEConfigSkeleton::ItemIntList( currentGroup(), TQString::fromLatin1( "Main Splitter Sizes" ), mMainSplitterSizes, defaultMainSplitterSizes ); addItem( itemMainSplitterSizes, TQString::fromLatin1( "MainSplitterSizes" ) ); TQValueList<int> defaultSecondarySplitterSizes; - KConfigSkeleton::ItemIntList *itemSecondarySplitterSizes; - itemSecondarySplitterSizes = new KConfigSkeleton::ItemIntList( currentGroup(), TQString::fromLatin1( "Secondary Splitter Sizes" ), mSecondarySplitterSizes, defaultSecondarySplitterSizes ); + TDEConfigSkeleton::ItemIntList *itemSecondarySplitterSizes; + itemSecondarySplitterSizes = new TDEConfigSkeleton::ItemIntList( currentGroup(), TQString::fromLatin1( "Secondary Splitter Sizes" ), mSecondarySplitterSizes, defaultSecondarySplitterSizes ); addItem( itemSecondarySplitterSizes, TQString::fromLatin1( "SecondarySplitterSizes" ) ); setCurrentGroup( TQString::fromLatin1( "Detailed View Options" ) ); - KConfigSkeleton::ItemInt *itemMaxPixmapWidth; - itemMaxPixmapWidth = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "MaxPixmapWidth" ), mMaxPixmapWidth, 50 ); + TDEConfigSkeleton::ItemInt *itemMaxPixmapWidth; + itemMaxPixmapWidth = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "MaxPixmapWidth" ), mMaxPixmapWidth, 50 ); addItem( itemMaxPixmapWidth, TQString::fromLatin1( "MaxPixmapWidth" ) ); - KConfigSkeleton::ItemInt *itemMaxPixmapHeight; - itemMaxPixmapHeight = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "MaxPixmapHeight" ), mMaxPixmapHeight, 50 ); + TDEConfigSkeleton::ItemInt *itemMaxPixmapHeight; + itemMaxPixmapHeight = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "MaxPixmapHeight" ), mMaxPixmapHeight, 50 ); addItem( itemMaxPixmapHeight, TQString::fromLatin1( "MaxPixmapHeight" ) ); setCurrentGroup( TQString::fromLatin1( "Group View Options" ) ); - KConfigSkeleton::ItemInt *itemGroupViewSortColumn; - itemGroupViewSortColumn = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "SortColumn" ), mGroupViewSortColumn, 0 ); + TDEConfigSkeleton::ItemInt *itemGroupViewSortColumn; + itemGroupViewSortColumn = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "SortColumn" ), mGroupViewSortColumn, 0 ); addItem( itemGroupViewSortColumn, TQString::fromLatin1( "groupViewSortColumn" ) ); - KConfigSkeleton::ItemBool *itemGroupViewSortAscending; - itemGroupViewSortAscending = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SortAscending" ), mGroupViewSortAscending, true ); + TDEConfigSkeleton::ItemBool *itemGroupViewSortAscending; + itemGroupViewSortAscending = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SortAscending" ), mGroupViewSortAscending, true ); addItem( itemGroupViewSortAscending, TQString::fromLatin1( "groupViewSortAscending" ) ); setCurrentGroup( TQString::fromLatin1( "Filter View Options" ) ); - KConfigSkeleton::ItemInt *itemFilterViewSortColumn; - itemFilterViewSortColumn = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "SortColumn" ), mFilterViewSortColumn, 0 ); + TDEConfigSkeleton::ItemInt *itemFilterViewSortColumn; + itemFilterViewSortColumn = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "SortColumn" ), mFilterViewSortColumn, 0 ); addItem( itemFilterViewSortColumn, TQString::fromLatin1( "filterViewSortColumn" ) ); - KConfigSkeleton::ItemBool *itemFilterViewSortAscending; - itemFilterViewSortAscending = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SortAscending" ), mFilterViewSortAscending, true ); + TDEConfigSkeleton::ItemBool *itemFilterViewSortAscending; + itemFilterViewSortAscending = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SortAscending" ), mFilterViewSortAscending, true ); addItem( itemFilterViewSortAscending, TQString::fromLatin1( "filterViewSortAscending" ) ); setCurrentGroup( TQString::fromLatin1( "Loan View Options" ) ); - KConfigSkeleton::ItemInt *itemLoanViewSortColumn; - itemLoanViewSortColumn = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "SortColumn" ), mLoanViewSortColumn, 0 ); + TDEConfigSkeleton::ItemInt *itemLoanViewSortColumn; + itemLoanViewSortColumn = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "SortColumn" ), mLoanViewSortColumn, 0 ); addItem( itemLoanViewSortColumn, TQString::fromLatin1( "loanViewSortColumn" ) ); - KConfigSkeleton::ItemBool *itemLoanViewSortAscending; - itemLoanViewSortAscending = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SortAscending" ), mLoanViewSortAscending, true ); + TDEConfigSkeleton::ItemBool *itemLoanViewSortAscending; + itemLoanViewSortAscending = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SortAscending" ), mLoanViewSortAscending, true ); addItem( itemLoanViewSortAscending, TQString::fromLatin1( "loanViewSortAscending" ) ); setCurrentGroup( TQString::fromLatin1( "Export Options - Bibtex" ) ); - KConfigSkeleton::ItemBool *itemUseBraces; - itemUseBraces = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Use Braces" ), mUseBraces, true ); + TDEConfigSkeleton::ItemBool *itemUseBraces; + itemUseBraces = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Use Braces" ), mUseBraces, true ); addItem( itemUseBraces, TQString::fromLatin1( "UseBraces" ) ); setCurrentGroup( TQString::fromLatin1( "General Options" ) ); - KConfigSkeleton::ItemBool *itemShowGroupWidget; - itemShowGroupWidget = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Show Group Widget" ), mShowGroupWidget, true ); + TDEConfigSkeleton::ItemBool *itemShowGroupWidget; + itemShowGroupWidget = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Show Group Widget" ), mShowGroupWidget, true ); addItem( itemShowGroupWidget, TQString::fromLatin1( "ShowGroupWidget" ) ); - KConfigSkeleton::ItemBool *itemShowEditWidget; - itemShowEditWidget = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Show Edit Widget" ), mShowEditWidget, false ); + TDEConfigSkeleton::ItemBool *itemShowEditWidget; + itemShowEditWidget = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Show Edit Widget" ), mShowEditWidget, false ); addItem( itemShowEditWidget, TQString::fromLatin1( "ShowEditWidget" ) ); - KConfigSkeleton::ItemBool *itemShowEntryView; - itemShowEntryView = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Show Entry View" ), mShowEntryView, true ); + TDEConfigSkeleton::ItemBool *itemShowEntryView; + itemShowEntryView = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Show Entry View" ), mShowEntryView, true ); addItem( itemShowEntryView, TQString::fromLatin1( "ShowEntryView" ) ); - TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesImageLocation; + TQValueList<TDEConfigSkeleton::ItemEnum::Choice> valuesImageLocation; { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "ImagesInFile" ); valuesImageLocation.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "ImagesInAppDir" ); valuesImageLocation.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "ImagesInLocalDir" ); valuesImageLocation.append( choice ); } - KConfigSkeleton::ItemEnum *itemImageLocation; - itemImageLocation = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Image Location" ), mImageLocation, valuesImageLocation, ImagesInFile ); + TDEConfigSkeleton::ItemEnum *itemImageLocation; + itemImageLocation = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Image Location" ), mImageLocation, valuesImageLocation, ImagesInFile ); addItem( itemImageLocation, TQString::fromLatin1( "ImageLocation" ) ); - KConfigSkeleton::ItemBool *itemAskWriteImagesInFile; - itemAskWriteImagesInFile = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Ask Write Images In File" ), mAskWriteImagesInFile, true ); + TDEConfigSkeleton::ItemBool *itemAskWriteImagesInFile; + itemAskWriteImagesInFile = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Ask Write Images In File" ), mAskWriteImagesInFile, true ); addItem( itemAskWriteImagesInFile, TQString::fromLatin1( "AskWriteImagesInFile" ) ); - KConfigSkeleton::ItemBool *itemReopenLastFile; - itemReopenLastFile = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Reopen Last File" ), mReopenLastFile, true ); + TDEConfigSkeleton::ItemBool *itemReopenLastFile; + itemReopenLastFile = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Reopen Last File" ), mReopenLastFile, true ); addItem( itemReopenLastFile, TQString::fromLatin1( "ReopenLastFile" ) ); - KConfigSkeleton::ItemBool *itemAutoCapitalization; - itemAutoCapitalization = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Capitalization" ), mAutoCapitalization, true ); + TDEConfigSkeleton::ItemBool *itemAutoCapitalization; + itemAutoCapitalization = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Capitalization" ), mAutoCapitalization, true ); addItem( itemAutoCapitalization, TQString::fromLatin1( "AutoCapitalization" ) ); - KConfigSkeleton::ItemBool *itemAutoFormat; - itemAutoFormat = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Format" ), mAutoFormat, true ); + TDEConfigSkeleton::ItemBool *itemAutoFormat; + itemAutoFormat = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Format" ), mAutoFormat, true ); addItem( itemAutoFormat, TQString::fromLatin1( "AutoFormat" ) ); - KConfigSkeleton::ItemString *itemLastOpenFile; - itemLastOpenFile = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Last Open File" ), mLastOpenFile ); + TDEConfigSkeleton::ItemString *itemLastOpenFile; + itemLastOpenFile = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Last Open File" ), mLastOpenFile ); addItem( itemLastOpenFile, TQString::fromLatin1( "LastOpenFile" ) ); - KConfigSkeleton::ItemString *itemNoCapitalizationString; - itemNoCapitalizationString = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "No Capitalization" ), mNoCapitalizationString, i18n("a,an,and,as,at,but,by,for,from,in,into,nor,of,off,on,onto,or,out,over,the,to,up,with") ); + TDEConfigSkeleton::ItemString *itemNoCapitalizationString; + itemNoCapitalizationString = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "No Capitalization" ), mNoCapitalizationString, i18n("a,an,and,as,at,but,by,for,from,in,into,nor,of,off,on,onto,or,out,over,the,to,up,with") ); addItem( itemNoCapitalizationString, TQString::fromLatin1( "noCapitalizationString" ) ); - KConfigSkeleton::ItemString *itemArticlesString; - itemArticlesString = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Articles" ), mArticlesString, i18n("the") ); + TDEConfigSkeleton::ItemString *itemArticlesString; + itemArticlesString = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Articles" ), mArticlesString, i18n("the") ); addItem( itemArticlesString, TQString::fromLatin1( "articlesString" ) ); - KConfigSkeleton::ItemString *itemNameSuffixesString; - itemNameSuffixesString = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Name Suffixes" ), mNameSuffixesString, i18n("jr.,jr,iii,iv") ); + TDEConfigSkeleton::ItemString *itemNameSuffixesString; + itemNameSuffixesString = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Name Suffixes" ), mNameSuffixesString, i18n("jr.,jr,iii,iv") ); addItem( itemNameSuffixesString, TQString::fromLatin1( "nameSuffixesString" ) ); - KConfigSkeleton::ItemString *itemSurnamePrefixesString; - itemSurnamePrefixesString = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Surname Prefixes" ), mSurnamePrefixesString, i18n("de,van,der,van der,von") ); + TDEConfigSkeleton::ItemString *itemSurnamePrefixesString; + itemSurnamePrefixesString = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Surname Prefixes" ), mSurnamePrefixesString, i18n("de,van,der,van der,von") ); addItem( itemSurnamePrefixesString, TQString::fromLatin1( "surnamePrefixesString" ) ); - KConfigSkeleton::ItemInt *itemMaxIconSize; - itemMaxIconSize = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Max Icon Size" ), mMaxIconSize, 96 ); + TDEConfigSkeleton::ItemInt *itemMaxIconSize; + itemMaxIconSize = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Max Icon Size" ), mMaxIconSize, 96 ); addItem( itemMaxIconSize, TQString::fromLatin1( "MaxIconSize" ) ); - KConfigSkeleton::ItemInt *itemImageCacheSize; - itemImageCacheSize = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Image Cache Size" ), mImageCacheSize, (10 * 1024 * 1024) ); + TDEConfigSkeleton::ItemInt *itemImageCacheSize; + itemImageCacheSize = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Image Cache Size" ), mImageCacheSize, (10 * 1024 * 1024) ); addItem( itemImageCacheSize, TQString::fromLatin1( "ImageCacheSize" ) ); - KConfigSkeleton::ItemUInt *itemMaxCustomURLSettings; - itemMaxCustomURLSettings = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Max Custom URL Settings" ), mMaxCustomURLSettings, 9 ); + TDEConfigSkeleton::ItemUInt *itemMaxCustomURLSettings; + itemMaxCustomURLSettings = new TDEConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Max Custom URL Settings" ), mMaxCustomURLSettings, 9 ); addItem( itemMaxCustomURLSettings, TQString::fromLatin1( "MaxCustomURLSettings" ) ); setCurrentGroup( TQString::fromLatin1( "Printing" ) ); - KConfigSkeleton::ItemBool *itemPrintFieldHeaders; - itemPrintFieldHeaders = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Print Field Headers" ), mPrintFieldHeaders, true ); + TDEConfigSkeleton::ItemBool *itemPrintFieldHeaders; + itemPrintFieldHeaders = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Print Field Headers" ), mPrintFieldHeaders, true ); addItem( itemPrintFieldHeaders, TQString::fromLatin1( "PrintFieldHeaders" ) ); - KConfigSkeleton::ItemBool *itemPrintFormatted; - itemPrintFormatted = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Print Formatted" ), mPrintFormatted, true ); + TDEConfigSkeleton::ItemBool *itemPrintFormatted; + itemPrintFormatted = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Print Formatted" ), mPrintFormatted, true ); addItem( itemPrintFormatted, TQString::fromLatin1( "PrintFormatted" ) ); - KConfigSkeleton::ItemBool *itemPrintGrouped; - itemPrintGrouped = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Print Grouped" ), mPrintGrouped, true ); + TDEConfigSkeleton::ItemBool *itemPrintGrouped; + itemPrintGrouped = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Print Grouped" ), mPrintGrouped, true ); addItem( itemPrintGrouped, TQString::fromLatin1( "PrintGrouped" ) ); - KConfigSkeleton::ItemInt *itemMaxImageWidth; - itemMaxImageWidth = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Max Image Width" ), mMaxImageWidth, 50 ); + TDEConfigSkeleton::ItemInt *itemMaxImageWidth; + itemMaxImageWidth = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Max Image Width" ), mMaxImageWidth, 50 ); addItem( itemMaxImageWidth, TQString::fromLatin1( "MaxImageWidth" ) ); - KConfigSkeleton::ItemInt *itemMaxImageHeight; - itemMaxImageHeight = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Max Image Height" ), mMaxImageHeight, 50 ); + TDEConfigSkeleton::ItemInt *itemMaxImageHeight; + itemMaxImageHeight = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Max Image Height" ), mMaxImageHeight, 50 ); addItem( itemMaxImageHeight, TQString::fromLatin1( "MaxImageHeight" ) ); setCurrentGroup( TQString::fromLatin1( "Options - book" ) ); - KConfigSkeleton::ItemString *itemTemplateBook; - itemTemplateBook = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateBook, TQString::fromLatin1( "Fancy" ) ); + TDEConfigSkeleton::ItemString *itemTemplateBook; + itemTemplateBook = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateBook, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateBook, TQString::fromLatin1( "templateBook" ) ); - KConfigSkeleton::ItemFont *itemFontBook; - itemFontBook = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontBook, TDEGlobalSettings::generalFont() ); + TDEConfigSkeleton::ItemFont *itemFontBook; + itemFontBook = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontBook, TDEGlobalSettings::generalFont() ); addItem( itemFontBook, TQString::fromLatin1( "fontBook" ) ); - KConfigSkeleton::ItemColor *itemBaseColorBook; - itemBaseColorBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorBook, TDEGlobalSettings::baseColor() ); + TDEConfigSkeleton::ItemColor *itemBaseColorBook; + itemBaseColorBook = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorBook, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorBook, TQString::fromLatin1( "baseColorBook" ) ); - KConfigSkeleton::ItemColor *itemTextColorBook; - itemTextColorBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorBook, TDEGlobalSettings::textColor() ); + TDEConfigSkeleton::ItemColor *itemTextColorBook; + itemTextColorBook = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorBook, TDEGlobalSettings::textColor() ); addItem( itemTextColorBook, TQString::fromLatin1( "textColorBook" ) ); - KConfigSkeleton::ItemColor *itemHighlightedBaseColorBook; - itemHighlightedBaseColorBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorBook, TDEGlobalSettings::highlightColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedBaseColorBook; + itemHighlightedBaseColorBook = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorBook, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorBook, TQString::fromLatin1( "highlightedBaseColorBook" ) ); - KConfigSkeleton::ItemColor *itemHighlightedTextColorBook; - itemHighlightedTextColorBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorBook, TDEGlobalSettings::highlightedTextColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedTextColorBook; + itemHighlightedTextColorBook = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorBook, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorBook, TQString::fromLatin1( "highlightedTextColorBook" ) ); setCurrentGroup( TQString::fromLatin1( "Options - video" ) ); - KConfigSkeleton::ItemString *itemTemplateVideo; - itemTemplateVideo = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateVideo, TQString::fromLatin1( "Video" ) ); + TDEConfigSkeleton::ItemString *itemTemplateVideo; + itemTemplateVideo = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateVideo, TQString::fromLatin1( "Video" ) ); addItem( itemTemplateVideo, TQString::fromLatin1( "templateVideo" ) ); - KConfigSkeleton::ItemFont *itemFontVideo; - itemFontVideo = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontVideo, TDEGlobalSettings::generalFont() ); + TDEConfigSkeleton::ItemFont *itemFontVideo; + itemFontVideo = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontVideo, TDEGlobalSettings::generalFont() ); addItem( itemFontVideo, TQString::fromLatin1( "fontVideo" ) ); - KConfigSkeleton::ItemColor *itemBaseColorVideo; - itemBaseColorVideo = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorVideo, TDEGlobalSettings::baseColor() ); + TDEConfigSkeleton::ItemColor *itemBaseColorVideo; + itemBaseColorVideo = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorVideo, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorVideo, TQString::fromLatin1( "baseColorVideo" ) ); - KConfigSkeleton::ItemColor *itemTextColorVideo; - itemTextColorVideo = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorVideo, TDEGlobalSettings::textColor() ); + TDEConfigSkeleton::ItemColor *itemTextColorVideo; + itemTextColorVideo = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorVideo, TDEGlobalSettings::textColor() ); addItem( itemTextColorVideo, TQString::fromLatin1( "textColorVideo" ) ); - KConfigSkeleton::ItemColor *itemHighlightedBaseColorVideo; - itemHighlightedBaseColorVideo = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorVideo, TDEGlobalSettings::highlightColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedBaseColorVideo; + itemHighlightedBaseColorVideo = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorVideo, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorVideo, TQString::fromLatin1( "highlightedBaseColorVideo" ) ); - KConfigSkeleton::ItemColor *itemHighlightedTextColorVideo; - itemHighlightedTextColorVideo = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorVideo, TDEGlobalSettings::highlightedTextColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedTextColorVideo; + itemHighlightedTextColorVideo = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorVideo, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorVideo, TQString::fromLatin1( "highlightedTextColorVideo" ) ); setCurrentGroup( TQString::fromLatin1( "Options - album" ) ); - KConfigSkeleton::ItemString *itemTemplateAlbum; - itemTemplateAlbum = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateAlbum, TQString::fromLatin1( "Album" ) ); + TDEConfigSkeleton::ItemString *itemTemplateAlbum; + itemTemplateAlbum = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateAlbum, TQString::fromLatin1( "Album" ) ); addItem( itemTemplateAlbum, TQString::fromLatin1( "templateAlbum" ) ); - KConfigSkeleton::ItemFont *itemFontAlbum; - itemFontAlbum = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontAlbum, TDEGlobalSettings::generalFont() ); + TDEConfigSkeleton::ItemFont *itemFontAlbum; + itemFontAlbum = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontAlbum, TDEGlobalSettings::generalFont() ); addItem( itemFontAlbum, TQString::fromLatin1( "fontAlbum" ) ); - KConfigSkeleton::ItemColor *itemBaseColorAlbum; - itemBaseColorAlbum = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorAlbum, TDEGlobalSettings::baseColor() ); + TDEConfigSkeleton::ItemColor *itemBaseColorAlbum; + itemBaseColorAlbum = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorAlbum, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorAlbum, TQString::fromLatin1( "baseColorAlbum" ) ); - KConfigSkeleton::ItemColor *itemTextColorAlbum; - itemTextColorAlbum = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorAlbum, TDEGlobalSettings::textColor() ); + TDEConfigSkeleton::ItemColor *itemTextColorAlbum; + itemTextColorAlbum = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorAlbum, TDEGlobalSettings::textColor() ); addItem( itemTextColorAlbum, TQString::fromLatin1( "textColorAlbum" ) ); - KConfigSkeleton::ItemColor *itemHighlightedBaseColorAlbum; - itemHighlightedBaseColorAlbum = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorAlbum, TDEGlobalSettings::highlightColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedBaseColorAlbum; + itemHighlightedBaseColorAlbum = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorAlbum, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorAlbum, TQString::fromLatin1( "highlightedBaseColorAlbum" ) ); - KConfigSkeleton::ItemColor *itemHighlightedTextColorAlbum; - itemHighlightedTextColorAlbum = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorAlbum, TDEGlobalSettings::highlightedTextColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedTextColorAlbum; + itemHighlightedTextColorAlbum = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorAlbum, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorAlbum, TQString::fromLatin1( "highlightedTextColorAlbum" ) ); setCurrentGroup( TQString::fromLatin1( "Options - bibtex" ) ); - KConfigSkeleton::ItemPath *itemLyxpipe; - itemLyxpipe = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "lyxpipe" ), mLyxpipe, TQString::fromLatin1( "$HOME/.lyx/lyxpipe" ) ); + TDEConfigSkeleton::ItemPath *itemLyxpipe; + itemLyxpipe = new TDEConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "lyxpipe" ), mLyxpipe, TQString::fromLatin1( "$HOME/.lyx/lyxpipe" ) ); addItem( itemLyxpipe, TQString::fromLatin1( "lyxpipe" ) ); - KConfigSkeleton::ItemString *itemTemplateBibtex; - itemTemplateBibtex = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateBibtex, TQString::fromLatin1( "Fancy" ) ); + TDEConfigSkeleton::ItemString *itemTemplateBibtex; + itemTemplateBibtex = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateBibtex, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateBibtex, TQString::fromLatin1( "templateBibtex" ) ); - KConfigSkeleton::ItemFont *itemFontBibtex; - itemFontBibtex = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontBibtex, TDEGlobalSettings::generalFont() ); + TDEConfigSkeleton::ItemFont *itemFontBibtex; + itemFontBibtex = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontBibtex, TDEGlobalSettings::generalFont() ); addItem( itemFontBibtex, TQString::fromLatin1( "fontBibtex" ) ); - KConfigSkeleton::ItemColor *itemBaseColorBibtex; - itemBaseColorBibtex = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorBibtex, TDEGlobalSettings::baseColor() ); + TDEConfigSkeleton::ItemColor *itemBaseColorBibtex; + itemBaseColorBibtex = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorBibtex, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorBibtex, TQString::fromLatin1( "baseColorBibtex" ) ); - KConfigSkeleton::ItemColor *itemTextColorBibtex; - itemTextColorBibtex = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorBibtex, TDEGlobalSettings::textColor() ); + TDEConfigSkeleton::ItemColor *itemTextColorBibtex; + itemTextColorBibtex = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorBibtex, TDEGlobalSettings::textColor() ); addItem( itemTextColorBibtex, TQString::fromLatin1( "textColorBibtex" ) ); - KConfigSkeleton::ItemColor *itemHighlightedBaseColorBibtex; - itemHighlightedBaseColorBibtex = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorBibtex, TDEGlobalSettings::highlightColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedBaseColorBibtex; + itemHighlightedBaseColorBibtex = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorBibtex, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorBibtex, TQString::fromLatin1( "highlightedBaseColorBibtex" ) ); - KConfigSkeleton::ItemColor *itemHighlightedTextColorBibtex; - itemHighlightedTextColorBibtex = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorBibtex, TDEGlobalSettings::highlightedTextColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedTextColorBibtex; + itemHighlightedTextColorBibtex = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorBibtex, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorBibtex, TQString::fromLatin1( "highlightedTextColorBibtex" ) ); setCurrentGroup( TQString::fromLatin1( "Options - comic" ) ); - KConfigSkeleton::ItemString *itemTemplateComicBook; - itemTemplateComicBook = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateComicBook, TQString::fromLatin1( "Fancy" ) ); + TDEConfigSkeleton::ItemString *itemTemplateComicBook; + itemTemplateComicBook = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateComicBook, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateComicBook, TQString::fromLatin1( "templateComicBook" ) ); - KConfigSkeleton::ItemFont *itemFontComicBook; - itemFontComicBook = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontComicBook, TDEGlobalSettings::generalFont() ); + TDEConfigSkeleton::ItemFont *itemFontComicBook; + itemFontComicBook = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontComicBook, TDEGlobalSettings::generalFont() ); addItem( itemFontComicBook, TQString::fromLatin1( "fontComicBook" ) ); - KConfigSkeleton::ItemColor *itemBaseColorComicBook; - itemBaseColorComicBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorComicBook, TDEGlobalSettings::baseColor() ); + TDEConfigSkeleton::ItemColor *itemBaseColorComicBook; + itemBaseColorComicBook = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorComicBook, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorComicBook, TQString::fromLatin1( "baseColorComicBook" ) ); - KConfigSkeleton::ItemColor *itemTextColorComicBook; - itemTextColorComicBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorComicBook, TDEGlobalSettings::textColor() ); + TDEConfigSkeleton::ItemColor *itemTextColorComicBook; + itemTextColorComicBook = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorComicBook, TDEGlobalSettings::textColor() ); addItem( itemTextColorComicBook, TQString::fromLatin1( "textColorComicBook" ) ); - KConfigSkeleton::ItemColor *itemHighlightedBaseColorComicBook; - itemHighlightedBaseColorComicBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorComicBook, TDEGlobalSettings::highlightColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedBaseColorComicBook; + itemHighlightedBaseColorComicBook = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorComicBook, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorComicBook, TQString::fromLatin1( "highlightedBaseColorComicBook" ) ); - KConfigSkeleton::ItemColor *itemHighlightedTextColorComicBook; - itemHighlightedTextColorComicBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorComicBook, TDEGlobalSettings::highlightedTextColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedTextColorComicBook; + itemHighlightedTextColorComicBook = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorComicBook, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorComicBook, TQString::fromLatin1( "highlightedTextColorComicBook" ) ); setCurrentGroup( TQString::fromLatin1( "Options - wine" ) ); - KConfigSkeleton::ItemString *itemTemplateWine; - itemTemplateWine = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateWine, TQString::fromLatin1( "Fancy" ) ); + TDEConfigSkeleton::ItemString *itemTemplateWine; + itemTemplateWine = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateWine, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateWine, TQString::fromLatin1( "templateWine" ) ); - KConfigSkeleton::ItemFont *itemFontWine; - itemFontWine = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontWine, TDEGlobalSettings::generalFont() ); + TDEConfigSkeleton::ItemFont *itemFontWine; + itemFontWine = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontWine, TDEGlobalSettings::generalFont() ); addItem( itemFontWine, TQString::fromLatin1( "fontWine" ) ); - KConfigSkeleton::ItemColor *itemBaseColorWine; - itemBaseColorWine = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorWine, TDEGlobalSettings::baseColor() ); + TDEConfigSkeleton::ItemColor *itemBaseColorWine; + itemBaseColorWine = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorWine, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorWine, TQString::fromLatin1( "baseColorWine" ) ); - KConfigSkeleton::ItemColor *itemTextColorWine; - itemTextColorWine = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorWine, TDEGlobalSettings::textColor() ); + TDEConfigSkeleton::ItemColor *itemTextColorWine; + itemTextColorWine = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorWine, TDEGlobalSettings::textColor() ); addItem( itemTextColorWine, TQString::fromLatin1( "textColorWine" ) ); - KConfigSkeleton::ItemColor *itemHighlightedBaseColorWine; - itemHighlightedBaseColorWine = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorWine, TDEGlobalSettings::highlightColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedBaseColorWine; + itemHighlightedBaseColorWine = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorWine, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorWine, TQString::fromLatin1( "highlightedBaseColorWine" ) ); - KConfigSkeleton::ItemColor *itemHighlightedTextColorWine; - itemHighlightedTextColorWine = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorWine, TDEGlobalSettings::highlightedTextColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedTextColorWine; + itemHighlightedTextColorWine = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorWine, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorWine, TQString::fromLatin1( "highlightedTextColorWine" ) ); setCurrentGroup( TQString::fromLatin1( "Options - coin" ) ); - KConfigSkeleton::ItemString *itemTemplateCoin; - itemTemplateCoin = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateCoin, TQString::fromLatin1( "Fancy" ) ); + TDEConfigSkeleton::ItemString *itemTemplateCoin; + itemTemplateCoin = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateCoin, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateCoin, TQString::fromLatin1( "templateCoin" ) ); - KConfigSkeleton::ItemFont *itemFontCoin; - itemFontCoin = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontCoin, TDEGlobalSettings::generalFont() ); + TDEConfigSkeleton::ItemFont *itemFontCoin; + itemFontCoin = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontCoin, TDEGlobalSettings::generalFont() ); addItem( itemFontCoin, TQString::fromLatin1( "fontCoin" ) ); - KConfigSkeleton::ItemColor *itemBaseColorCoin; - itemBaseColorCoin = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorCoin, TDEGlobalSettings::baseColor() ); + TDEConfigSkeleton::ItemColor *itemBaseColorCoin; + itemBaseColorCoin = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorCoin, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorCoin, TQString::fromLatin1( "baseColorCoin" ) ); - KConfigSkeleton::ItemColor *itemTextColorCoin; - itemTextColorCoin = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorCoin, TDEGlobalSettings::textColor() ); + TDEConfigSkeleton::ItemColor *itemTextColorCoin; + itemTextColorCoin = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorCoin, TDEGlobalSettings::textColor() ); addItem( itemTextColorCoin, TQString::fromLatin1( "textColorCoin" ) ); - KConfigSkeleton::ItemColor *itemHighlightedBaseColorCoin; - itemHighlightedBaseColorCoin = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorCoin, TDEGlobalSettings::highlightColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedBaseColorCoin; + itemHighlightedBaseColorCoin = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorCoin, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorCoin, TQString::fromLatin1( "highlightedBaseColorCoin" ) ); - KConfigSkeleton::ItemColor *itemHighlightedTextColorCoin; - itemHighlightedTextColorCoin = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorCoin, TDEGlobalSettings::highlightedTextColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedTextColorCoin; + itemHighlightedTextColorCoin = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorCoin, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorCoin, TQString::fromLatin1( "highlightedTextColorCoin" ) ); setCurrentGroup( TQString::fromLatin1( "Options - stamp" ) ); - KConfigSkeleton::ItemString *itemTemplateStamp; - itemTemplateStamp = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateStamp, TQString::fromLatin1( "Fancy" ) ); + TDEConfigSkeleton::ItemString *itemTemplateStamp; + itemTemplateStamp = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateStamp, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateStamp, TQString::fromLatin1( "templateStamp" ) ); - KConfigSkeleton::ItemFont *itemFontStamp; - itemFontStamp = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontStamp, TDEGlobalSettings::generalFont() ); + TDEConfigSkeleton::ItemFont *itemFontStamp; + itemFontStamp = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontStamp, TDEGlobalSettings::generalFont() ); addItem( itemFontStamp, TQString::fromLatin1( "fontStamp" ) ); - KConfigSkeleton::ItemColor *itemBaseColorStamp; - itemBaseColorStamp = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorStamp, TDEGlobalSettings::baseColor() ); + TDEConfigSkeleton::ItemColor *itemBaseColorStamp; + itemBaseColorStamp = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorStamp, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorStamp, TQString::fromLatin1( "baseColorStamp" ) ); - KConfigSkeleton::ItemColor *itemTextColorStamp; - itemTextColorStamp = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorStamp, TDEGlobalSettings::textColor() ); + TDEConfigSkeleton::ItemColor *itemTextColorStamp; + itemTextColorStamp = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorStamp, TDEGlobalSettings::textColor() ); addItem( itemTextColorStamp, TQString::fromLatin1( "textColorStamp" ) ); - KConfigSkeleton::ItemColor *itemHighlightedBaseColorStamp; - itemHighlightedBaseColorStamp = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorStamp, TDEGlobalSettings::highlightColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedBaseColorStamp; + itemHighlightedBaseColorStamp = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorStamp, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorStamp, TQString::fromLatin1( "highlightedBaseColorStamp" ) ); - KConfigSkeleton::ItemColor *itemHighlightedTextColorStamp; - itemHighlightedTextColorStamp = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorStamp, TDEGlobalSettings::highlightedTextColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedTextColorStamp; + itemHighlightedTextColorStamp = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorStamp, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorStamp, TQString::fromLatin1( "highlightedTextColorStamp" ) ); setCurrentGroup( TQString::fromLatin1( "Options - card" ) ); - KConfigSkeleton::ItemString *itemTemplateCard; - itemTemplateCard = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateCard, TQString::fromLatin1( "Fancy" ) ); + TDEConfigSkeleton::ItemString *itemTemplateCard; + itemTemplateCard = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateCard, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateCard, TQString::fromLatin1( "templateCard" ) ); - KConfigSkeleton::ItemFont *itemFontCard; - itemFontCard = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontCard, TDEGlobalSettings::generalFont() ); + TDEConfigSkeleton::ItemFont *itemFontCard; + itemFontCard = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontCard, TDEGlobalSettings::generalFont() ); addItem( itemFontCard, TQString::fromLatin1( "fontCard" ) ); - KConfigSkeleton::ItemColor *itemBaseColorCard; - itemBaseColorCard = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorCard, TDEGlobalSettings::baseColor() ); + TDEConfigSkeleton::ItemColor *itemBaseColorCard; + itemBaseColorCard = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorCard, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorCard, TQString::fromLatin1( "baseColorCard" ) ); - KConfigSkeleton::ItemColor *itemTextColorCard; - itemTextColorCard = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorCard, TDEGlobalSettings::textColor() ); + TDEConfigSkeleton::ItemColor *itemTextColorCard; + itemTextColorCard = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorCard, TDEGlobalSettings::textColor() ); addItem( itemTextColorCard, TQString::fromLatin1( "textColorCard" ) ); - KConfigSkeleton::ItemColor *itemHighlightedBaseColorCard; - itemHighlightedBaseColorCard = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorCard, TDEGlobalSettings::highlightColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedBaseColorCard; + itemHighlightedBaseColorCard = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorCard, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorCard, TQString::fromLatin1( "highlightedBaseColorCard" ) ); - KConfigSkeleton::ItemColor *itemHighlightedTextColorCard; - itemHighlightedTextColorCard = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorCard, TDEGlobalSettings::highlightedTextColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedTextColorCard; + itemHighlightedTextColorCard = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorCard, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorCard, TQString::fromLatin1( "highlightedTextColorCard" ) ); setCurrentGroup( TQString::fromLatin1( "Options - game" ) ); - KConfigSkeleton::ItemString *itemTemplateGame; - itemTemplateGame = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateGame, TQString::fromLatin1( "Fancy" ) ); + TDEConfigSkeleton::ItemString *itemTemplateGame; + itemTemplateGame = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateGame, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateGame, TQString::fromLatin1( "templateGame" ) ); - KConfigSkeleton::ItemFont *itemFontGame; - itemFontGame = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontGame, TDEGlobalSettings::generalFont() ); + TDEConfigSkeleton::ItemFont *itemFontGame; + itemFontGame = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontGame, TDEGlobalSettings::generalFont() ); addItem( itemFontGame, TQString::fromLatin1( "fontGame" ) ); - KConfigSkeleton::ItemColor *itemBaseColorGame; - itemBaseColorGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorGame, TDEGlobalSettings::baseColor() ); + TDEConfigSkeleton::ItemColor *itemBaseColorGame; + itemBaseColorGame = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorGame, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorGame, TQString::fromLatin1( "baseColorGame" ) ); - KConfigSkeleton::ItemColor *itemTextColorGame; - itemTextColorGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorGame, TDEGlobalSettings::textColor() ); + TDEConfigSkeleton::ItemColor *itemTextColorGame; + itemTextColorGame = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorGame, TDEGlobalSettings::textColor() ); addItem( itemTextColorGame, TQString::fromLatin1( "textColorGame" ) ); - KConfigSkeleton::ItemColor *itemHighlightedBaseColorGame; - itemHighlightedBaseColorGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorGame, TDEGlobalSettings::highlightColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedBaseColorGame; + itemHighlightedBaseColorGame = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorGame, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorGame, TQString::fromLatin1( "highlightedBaseColorGame" ) ); - KConfigSkeleton::ItemColor *itemHighlightedTextColorGame; - itemHighlightedTextColorGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorGame, TDEGlobalSettings::highlightedTextColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedTextColorGame; + itemHighlightedTextColorGame = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorGame, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorGame, TQString::fromLatin1( "highlightedTextColorGame" ) ); setCurrentGroup( TQString::fromLatin1( "Options - file" ) ); - KConfigSkeleton::ItemString *itemTemplateFile; - itemTemplateFile = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateFile, TQString::fromLatin1( "Fancy" ) ); + TDEConfigSkeleton::ItemString *itemTemplateFile; + itemTemplateFile = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateFile, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateFile, TQString::fromLatin1( "templateFile" ) ); - KConfigSkeleton::ItemFont *itemFontFile; - itemFontFile = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontFile, TDEGlobalSettings::generalFont() ); + TDEConfigSkeleton::ItemFont *itemFontFile; + itemFontFile = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontFile, TDEGlobalSettings::generalFont() ); addItem( itemFontFile, TQString::fromLatin1( "fontFile" ) ); - KConfigSkeleton::ItemColor *itemBaseColorFile; - itemBaseColorFile = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorFile, TDEGlobalSettings::baseColor() ); + TDEConfigSkeleton::ItemColor *itemBaseColorFile; + itemBaseColorFile = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorFile, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorFile, TQString::fromLatin1( "baseColorFile" ) ); - KConfigSkeleton::ItemColor *itemTextColorFile; - itemTextColorFile = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorFile, TDEGlobalSettings::textColor() ); + TDEConfigSkeleton::ItemColor *itemTextColorFile; + itemTextColorFile = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorFile, TDEGlobalSettings::textColor() ); addItem( itemTextColorFile, TQString::fromLatin1( "textColorFile" ) ); - KConfigSkeleton::ItemColor *itemHighlightedBaseColorFile; - itemHighlightedBaseColorFile = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorFile, TDEGlobalSettings::highlightColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedBaseColorFile; + itemHighlightedBaseColorFile = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorFile, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorFile, TQString::fromLatin1( "highlightedBaseColorFile" ) ); - KConfigSkeleton::ItemColor *itemHighlightedTextColorFile; - itemHighlightedTextColorFile = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorFile, TDEGlobalSettings::highlightedTextColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedTextColorFile; + itemHighlightedTextColorFile = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorFile, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorFile, TQString::fromLatin1( "highlightedTextColorFile" ) ); setCurrentGroup( TQString::fromLatin1( "Options - boardgame" ) ); - KConfigSkeleton::ItemString *itemTemplateBoardGame; - itemTemplateBoardGame = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateBoardGame, TQString::fromLatin1( "Fancy" ) ); + TDEConfigSkeleton::ItemString *itemTemplateBoardGame; + itemTemplateBoardGame = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateBoardGame, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateBoardGame, TQString::fromLatin1( "templateBoardGame" ) ); - KConfigSkeleton::ItemFont *itemFontBoardGame; - itemFontBoardGame = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontBoardGame, TDEGlobalSettings::generalFont() ); + TDEConfigSkeleton::ItemFont *itemFontBoardGame; + itemFontBoardGame = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontBoardGame, TDEGlobalSettings::generalFont() ); addItem( itemFontBoardGame, TQString::fromLatin1( "fontBoardGame" ) ); - KConfigSkeleton::ItemColor *itemBaseColorBoardGame; - itemBaseColorBoardGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorBoardGame, TDEGlobalSettings::baseColor() ); + TDEConfigSkeleton::ItemColor *itemBaseColorBoardGame; + itemBaseColorBoardGame = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorBoardGame, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorBoardGame, TQString::fromLatin1( "baseColorBoardGame" ) ); - KConfigSkeleton::ItemColor *itemTextColorBoardGame; - itemTextColorBoardGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorBoardGame, TDEGlobalSettings::textColor() ); + TDEConfigSkeleton::ItemColor *itemTextColorBoardGame; + itemTextColorBoardGame = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorBoardGame, TDEGlobalSettings::textColor() ); addItem( itemTextColorBoardGame, TQString::fromLatin1( "textColorBoardGame" ) ); - KConfigSkeleton::ItemColor *itemHighlightedBaseColorBoardGame; - itemHighlightedBaseColorBoardGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorBoardGame, TDEGlobalSettings::highlightColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedBaseColorBoardGame; + itemHighlightedBaseColorBoardGame = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorBoardGame, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorBoardGame, TQString::fromLatin1( "highlightedBaseColorBoardGame" ) ); - KConfigSkeleton::ItemColor *itemHighlightedTextColorBoardGame; - itemHighlightedTextColorBoardGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorBoardGame, TDEGlobalSettings::highlightedTextColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedTextColorBoardGame; + itemHighlightedTextColorBoardGame = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorBoardGame, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorBoardGame, TQString::fromLatin1( "highlightedTextColorBoardGame" ) ); setCurrentGroup( TQString::fromLatin1( "Options - entry" ) ); - KConfigSkeleton::ItemString *itemTemplateBase; - itemTemplateBase = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateBase, TQString::fromLatin1( "Fancy" ) ); + TDEConfigSkeleton::ItemString *itemTemplateBase; + itemTemplateBase = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateBase, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateBase, TQString::fromLatin1( "templateBase" ) ); - KConfigSkeleton::ItemFont *itemFontBase; - itemFontBase = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontBase, TDEGlobalSettings::generalFont() ); + TDEConfigSkeleton::ItemFont *itemFontBase; + itemFontBase = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontBase, TDEGlobalSettings::generalFont() ); addItem( itemFontBase, TQString::fromLatin1( "fontBase" ) ); - KConfigSkeleton::ItemColor *itemBaseColorBase; - itemBaseColorBase = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorBase, TDEGlobalSettings::baseColor() ); + TDEConfigSkeleton::ItemColor *itemBaseColorBase; + itemBaseColorBase = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorBase, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorBase, TQString::fromLatin1( "baseColorBase" ) ); - KConfigSkeleton::ItemColor *itemTextColorBase; - itemTextColorBase = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorBase, TDEGlobalSettings::textColor() ); + TDEConfigSkeleton::ItemColor *itemTextColorBase; + itemTextColorBase = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorBase, TDEGlobalSettings::textColor() ); addItem( itemTextColorBase, TQString::fromLatin1( "textColorBase" ) ); - KConfigSkeleton::ItemColor *itemHighlightedBaseColorBase; - itemHighlightedBaseColorBase = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorBase, TDEGlobalSettings::highlightColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedBaseColorBase; + itemHighlightedBaseColorBase = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorBase, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorBase, TQString::fromLatin1( "highlightedBaseColorBase" ) ); - KConfigSkeleton::ItemColor *itemHighlightedTextColorBase; - itemHighlightedTextColorBase = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorBase, TDEGlobalSettings::highlightedTextColor() ); + TDEConfigSkeleton::ItemColor *itemHighlightedTextColorBase; + itemHighlightedTextColorBase = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorBase, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorBase, TQString::fromLatin1( "highlightedTextColorBase" ) ); } diff --git a/src/detailedlistview.cpp b/src/detailedlistview.cpp index 716f5df..78199c3 100644 --- a/src/detailedlistview.cpp +++ b/src/detailedlistview.cpp @@ -82,7 +82,7 @@ void DetailedListView::addCollection(Data::CollPtr coll_) { m_imageColumns.clear(); // myDebug() << "DetailedListView::addCollection()" << endl; - KConfigGroup config(kapp->config(), TQString::fromLatin1("Options - %1").arg(coll_->typeName())); + TDEConfigGroup config(kapp->config(), TQString::fromLatin1("Options - %1").arg(coll_->typeName())); TQString configN; if(coll_->type() == Data::Collection::Base) { @@ -747,7 +747,7 @@ void DetailedListView::slotUpdatePixmap() { } void DetailedListView::saveConfig(Tellico::Data::CollPtr coll_, int configIndex_) { - KConfigGroup config(kapp->config(), TQString::fromLatin1("Options - %1").arg(coll_->typeName())); + TDEConfigGroup config(kapp->config(), TQString::fromLatin1("Options - %1").arg(coll_->typeName())); // all of this is to have custom settings on a per file basis TQString configN; diff --git a/src/exportdialog.cpp b/src/exportdialog.cpp index f2d80a0..df9cf87 100644 --- a/src/exportdialog.cpp +++ b/src/exportdialog.cpp @@ -101,7 +101,7 @@ TQString ExportDialog::fileFilter() { } void ExportDialog::readOptions() { - KConfigGroup config(TDEGlobal::config(), "ExportOptions"); + TDEConfigGroup config(TDEGlobal::config(), "ExportOptions"); bool format = config.readBoolEntry("FormatFields", false); m_formatFields->setChecked(format); bool selected = config.readBoolEntry("ExportSelectedOnly", false); @@ -115,11 +115,11 @@ void ExportDialog::readOptions() { } void ExportDialog::slotSaveOptions() { - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); // each exporter sets its own group m_exporter->saveOptions(config); - KConfigGroup configGroup(config, "ExportOptions"); + TDEConfigGroup configGroup(config, "ExportOptions"); configGroup.writeEntry("FormatFields", m_formatFields->isChecked()); configGroup.writeEntry("ExportSelectedOnly", m_exportSelected->isChecked()); configGroup.writeEntry("EncodeUTF8", m_encodeUTF8->isChecked()); @@ -244,7 +244,7 @@ bool ExportDialog::exportCollection(Export::Format format_, const KURL& url_) { exp->setURL(url_); exp->setEntries(Data::Document::self()->collection()->entries()); - KConfigGroup config(TDEGlobal::config(), "ExportOptions"); + TDEConfigGroup config(TDEGlobal::config(), "ExportOptions"); long options = 0; if(config.readBoolEntry("FormatFields", false)) { options |= Export::ExportFormatted; diff --git a/src/fetch/amazonfetcher.cpp b/src/fetch/amazonfetcher.cpp index 1633f60..d21ee27 100644 --- a/src/fetch/amazonfetcher.cpp +++ b/src/fetch/amazonfetcher.cpp @@ -112,7 +112,7 @@ bool AmazonFetcher::canFetch(int type) const { || type == Data::Collection::Game; } -void AmazonFetcher::readConfigHook(const KConfigGroup& config_) { +void AmazonFetcher::readConfigHook(const TDEConfigGroup& config_) { TQString s = config_.readEntry("AccessKey"); if(!s.isEmpty()) { m_access = s; @@ -311,11 +311,11 @@ void AmazonFetcher::doSearch() { } // myDebug() << "AmazonFetcher::search() - url: " << u.url() << endl; - m_job = KIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotComplete(KIO::Job*))); + m_job = TDEIO::get(u, false, false); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotComplete(TDEIO::Job*))); } void AmazonFetcher::stop() { @@ -332,12 +332,12 @@ void AmazonFetcher::stop() { emit signalDone(this); } -void AmazonFetcher::slotData(KIO::Job*, const TQByteArray& data_) { +void AmazonFetcher::slotData(TDEIO::Job*, const TQByteArray& data_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(data_.data(), data_.size()); } -void AmazonFetcher::slotComplete(KIO::Job* job_) { +void AmazonFetcher::slotComplete(TDEIO::Job* job_) { // myDebug() << "AmazonFetcher::slotComplete()" << endl; // since the fetch is done, don't worry about holding the job pointer @@ -905,7 +905,7 @@ AmazonFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const AmazonFetcher KAcceleratorManager::manage(optionsWidget()); } -void AmazonFetcher::ConfigWidget::saveConfig(KConfigGroup& config_) { +void AmazonFetcher::ConfigWidget::saveConfig(TDEConfigGroup& config_) { int n = m_siteCombo->currentData().toInt(); config_.writeEntry("Site", n); TQString s = m_assocEdit->text().stripWhiteSpace(); diff --git a/src/fetch/amazonfetcher.h b/src/fetch/amazonfetcher.h index a1ddc6b..03aed7d 100644 --- a/src/fetch/amazonfetcher.h +++ b/src/fetch/amazonfetcher.h @@ -28,7 +28,7 @@ class KLineEdit; class TQCheckBox; class TQLabel; -namespace KIO { +namespace TDEIO { class Job; } @@ -81,7 +81,7 @@ public: virtual Data::EntryPtr fetchEntry(uint uid); virtual Type type() const { return Amazon; } virtual bool canFetch(int type) const; - virtual void readConfigHook(const KConfigGroup& config); + virtual void readConfigHook(const TDEConfigGroup& config); virtual void updateEntry(Data::EntryPtr entry); @@ -104,8 +104,8 @@ public: static TQString defaultName(); private slots: - void slotData(KIO::Job* job, const TQByteArray& data); - void slotComplete(KIO::Job* job); + void slotData(TDEIO::Job* job, const TQByteArray& data); + void slotComplete(TDEIO::Job* job); private: void initXSLTHandler(); @@ -128,7 +128,7 @@ private: int m_total; int m_numResults; TQMap<int, Data::EntryPtr> m_entries; // they get modified after collection is created, so can't be const - TQGuardedPtr<KIO::Job> m_job; + TQGuardedPtr<TDEIO::Job> m_job; FetchKey m_key; TQString m_value; @@ -143,7 +143,7 @@ Q_OBJECT public: ConfigWidget(TQWidget* parent_, const AmazonFetcher* fetcher = 0); - virtual void saveConfig(KConfigGroup& config); + virtual void saveConfig(TDEConfigGroup& config); virtual TQString preferredName() const; private slots: diff --git a/src/fetch/animenfofetcher.cpp b/src/fetch/animenfofetcher.cpp index 43516b8..be639d6 100644 --- a/src/fetch/animenfofetcher.cpp +++ b/src/fetch/animenfofetcher.cpp @@ -55,7 +55,7 @@ bool AnimeNfoFetcher::canFetch(int type) const { return type == Data::Collection::Video; } -void AnimeNfoFetcher::readConfigHook(const KConfigGroup& config_) { +void AnimeNfoFetcher::readConfigHook(const TDEConfigGroup& config_) { Q_UNUSED(config_); } @@ -90,11 +90,11 @@ void AnimeNfoFetcher::search(FetchKey key_, const TQString& value_) { #endif // myDebug() << "AnimeNfoFetcher::search() - url: " << u.url() << endl; - m_job = KIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotComplete(KIO::Job*))); + m_job = TDEIO::get(u, false, false); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotComplete(TDEIO::Job*))); } void AnimeNfoFetcher::stop() { @@ -111,12 +111,12 @@ void AnimeNfoFetcher::stop() { emit signalDone(this); } -void AnimeNfoFetcher::slotData(KIO::Job*, const TQByteArray& data_) { +void AnimeNfoFetcher::slotData(TDEIO::Job*, const TQByteArray& data_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(data_.data(), data_.size()); } -void AnimeNfoFetcher::slotComplete(KIO::Job* job_) { +void AnimeNfoFetcher::slotComplete(TDEIO::Job* job_) { // myDebug() << "AnimeNfoFetcher::slotComplete()" << endl; // since the fetch is done, don't worry about holding the job pointer m_job = 0; diff --git a/src/fetch/animenfofetcher.h b/src/fetch/animenfofetcher.h index b6ba291..e8540db 100644 --- a/src/fetch/animenfofetcher.h +++ b/src/fetch/animenfofetcher.h @@ -20,7 +20,7 @@ #include <tqcstring.h> // for TQByteArray #include <tqguardedptr.h> -namespace KIO { +namespace TDEIO { class Job; } @@ -49,7 +49,7 @@ public: virtual Data::EntryPtr fetchEntry(uint uid); virtual Type type() const { return AnimeNfo; } virtual bool canFetch(int type) const; - virtual void readConfigHook(const KConfigGroup& config); + virtual void readConfigHook(const TDEConfigGroup& config); virtual void updateEntry(Data::EntryPtr entry); @@ -58,7 +58,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: ConfigWidget(TQWidget* parent_); - virtual void saveConfig(KConfigGroup&) {} + virtual void saveConfig(TDEConfigGroup&) {} virtual TQString preferredName() const; }; friend class ConfigWidget; @@ -66,8 +66,8 @@ public: static TQString defaultName(); private slots: - void slotData(KIO::Job* job, const TQByteArray& data); - void slotComplete(KIO::Job* job); + void slotData(TDEIO::Job* job, const TQByteArray& data); + void slotComplete(TDEIO::Job* job); private: Data::EntryPtr parseEntry(const TQString& str); @@ -76,7 +76,7 @@ private: int m_total; TQMap<int, Data::EntryPtr> m_entries; TQMap<int, KURL> m_matches; - TQGuardedPtr<KIO::Job> m_job; + TQGuardedPtr<TDEIO::Job> m_job; bool m_started; // TQStringList m_fields; diff --git a/src/fetch/arxivfetcher.cpp b/src/fetch/arxivfetcher.cpp index 377df34..ffc3e60 100644 --- a/src/fetch/arxivfetcher.cpp +++ b/src/fetch/arxivfetcher.cpp @@ -61,7 +61,7 @@ bool ArxivFetcher::canFetch(int type) const { return type == Data::Collection::Bibtex; } -void ArxivFetcher::readConfigHook(const KConfigGroup&) { +void ArxivFetcher::readConfigHook(const TDEConfigGroup&) { } void ArxivFetcher::search(FetchKey key_, const TQString& value_) { @@ -95,11 +95,11 @@ void ArxivFetcher::doSearch() { return; } - m_job = KIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotComplete(KIO::Job*))); + m_job = TDEIO::get(u, false, false); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotComplete(TDEIO::Job*))); } void ArxivFetcher::stop() { @@ -116,12 +116,12 @@ void ArxivFetcher::stop() { emit signalDone(this); } -void ArxivFetcher::slotData(KIO::Job*, const TQByteArray& data_) { +void ArxivFetcher::slotData(TDEIO::Job*, const TQByteArray& data_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(data_.data(), data_.size()); } -void ArxivFetcher::slotComplete(KIO::Job* job_) { +void ArxivFetcher::slotComplete(TDEIO::Job* job_) { // myDebug() << "ArxivFetcher::slotComplete()" << endl; // since the fetch is done, don't worry about holding the job pointer m_job = 0; @@ -356,7 +356,7 @@ ArxivFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const ArxivFetcher*) l->addStretch(); } -void ArxivFetcher::ConfigWidget::saveConfig(KConfigGroup&) { +void ArxivFetcher::ConfigWidget::saveConfig(TDEConfigGroup&) { } TQString ArxivFetcher::ConfigWidget::preferredName() const { diff --git a/src/fetch/arxivfetcher.h b/src/fetch/arxivfetcher.h index 6b667d2..4ee2a80 100644 --- a/src/fetch/arxivfetcher.h +++ b/src/fetch/arxivfetcher.h @@ -50,7 +50,7 @@ public: virtual Data::EntryPtr fetchEntry(uint uid); virtual Type type() const { return Arxiv; } virtual bool canFetch(int type) const; - virtual void readConfigHook(const KConfigGroup& config); + virtual void readConfigHook(const TDEConfigGroup& config); virtual void updateEntry(Data::EntryPtr entry); virtual void updateEntrySynchronous(Data::EntryPtr entry); @@ -60,7 +60,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: ConfigWidget(TQWidget* parent_, const ArxivFetcher* fetcher = 0); - virtual void saveConfig(KConfigGroup& config); + virtual void saveConfig(TDEConfigGroup& config); virtual TQString preferredName() const; }; friend class ConfigWidget; @@ -68,8 +68,8 @@ public: static TQString defaultName(); private slots: - void slotData(KIO::Job* job, const TQByteArray& data); - void slotComplete(KIO::Job* job); + void slotData(TDEIO::Job* job, const TQByteArray& data); + void slotComplete(TDEIO::Job* job); private: void initXSLTHandler(); @@ -82,7 +82,7 @@ private: TQByteArray m_data; TQMap<int, Data::EntryPtr> m_entries; - TQGuardedPtr<KIO::Job> m_job; + TQGuardedPtr<TDEIO::Job> m_job; FetchKey m_key; TQString m_value; diff --git a/src/fetch/bibsonomyfetcher.cpp b/src/fetch/bibsonomyfetcher.cpp index 4ce1cd4..81b13b7 100644 --- a/src/fetch/bibsonomyfetcher.cpp +++ b/src/fetch/bibsonomyfetcher.cpp @@ -54,7 +54,7 @@ bool BibsonomyFetcher::canFetch(int type) const { return type == Data::Collection::Bibtex; } -void BibsonomyFetcher::readConfigHook(const KConfigGroup&) { +void BibsonomyFetcher::readConfigHook(const TDEConfigGroup&) { } void BibsonomyFetcher::search(FetchKey key_, const TQString& value_) { @@ -78,11 +78,11 @@ void BibsonomyFetcher::search(FetchKey key_, const TQString& value_) { return; } - m_job = KIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotComplete(KIO::Job*))); + m_job = TDEIO::get(u, false, false); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotComplete(TDEIO::Job*))); } void BibsonomyFetcher::stop() { @@ -99,12 +99,12 @@ void BibsonomyFetcher::stop() { emit signalDone(this); } -void BibsonomyFetcher::slotData(KIO::Job*, const TQByteArray& data_) { +void BibsonomyFetcher::slotData(TDEIO::Job*, const TQByteArray& data_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(data_.data(), data_.size()); } -void BibsonomyFetcher::slotComplete(KIO::Job* job_) { +void BibsonomyFetcher::slotComplete(TDEIO::Job* job_) { // myDebug() << "BibsonomyFetcher::slotComplete()" << endl; // since the fetch is done, don't worry about holding the job pointer m_job = 0; @@ -199,7 +199,7 @@ BibsonomyFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const BibsonomyF l->addStretch(); } -void BibsonomyFetcher::ConfigWidget::saveConfig(KConfigGroup&) { +void BibsonomyFetcher::ConfigWidget::saveConfig(TDEConfigGroup&) { } TQString BibsonomyFetcher::ConfigWidget::preferredName() const { diff --git a/src/fetch/bibsonomyfetcher.h b/src/fetch/bibsonomyfetcher.h index 87af2db..eb85610 100644 --- a/src/fetch/bibsonomyfetcher.h +++ b/src/fetch/bibsonomyfetcher.h @@ -46,7 +46,7 @@ public: virtual Data::EntryPtr fetchEntry(uint uid); virtual Type type() const { return Bibsonomy; } virtual bool canFetch(int type) const; - virtual void readConfigHook(const KConfigGroup& config); + virtual void readConfigHook(const TDEConfigGroup& config); virtual void updateEntry(Data::EntryPtr entry); @@ -55,7 +55,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: ConfigWidget(TQWidget* parent_, const BibsonomyFetcher* fetcher = 0); - virtual void saveConfig(KConfigGroup& config); + virtual void saveConfig(TDEConfigGroup& config); virtual TQString preferredName() const; }; friend class ConfigWidget; @@ -63,15 +63,15 @@ public: static TQString defaultName(); private slots: - void slotData(KIO::Job* job, const TQByteArray& data); - void slotComplete(KIO::Job* job); + void slotData(TDEIO::Job* job, const TQByteArray& data); + void slotComplete(TDEIO::Job* job); private: KURL searchURL(FetchKey key, const TQString& value) const; TQByteArray m_data; TQMap<int, Data::EntryPtr> m_entries; - TQGuardedPtr<KIO::Job> m_job; + TQGuardedPtr<TDEIO::Job> m_job; FetchKey m_key; TQString m_value; diff --git a/src/fetch/citebasefetcher.cpp b/src/fetch/citebasefetcher.cpp index adc855d..5ab886d 100644 --- a/src/fetch/citebasefetcher.cpp +++ b/src/fetch/citebasefetcher.cpp @@ -55,7 +55,7 @@ bool CitebaseFetcher::canFetch(int type) const { return type == Data::Collection::Bibtex; } -void CitebaseFetcher::readConfigHook(const KConfigGroup&) { +void CitebaseFetcher::readConfigHook(const TDEConfigGroup&) { } void CitebaseFetcher::search(FetchKey key_, const TQString& value_) { @@ -79,11 +79,11 @@ void CitebaseFetcher::search(FetchKey key_, const TQString& value_) { return; } - m_job = KIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotComplete(KIO::Job*))); + m_job = TDEIO::get(u, false, false); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotComplete(TDEIO::Job*))); } void CitebaseFetcher::stop() { @@ -100,12 +100,12 @@ void CitebaseFetcher::stop() { emit signalDone(this); } -void CitebaseFetcher::slotData(KIO::Job*, const TQByteArray& data_) { +void CitebaseFetcher::slotData(TDEIO::Job*, const TQByteArray& data_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(data_.data(), data_.size()); } -void CitebaseFetcher::slotComplete(KIO::Job* job_) { +void CitebaseFetcher::slotComplete(TDEIO::Job* job_) { // myDebug() << "CitebaseFetcher::slotComplete()" << endl; // since the fetch is done, don't worry about holding the job pointer m_job = 0; @@ -238,7 +238,7 @@ CitebaseFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const CitebaseFet l->addStretch(); } -void CitebaseFetcher::ConfigWidget::saveConfig(KConfigGroup&) { +void CitebaseFetcher::ConfigWidget::saveConfig(TDEConfigGroup&) { } TQString CitebaseFetcher::ConfigWidget::preferredName() const { diff --git a/src/fetch/citebasefetcher.h b/src/fetch/citebasefetcher.h index 003a43b..72325dd 100644 --- a/src/fetch/citebasefetcher.h +++ b/src/fetch/citebasefetcher.h @@ -46,7 +46,7 @@ public: virtual Data::EntryPtr fetchEntry(uint uid); virtual Type type() const { return Citebase; } virtual bool canFetch(int type) const; - virtual void readConfigHook(const KConfigGroup& config); + virtual void readConfigHook(const TDEConfigGroup& config); virtual void updateEntry(Data::EntryPtr entry); virtual void updateEntrySynchronous(Data::EntryPtr entry); @@ -56,7 +56,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: ConfigWidget(TQWidget* parent_, const CitebaseFetcher* fetcher = 0); - virtual void saveConfig(KConfigGroup& config); + virtual void saveConfig(TDEConfigGroup& config); virtual TQString preferredName() const; }; friend class ConfigWidget; @@ -64,15 +64,15 @@ public: static TQString defaultName(); private slots: - void slotData(KIO::Job* job, const TQByteArray& data); - void slotComplete(KIO::Job* job); + void slotData(TDEIO::Job* job, const TQByteArray& data); + void slotComplete(TDEIO::Job* job); private: KURL searchURL(FetchKey key, const TQString& value) const; TQByteArray m_data; TQMap<int, Data::EntryPtr> m_entries; - TQGuardedPtr<KIO::Job> m_job; + TQGuardedPtr<TDEIO::Job> m_job; FetchKey m_key; TQString m_value; diff --git a/src/fetch/configwidget.cpp b/src/fetch/configwidget.cpp index e268bb3..983ef9a 100644 --- a/src/fetch/configwidget.cpp +++ b/src/fetch/configwidget.cpp @@ -53,7 +53,7 @@ void ConfigWidget::addFieldsWidget(const StringMap& customFields_, const TQStrin return; } -void ConfigWidget::saveFieldsConfig(KConfigGroup& config_) const { +void ConfigWidget::saveFieldsConfig(TDEConfigGroup& config_) const { TQStringList fields; for(TQDictIterator<TQCheckBox> it(m_fields); it.current(); ++it) { if(it.current()->isChecked()) { diff --git a/src/fetch/configwidget.h b/src/fetch/configwidget.h index 55eafb0..7230cae 100644 --- a/src/fetch/configwidget.h +++ b/src/fetch/configwidget.h @@ -20,7 +20,7 @@ #include <tqdict.h> #include <tqcheckbox.h> -class KConfigGroup; +class TDEConfigGroup; class TQStringList; namespace Tellico { @@ -43,9 +43,9 @@ public: * Saves any configuration options. The config group must be * set before calling this function. * - * @param config_ The KConfig pointer + * @param config_ The TDEConfig pointer */ - virtual void saveConfig(KConfigGroup& config) = 0; + virtual void saveConfig(TDEConfigGroup& config) = 0; /** * Called when a fetcher data source is removed. Useful for any cleanup work necessary. * The ExecExternalFetcher might need to remove the script, for example. @@ -64,7 +64,7 @@ public slots: protected: TQWidget* optionsWidget() { return m_optionsWidget; } void addFieldsWidget(const StringMap& customFields, const TQStringList& fieldsToAdd); - void saveFieldsConfig(KConfigGroup& config) const; + void saveFieldsConfig(TDEConfigGroup& config) const; private: bool m_modified; diff --git a/src/fetch/crossreffetcher.cpp b/src/fetch/crossreffetcher.cpp index dd0acb2..897aca8 100644 --- a/src/fetch/crossreffetcher.cpp +++ b/src/fetch/crossreffetcher.cpp @@ -65,7 +65,7 @@ bool CrossRefFetcher::canFetch(int type) const { return type == Data::Collection::Bibtex; } -void CrossRefFetcher::readConfigHook(const KConfigGroup& config_) { +void CrossRefFetcher::readConfigHook(const TDEConfigGroup& config_) { TQString s = config_.readEntry("User"); if(!s.isEmpty()) { m_user = s; @@ -103,11 +103,11 @@ void CrossRefFetcher::search(FetchKey key_, const TQString& value_) { return; } - m_job = KIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotComplete(KIO::Job*))); + m_job = TDEIO::get(u, false, false); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotComplete(TDEIO::Job*))); } void CrossRefFetcher::stop() { @@ -124,12 +124,12 @@ void CrossRefFetcher::stop() { emit signalDone(this); } -void CrossRefFetcher::slotData(KIO::Job*, const TQByteArray& data_) { +void CrossRefFetcher::slotData(TDEIO::Job*, const TQByteArray& data_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(data_.data(), data_.size()); } -void CrossRefFetcher::slotComplete(KIO::Job* job_) { +void CrossRefFetcher::slotComplete(TDEIO::Job* job_) { // myDebug() << "CrossRefFetcher::slotComplete()" << endl; // since the fetch is done, don't worry about holding the job pointer m_job = 0; @@ -375,7 +375,7 @@ CrossRefFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const CrossRefFet } } -void CrossRefFetcher::ConfigWidget::saveConfig(KConfigGroup& config_) { +void CrossRefFetcher::ConfigWidget::saveConfig(TDEConfigGroup& config_) { TQString s = m_userEdit->text(); config_.writeEntry("User", s); diff --git a/src/fetch/crossreffetcher.h b/src/fetch/crossreffetcher.h index 1bcb009..a39d69c 100644 --- a/src/fetch/crossreffetcher.h +++ b/src/fetch/crossreffetcher.h @@ -51,7 +51,7 @@ public: virtual Data::EntryPtr fetchEntry(uint uid); virtual Type type() const { return CrossRef; } virtual bool canFetch(int type) const; - virtual void readConfigHook(const KConfigGroup& config); + virtual void readConfigHook(const TDEConfigGroup& config); virtual void updateEntry(Data::EntryPtr entry); virtual void updateEntrySynchronous(Data::EntryPtr entry); @@ -61,7 +61,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: ConfigWidget(TQWidget* parent_, const CrossRefFetcher* fetcher = 0); - virtual void saveConfig(KConfigGroup& config); + virtual void saveConfig(TDEConfigGroup& config); virtual TQString preferredName() const; private: KLineEdit* m_userEdit; @@ -72,8 +72,8 @@ public: static TQString defaultName(); private slots: - void slotData(KIO::Job* job, const TQByteArray& data); - void slotComplete(KIO::Job* job); + void slotData(TDEIO::Job* job, const TQByteArray& data); + void slotComplete(TDEIO::Job* job); private: void initXSLTHandler(); @@ -86,7 +86,7 @@ private: TQByteArray m_data; TQMap<int, Data::EntryPtr> m_entries; - TQGuardedPtr<KIO::Job> m_job; + TQGuardedPtr<TDEIO::Job> m_job; FetchKey m_key; TQString m_value; diff --git a/src/fetch/discogsfetcher.cpp b/src/fetch/discogsfetcher.cpp index 2d3384b..f24e642 100644 --- a/src/fetch/discogsfetcher.cpp +++ b/src/fetch/discogsfetcher.cpp @@ -65,7 +65,7 @@ bool DiscogsFetcher::canFetch(int type) const { return type == Data::Collection::Album; } -void DiscogsFetcher::readConfigHook(const KConfigGroup& config_) { +void DiscogsFetcher::readConfigHook(const TDEConfigGroup& config_) { TQString k = config_.readEntry("API Key"); if(!k.isEmpty()) { m_apiKey = k; @@ -127,11 +127,11 @@ void DiscogsFetcher::doSearch() { #endif // myDebug() << "DiscogsFetcher::search() - url: " << u.url() << endl; - m_job = KIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotComplete(KIO::Job*))); + m_job = TDEIO::get(u, false, false); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotComplete(TDEIO::Job*))); } void DiscogsFetcher::stop() { @@ -147,12 +147,12 @@ void DiscogsFetcher::stop() { emit signalDone(this); } -void DiscogsFetcher::slotData(KIO::Job*, const TQByteArray& data_) { +void DiscogsFetcher::slotData(TDEIO::Job*, const TQByteArray& data_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(data_.data(), data_.size()); } -void DiscogsFetcher::slotComplete(KIO::Job* job_) { +void DiscogsFetcher::slotComplete(TDEIO::Job* job_) { // myDebug() << "DiscogsFetcher::slotComplete()" << endl; if(job_->error()) { job_->showErrorDialog(Kernel::self()->widget()); @@ -387,7 +387,7 @@ DiscogsFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const DiscogsFetch } } -void DiscogsFetcher::ConfigWidget::saveConfig(KConfigGroup& config_) { +void DiscogsFetcher::ConfigWidget::saveConfig(TDEConfigGroup& config_) { TQString apiKey = m_apiKeyEdit->text().stripWhiteSpace(); if(!apiKey.isEmpty()) { config_.writeEntry("API Key", apiKey); diff --git a/src/fetch/discogsfetcher.h b/src/fetch/discogsfetcher.h index d02e8eb..e719da3 100644 --- a/src/fetch/discogsfetcher.h +++ b/src/fetch/discogsfetcher.h @@ -27,7 +27,7 @@ namespace Tellico { #include <tqcstring.h> // for TQByteArray #include <tqguardedptr.h> -namespace KIO { +namespace TDEIO { class Job; } @@ -63,7 +63,7 @@ public: virtual Data::EntryPtr fetchEntry(uint uid); virtual Type type() const { return Discogs; } virtual bool canFetch(int type) const; - virtual void readConfigHook(const KConfigGroup& config); + virtual void readConfigHook(const TDEConfigGroup& config); virtual void updateEntry(Data::EntryPtr entry); @@ -77,7 +77,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: ConfigWidget(TQWidget* parent_, const DiscogsFetcher* fetcher = 0); - virtual void saveConfig(KConfigGroup&); + virtual void saveConfig(TDEConfigGroup&); virtual TQString preferredName() const; private: KLineEdit *m_apiKeyEdit; @@ -88,8 +88,8 @@ public: static TQString defaultName(); private slots: - void slotData(KIO::Job* job, const TQByteArray& data); - void slotComplete(KIO::Job* job); + void slotData(TDEIO::Job* job, const TQByteArray& data); + void slotComplete(TDEIO::Job* job); private: void initXSLTHandler(); @@ -102,7 +102,7 @@ private: TQByteArray m_data; TQMap<int, Data::EntryPtr> m_entries; - TQGuardedPtr<KIO::Job> m_job; + TQGuardedPtr<TDEIO::Job> m_job; FetchKey m_key; TQString m_value; diff --git a/src/fetch/entrezfetcher.cpp b/src/fetch/entrezfetcher.cpp index 0d38009..51839ec 100644 --- a/src/fetch/entrezfetcher.cpp +++ b/src/fetch/entrezfetcher.cpp @@ -64,7 +64,7 @@ bool EntrezFetcher::canFetch(int type) const { return type == Data::Collection::Bibtex; } -void EntrezFetcher::readConfigHook(const KConfigGroup& config_) { +void EntrezFetcher::readConfigHook(const TDEConfigGroup& config_) { TQString s = config_.readEntry("Database", TQString::fromLatin1(ENTREZ_DEFAULT_DATABASE)); // default to pubmed if(!s.isEmpty()) { m_dbname = s; @@ -130,11 +130,11 @@ void EntrezFetcher::search(FetchKey key_, const TQString& value_) { m_step = Search; // myLog() << "EntrezFetcher::doSearch() - url: " << u.url() << endl; - m_job = KIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotComplete(KIO::Job*))); + m_job = TDEIO::get(u, false, false); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotComplete(TDEIO::Job*))); } void EntrezFetcher::continueSearch() { @@ -156,12 +156,12 @@ void EntrezFetcher::stop() { emit signalDone(this); } -void EntrezFetcher::slotData(KIO::Job*, const TQByteArray& data_) { +void EntrezFetcher::slotData(TDEIO::Job*, const TQByteArray& data_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(data_.data(), data_.size()); } -void EntrezFetcher::slotComplete(KIO::Job* job_) { +void EntrezFetcher::slotComplete(TDEIO::Job* job_) { // since the fetch is done, don't worry about holding the job pointer m_job = 0; @@ -255,11 +255,11 @@ void EntrezFetcher::doSummary() { m_step = Summary; // myLog() << "EntrezFetcher::searchResults() - url: " << u.url() << endl; - m_job = KIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotComplete(KIO::Job*))); + m_job = TDEIO::get(u, false, false); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotComplete(TDEIO::Job*))); } void EntrezFetcher::summaryResults() { @@ -477,7 +477,7 @@ EntrezFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const EntrezFetcher addFieldsWidget(EntrezFetcher::customFields(), fetcher_ ? fetcher_->m_fields : TQStringList()); } -void EntrezFetcher::ConfigWidget::saveConfig(KConfigGroup& config_) { +void EntrezFetcher::ConfigWidget::saveConfig(TDEConfigGroup& config_) { saveFieldsConfig(config_); slotSetModified(false); } diff --git a/src/fetch/entrezfetcher.h b/src/fetch/entrezfetcher.h index f8bc1cc..87e13ae 100644 --- a/src/fetch/entrezfetcher.h +++ b/src/fetch/entrezfetcher.h @@ -25,7 +25,7 @@ namespace Tellico { #include <tqcstring.h> // for TQByteArray #include <tqguardedptr.h> -namespace KIO { +namespace TDEIO { class Job; } @@ -55,7 +55,7 @@ public: virtual Data::EntryPtr fetchEntry(uint uid); virtual Type type() const { return Entrez; } virtual bool canFetch(int type) const; - virtual void readConfigHook(const KConfigGroup& config); + virtual void readConfigHook(const TDEConfigGroup& config); virtual void updateEntry(Data::EntryPtr entry); virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; @@ -64,7 +64,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: ConfigWidget(TQWidget* parent_, const EntrezFetcher* fetcher=0); - virtual void saveConfig(KConfigGroup& config); + virtual void saveConfig(TDEConfigGroup& config); virtual TQString preferredName() const; }; friend class ConfigWidget; @@ -72,8 +72,8 @@ public: static TQString defaultName(); private slots: - void slotData(KIO::Job* job, const TQByteArray& data); - void slotComplete(KIO::Job* job); + void slotData(TDEIO::Job* job, const TQByteArray& data); + void slotComplete(TDEIO::Job* job); private: void initXSLTHandler(); @@ -98,7 +98,7 @@ private: TQByteArray m_data; TQMap<int, Data::EntryPtr> m_entries; // map from search result id to entry TQMap<int, int> m_matches; // search result id to pubmed id - TQGuardedPtr<KIO::Job> m_job; + TQGuardedPtr<TDEIO::Job> m_job; TQString m_queryKey; TQString m_webEnv; diff --git a/src/fetch/execexternalfetcher.cpp b/src/fetch/execexternalfetcher.cpp index 1ba084f..4b45520 100644 --- a/src/fetch/execexternalfetcher.cpp +++ b/src/fetch/execexternalfetcher.cpp @@ -90,7 +90,7 @@ bool ExecExternalFetcher::canFetch(int type_) const { return m_collType == -1 ? false : m_collType == type_; } -void ExecExternalFetcher::readConfigHook(const KConfigGroup& config_) { +void ExecExternalFetcher::readConfigHook(const TDEConfigGroup& config_) { TQString s = config_.readPathEntry("ExecPath"); if(!s.isEmpty()) { m_path = s; @@ -460,7 +460,7 @@ ExecExternalFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const ExecExt ExecExternalFetcher::ConfigWidget::~ConfigWidget() { } -void ExecExternalFetcher::ConfigWidget::readConfig(KConfig* config_) { +void ExecExternalFetcher::ConfigWidget::readConfig(TDEConfig* config_) { m_pathEdit->setURL(config_->readPathEntry("ExecPath")); TQValueList<int> argKeys = config_->readIntListEntry("ArgumentKeys"); TQStringList argValues = config_->readListEntry("Arguments"); @@ -513,7 +513,7 @@ void ExecExternalFetcher::ConfigWidget::readConfig(KConfig* config_) { m_newStuffName = config_->readEntry("NewStuffName"); } -void ExecExternalFetcher::ConfigWidget::saveConfig(KConfigGroup& config_) { +void ExecExternalFetcher::ConfigWidget::saveConfig(TDEConfigGroup& config_) { TQString s = m_pathEdit->url(); if(!s.isEmpty()) { config_.writePathEntry("ExecPath", s); diff --git a/src/fetch/execexternalfetcher.h b/src/fetch/execexternalfetcher.h index c81a27d..b303fae 100644 --- a/src/fetch/execexternalfetcher.h +++ b/src/fetch/execexternalfetcher.h @@ -58,7 +58,7 @@ public: virtual Data::EntryPtr fetchEntry(uint uid); virtual Type type() const { return ExecExternal; } virtual bool canFetch(int type) const; - virtual void readConfigHook(const KConfigGroup& config); + virtual void readConfigHook(const TDEConfigGroup& config); virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; const TQString& execPath() const { return m_path; } @@ -68,8 +68,8 @@ public: ConfigWidget(TQWidget* parent = 0, const ExecExternalFetcher* fetcher = 0); ~ConfigWidget(); - void readConfig(KConfig* config); - virtual void saveConfig(KConfigGroup& config); + void readConfig(TDEConfig* config); + virtual void saveConfig(TDEConfigGroup& config); virtual void removed(); virtual TQString preferredName() const; diff --git a/src/fetch/fetcher.cpp b/src/fetch/fetcher.cpp index 1996b96..025d494 100644 --- a/src/fetch/fetcher.cpp +++ b/src/fetch/fetcher.cpp @@ -22,11 +22,11 @@ using Tellico::Fetch::Fetcher; using Tellico::Fetch::SearchResult; Fetcher::~Fetcher() { - KConfigGroup config(TDEGlobal::config(), m_configGroup); + TDEConfigGroup config(TDEGlobal::config(), m_configGroup); saveConfigHook(config); } -void Fetcher::readConfig(const KConfigGroup& config_, const TQString& groupName_) { +void Fetcher::readConfig(const TDEConfigGroup& config_, const TQString& groupName_) { m_configGroup = groupName_; TQString s = config_.readEntry("Name"); diff --git a/src/fetch/fetcher.h b/src/fetch/fetcher.h index c0a1b21..42d3b23 100644 --- a/src/fetch/fetcher.h +++ b/src/fetch/fetcher.h @@ -22,7 +22,7 @@ #include <tqobject.h> #include <tqstring.h> -class KConfigGroup; +class TDEConfigGroup; namespace Tellico { namespace Fetch { @@ -110,7 +110,7 @@ public: /** * Reads the config for the widget, given a config group. */ - void readConfig(const KConfigGroup& config, const TQString& groupName); + void readConfig(const TDEConfigGroup& config, const TQString& groupName); /** * Returns a widget for modifying the fetcher's config. */ @@ -127,8 +127,8 @@ protected: bool m_hasMoreResults : 1; private: - virtual void readConfigHook(const KConfigGroup&) = 0; - virtual void saveConfigHook(KConfigGroup&) {} + virtual void readConfigHook(const TDEConfigGroup&) = 0; + virtual void saveConfigHook(TDEConfigGroup&) {} MessageHandler* m_messager; TQString m_configGroup; diff --git a/src/fetch/fetchmanager.cpp b/src/fetch/fetchmanager.cpp index 7888987..5aa61cd 100644 --- a/src/fetch/fetchmanager.cpp +++ b/src/fetch/fetchmanager.cpp @@ -93,9 +93,9 @@ void Manager::loadFetchers() { m_fetchers.clear(); m_configMap.clear(); - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); if(config->hasGroup(TQString::fromLatin1("Data Sources"))) { - KConfigGroup configGroup(config, TQString::fromLatin1("Data Sources")); + TDEConfigGroup configGroup(config, TQString::fromLatin1("Data Sources")); int nSources = configGroup.readNumEntry("Sources Count", 0); for(int i = 0; i < nSources; ++i) { TQString group = TQString::fromLatin1("Data Source %1").arg(i); @@ -235,13 +235,13 @@ bool Manager::canFetch() const { return false; } -Tellico::Fetch::Fetcher::Ptr Manager::createFetcher(KConfig* config_, const TQString& group_) { +Tellico::Fetch::Fetcher::Ptr Manager::createFetcher(TDEConfig* config_, const TQString& group_) { if(!config_->hasGroup(group_)) { myDebug() << "Manager::createFetcher() - no config group for " << group_ << endl; return 0; } - KConfigGroup config(config_, group_); + TDEConfigGroup config(config_, group_); int fetchType = config.readNumEntry("Type", Fetch::Unknown); if(fetchType == Fetch::Unknown) { @@ -371,11 +371,11 @@ Tellico::Fetch::FetcherVec Manager::createUpdateFetchers(int collType_) { } FetcherVec vec; - KConfigGroup config(TDEGlobal::config(), "Data Sources"); + TDEConfigGroup config(TDEGlobal::config(), "Data Sources"); int nSources = config.readNumEntry("Sources Count", 0); for(int i = 0; i < nSources; ++i) { TQString group = TQString::fromLatin1("Data Source %1").arg(i); - // needs the KConfig* + // needs the TDEConfig* Fetcher::Ptr f = createFetcher(TDEGlobal::config(), group); if(f && f->canFetch(collType_) && f->canUpdate()) { vec.append(f); @@ -443,7 +443,7 @@ Tellico::Fetch::TypePairList Manager::typeList() { TQStringList files = TDEGlobal::dirs()->findAllResources("appdata", TQString::fromLatin1("data-sources/*.spec"), false, true); for(TQStringList::Iterator it = files.begin(); it != files.end(); ++it) { - KConfig spec(*it, false, false); + TDEConfig spec(*it, false, false); TQString name = spec.readEntry("Name"); if(name.isEmpty()) { myDebug() << "Fetch::Manager::typeList() - no Name for " << *it << endl; @@ -499,10 +499,10 @@ Tellico::Fetch::ConfigWidget* Manager::configWidget(TQWidget* parent_, Type type from.setPath(m_scriptMap[name_]); to.setPath(tmpFile.name()); // have to overwrite since KTempFile already created it - if(!KIO::NetAccess::file_copy(from, to, -1, true /*overwrite*/)) { - myDebug() << KIO::NetAccess::lastErrorString() << endl; + if(!TDEIO::NetAccess::file_copy(from, to, -1, true /*overwrite*/)) { + myDebug() << TDEIO::NetAccess::lastErrorString() << endl; } - KConfig spec(to.path(), false, false); + TDEConfig spec(to.path(), false, false); // pass actual location of spec file if(name_ == spec.readEntry("Name") && bundledScriptHasExecPath(m_scriptMap[name_], &spec)) { static_cast<ExecExternalFetcher::ConfigWidget*>(w)->readConfig(&spec); @@ -677,7 +677,7 @@ TQString Manager::favIcon(const KURL& url_) { return KMimeType::iconForURL(url_); } -bool Manager::bundledScriptHasExecPath(const TQString& specFile_, KConfig* config_) { +bool Manager::bundledScriptHasExecPath(const TQString& specFile_, TDEConfig* config_) { // make sure ExecPath is set and executable // for the bundled scripts, either the exec name is not set, in which case it is the // name of the spec file, minus the .spec, or the exec is set, and is local to the dir diff --git a/src/fetch/fetchmanager.h b/src/fetch/fetchmanager.h index 6bfed98..4cf7909 100644 --- a/src/fetch/fetchmanager.h +++ b/src/fetch/fetchmanager.h @@ -86,12 +86,12 @@ private: static Manager* s_self; Manager(); - Fetcher::Ptr createFetcher(KConfig* config, const TQString& configGroup); + Fetcher::Ptr createFetcher(TDEConfig* config, const TQString& configGroup); FetcherVec defaultFetchers(); void updateStatus(const TQString& message); static TQString favIcon(const KURL& url); - static bool bundledScriptHasExecPath(const TQString& specFile, KConfig* config); + static bool bundledScriptHasExecPath(const TQString& specFile, TDEConfig* config); FetcherVec m_fetchers; int m_currentFetcherIndex; diff --git a/src/fetch/gcstarpluginfetcher.cpp b/src/fetch/gcstarpluginfetcher.cpp index 7b363ce..a026f97 100644 --- a/src/fetch/gcstarpluginfetcher.cpp +++ b/src/fetch/gcstarpluginfetcher.cpp @@ -198,7 +198,7 @@ bool GCstarPluginFetcher::canFetch(int type_) const { return m_collType == -1 ? false : m_collType == type_; } -void GCstarPluginFetcher::readConfigHook(const KConfigGroup& config_) { +void GCstarPluginFetcher::readConfigHook(const TDEConfigGroup& config_) { m_collType = config_.readNumEntry("CollectionType", -1); m_plugin = config_.readEntry("Plugin"); } @@ -443,7 +443,7 @@ GCstarPluginFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const GCstarP GCstarPluginFetcher::ConfigWidget::~ConfigWidget() { } -void GCstarPluginFetcher::ConfigWidget::saveConfig(KConfigGroup& config_) { +void GCstarPluginFetcher::ConfigWidget::saveConfig(TDEConfigGroup& config_) { config_.writeEntry("CollectionType", m_collCombo->currentType()); config_.writeEntry("Plugin", m_pluginCombo->currentText()); } diff --git a/src/fetch/gcstarpluginfetcher.h b/src/fetch/gcstarpluginfetcher.h index 65c33c0..43f15ef 100644 --- a/src/fetch/gcstarpluginfetcher.h +++ b/src/fetch/gcstarpluginfetcher.h @@ -54,7 +54,7 @@ public: virtual Data::EntryPtr fetchEntry(uint uid); virtual Type type() const { return GCstarPlugin; } virtual bool canFetch(int type) const; - virtual void readConfigHook(const KConfigGroup& config); + virtual void readConfigHook(const TDEConfigGroup& config); virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; class ConfigWidget; @@ -99,7 +99,7 @@ public: ConfigWidget(TQWidget* parent, const GCstarPluginFetcher* fetcher = 0); ~ConfigWidget(); - virtual void saveConfig(KConfigGroup& config); + virtual void saveConfig(TDEConfigGroup& config); virtual TQString preferredName() const; private slots: diff --git a/src/fetch/googlescholarfetcher.cpp b/src/fetch/googlescholarfetcher.cpp index 83730e7..567983c 100644 --- a/src/fetch/googlescholarfetcher.cpp +++ b/src/fetch/googlescholarfetcher.cpp @@ -58,7 +58,7 @@ bool GoogleScholarFetcher::canFetch(int type) const { return type == Data::Collection::Bibtex; } -void GoogleScholarFetcher::readConfigHook(const KConfigGroup& config_) { +void GoogleScholarFetcher::readConfigHook(const TDEConfigGroup& config_) { Q_UNUSED(config_); } @@ -113,11 +113,11 @@ void GoogleScholarFetcher::doSearch() { } // myDebug() << "GoogleScholarFetcher::search() - url: " << u.url() << endl; - m_job = KIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotComplete(KIO::Job*))); + m_job = TDEIO::get(u, false, false); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotComplete(TDEIO::Job*))); } void GoogleScholarFetcher::stop() { @@ -133,12 +133,12 @@ void GoogleScholarFetcher::stop() { emit signalDone(this); } -void GoogleScholarFetcher::slotData(KIO::Job*, const TQByteArray& data_) { +void GoogleScholarFetcher::slotData(TDEIO::Job*, const TQByteArray& data_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(data_.data(), data_.size()); } -void GoogleScholarFetcher::slotComplete(KIO::Job* job_) { +void GoogleScholarFetcher::slotComplete(TDEIO::Job* job_) { // myDebug() << "GoogleScholarFetcher::slotComplete()" << endl; // since the fetch is done, don't worry about holding the job pointer m_job = 0; diff --git a/src/fetch/googlescholarfetcher.h b/src/fetch/googlescholarfetcher.h index 70b93c3..8ef91da 100644 --- a/src/fetch/googlescholarfetcher.h +++ b/src/fetch/googlescholarfetcher.h @@ -21,7 +21,7 @@ #include <tqguardedptr.h> #include <tqregexp.h> -namespace KIO { +namespace TDEIO { class Job; } @@ -57,7 +57,7 @@ public: virtual Data::EntryPtr fetchEntry(uint uid); virtual Type type() const { return GoogleScholar; } virtual bool canFetch(int type) const; - virtual void readConfigHook(const KConfigGroup& config); + virtual void readConfigHook(const TDEConfigGroup& config); virtual void updateEntry(Data::EntryPtr entry); @@ -69,7 +69,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: ConfigWidget(TQWidget* parent_, const GoogleScholarFetcher* fetcher = 0); - virtual void saveConfig(KConfigGroup&) {} + virtual void saveConfig(TDEConfigGroup&) {} virtual TQString preferredName() const; }; friend class ConfigWidget; @@ -77,8 +77,8 @@ public: static TQString defaultName(); private slots: - void slotData(KIO::Job* job, const TQByteArray& data); - void slotComplete(KIO::Job* job); + void slotData(TDEIO::Job* job, const TQByteArray& data); + void slotComplete(TDEIO::Job* job); private: void doSearch(); @@ -89,7 +89,7 @@ private: TQByteArray m_data; TQMap<int, Data::EntryPtr> m_entries; - TQGuardedPtr<KIO::Job> m_job; + TQGuardedPtr<TDEIO::Job> m_job; FetchKey m_key; TQString m_value; diff --git a/src/fetch/ibsfetcher.cpp b/src/fetch/ibsfetcher.cpp index 2985c57..a6b608d 100644 --- a/src/fetch/ibsfetcher.cpp +++ b/src/fetch/ibsfetcher.cpp @@ -55,7 +55,7 @@ bool IBSFetcher::canFetch(int type) const { return type == Data::Collection::Book || type == Data::Collection::Bibtex; } -void IBSFetcher::readConfigHook(const KConfigGroup& config_) { +void IBSFetcher::readConfigHook(const TDEConfigGroup& config_) { Q_UNUSED(config_); } @@ -109,13 +109,13 @@ void IBSFetcher::search(FetchKey key_, const TQString& value_) { #endif // myDebug() << "IBSFetcher::search() - url: " << u.url() << endl; - m_job = KIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); + m_job = TDEIO::get(u, false, false); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); if(key_ == ISBN) { - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotCompleteISBN(KIO::Job*))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotCompleteISBN(TDEIO::Job*))); } else { - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotComplete(KIO::Job*))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotComplete(TDEIO::Job*))); } } @@ -133,12 +133,12 @@ void IBSFetcher::stop() { emit signalDone(this); } -void IBSFetcher::slotData(KIO::Job*, const TQByteArray& data_) { +void IBSFetcher::slotData(TDEIO::Job*, const TQByteArray& data_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(data_.data(), data_.size()); } -void IBSFetcher::slotComplete(KIO::Job* job_) { +void IBSFetcher::slotComplete(TDEIO::Job* job_) { // since the fetch is done, don't worry about holding the job pointer m_job = 0; @@ -204,7 +204,7 @@ void IBSFetcher::slotComplete(KIO::Job* job_) { stop(); } -void IBSFetcher::slotCompleteISBN(KIO::Job* job_) { +void IBSFetcher::slotCompleteISBN(TDEIO::Job* job_) { // since the fetch is done, don't worry about holding the job pointer m_job = 0; @@ -231,7 +231,7 @@ void IBSFetcher::slotCompleteISBN(KIO::Job* job_) { + '/' + entry->field(TQString::fromLatin1("publisher")); SearchResult* r = new SearchResult(this, entry->title(), desc, entry->field(TQString::fromLatin1("isbn"))); emit signalResultFound(r); - m_matches.insert(r->uid, static_cast<KIO::TransferJob*>(job_)->url().url()); + m_matches.insert(r->uid, static_cast<TDEIO::TransferJob*>(job_)->url().url()); } stop(); diff --git a/src/fetch/ibsfetcher.h b/src/fetch/ibsfetcher.h index 8f3f17e..e6f8e94 100644 --- a/src/fetch/ibsfetcher.h +++ b/src/fetch/ibsfetcher.h @@ -20,7 +20,7 @@ #include <tqcstring.h> // for TQByteArray #include <tqguardedptr.h> -namespace KIO { +namespace TDEIO { class Job; } @@ -49,7 +49,7 @@ public: virtual Data::EntryPtr fetchEntry(uint uid); virtual Type type() const { return IBS; } virtual bool canFetch(int type) const; - virtual void readConfigHook(const KConfigGroup& config); + virtual void readConfigHook(const TDEConfigGroup& config); virtual void updateEntry(Data::EntryPtr entry); @@ -58,7 +58,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: ConfigWidget(TQWidget* parent_); - virtual void saveConfig(KConfigGroup&) {} + virtual void saveConfig(TDEConfigGroup&) {} virtual TQString preferredName() const; }; friend class ConfigWidget; @@ -66,9 +66,9 @@ public: static TQString defaultName(); private slots: - void slotData(KIO::Job* job, const TQByteArray& data); - void slotComplete(KIO::Job* job); - void slotCompleteISBN(KIO::Job* job); + void slotData(TDEIO::Job* job, const TQByteArray& data); + void slotComplete(TDEIO::Job* job); + void slotCompleteISBN(TDEIO::Job* job); private: Data::EntryPtr parseEntry(const TQString& str); @@ -77,7 +77,7 @@ private: int m_total; TQMap<int, Data::EntryPtr> m_entries; TQMap<int, KURL> m_matches; - TQGuardedPtr<KIO::Job> m_job; + TQGuardedPtr<TDEIO::Job> m_job; bool m_started; // TQStringList m_fields; diff --git a/src/fetch/imdbfetcher.cpp b/src/fetch/imdbfetcher.cpp index 8880df9..d23881b 100644 --- a/src/fetch/imdbfetcher.cpp +++ b/src/fetch/imdbfetcher.cpp @@ -97,7 +97,7 @@ bool IMDBFetcher::canFetch(int type) const { return type == Data::Collection::Video; } -void IMDBFetcher::readConfigHook(const KConfigGroup& config_) { +void IMDBFetcher::readConfigHook(const TDEConfigGroup& config_) { TQString h = config_.readEntry("Host"); if(!h.isEmpty()) { m_host = h; @@ -164,13 +164,13 @@ void IMDBFetcher::search(FetchKey key_, const TQString& value_) { // myDebug() << "IMDBFetcher::search() url = " << m_url << endl; #endif - m_job = KIO::get(m_url, false, false); - connect(m_job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotComplete(KIO::Job*))); - connect(m_job, TQT_SIGNAL(redirection(KIO::Job *, const KURL&)), - TQT_SLOT(slotRedirection(KIO::Job*, const KURL&))); + m_job = TDEIO::get(m_url, false, false); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)), + TQT_SLOT(slotRedirection(TDEIO::Job*, const KURL&))); } void IMDBFetcher::continueSearch() { @@ -217,17 +217,17 @@ void IMDBFetcher::stop() { emit signalDone(this); } -void IMDBFetcher::slotData(KIO::Job*, const TQByteArray& data_) { +void IMDBFetcher::slotData(TDEIO::Job*, const TQByteArray& data_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(data_.data(), data_.size()); } -void IMDBFetcher::slotRedirection(KIO::Job*, const KURL& toURL_) { +void IMDBFetcher::slotRedirection(TDEIO::Job*, const KURL& toURL_) { m_url = toURL_; m_redirected = true; } -void IMDBFetcher::slotComplete(KIO::Job* job_) { +void IMDBFetcher::slotComplete(TDEIO::Job* job_) { // since the fetch is done, don't worry about holding the job pointer m_job = 0; @@ -608,13 +608,13 @@ void IMDBFetcher::parseMultipleNameResults() { // redirected is true since that's how I tell if an exact match has been found m_redirected = true; m_data.truncate(0); - m_job = KIO::get(m_url, false, false); - connect(m_job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotComplete(KIO::Job*))); - connect(m_job, TQT_SIGNAL(redirection(KIO::Job *, const KURL&)), - TQT_SLOT(slotRedirection(KIO::Job*, const KURL&))); + m_job = TDEIO::get(m_url, false, false); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)), + TQT_SLOT(slotRedirection(TDEIO::Job*, const KURL&))); // do not stop() here } @@ -1106,13 +1106,13 @@ void IMDBFetcher::updateEntry(Data::EntryPtr entry_) { m_matches.clear(); m_url = link; m_redirected = true; // m_redirected is used as a flag later to tell if we get a single result - m_job = KIO::get(m_url, false, false); - connect(m_job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotComplete(KIO::Job*))); - connect(m_job, TQT_SIGNAL(redirection(KIO::Job *, const KURL&)), - TQT_SLOT(slotRedirection(KIO::Job*, const KURL&))); + m_job = TDEIO::get(m_url, false, false); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)), + TQT_SLOT(slotRedirection(TDEIO::Job*, const KURL&))); return; } // optimistically try searching for title and rely on Collection::sameEntry() to figure things out @@ -1179,7 +1179,7 @@ IMDBFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const IMDBFetcher* fe } } -void IMDBFetcher::ConfigWidget::saveConfig(KConfigGroup& config_) { +void IMDBFetcher::ConfigWidget::saveConfig(TDEConfigGroup& config_) { TQString host = m_hostEdit->text().stripWhiteSpace(); if(!host.isEmpty()) { config_.writeEntry("Host", host); diff --git a/src/fetch/imdbfetcher.h b/src/fetch/imdbfetcher.h index e3f7827..75549fe 100644 --- a/src/fetch/imdbfetcher.h +++ b/src/fetch/imdbfetcher.h @@ -56,7 +56,7 @@ public: virtual Data::EntryPtr fetchEntry(uint uid); virtual Type type() const { return IMDB; } virtual bool canFetch(int type) const; - virtual void readConfigHook(const KConfigGroup& config); + virtual void readConfigHook(const TDEConfigGroup& config); virtual void updateEntry(Data::EntryPtr entry); @@ -67,7 +67,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: ConfigWidget(TQWidget* parent_, const IMDBFetcher* fetcher = 0); - virtual void saveConfig(KConfigGroup& config); + virtual void saveConfig(TDEConfigGroup& config); virtual TQString preferredName() const; private: @@ -80,9 +80,9 @@ public: static TQString defaultName(); private slots: - void slotData(KIO::Job* job, const TQByteArray& data); - void slotComplete(KIO::Job* job); - void slotRedirection(KIO::Job* job, const KURL& toURL); + void slotData(TDEIO::Job* job, const TQByteArray& data); + void slotComplete(TDEIO::Job* job); + void slotRedirection(TDEIO::Job* job, const KURL& toURL); private: static void initRegExps(); @@ -114,7 +114,7 @@ private: TQByteArray m_data; TQMap<int, Data::EntryPtr> m_entries; TQMap<int, KURL> m_matches; - TQGuardedPtr<KIO::Job> m_job; + TQGuardedPtr<TDEIO::Job> m_job; FetchKey m_key; TQString m_value; diff --git a/src/fetch/isbndbfetcher.cpp b/src/fetch/isbndbfetcher.cpp index cc4dcb2..d0c93c1 100644 --- a/src/fetch/isbndbfetcher.cpp +++ b/src/fetch/isbndbfetcher.cpp @@ -62,7 +62,7 @@ bool ISBNdbFetcher::canFetch(int type) const { return type == Data::Collection::Book || type == Data::Collection::ComicBook || type == Data::Collection::Bibtex; } -void ISBNdbFetcher::readConfigHook(const KConfigGroup& config_) { +void ISBNdbFetcher::readConfigHook(const TDEConfigGroup& config_) { Q_UNUSED(config_); } @@ -133,11 +133,11 @@ void ISBNdbFetcher::doSearch() { } // myDebug() << "ISBNdbFetcher::search() - url: " << u.url() << endl; - m_job = KIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotComplete(KIO::Job*))); + m_job = TDEIO::get(u, false, false); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotComplete(TDEIO::Job*))); } void ISBNdbFetcher::stop() { @@ -154,12 +154,12 @@ void ISBNdbFetcher::stop() { emit signalDone(this); } -void ISBNdbFetcher::slotData(KIO::Job*, const TQByteArray& data_) { +void ISBNdbFetcher::slotData(TDEIO::Job*, const TQByteArray& data_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(data_.data(), data_.size()); } -void ISBNdbFetcher::slotComplete(KIO::Job* job_) { +void ISBNdbFetcher::slotComplete(TDEIO::Job* job_) { // myDebug() << "ISBNdbFetcher::slotComplete()" << endl; // since the fetch is done, don't worry about holding the job pointer m_job = 0; diff --git a/src/fetch/isbndbfetcher.h b/src/fetch/isbndbfetcher.h index 681c65a..75e3dbf 100644 --- a/src/fetch/isbndbfetcher.h +++ b/src/fetch/isbndbfetcher.h @@ -50,7 +50,7 @@ public: virtual Data::EntryPtr fetchEntry(uint uid); virtual Type type() const { return ISBNdb; } virtual bool canFetch(int type) const; - virtual void readConfigHook(const KConfigGroup& config); + virtual void readConfigHook(const TDEConfigGroup& config); virtual void updateEntry(Data::EntryPtr entry); @@ -59,7 +59,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: ConfigWidget(TQWidget* parent_, const ISBNdbFetcher* fetcher = 0); - virtual void saveConfig(KConfigGroup&) {} + virtual void saveConfig(TDEConfigGroup&) {} virtual TQString preferredName() const; }; friend class ConfigWidget; @@ -67,8 +67,8 @@ public: static TQString defaultName(); private slots: - void slotData(KIO::Job* job, const TQByteArray& data); - void slotComplete(KIO::Job* job); + void slotData(TDEIO::Job* job, const TQByteArray& data); + void slotComplete(TDEIO::Job* job); private: void initXSLTHandler(); @@ -83,7 +83,7 @@ private: TQByteArray m_data; TQMap<int, Data::EntryPtr> m_entries; - TQGuardedPtr<KIO::Job> m_job; + TQGuardedPtr<TDEIO::Job> m_job; FetchKey m_key; TQString m_value; diff --git a/src/fetch/srufetcher.cpp b/src/fetch/srufetcher.cpp index 24d9ec0..505fa74 100644 --- a/src/fetch/srufetcher.cpp +++ b/src/fetch/srufetcher.cpp @@ -81,7 +81,7 @@ bool SRUFetcher::canFetch(int type) const { return type == Data::Collection::Book || type == Data::Collection::Bibtex; } -void SRUFetcher::readConfigHook(const KConfigGroup& config_) { +void SRUFetcher::readConfigHook(const TDEConfigGroup& config_) { m_host = config_.readEntry("Host"); int p = config_.readNumEntry("Port", SRU_DEFAULT_PORT); if(p > 0) { @@ -183,11 +183,11 @@ void SRUFetcher::search(FetchKey key_, const TQString& value_) { #endif // myDebug() << u.prettyURL() << endl; - m_job = KIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotComplete(KIO::Job*))); + m_job = TDEIO::get(u, false, false); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotComplete(TDEIO::Job*))); } void SRUFetcher::stop() { @@ -203,12 +203,12 @@ void SRUFetcher::stop() { emit signalDone(this); } -void SRUFetcher::slotData(KIO::Job*, const TQByteArray& data_) { +void SRUFetcher::slotData(TDEIO::Job*, const TQByteArray& data_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(data_.data(), data_.size()); } -void SRUFetcher::slotComplete(KIO::Job* job_) { +void SRUFetcher::slotComplete(TDEIO::Job* job_) { // since the fetch is done, don't worry about holding the job pointer m_job = 0; @@ -495,7 +495,7 @@ SRUConfigWidget::SRUConfigWidget(TQWidget* parent_, const SRUFetcher* fetcher_ / KAcceleratorManager::manage(optionsWidget()); } -void SRUConfigWidget::saveConfig(KConfigGroup& config_) { +void SRUConfigWidget::saveConfig(TDEConfigGroup& config_) { TQString s = m_hostEdit->text().stripWhiteSpace(); if(!s.isEmpty()) { config_.writeEntry("Host", s); diff --git a/src/fetch/srufetcher.h b/src/fetch/srufetcher.h index f635071..1b6c2b4 100644 --- a/src/fetch/srufetcher.h +++ b/src/fetch/srufetcher.h @@ -24,7 +24,7 @@ namespace Tellico { class KIntSpinBox; class KComboBox; -namespace KIO { +namespace TDEIO { class Job; } @@ -73,7 +73,7 @@ public: virtual Data::EntryPtr fetchEntry(uint uid); virtual Type type() const { return SRU; } virtual bool canFetch(int type) const; - virtual void readConfigHook(const KConfigGroup& config); + virtual void readConfigHook(const TDEConfigGroup& config); virtual void updateEntry(Data::EntryPtr entry); @@ -86,8 +86,8 @@ public: static Fetcher::Ptr libraryOfCongress(TQObject* parent); private slots: - void slotData(KIO::Job* job, const TQByteArray& data); - void slotComplete(KIO::Job* job); + void slotData(TDEIO::Job* job, const TQByteArray& data); + void slotComplete(TDEIO::Job* job); private: bool initMARCXMLHandler(); @@ -100,7 +100,7 @@ private: TQByteArray m_data; TQMap<int, Data::EntryPtr> m_entries; - TQGuardedPtr<KIO::Job> m_job; + TQGuardedPtr<TDEIO::Job> m_job; XSLTHandler* m_MARCXMLHandler; XSLTHandler* m_MODSHandler; bool m_started; @@ -115,7 +115,7 @@ friend class SRUFetcher; public: SRUConfigWidget(TQWidget* parent_, const SRUFetcher* fetcher = 0); - virtual void saveConfig(KConfigGroup& config); + virtual void saveConfig(TDEConfigGroup& config); virtual TQString preferredName() const; private slots: diff --git a/src/fetch/yahoofetcher.cpp b/src/fetch/yahoofetcher.cpp index 2746f90..fe6d407 100644 --- a/src/fetch/yahoofetcher.cpp +++ b/src/fetch/yahoofetcher.cpp @@ -62,7 +62,7 @@ bool YahooFetcher::canFetch(int type) const { return type == Data::Collection::Album; } -void YahooFetcher::readConfigHook(const KConfigGroup& config_) { +void YahooFetcher::readConfigHook(const TDEConfigGroup& config_) { Q_UNUSED(config_); } @@ -119,11 +119,11 @@ void YahooFetcher::doSearch() { } // myDebug() << "YahooFetcher::search() - url: " << u.url() << endl; - m_job = KIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotComplete(KIO::Job*))); + m_job = TDEIO::get(u, false, false); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotComplete(TDEIO::Job*))); } void YahooFetcher::stop() { @@ -139,12 +139,12 @@ void YahooFetcher::stop() { emit signalDone(this); } -void YahooFetcher::slotData(KIO::Job*, const TQByteArray& data_) { +void YahooFetcher::slotData(TDEIO::Job*, const TQByteArray& data_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(data_.data(), data_.size()); } -void YahooFetcher::slotComplete(KIO::Job* job_) { +void YahooFetcher::slotComplete(TDEIO::Job* job_) { // myDebug() << "YahooFetcher::slotComplete()" << endl; // since the fetch is done, don't worry about holding the job pointer m_job = 0; diff --git a/src/fetch/yahoofetcher.h b/src/fetch/yahoofetcher.h index 1620520..efaf95f 100644 --- a/src/fetch/yahoofetcher.h +++ b/src/fetch/yahoofetcher.h @@ -25,7 +25,7 @@ namespace Tellico { #include <tqcstring.h> // for TQByteArray #include <tqguardedptr.h> -namespace KIO { +namespace TDEIO { class Job; } @@ -58,7 +58,7 @@ public: virtual Data::EntryPtr fetchEntry(uint uid); virtual Type type() const { return Yahoo; } virtual bool canFetch(int type) const; - virtual void readConfigHook(const KConfigGroup& config); + virtual void readConfigHook(const TDEConfigGroup& config); virtual void updateEntry(Data::EntryPtr entry); @@ -70,7 +70,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: ConfigWidget(TQWidget* parent_, const YahooFetcher* fetcher = 0); - virtual void saveConfig(KConfigGroup&) {} + virtual void saveConfig(TDEConfigGroup&) {} virtual TQString preferredName() const; }; friend class ConfigWidget; @@ -78,8 +78,8 @@ public: static TQString defaultName(); private slots: - void slotData(KIO::Job* job, const TQByteArray& data); - void slotComplete(KIO::Job* job); + void slotData(TDEIO::Job* job, const TQByteArray& data); + void slotComplete(TDEIO::Job* job); private: void initXSLTHandler(); @@ -94,7 +94,7 @@ private: TQByteArray m_data; TQMap<int, Data::EntryPtr> m_entries; // they get modified after collection is created, so can't be const - TQGuardedPtr<KIO::Job> m_job; + TQGuardedPtr<TDEIO::Job> m_job; FetchKey m_key; TQString m_value; diff --git a/src/fetch/z3950fetcher.cpp b/src/fetch/z3950fetcher.cpp index 9083c17..3be46fc 100644 --- a/src/fetch/z3950fetcher.cpp +++ b/src/fetch/z3950fetcher.cpp @@ -88,7 +88,7 @@ bool Z3950Fetcher::canFetch(int type) const { return type == Data::Collection::Book || type == Data::Collection::Bibtex; } -void Z3950Fetcher::readConfigHook(const KConfigGroup& config_) { +void Z3950Fetcher::readConfigHook(const TDEConfigGroup& config_) { TQString preset = config_.readEntry("Preset"); if(preset.isEmpty()) { m_host = config_.readEntry("Host"); @@ -105,7 +105,7 @@ void Z3950Fetcher::readConfigHook(const KConfigGroup& config_) { m_preset = preset; TQString serverFile = locate("appdata", TQString::fromLatin1("z3950-servers.cfg")); if(!serverFile.isEmpty()) { - KConfig cfg(serverFile, true /* read-only */, false /* read KDE */); + TDEConfig cfg(serverFile, true /* read-only */, false /* read KDE */); const TQStringList servers = cfg.groupList(); for(TQStringList::ConstIterator server = servers.begin(); server != servers.end(); ++server) { cfg.setGroup(*server); @@ -128,7 +128,7 @@ void Z3950Fetcher::readConfigHook(const KConfigGroup& config_) { m_fields = config_.readListEntry("Custom Fields"); } -void Z3950Fetcher::saveConfigHook(KConfigGroup& config_) { +void Z3950Fetcher::saveConfigHook(TDEConfigGroup& config_) { config_.writeEntry("Syntax", m_syntax); config_.sync(); } @@ -644,7 +644,7 @@ Z3950Fetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const Z3950Fetcher* Z3950Fetcher::ConfigWidget::~ConfigWidget() { } -void Z3950Fetcher::ConfigWidget::saveConfig(KConfigGroup& config_) { +void Z3950Fetcher::ConfigWidget::saveConfig(TDEConfigGroup& config_) { if(m_usePreset->isChecked()) { TQString presetID = m_serverCombo->currentData().toString(); config_.writeEntry("Preset", presetID); @@ -735,7 +735,7 @@ void Z3950Fetcher::ConfigWidget::loadPresets(const TQString& current_) { int idx = -1; - KConfig cfg(serverFile, true /* read-only */, false /* read KDE */); + TDEConfig cfg(serverFile, true /* read-only */, false /* read KDE */); const TQStringList servers = cfg.groupList(); // I want the list of servers sorted by name TQMap<TQString, TQString> serverNameMap; diff --git a/src/fetch/z3950fetcher.h b/src/fetch/z3950fetcher.h index 0618b65..b5bb688 100644 --- a/src/fetch/z3950fetcher.h +++ b/src/fetch/z3950fetcher.h @@ -67,8 +67,8 @@ public: virtual Data::EntryPtr fetchEntry(uint uid); virtual Type type() const { return Z3950; } virtual bool canFetch(int type) const; - virtual void readConfigHook(const KConfigGroup& config); - virtual void saveConfigHook(KConfigGroup& config); + virtual void readConfigHook(const TDEConfigGroup& config); + virtual void saveConfigHook(TDEConfigGroup& config); virtual void updateEntry(Data::EntryPtr entry); const TQString& host() const { return m_host; } @@ -127,7 +127,7 @@ Q_OBJECT public: ConfigWidget(TQWidget* parent, const Z3950Fetcher* fetcher = 0); virtual ~ConfigWidget(); - virtual void saveConfig(KConfigGroup& config_); + virtual void saveConfig(TDEConfigGroup& config_); virtual TQString preferredName() const; private slots: diff --git a/src/fetchdialog.cpp b/src/fetchdialog.cpp index 5b7222d..b51d0be 100644 --- a/src/fetchdialog.cpp +++ b/src/fetchdialog.cpp @@ -227,7 +227,7 @@ FetchDialog::FetchDialog(TQWidget* parent_, const char* name_) resize(configDialogSize(TQString::fromLatin1("Fetch Dialog Options"))); - KConfigGroup config(kapp->config(), "Fetch Dialog Options"); + TDEConfigGroup config(kapp->config(), "Fetch Dialog Options"); TQValueList<int> splitList = config.readIntListEntry("Splitter Sizes"); if(!splitList.empty()) { split->setSizes(splitList); @@ -287,7 +287,7 @@ FetchDialog::~FetchDialog() { saveDialogSize(TQString::fromLatin1("Fetch Dialog Options")); - KConfigGroup config(kapp->config(), "Fetch Dialog Options"); + TDEConfigGroup config(kapp->config(), "Fetch Dialog Options"); config.writeEntry("Splitter Sizes", static_cast<TQSplitter*>(m_listView->parentWidget())->sizes()); config.writeEntry("Search Key", m_keyCombo->currentData().toInt()); config.writeEntry("Search Source", m_sourceCombo->currentText()); @@ -530,7 +530,7 @@ void FetchDialog::slotInit() { Kernel::self()->sorry(i18n("No Internet sources are available for your current collection type."), this); } - KConfigGroup config(kapp->config(), "Fetch Dialog Options"); + TDEConfigGroup config(kapp->config(), "Fetch Dialog Options"); int key = config.readNumEntry("Search Key", Fetch::FetchFirst); // only change key if valid if(key > Fetch::FetchFirst) { diff --git a/src/filehandler.cpp b/src/filehandler.cpp index 10c5405..96a1ef9 100644 --- a/src/filehandler.cpp +++ b/src/filehandler.cpp @@ -37,9 +37,9 @@ using Tellico::FileHandler; class FileHandler::ItemDeleter : public TQObject { public: - ItemDeleter(KIO::Job* job, KFileItem* item) : TQObject(), m_job(job), m_item(item) { + ItemDeleter(TDEIO::Job* job, KFileItem* item) : TQObject(), m_job(job), m_item(item) { FileHandler::s_deleterList.append(this); - connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(deleteLater())); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(deleteLater())); } ~ItemDeleter() { FileHandler::s_deleterList.removeRef(this); @@ -47,7 +47,7 @@ public: delete m_item; m_item = 0; } private: - TQGuardedPtr<KIO::Job> m_job; + TQGuardedPtr<TDEIO::Job> m_job; KFileItem* m_item; }; @@ -60,7 +60,7 @@ FileHandler::FileRef::FileRef(const KURL& url_, bool quiet_, bool allowCompresse if(!Tellico::NetAccess::download(url_, m_filename, Kernel::self()->widget())) { myDebug() << "FileRef::FileRef() - can't download " << url_ << endl; - TQString s = KIO::NetAccess::lastErrorString(); + TQString s = TDEIO::NetAccess::lastErrorString(); if(!s.isEmpty()) { myDebug() << s << endl; } @@ -183,10 +183,10 @@ Tellico::Data::Image* FileHandler::readImageFile(const KURL& url_, bool quiet_, tmpURL.setPath(tmpFile.name()); tmpFile.setAutoDelete(true); - KIO::Job* job = KIO::file_copy(url_, tmpURL, -1, true /* overwrite */); + TDEIO::Job* job = TDEIO::file_copy(url_, tmpURL, -1, true /* overwrite */); job->addMetaData(TQString::fromLatin1("referrer"), referrer_.url()); - if(!KIO::NetAccess::synchronousRun(job, Kernel::self()->widget())) { + if(!TDEIO::NetAccess::synchronousRun(job, Kernel::self()->widget())) { if(!quiet_) { Kernel::self()->sorry(i18n(errorLoad).arg(url_.fileName())); } @@ -210,7 +210,7 @@ Tellico::Data::Image* FileHandler::readImageFile(const KURL& url_, bool quiet_) } bool FileHandler::queryExists(const KURL& url_) { - if(url_.isEmpty() || !KIO::NetAccess::exists(url_, false, Kernel::self()->widget())) { + if(url_.isEmpty() || !TDEIO::NetAccess::exists(url_, false, Kernel::self()->widget())) { return true; } @@ -238,7 +238,7 @@ bool FileHandler::queryExists(const KURL& url_) { KFileItemList list; int perm = -1; TQString grp; - if(KIO::NetAccess::exists(url_, false, Kernel::self()->widget())) { + if(TDEIO::NetAccess::exists(url_, false, Kernel::self()->widget())) { KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url_, true); perm = item.permissions(); grp = item.group(); @@ -250,12 +250,12 @@ bool FileHandler::queryExists(const KURL& url_) { success = KSaveFile::backupFile(url_.path()); if(!list.isEmpty()) { // have to leave the user alone - KIO::Job* job = KIO::chmod(list, perm, 0, TQString(), grp, true, false); + TDEIO::Job* job = TDEIO::chmod(list, perm, 0, TQString(), grp, true, false); new ItemDeleter(job, list.first()); } } else { - KIO::NetAccess::del(backup, Kernel::self()->widget()); // might fail if backup doesn't exist, that's ok - success = KIO::NetAccess::file_copy(url_, backup, -1 /* permissions */, true /* overwrite */, + TDEIO::NetAccess::del(backup, Kernel::self()->widget()); // might fail if backup doesn't exist, that's ok + success = TDEIO::NetAccess::file_copy(url_, backup, -1 /* permissions */, true /* overwrite */, false /* resume */, Kernel::self()->widget()); } if(!success) { @@ -278,7 +278,7 @@ bool FileHandler::writeTextURL(const KURL& url_, const TQString& text_, bool enc KFileItemList list; int perm = -1; TQString grp; - if(KIO::NetAccess::exists(url_, false, Kernel::self()->widget())) { + if(TDEIO::NetAccess::exists(url_, false, Kernel::self()->widget())) { KFileItem* item = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, url_, true); list.append(item); perm = item->permissions(); @@ -295,7 +295,7 @@ bool FileHandler::writeTextURL(const KURL& url_, const TQString& text_, bool enc bool success = FileHandler::writeTextFile(f, text_, encodeUTF8_); if(!list.isEmpty()) { // have to leave the user alone - KIO::Job* job = KIO::chmod(list, perm, 0, TQString(), grp, true, false); + TDEIO::Job* job = TDEIO::chmod(list, perm, 0, TQString(), grp, true, false); new ItemDeleter(job, list.first()); } return success; @@ -314,7 +314,7 @@ bool FileHandler::writeTextURL(const KURL& url_, const TQString& text_, bool enc bool success = FileHandler::writeTextFile(f, text_, encodeUTF8_); if(success) { - bool uploaded = KIO::NetAccess::upload(tempfile.name(), url_, Kernel::self()->widget()); + bool uploaded = TDEIO::NetAccess::upload(tempfile.name(), url_, Kernel::self()->widget()); if(!uploaded) { tempfile.unlink(); if(!quiet_) { @@ -359,7 +359,7 @@ bool FileHandler::writeDataURL(const KURL& url_, const TQByteArray& data_, bool KFileItemList list; int perm = -1; TQString grp; - if(KIO::NetAccess::exists(url_, false, Kernel::self()->widget())) { + if(TDEIO::NetAccess::exists(url_, false, Kernel::self()->widget())) { KFileItem* item = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, url_, true); list.append(item); perm = item->permissions(); @@ -376,7 +376,7 @@ bool FileHandler::writeDataURL(const KURL& url_, const TQByteArray& data_, bool bool success = FileHandler::writeDataFile(f, data_); if(!list.isEmpty()) { // have to leave the user alone - KIO::Job* job = KIO::chmod(list, perm, 0, TQString(), grp, true, false); + TDEIO::Job* job = TDEIO::chmod(list, perm, 0, TQString(), grp, true, false); new ItemDeleter(job, list.first()); } return success; @@ -394,7 +394,7 @@ bool FileHandler::writeDataURL(const KURL& url_, const TQByteArray& data_, bool bool success = FileHandler::writeDataFile(f, data_); if(success) { - success = KIO::NetAccess::upload(tempfile.name(), url_, Kernel::self()->widget()); + success = TDEIO::NetAccess::upload(tempfile.name(), url_, Kernel::self()->widget()); if(!success && !quiet_) { Kernel::self()->sorry(i18n(errorUpload).arg(url_.fileName())); } diff --git a/src/filehandler.h b/src/filehandler.h index d4c6af0..653f84f 100644 --- a/src/filehandler.h +++ b/src/filehandler.h @@ -21,7 +21,7 @@ class KURL; class KSaveFile; class KFileItem; -namespace KIO { +namespace TDEIO { class Job; } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index b5e2a4b..18d7738 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -776,7 +776,7 @@ void MainWindow::initDocument() { MARK; Data::Document* doc = Data::Document::self(); - KConfigGroup config(TDEGlobal::config(), "General Options"); + TDEConfigGroup config(TDEGlobal::config(), "General Options"); doc->setLoadAllImages(config.readBoolEntry("Load All Images", false)); // allow status messages from the document @@ -924,7 +924,7 @@ void MainWindow::saveOptions() { } void MainWindow::readCollectionOptions(Data::CollPtr coll_) { - KConfigGroup group(TDEGlobal::config(), TQString::fromLatin1("Options - %1").arg(coll_->typeName())); + TDEConfigGroup group(TDEGlobal::config(), TQString::fromLatin1("Options - %1").arg(coll_->typeName())); TQString defaultGroup = coll_->defaultGroupField(); TQString entryGroup; @@ -966,7 +966,7 @@ void MainWindow::saveCollectionOptions(Data::CollPtr coll_) { } int configIndex = -1; - KConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("Options - %1").arg(coll_->typeName())); + TDEConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("Options - %1").arg(coll_->typeName())); TQString groupName; if(m_entryGrouping->currentItem() > -1 && static_cast<int>(coll_->entryGroups().count()) > m_entryGrouping->currentItem()) { @@ -1047,7 +1047,7 @@ void MainWindow::readOptions() { // Put them in init() } -void MainWindow::saveProperties(KConfig* cfg_) { +void MainWindow::saveProperties(TDEConfig* cfg_) { if(!isNewDocument() && !Data::Document::self()->isModified()) { // saving to tempfile not necessary } else { @@ -1061,7 +1061,7 @@ void MainWindow::saveProperties(KConfig* cfg_) { } } -void MainWindow::readProperties(KConfig* cfg_) { +void MainWindow::readProperties(TDEConfig* cfg_) { TQString filename = cfg_->readEntry(TQString::fromLatin1("filename")); bool modified = cfg_->readBoolEntry(TQString::fromLatin1("modified"), false); if(modified) { @@ -1908,7 +1908,7 @@ void MainWindow::slotFileImport(int format_) { } if(checkURL) { - bool ok = !url.isEmpty() && url.isValid() && KIO::NetAccess::exists(url, true, this); + bool ok = !url.isEmpty() && url.isValid() && TDEIO::NetAccess::exists(url, true, this); if(!ok) { StatusBar::self()->clearStatus(); return; @@ -2062,7 +2062,7 @@ bool MainWindow::importFile(Import::Format format_, const KURL& url_, Import::Ac bool failed = false; Data::CollPtr coll; - if(!url_.isEmpty() && url_.isValid() && KIO::NetAccess::exists(url_, true, this)) { + if(!url_.isEmpty() && url_.isValid() && TDEIO::NetAccess::exists(url_, true, this)) { coll = ImportDialog::importURL(format_, url_); } else { Kernel::self()->sorry(i18n(errorLoad).arg(url_.fileName())); diff --git a/src/mainwindow.h b/src/mainwindow.h index a9b2ba4..4c2e5be 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -66,7 +66,7 @@ namespace Tellico { * using KActions. * @see KMainWindow * @see TDEApplication - * @see KConfig + * @see TDEConfig * * @author Robby Stephenson */ @@ -339,7 +339,7 @@ private: * * @param cfg The config class with the properties to restore */ - void saveProperties(KConfig* cfg); + void saveProperties(TDEConfig* cfg); /** * Reads the session config file and restores the application's state including * the last opened files and documents by reading the temporary files saved by @@ -348,7 +348,7 @@ private: * * @param cfg The config class with the properties to restore */ - void readProperties(KConfig* cfg); + void readProperties(TDEConfig* cfg); /** * Called before the window is closed, either by the user or indirectely by the * session manager. diff --git a/src/newstuff/dialog.cpp b/src/newstuff/dialog.cpp index 31e41db..0d21c69 100644 --- a/src/newstuff/dialog.cpp +++ b/src/newstuff/dialog.cpp @@ -215,7 +215,7 @@ Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_) setMinimumHeight(TQMAX(minimumHeight(), NEW_STUFF_MIN_HEIGHT)); resize(configDialogSize(TQString::fromLatin1("NewStuff Dialog Options"))); - KConfigGroup dialogConfig(TDEGlobal::config(), "NewStuff Dialog Options"); + TDEConfigGroup dialogConfig(TDEGlobal::config(), "NewStuff Dialog Options"); TQValueList<int> splitList = dialogConfig.readIntListEntry("Splitter Sizes"); if(!splitList.empty()) { m_split->setSizes(splitList); @@ -225,10 +225,10 @@ Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_) ProviderLoader* loader = new Tellico::NewStuff::ProviderLoader(this); connect(loader, TQT_SIGNAL(providersLoaded(TQPtrList<KNS::Provider>*)), TQT_SLOT(slotProviders(TQPtrList<KNS::Provider>*))); - connect(loader, TQT_SIGNAL(percent(KIO::Job*, unsigned long)), TQT_SLOT(slotShowPercent(KIO::Job*, unsigned long))); + connect(loader, TQT_SIGNAL(percent(TDEIO::Job*, unsigned long)), TQT_SLOT(slotShowPercent(TDEIO::Job*, unsigned long))); connect(loader, TQT_SIGNAL(error()), TQT_SLOT(slotProviderError())); - KConfigGroup config(TDEGlobal::config(), "KNewStuff"); + TDEConfigGroup config(TDEGlobal::config(), "KNewStuff"); TQString prov = config.readEntry("ProvidersUrl"); if(prov.isEmpty()) { if(m_type == EntryTemplate) { @@ -254,7 +254,7 @@ Dialog::~Dialog() { m_cursorSaver = 0; saveDialogSize(TQString::fromLatin1("NewStuff Dialog Options")); - KConfigGroup config(TDEGlobal::config(), "NewStuff Dialog Options"); + TDEConfigGroup config(TDEGlobal::config(), "NewStuff Dialog Options"); config.writeEntry("Splitter Sizes", m_split->sizes()); } @@ -270,22 +270,22 @@ void Dialog::slotProviderError() { void Dialog::slotProviders(TQPtrList<KNS::Provider>* list_) { for(KNS::Provider* prov = list_->first(); prov; prov = list_->next()) { - KIO::TransferJob* job = KIO::get(prov->downloadUrl()); + TDEIO::TransferJob* job = TDEIO::get(prov->downloadUrl()); m_jobs[job] = prov; - connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); - connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotResult(KIO::Job*))); - connect(job, TQT_SIGNAL(percent(KIO::Job*, unsigned long)), - TQT_SLOT(slotShowPercent(KIO::Job*, unsigned long))); + connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQT_SIGNAL(percent(TDEIO::Job*, unsigned long)), + TQT_SLOT(slotShowPercent(TDEIO::Job*, unsigned long))); } } -void Dialog::slotData(KIO::Job* job_, const TQByteArray& data_) { +void Dialog::slotData(TDEIO::Job* job_, const TQByteArray& data_) { TQDataStream stream(m_data[job_], IO_WriteOnly | IO_Append); stream.writeRawBytes(data_.data(), data_.size()); } -void Dialog::slotResult(KIO::Job* job_) { +void Dialog::slotResult(TDEIO::Job* job_) { // myDebug() << "NewStuff::Dialog::slotResult()" << endl; TQDomDocument dom; if(!dom.setContent(m_data[job_])) { @@ -364,10 +364,10 @@ void Dialog::slotSelected(TQListViewItem* item_) { m_tempPreviewImage->setAutoDelete(true); KURL dest; dest.setPath(m_tempPreviewImage->name()); - KIO::FileCopyJob* job = KIO::file_copy(preview, dest, -1, true, false, false); - connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotPreviewResult(KIO::Job*))); - connect(job, TQT_SIGNAL(percent(KIO::Job*, unsigned long)), - TQT_SLOT(slotShowPercent(KIO::Job*, unsigned long))); + TDEIO::FileCopyJob* job = TDEIO::file_copy(preview, dest, -1, true, false, false); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotPreviewResult(TDEIO::Job*))); + connect(job, TQT_SIGNAL(percent(TDEIO::Job*, unsigned long)), + TQT_SLOT(slotShowPercent(TDEIO::Job*, unsigned long))); m_lastPreviewItem = item_; } TQPixmap pix = m_type == EntryTemplate @@ -444,7 +444,7 @@ void Dialog::setStatus(const TQString& text_) { m_statusBar->changeItem(TQChar(' ') + text_, PROGRESS_STATUS_ID); } -void Dialog::slotShowPercent(KIO::Job*, unsigned long pct_) { +void Dialog::slotShowPercent(TDEIO::Job*, unsigned long pct_) { if(pct_ >= 100) { m_progress->hide(); } else { @@ -453,8 +453,8 @@ void Dialog::slotShowPercent(KIO::Job*, unsigned long pct_) { } } -void Dialog::slotPreviewResult(KIO::Job* job_) { - KIO::FileCopyJob* job = static_cast<KIO::FileCopyJob*>(job_); +void Dialog::slotPreviewResult(TDEIO::Job* job_) { + TDEIO::FileCopyJob* job = static_cast<TDEIO::FileCopyJob*>(job_); if(job->error()) { return; } diff --git a/src/newstuff/dialog.h b/src/newstuff/dialog.h index 65046ca..082fbd8 100644 --- a/src/newstuff/dialog.h +++ b/src/newstuff/dialog.h @@ -20,7 +20,7 @@ class KPushButton; class KStatusBar; -namespace KIO { +namespace TDEIO { class Job; } namespace KNS { @@ -53,11 +53,11 @@ public: private slots: void slotProviders(TQPtrList<KNS::Provider>* list); - void slotData(KIO::Job* job, const TQByteArray& data); - void slotResult(KIO::Job* job); - void slotPreviewResult(KIO::Job* job); + void slotData(TDEIO::Job* job, const TQByteArray& data); + void slotResult(TDEIO::Job* job); + void slotPreviewResult(TDEIO::Job* job); - void slotShowPercent(KIO::Job* job, unsigned long percent); + void slotShowPercent(TDEIO::Job* job, unsigned long percent); void slotSelected(TQListViewItem* item); void slotInstall(); @@ -90,8 +90,8 @@ private: GUI::CursorSaver* m_cursorSaver; KTempFile* m_tempPreviewImage; - TQMap<KIO::Job*, KNS::Provider*> m_jobs; - TQMap<KIO::Job*, TQByteArray> m_data; + TQMap<TDEIO::Job*, KNS::Provider*> m_jobs; + TQMap<TDEIO::Job*, TQByteArray> m_data; TQMap<TQListViewItem*, KNS::Entry*> m_entryMap; TQListViewItem* m_lastPreviewItem; diff --git a/src/newstuff/manager.cpp b/src/newstuff/manager.cpp index 8eabc7d..45eae08 100644 --- a/src/newstuff/manager.cpp +++ b/src/newstuff/manager.cpp @@ -83,7 +83,7 @@ bool Manager::installTemplate(const KURL& url_, const TQString& entryName_) { if(TQFile::exists(dest.path())) { myDebug() << "Manager::installTemplate() - " << dest.path() << " exists!" << endl; success = false; - } else if(KIO::NetAccess::file_copy(url_, dest)) { + } else if(TDEIO::NetAccess::file_copy(url_, dest)) { xslFile = dest.fileName(); allFiles += xslFile; } @@ -94,7 +94,7 @@ bool Manager::installTemplate(const KURL& url_, const TQString& entryName_) { } else { // remove ".xsl" xslFile.truncate(xslFile.length()-4); - KConfigGroup config(TDEGlobal::config(), "KNewStuffFiles"); + TDEConfigGroup config(TDEGlobal::config(), "KNewStuffFiles"); config.writeEntry(xslFile, allFiles); m_urlNameMap.insert(url_, xslFile); } @@ -106,7 +106,7 @@ bool Manager::installTemplate(const KURL& url_, const TQString& entryName_) { } bool Manager::removeTemplate(const TQString& name_) { - KConfigGroup fileGroup(TDEGlobal::config(), "KNewStuffFiles"); + TDEConfigGroup fileGroup(TDEGlobal::config(), "KNewStuffFiles"); TQStringList files = fileGroup.readListEntry(name_); // at least, delete xsl file if(files.isEmpty()) { @@ -130,7 +130,7 @@ bool Manager::removeTemplate(const TQString& name_) { // remove config entries even if unsuccessful fileGroup.deleteEntry(name_); - KConfigGroup statusGroup(TDEGlobal::config(), "KNewStuffStatus"); + TDEConfigGroup statusGroup(TDEGlobal::config(), "KNewStuffStatus"); TQString entryName = statusGroup.readEntry(name_); statusGroup.deleteEntry(name_); statusGroup.deleteEntry(entryName); @@ -170,7 +170,7 @@ bool Manager::installScript(const KURL& url_) { KURL u; u.setPath(scriptFolder); myLog() << "Manager::installScript() - deleting " << scriptFolder << endl; - KIO::NetAccess::del(u, Kernel::self()->widget()); + TDEIO::NetAccess::del(u, Kernel::self()->widget()); info->isUpdate = true; } scriptFolder = copyTarget; @@ -200,7 +200,7 @@ bool Manager::installScript(const KURL& url_) { ::chmod(TQFile::encodeName(dest.path()), item.permissions() | S_IXUSR); { - KConfig spec(info->specFile, false, false); + TDEConfig spec(info->specFile, false, false); // update name info->sourceName = spec.readEntry("Name", info->sourceName); spec.writePathEntry("ExecPath", info->sourceExec); @@ -209,7 +209,7 @@ bool Manager::installScript(const KURL& url_) { } { - KConfigGroup config(TDEGlobal::config(), "KNewStuffFiles"); + TDEConfigGroup config(TDEGlobal::config(), "KNewStuffFiles"); config.writeEntry(info->sourceName, archiveFiles(archiveDir)); m_urlNameMap.insert(url_, info->sourceName); } @@ -225,7 +225,7 @@ bool Manager::installScript(const KURL& url_) { } bool Manager::removeScript(const TQString& name_) { - KConfigGroup fileGroup(TDEGlobal::config(), "KNewStuffFiles"); + TDEConfigGroup fileGroup(TDEGlobal::config(), "KNewStuffFiles"); TQStringList files = fileGroup.readListEntry(name_); bool success = true; @@ -244,7 +244,7 @@ bool Manager::removeScript(const TQString& name_) { // remove config entries even if unsuccessful fileGroup.deleteEntry(name_); - KConfigGroup statusGroup(TDEGlobal::config(), "KNewStuffStatus"); + TDEConfigGroup statusGroup(TDEGlobal::config(), "KNewStuffStatus"); TQString entryName = statusGroup.readEntry(name_); statusGroup.deleteEntry(name_); statusGroup.deleteEntry(entryName); @@ -253,7 +253,7 @@ bool Manager::removeScript(const TQString& name_) { } Tellico::NewStuff::InstallStatus Manager::installStatus(KNS::Entry* entry_) { - KConfigGroup config(TDEGlobal::config(), "KNewStuffStatus"); + TDEConfigGroup config(TDEGlobal::config(), "KNewStuffStatus"); TQString datestring = config.readEntry(entry_->name()); if(datestring.isEmpty()) { return NotInstalled; @@ -268,7 +268,7 @@ Tellico::NewStuff::InstallStatus Manager::installStatus(KNS::Entry* entry_) { } // also check that executable files exists - KConfigGroup fileGroup(TDEGlobal::config(), "KNewStuffFiles"); + TDEConfigGroup fileGroup(TDEGlobal::config(), "KNewStuffFiles"); TQStringList files = fileGroup.readListEntry(entry_->name()); TQString path = Tellico::saveLocation(TQString::fromLatin1("data-sources/")); for(TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) { @@ -346,13 +346,13 @@ void Manager::install(DataType type_, KNS::Entry* entry_) { KURL destination; destination.setPath(m_tempFile->name()); - KIO::FileCopyJob* job = KIO::file_copy(entry_->payload(), destination, -1, true); - connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotDownloadJobResult(KIO::Job*))); + TDEIO::FileCopyJob* job = TDEIO::file_copy(entry_->payload(), destination, -1, true); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotDownloadJobResult(TDEIO::Job*))); m_jobMap.insert(job, EntryPair(entry_, type_)); } -void Manager::slotDownloadJobResult(KIO::Job* job_) { - KIO::FileCopyJob* job = static_cast<KIO::FileCopyJob*>(job_); +void Manager::slotDownloadJobResult(TDEIO::Job* job_) { + TDEIO::FileCopyJob* job = static_cast<TDEIO::FileCopyJob*>(job_); if(job->error()) { GUI::CursorSaver cs(TQt::arrowCursor); delete m_tempFile; @@ -394,7 +394,7 @@ void Manager::slotInstallFinished() { if(newScript && newScript->successfulInstall()) { const TQString name = m_urlNameMap[newScript->url()]; KNS::Entry* entry = m_scriptEntryMap[newScript]; - KConfigGroup config(TDEGlobal::config(), "KNewStuffStatus"); + TDEConfigGroup config(TDEGlobal::config(), "KNewStuffStatus"); // have to keep a config entry that maps the name of the file to the name // of the newstuff entry, so we can track which entries are installed // name and entry-name() are probably the same for scripts, but not a problem @@ -440,7 +440,7 @@ bool Manager::checkCommonFile() { KURL src, dest; src.setPath(TDEGlobal::dirs()->findResource("appdata", TQString::fromLatin1("tellico-common.xsl"))); dest.setPath(userCommonFile); - return KIO::NetAccess::file_copy(src, dest); + return TDEIO::NetAccess::file_copy(src, dest); } #include "manager.moc" diff --git a/src/newstuff/manager.h b/src/newstuff/manager.h index 73b77a5..f979ac1 100644 --- a/src/newstuff/manager.h +++ b/src/newstuff/manager.h @@ -26,7 +26,7 @@ class TQStringList; namespace KNS { class Entry; } -namespace KIO { +namespace TDEIO { class Job; } @@ -78,7 +78,7 @@ signals: void signalInstalled(KNS::Entry* entry); private slots: - void slotDownloadJobResult(KIO::Job* job); + void slotDownloadJobResult(TDEIO::Job* job); void slotInstallFinished(); private: @@ -89,7 +89,7 @@ private: static TQString findEXE(const KArchiveDirectory* dir); typedef TQPair<KNS::Entry*, DataType> EntryPair; - TQMap<KIO::Job*, EntryPair> m_jobMap; + TQMap<TDEIO::Job*, EntryPair> m_jobMap; TQMap<KURL, TQString> m_urlNameMap; TQMap<const NewScript*, KNS::Entry*> m_scriptEntryMap; TQPtrList<DataSourceInfo> m_infoList; diff --git a/src/newstuff/providerloader.cpp b/src/newstuff/providerloader.cpp index 20eda49..0f12a7e 100644 --- a/src/newstuff/providerloader.cpp +++ b/src/newstuff/providerloader.cpp @@ -43,25 +43,25 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList ) // myLog() << "ProviderLoader::load(): providersList: " << providersList << endl; - KIO::TransferJob *job = KIO::get( KURL( providersList ), false, false ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotJobResult( KIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) ); - connect( job, TQT_SIGNAL( percent (KIO::Job *, unsigned long) ), - TQT_SIGNAL( percent (KIO::Job *, unsigned long) ) ); + TDEIO::TransferJob *job = TDEIO::get( KURL( providersList ), false, false ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQT_SIGNAL( percent (TDEIO::Job *, unsigned long) ), + TQT_SIGNAL( percent (TDEIO::Job *, unsigned long) ) ); // job->dumpObjectInfo(); } -void ProviderLoader::slotJobData( KIO::Job *, const TQByteArray &data ) +void ProviderLoader::slotJobData( TDEIO::Job *, const TQByteArray &data ) { if ( data.size() == 0 ) return; TQCString str( data, data.size() + 1 ); mJobData.append( TQString::fromUtf8( str ) ); } -void ProviderLoader::slotJobResult( KIO::Job *job ) +void ProviderLoader::slotJobResult( TDEIO::Job *job ) { if ( job->error() ) { job->showErrorDialog( mParentWidget ); diff --git a/src/newstuff/providerloader.h b/src/newstuff/providerloader.h index a3dfed1..8b24dbc 100644 --- a/src/newstuff/providerloader.h +++ b/src/newstuff/providerloader.h @@ -24,7 +24,7 @@ #include <tqobject.h> #include <tqptrlist.h> -namespace KIO { +namespace TDEIO { class Job; } namespace KNS { @@ -63,12 +63,12 @@ public: * Indicates that the list of providers has been successfully loaded. */ void providersLoaded( TQPtrList<KNS::Provider>* ); - void percent(KIO::Job *job, unsigned long percent); + void percent(TDEIO::Job *job, unsigned long percent); void error(); protected slots: - void slotJobData( KIO::Job *, const TQByteArray & ); - void slotJobResult( KIO::Job * ); + void slotJobData( TDEIO::Job *, const TQByteArray & ); + void slotJobResult( TDEIO::Job * ); private: TQWidget *mParentWidget; diff --git a/src/reportdialog.cpp b/src/reportdialog.cpp index 0600950..f47ed50 100644 --- a/src/reportdialog.cpp +++ b/src/reportdialog.cpp @@ -195,7 +195,7 @@ void ReportDialog::slotSaveAs() { TQString filter = i18n("*.html|HTML Files (*.html)") + TQChar('\n') + i18n("*|All Files"); KURL u = KFileDialog::getSaveURL(TQString(), filter, this); if(!u.isEmpty() && u.isValid()) { - KConfigGroup config(TDEGlobal::config(), "ExportOptions"); + TDEConfigGroup config(TDEGlobal::config(), "ExportOptions"); bool encode = config.readBoolEntry("EncodeUTF8", true); int oldOpt = m_exporter->options(); diff --git a/src/translators/bibtexexporter.cpp b/src/translators/bibtexexporter.cpp index f987815..2055f39 100644 --- a/src/translators/bibtexexporter.cpp +++ b/src/translators/bibtexexporter.cpp @@ -235,8 +235,8 @@ TQWidget* BibtexExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { return m_widget; } -void BibtexExporter::readOptions(KConfig* config_) { - KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); +void BibtexExporter::readOptions(TDEConfig* config_) { + TDEConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); m_expandMacros = group.readBoolEntry("Expand Macros", m_expandMacros); m_packageURL = group.readBoolEntry("URL Package", m_packageURL); m_skipEmptyKeys = group.readBoolEntry("Skip Empty Keys", m_skipEmptyKeys); @@ -248,8 +248,8 @@ void BibtexExporter::readOptions(KConfig* config_) { } } -void BibtexExporter::saveOptions(KConfig* config_) { - KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); +void BibtexExporter::saveOptions(TDEConfig* config_) { + TDEConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); m_expandMacros = m_checkExpandMacros->isChecked(); group.writeEntry("Expand Macros", m_expandMacros); m_packageURL = m_checkPackageURL->isChecked(); diff --git a/src/translators/bibtexexporter.h b/src/translators/bibtexexporter.h index e3c302c..ef29041 100644 --- a/src/translators/bibtexexporter.h +++ b/src/translators/bibtexexporter.h @@ -41,8 +41,8 @@ public: virtual TQString fileFilter() const; virtual TQWidget* widget(TQWidget* parent, const char* name=0); - virtual void readOptions(KConfig*); - virtual void saveOptions(KConfig*); + virtual void readOptions(TDEConfig*); + virtual void saveOptions(TDEConfig*); private: void writeEntryText(TQString& text, const Data::FieldVec& field, const Data::Entry& entry, diff --git a/src/translators/bibteximporter.cpp b/src/translators/bibteximporter.cpp index 850a390..898d216 100644 --- a/src/translators/bibteximporter.cpp +++ b/src/translators/bibteximporter.cpp @@ -46,7 +46,7 @@ BibtexImporter::BibtexImporter(const TQString& text_) : Importer(text_) BibtexImporter::~BibtexImporter() { bt_cleanup(); if(m_readUTF8) { - KConfigGroup config(kapp->config(), "Import Options"); + TDEConfigGroup config(kapp->config(), "Import Options"); config.writeEntry("Bibtex UTF8", m_readUTF8->isChecked()); } } @@ -295,7 +295,7 @@ TQWidget* BibtexImporter::widget(TQWidget* parent_, const char* name_/*=0*/) { m_readLocale->setChecked(true); TQWhatsThis::add(m_readLocale, i18n("Read the imported file in the local encoding.")); - KConfigGroup config(kapp->config(), "Import Options"); + TDEConfigGroup config(kapp->config(), "Import Options"); bool useUTF8 = config.readBoolEntry("Bibtex UTF8", false); if(useUTF8) { m_readUTF8->setChecked(true); diff --git a/src/translators/csvexporter.cpp b/src/translators/csvexporter.cpp index 7d94271..2755a17 100644 --- a/src/translators/csvexporter.cpp +++ b/src/translators/csvexporter.cpp @@ -164,13 +164,13 @@ TQWidget* CSVExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { return m_widget; } -void CSVExporter::readOptions(KConfig* config_) { - KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); +void CSVExporter::readOptions(TDEConfig* config_) { + TDEConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); m_includeTitles = group.readBoolEntry("Include Titles", m_includeTitles); m_delimiter = group.readEntry("Delimiter", m_delimiter); } -void CSVExporter::saveOptions(KConfig* config_) { +void CSVExporter::saveOptions(TDEConfig* config_) { m_includeTitles = m_checkIncludeTitles->isChecked(); if(m_radioComma->isChecked()) { m_delimiter = TQChar(','); @@ -182,7 +182,7 @@ void CSVExporter::saveOptions(KConfig* config_) { m_delimiter = m_editOther->text(); } - KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); + TDEConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); group.writeEntry("Include Titles", m_includeTitles); group.writeEntry("Delimiter", m_delimiter); } diff --git a/src/translators/csvexporter.h b/src/translators/csvexporter.h index 8d41a3a..5ec6fed 100644 --- a/src/translators/csvexporter.h +++ b/src/translators/csvexporter.h @@ -15,7 +15,7 @@ #define CSVEXPORTER_H class KLineEdit; -class KConfig; +class TDEConfig; class TQWidget; class TQCheckBox; @@ -41,8 +41,8 @@ public: virtual TQString fileFilter() const; virtual TQWidget* widget(TQWidget* parent, const char* name=0); - virtual void readOptions(KConfig* config); - virtual void saveOptions(KConfig* config); + virtual void readOptions(TDEConfig* config); + virtual void saveOptions(TDEConfig* config); private: TQString& escapeText(TQString& text); diff --git a/src/translators/csvimporter.cpp b/src/translators/csvimporter.cpp index ca3e7aa..c4f74d0 100644 --- a/src/translators/csvimporter.cpp +++ b/src/translators/csvimporter.cpp @@ -202,7 +202,7 @@ Tellico::Data::CollPtr CSVImporter::collection() { } { - KConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("ImportOptions - CSV")); + TDEConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("ImportOptions - CSV")); config.writeEntry("Delimiter", m_delimiter); config.writeEntry("First Row Titles", m_firstRowHeader); } @@ -320,7 +320,7 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) { l->addStretch(1); - KConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("ImportOptions - CSV")); + TDEConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("ImportOptions - CSV")); m_delimiter = config.readEntry("Delimiter", m_delimiter); m_firstRowHeader = config.readBoolEntry("First Row Titles", m_firstRowHeader); diff --git a/src/translators/exporter.h b/src/translators/exporter.h index 76d3897..2815577 100644 --- a/src/translators/exporter.h +++ b/src/translators/exporter.h @@ -14,7 +14,7 @@ #ifndef TELLICO_EXPORTER_H #define TELLICO_EXPORTER_H -class KConfig; +class TDEConfig; class TQWidget; class TQString; @@ -75,8 +75,8 @@ public: virtual void reset() {} virtual TQWidget* widget(TQWidget* parent, const char* name=0) = 0; - virtual void readOptions(KConfig*) {} - virtual void saveOptions(KConfig*) {} + virtual void readOptions(TDEConfig*) {} + virtual void saveOptions(TDEConfig*) {} private: long m_options; diff --git a/src/translators/filelistingimporter.cpp b/src/translators/filelistingimporter.cpp index 673cd21..934d4b0 100644 --- a/src/translators/filelistingimporter.cpp +++ b/src/translators/filelistingimporter.cpp @@ -69,12 +69,12 @@ Tellico::Data::CollPtr FileListingImporter::collection() { TQString volume = volumeName(); m_job = m_recursive->isChecked() - ? KIO::listRecursive(url(), true, false) - : KIO::listDir(url(), true, false); - connect(m_job, TQT_SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)), - TQT_SLOT(slotEntries(KIO::Job*, const KIO::UDSEntryList&))); + ? TDEIO::listRecursive(url(), true, false) + : TDEIO::listDir(url(), true, false); + connect(m_job, TQT_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQT_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&))); - if(!KIO::NetAccess::synchronousRun(m_job, Kernel::self()->widget()) || m_cancelled) { + if(!TDEIO::NetAccess::synchronousRun(m_job, Kernel::self()->widget()) || m_cancelled) { return 0; } @@ -114,18 +114,18 @@ Tellico::Data::CollPtr FileListingImporter::collection() { // remove "./" from the string entry->setField(folder, tmp.right(tmp.length()-2)); entry->setField(type, it.current()->mimetype()); - entry->setField(size, KIO::convertSize(it.current()->size())); + entry->setField(size, TDEIO::convertSize(it.current()->size())); entry->setField(perm, it.current()->permissionsString()); entry->setField(owner, it.current()->user()); entry->setField(group, it.current()->group()); - time_t t = it.current()->time(KIO::UDS_CREATION_TIME); + time_t t = it.current()->time(TDEIO::UDS_CREATION_TIME); if(t > 0) { TQDateTime dt; dt.setTime_t(t); entry->setField(created, dt.toString(Qt::ISODate)); } - t = it.current()->time(KIO::UDS_MODIFICATION_TIME); + t = it.current()->time(TDEIO::UDS_MODIFICATION_TIME); if(t > 0) { TQDateTime dt; dt.setTime_t(t); @@ -206,14 +206,14 @@ TQWidget* FileListingImporter::widget(TQWidget* parent_, const char* name_) { return m_widget; } -void FileListingImporter::slotEntries(KIO::Job* job_, const KIO::UDSEntryList& list_) { +void FileListingImporter::slotEntries(TDEIO::Job* job_, const TDEIO::UDSEntryList& list_) { if(m_cancelled) { job_->kill(); m_job = 0; return; } - for(KIO::UDSEntryList::ConstIterator it = list_.begin(); it != list_.end(); ++it) { + for(TDEIO::UDSEntryList::ConstIterator it = list_.begin(); it != list_.end(); ++it) { KFileItem* item = new KFileItem(*it, url(), false, true); if(item->isFile()) { m_files.append(item); diff --git a/src/translators/filelistingimporter.h b/src/translators/filelistingimporter.h index 82d1693..bddc059 100644 --- a/src/translators/filelistingimporter.h +++ b/src/translators/filelistingimporter.h @@ -23,7 +23,7 @@ #include <tqguardedptr.h> class TQCheckBox; -namespace KIO { +namespace TDEIO { class Job; } @@ -53,7 +53,7 @@ public slots: void slotCancel(); private slots: - void slotEntries(KIO::Job* job, const KIO::UDSEntryList& list); + void slotEntries(TDEIO::Job* job, const TDEIO::UDSEntryList& list); private: TQString volumeName() const; @@ -62,7 +62,7 @@ private: TQWidget* m_widget; TQCheckBox* m_recursive; TQCheckBox* m_filePreview; - TQGuardedPtr<KIO::Job> m_job; + TQGuardedPtr<TDEIO::Job> m_job; KFileItemList m_files; TQPixmap m_pixmap; bool m_cancelled : 1; diff --git a/src/translators/freedbimporter.cpp b/src/translators/freedbimporter.cpp index 480bf07..805fbff 100644 --- a/src/translators/freedbimporter.cpp +++ b/src/translators/freedbimporter.cpp @@ -96,7 +96,7 @@ void FreeDBImporter::readCDROM() { } { - KConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("ImportOptions - FreeDB")); + TDEConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("ImportOptions - FreeDB")); config.writeEntry("CD-ROM Devices", drives); config.writeEntry("Last Device", drivePath); config.writeEntry("Cache Files Only", false); @@ -291,7 +291,7 @@ void FreeDBImporter::readCache() { #ifdef HAVE_KCDDB { // remember the import options - KConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("ImportOptions - FreeDB")); + TDEConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("ImportOptions - FreeDB")); config.writeEntry("Cache Files Only", true); } @@ -515,7 +515,7 @@ TQWidget* FreeDBImporter::widget(TQWidget* parent_, const char* name_/*=0*/) { l->addStretch(1); // now read config options - KConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("ImportOptions - FreeDB")); + TDEConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("ImportOptions - FreeDB")); TQStringList devices = config.readListEntry("CD-ROM Devices"); if(devices.isEmpty()) { #if defined(__OpenBSD__) diff --git a/src/translators/gcfilmsexporter.cpp b/src/translators/gcfilmsexporter.cpp index 91a4d8e..55e3c7c 100644 --- a/src/translators/gcfilmsexporter.cpp +++ b/src/translators/gcfilmsexporter.cpp @@ -85,8 +85,8 @@ bool GCfilmsExporter::exec() { imageDir = url(); imageDir.cd(TQString::fromLatin1("..")); imageDir.addPath(url().fileName().section('.', 0, 0) + TQString::fromLatin1("_images/")); - if(!KIO::NetAccess::exists(imageDir, false, 0)) { - bool success = KIO::NetAccess::mkdir(imageDir, Kernel::self()->widget()); + if(!TDEIO::NetAccess::exists(imageDir, false, 0)) { + bool success = TDEIO::NetAccess::mkdir(imageDir, Kernel::self()->widget()); if(!success) { imageDir = KURL(); // means don't write images } diff --git a/src/translators/htmlexporter.cpp b/src/translators/htmlexporter.cpp index 6cb38b4..2e006a3 100644 --- a/src/translators/htmlexporter.cpp +++ b/src/translators/htmlexporter.cpp @@ -483,8 +483,8 @@ TQWidget* HTMLExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { return m_widget; } -void HTMLExporter::readOptions(KConfig* config_) { - KConfigGroup exportConfig(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); +void HTMLExporter::readOptions(TDEConfig* config_) { + TDEConfigGroup exportConfig(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); m_printHeaders = exportConfig.readBoolEntry("Print Field Headers", m_printHeaders); m_printGrouped = exportConfig.readBoolEntry("Print Grouped", m_printGrouped); m_exportEntryFiles = exportConfig.readBoolEntry("Export Entry Files", m_exportEntryFiles); @@ -495,8 +495,8 @@ void HTMLExporter::readOptions(KConfig* config_) { + m_entryXSLTFile + TQString::fromLatin1(".xsl")); } -void HTMLExporter::saveOptions(KConfig* config_) { - KConfigGroup cfg(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); +void HTMLExporter::saveOptions(TDEConfig* config_) { + TDEConfigGroup cfg(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); m_printHeaders = m_checkPrintHeaders->isChecked(); cfg.writeEntry("Print Field Headers", m_printHeaders); m_printGrouped = m_checkPrintGrouped->isChecked(); @@ -562,7 +562,7 @@ TQString HTMLExporter::handleLink(const TQString& link_) { // the tmpDir() when exporting entry files from a collection, but those images // don't actually exist, and they get copied in writeImages() instead. // so we only need to keep track of the url if it exists - const bool exists = KIO::NetAccess::exists(u, false, 0); + const bool exists = TDEIO::NetAccess::exists(u, false, 0); if(exists) { m_files.append(u); } @@ -620,10 +620,10 @@ void HTMLExporter::createDir() { myDebug() << "HTMLExporter::createDir() - called on empty URL!" << endl; return; } - if(KIO::NetAccess::exists(dir, false, 0)) { + if(TDEIO::NetAccess::exists(dir, false, 0)) { m_checkCreateDir = false; } else { - m_checkCreateDir = !KIO::NetAccess::mkdir(dir, m_widget); + m_checkCreateDir = !TDEIO::NetAccess::mkdir(dir, m_widget); } } @@ -647,12 +647,12 @@ bool HTMLExporter::copyFiles() { target = fileDir(); } target.setFileName((*it).fileName()); - bool success = KIO::NetAccess::file_copy(*it, target, -1, true /* overwrite */, false /* resume */, m_widget); + bool success = TDEIO::NetAccess::file_copy(*it, target, -1, true /* overwrite */, false /* resume */, m_widget); if(success) { m_copiedFiles.add((*it).url()); } else { kdWarning() << "HTMLExporter::copyFiles() - can't copy " << target << endl; - kdWarning() << KIO::NetAccess::lastErrorString() << endl; + kdWarning() << TDEIO::NetAccess::lastErrorString() << endl; } if(j%stepSize == 0) { if(options() & ExportProgress) { @@ -741,11 +741,11 @@ bool HTMLExporter::writeEntryFiles() { dataDir.setPath(TDEGlobal::dirs()->findResourceDir("appdata", TQString::fromLatin1("pics/tellico.png")) + "pics/"); KURL target = fileDir(); target.addPath(TQString::fromLatin1("pics/")); - KIO::NetAccess::mkdir(target, m_widget); + TDEIO::NetAccess::mkdir(target, m_widget); for(TQStringList::ConstIterator it = dataImages.begin(); it != dataImages.end(); ++it) { dataDir.setFileName(*it); target.setFileName(*it); - KIO::NetAccess::copy(dataDir, target, m_widget); + TDEIO::NetAccess::copy(dataDir, target, m_widget); } return true; diff --git a/src/translators/htmlexporter.h b/src/translators/htmlexporter.h index e99f227..e2275ab 100644 --- a/src/translators/htmlexporter.h +++ b/src/translators/htmlexporter.h @@ -53,8 +53,8 @@ public: virtual TQString fileFilter() const; virtual TQWidget* widget(TQWidget* parent, const char* name=0); - virtual void readOptions(KConfig*); - virtual void saveOptions(KConfig*); + virtual void readOptions(TDEConfig*); + virtual void saveOptions(TDEConfig*); void setCollectionURL(const KURL& url) { m_collectionURL = url; m_links.clear(); } void setXSLTFile(const TQString& filename); diff --git a/src/translators/onixexporter.cpp b/src/translators/onixexporter.cpp index 22314b5..f4861af 100644 --- a/src/translators/onixexporter.cpp +++ b/src/translators/onixexporter.cpp @@ -184,15 +184,15 @@ TQWidget* ONIXExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { return m_widget; } -void ONIXExporter::readOptions(KConfig* config_) { - KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); +void ONIXExporter::readOptions(TDEConfig* config_) { + TDEConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); m_includeImages = group.readBoolEntry("Include Images", m_includeImages); } -void ONIXExporter::saveOptions(KConfig* config_) { +void ONIXExporter::saveOptions(TDEConfig* config_) { m_includeImages = m_checkIncludeImages->isChecked(); - KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); + TDEConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); group.writeEntry("Include Images", m_includeImages); } diff --git a/src/translators/onixexporter.h b/src/translators/onixexporter.h index 08c0dcd..3cf44c8 100644 --- a/src/translators/onixexporter.h +++ b/src/translators/onixexporter.h @@ -42,8 +42,8 @@ public: virtual TQString fileFilter() const; virtual TQWidget* widget(TQWidget*, const char* name=0); - virtual void readOptions(KConfig*); - virtual void saveOptions(KConfig*); + virtual void readOptions(TDEConfig*); + virtual void saveOptions(TDEConfig*); TQString text(); diff --git a/src/translators/pilotdbexporter.cpp b/src/translators/pilotdbexporter.cpp index 5d7b40f..be86de2 100644 --- a/src/translators/pilotdbexporter.cpp +++ b/src/translators/pilotdbexporter.cpp @@ -58,7 +58,7 @@ bool PilotDBExporter::exec() { TQTextCodec* codec = 0; { // Latin1 is default - KConfigGroup group(TDEGlobal::config(), TQString::fromLatin1("ExportOptions - %1").arg(formatString())); + TDEConfigGroup group(TDEGlobal::config(), TQString::fromLatin1("ExportOptions - %1").arg(formatString())); codec = TDEGlobal::charsets()->codecForName(group.readEntry("Charset")); } if(!codec) { @@ -218,13 +218,13 @@ TQWidget* PilotDBExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { return m_widget; } -void PilotDBExporter::readOptions(KConfig* config_) { - KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); +void PilotDBExporter::readOptions(TDEConfig* config_) { + TDEConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); m_backup = group.readBoolEntry("Backup", m_backup); } -void PilotDBExporter::saveOptions(KConfig* config_) { - KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); +void PilotDBExporter::saveOptions(TDEConfig* config_) { + TDEConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); m_backup = m_checkBackup->isChecked(); group.writeEntry("Backup", m_backup); } diff --git a/src/translators/pilotdbexporter.h b/src/translators/pilotdbexporter.h index d4e87ad..cce7d13 100644 --- a/src/translators/pilotdbexporter.h +++ b/src/translators/pilotdbexporter.h @@ -38,8 +38,8 @@ public: virtual TQString fileFilter() const; virtual TQWidget* widget(TQWidget* parent, const char* name=0); - virtual void readOptions(KConfig* cfg); - virtual void saveOptions(KConfig* cfg); + virtual void readOptions(TDEConfig* cfg); + virtual void saveOptions(TDEConfig* cfg); void setColumns(const TQStringList& columns) { m_columns = columns; } diff --git a/src/translators/tellicoxmlexporter.cpp b/src/translators/tellicoxmlexporter.cpp index be7404b..7e62bb5 100644 --- a/src/translators/tellicoxmlexporter.cpp +++ b/src/translators/tellicoxmlexporter.cpp @@ -490,15 +490,15 @@ TQWidget* TellicoXMLExporter::widget(TQWidget* parent_, const char* name_/*=0*/) return m_widget; } -void TellicoXMLExporter::readOptions(KConfig* config_) { - KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); +void TellicoXMLExporter::readOptions(TDEConfig* config_) { + TDEConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); m_includeImages = group.readBoolEntry("Include Images", m_includeImages); } -void TellicoXMLExporter::saveOptions(KConfig* config_) { +void TellicoXMLExporter::saveOptions(TDEConfig* config_) { m_includeImages = m_checkIncludeImages->isChecked(); - KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); + TDEConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString())); group.writeEntry("Include Images", m_includeImages); } diff --git a/src/translators/tellicoxmlexporter.h b/src/translators/tellicoxmlexporter.h index d2b291c..3f6c0ca 100644 --- a/src/translators/tellicoxmlexporter.h +++ b/src/translators/tellicoxmlexporter.h @@ -50,8 +50,8 @@ public: void setIncludeGroups(bool b) { m_includeGroups = b; } virtual TQWidget* widget(TQWidget*, const char*); - virtual void readOptions(KConfig* cfg); - virtual void saveOptions(KConfig* cfg); + virtual void readOptions(TDEConfig* cfg); + virtual void saveOptions(TDEConfig* cfg); /** * An integer indicating format version. |