diff --git a/adept/adept/installerview.cpp b/adept/adept/installerview.cpp index ce99ae8..f18e9a6 100644 --- a/adept/adept/installerview.cpp +++ b/adept/adept/installerview.cpp @@ -85,7 +85,7 @@ void InstallerView::showDescription( entity::Desktop e ) { kdDebug() << "InstallerView::showDescription..." << endl; TQString file("/usr/share/app-install/desktop/" + e.package().name() + ".desktop"); - KConfig desktopFile(TQString("/usr/share/app-install/desktop/" + e.package().name() + ".desktop"), false, false); + TDEConfig desktopFile(TQString("/usr/share/app-install/desktop/" + e.package().name() + ".desktop"), false, false); TQString name(desktopFile.name()); desktopFile.setGroup("Desktop Entry"); diff --git a/adept/kubuntu_upgrader/upgradewizard.cpp b/adept/kubuntu_upgrader/upgradewizard.cpp index cc4ed77..05f94cb 100644 --- a/adept/kubuntu_upgrader/upgradewizard.cpp +++ b/adept/kubuntu_upgrader/upgradewizard.cpp @@ -151,7 +151,7 @@ bool UpgradeWizard::checkForDistUpgrade(TQString url, bool developmentVersion) { } bool upgrade_available = false; - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("General Settings"); TQString upgradeURL; upgradeURL = config->readEntry(TQString("upgradeURL"), url); @@ -159,7 +159,7 @@ bool UpgradeWizard::checkForDistUpgrade(TQString url, bool developmentVersion) { TQString temp_file_location; - if( KIO::NetAccess::download( metafile_url, temp_file_location, NULL ) ) { + if( TDEIO::NetAccess::download( metafile_url, temp_file_location, NULL ) ) { TQFile temp_file( temp_file_location ); temp_file.open( IO_ReadOnly ); TQTextIStream *temp_file_stream = new TQTextIStream( temp_file.readAll() ); @@ -236,7 +236,7 @@ bool UpgradeWizard::checkForDistUpgrade(TQString url, bool developmentVersion) { } */ temp_file.close(); - KIO::NetAccess::removeTempFile( temp_file_location ); + TDEIO::NetAccess::removeTempFile( temp_file_location ); } return upgrade_available; @@ -422,7 +422,7 @@ void UpgradeWizard::fetchReleaseAnnounce() { kdDebug() << "No release notes URL, so I'm skipping the fetch." << endl; } else { KURL my_url(*upgrade_dist->release_notes_url); - result = KIO::NetAccess::download(my_url, temp_file_location, NULL ); + result = TDEIO::NetAccess::download(my_url, temp_file_location, NULL ); } if( result ) { @@ -447,9 +447,9 @@ void UpgradeWizard::fetchReleaseAnnounce() { void UpgradeWizard::fetchUpgradeTool() { // download the upgrade tool KURL my_url(*upgrade_dist->upgrade_tool_url); - bool result = KIO::NetAccess::download( my_url, upgrade_tool_location, NULL ); + bool result = TDEIO::NetAccess::download( my_url, upgrade_tool_location, NULL ); // uncomment this to use for testing if you don't want to d/l the file every time - //bool result = KIO::NetAccess::download( "/home/vladi/edgy.tar.gz", upgrade_tool_location, NULL ); + //bool result = TDEIO::NetAccess::download( "/home/vladi/edgy.tar.gz", upgrade_tool_location, NULL ); if( result ) { emit killErrorDialog(); err_dlg = NULL; @@ -467,7 +467,7 @@ void UpgradeWizard::fetchUpgradeTool() { } void UpgradeWizard::fetchUpgradeToolSig() { - bool result = KIO::NetAccess::download( *upgrade_dist->upgrade_tool_sig_url, upgrade_tool_sig_location, NULL ); + bool result = TDEIO::NetAccess::download( *upgrade_dist->upgrade_tool_sig_url, upgrade_tool_sig_location, NULL ); if( result) { emit killErrorDialog(); err_dlg = NULL; @@ -496,7 +496,7 @@ void UpgradeWizard::verifyUpgradeTool() { emit killErrorDialog(); err_dlg = NULL; // remove the signature file - KIO::file_delete( KURL( upgrade_tool_sig_location ), false ); + TDEIO::file_delete( KURL( upgrade_tool_sig_location ), false ); TQWidget *p = page( pageCount()-1 ); setFinishEnabled( p, true ); textLabel3->show(); @@ -529,7 +529,7 @@ void UpgradeWizard::next() } else if( indexOf( currentPage() ) == 2 ) { // remove the temp file used to store the release announcement - KIO::file_delete( KURL( textBrowser1->source() ), false ); + TDEIO::file_delete( KURL( textBrowser1->source() ), false ); // download the tool, its signature, and verify fetchUpgradeTool(); diff --git a/adept/manager/main.cpp b/adept/manager/main.cpp index 3320b1d..f4c0d70 100644 --- a/adept/manager/main.cpp +++ b/adept/manager/main.cpp @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); // if (args && args->isSet("xy")) ... - /* KConfig* config = TDEGlobal::config(); + /* TDEConfig* config = TDEGlobal::config(); config->setGroup("General Settings"); TQString version = config->readEntry("Version"); */ diff --git a/adept/updater/main.cpp b/adept/updater/main.cpp index 9429552..03c748e 100644 --- a/adept/updater/main.cpp +++ b/adept/updater/main.cpp @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); // if (args && args->isSet("xy")) ... - /* KConfig* config = TDEGlobal::config(); + /* TDEConfig* config = TDEGlobal::config(); config->setGroup("General Settings"); TQString version = config->readEntry("Version"); */