From da1522385e5367bae56b90fac55c4355e475905b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:38:54 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- src/projectmanager.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/projectmanager.cpp') diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index cf545ac9..bd4ee23e 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -125,7 +125,7 @@ void ProjectManager::createActions( KActionCollection* ac ) void ProjectManager::slotOpenProject() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General Options"); TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/"); @@ -153,7 +153,7 @@ void ProjectManager::slotProjectOptions() GeneralInfoWidget *g = new GeneralInfoWidget(*API::getInstance()->projectDom(), box, "general informations widget"); connect (&dlg, TQT_SIGNAL(okClicked()), g, TQT_SLOT(accept())); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Project Settings Dialog"); int height = config->readNumEntry( "Height", 600 ); int width = config->readNumEntry( "Width", 800 ); @@ -176,7 +176,7 @@ void ProjectManager::loadSettings() void ProjectManager::saveSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); if (projectLoaded()) { @@ -189,7 +189,7 @@ void ProjectManager::saveSettings() void ProjectManager::loadDefaultProject() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General Options"); TQString project = config->readPathEntry("Last Project"); bool readProject = config->readBoolEntry("Read Last Project On Startup", true); @@ -353,7 +353,7 @@ bool ProjectManager::closeProject( bool exiting ) bool ProjectManager::loadProjectFile() { TQString path; - if (!KIO::NetAccess::download(m_info->m_projectURL, path, 0)) { + if (!TDEIO::NetAccess::download(m_info->m_projectURL, path, 0)) { KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("Could not read project file: %1").arg(m_info->m_projectURL.prettyURL())); return false; @@ -376,7 +376,7 @@ bool ProjectManager::loadProjectFile() "XML error in line %1, column %2:\n%3") .arg(errorLine).arg(errorCol).arg(errorMsg)); fin.close(); - KIO::NetAccess::removeTempFile(path); + TDEIO::NetAccess::removeTempFile(path); return false; } if (m_info->m_document.documentElement().nodeName() != "tdevelop") @@ -384,12 +384,12 @@ bool ProjectManager::loadProjectFile() KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("This is not a valid project file.")); fin.close(); - KIO::NetAccess::removeTempFile(path); + TDEIO::NetAccess::removeTempFile(path); return false; } fin.close(); - KIO::NetAccess::removeTempFile(path); + TDEIO::NetAccess::removeTempFile(path); API::getInstance()->setProjectDom(&m_info->m_document); @@ -419,7 +419,7 @@ bool ProjectManager::saveProjectFile() } API::getInstance()->projectDom()->save(*(fout.textStream()), 2); fout.close(); - KIO::NetAccess::upload(fout.name(), m_info->m_projectURL, 0); + TDEIO::NetAccess::upload(fout.name(), m_info->m_projectURL, 0); } return true; @@ -637,7 +637,7 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url ) // TQString ProjectManager::profileByAttributes(const TQString &language, const TQStringList &keywords) // { -// KConfig config(locate("data", "tdevelop/profiles/projectprofiles")); +// TDEConfig config(locate("data", "tdevelop/profiles/projectprofiles")); // config.setGroup(language); // // TQStringList profileKeywords = TQStringList::split("/", "Empty"); -- cgit v1.2.1