diff options
Diffstat (limited to 'src/newstuff')
-rw-r--r-- | src/newstuff/dialog.cpp | 12 | ||||
-rw-r--r-- | src/newstuff/manager.cpp | 22 | ||||
-rw-r--r-- | src/newstuff/providerloader.h | 2 |
3 files changed, 18 insertions, 18 deletions
diff --git a/src/newstuff/dialog.cpp b/src/newstuff/dialog.cpp index 000e782..31e41db 100644 --- a/src/newstuff/dialog.cpp +++ b/src/newstuff/dialog.cpp @@ -79,7 +79,7 @@ public: return s; } else if(col == 4) { TQString s; - TQDate date = KGlobal::locale()->readDate(text(col)); + TQDate date = TDEGlobal::locale()->readDate(text(col)); s.sprintf("%08d", date.year() * 366 + date.dayOfYear()); return s; } @@ -99,7 +99,7 @@ Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_) , m_tempPreviewImage(0) , m_lastPreviewItem(0) { - m_lang = KGlobal::locale()->language(); + m_lang = TDEGlobal::locale()->language(); TQFrame* frame = plainPage(); TQBoxLayout* boxLayout = new TQVBoxLayout(frame, 0, KDialog::spacingHint()); @@ -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(KGlobal::config(), "NewStuff Dialog Options"); + KConfigGroup dialogConfig(TDEGlobal::config(), "NewStuff Dialog Options"); TQValueList<int> splitList = dialogConfig.readIntListEntry("Splitter Sizes"); if(!splitList.empty()) { m_split->setSizes(splitList); @@ -228,7 +228,7 @@ Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_) connect(loader, TQT_SIGNAL(percent(KIO::Job*, unsigned long)), TQT_SLOT(slotShowPercent(KIO::Job*, unsigned long))); connect(loader, TQT_SIGNAL(error()), TQT_SLOT(slotProviderError())); - KConfigGroup config(KGlobal::config(), "KNewStuff"); + KConfigGroup 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(KGlobal::config(), "NewStuff Dialog Options"); + KConfigGroup config(TDEGlobal::config(), "NewStuff Dialog Options"); config.writeEntry("Splitter Sizes", m_split->sizes()); } @@ -337,7 +337,7 @@ void Dialog::addEntry(KNS::Entry* entry_) { item->setText(1, entry_->version()); item->setText(2, TQString::number(entry_->rating())); item->setText(3, TQString::number(entry_->downloads())); - item->setText(4, KGlobal::locale()->formatDate(entry_->releaseDate(), true /*short format */)); + item->setText(4, TDEGlobal::locale()->formatDate(entry_->releaseDate(), true /*short format */)); item->setStatus(NewStuff::Manager::installStatus(entry_)); m_entryMap.insert(item, entry_); diff --git a/src/newstuff/manager.cpp b/src/newstuff/manager.cpp index 7011e9c..8eabc7d 100644 --- a/src/newstuff/manager.cpp +++ b/src/newstuff/manager.cpp @@ -94,7 +94,7 @@ bool Manager::installTemplate(const KURL& url_, const TQString& entryName_) { } else { // remove ".xsl" xslFile.truncate(xslFile.length()-4); - KConfigGroup config(KGlobal::config(), "KNewStuffFiles"); + KConfigGroup 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(KGlobal::config(), "KNewStuffFiles"); + KConfigGroup 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(KGlobal::config(), "KNewStuffStatus"); + KConfigGroup statusGroup(TDEGlobal::config(), "KNewStuffStatus"); TQString entryName = statusGroup.readEntry(name_); statusGroup.deleteEntry(name_); statusGroup.deleteEntry(entryName); @@ -209,7 +209,7 @@ bool Manager::installScript(const KURL& url_) { } { - KConfigGroup config(KGlobal::config(), "KNewStuffFiles"); + KConfigGroup 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(KGlobal::config(), "KNewStuffFiles"); + KConfigGroup 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(KGlobal::config(), "KNewStuffStatus"); + KConfigGroup 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(KGlobal::config(), "KNewStuffStatus"); + KConfigGroup 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(KGlobal::config(), "KNewStuffFiles"); + KConfigGroup 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) { @@ -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(KGlobal::config(), "KNewStuffStatus"); + KConfigGroup 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 @@ -418,7 +418,7 @@ bool Manager::checkCommonFile() { if(TQFile::exists(userCommonFile)) { // check timestamps // pics/tellico.png is not likely to be in a user directory - TQString installDir = KGlobal::dirs()->findResourceDir("appdata", TQString::fromLatin1("pics/tellico.png")); + TQString installDir = TDEGlobal::dirs()->findResourceDir("appdata", TQString::fromLatin1("pics/tellico.png")); TQString installCommonFile = installDir + '/' + TQString::fromLatin1("tellico-common.xsl"); #ifndef NDEBUG if(userCommonFile == installCommonFile) { @@ -438,7 +438,7 @@ bool Manager::checkCommonFile() { } } KURL src, dest; - src.setPath(KGlobal::dirs()->findResource("appdata", TQString::fromLatin1("tellico-common.xsl"))); + src.setPath(TDEGlobal::dirs()->findResource("appdata", TQString::fromLatin1("tellico-common.xsl"))); dest.setPath(userCommonFile); return KIO::NetAccess::file_copy(src, dest); } diff --git a/src/newstuff/providerloader.h b/src/newstuff/providerloader.h index 60b174a..a3dfed1 100644 --- a/src/newstuff/providerloader.h +++ b/src/newstuff/providerloader.h @@ -51,7 +51,7 @@ public: * * @param type data type such as 'kdesktop/wallpaper'. * @param providerList the URl to the list of providers; if empty - * we first try the ProvidersUrl from KGlobal::config, then we + * we first try the ProvidersUrl from TDEGlobal::config, then we * fall back to a hardcoded value. */ void load( const TQString &type, const TQString &providerList = TQString() ); |