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/core.cpp | 2 +- src/editorproxy.cpp | 4 ++-- src/kdevideextension.cpp | 4 ++-- src/mainwindowshare.cpp | 2 +- src/newui/button.cpp | 4 ++-- src/newui/ddockwindow.cpp | 8 ++++---- src/newui/dmainwindow.cpp | 2 +- src/newui/dtabwidget.cpp | 2 +- src/partcontroller.cpp | 18 +++++++++--------- src/profileengine/lib/profile.cpp | 8 ++++---- src/projectmanager.cpp | 20 ++++++++++---------- src/simplemainwindow.cpp | 8 ++++---- 12 files changed, 41 insertions(+), 41 deletions(-) (limited to 'src') diff --git a/src/core.cpp b/src/core.cpp index 61c22403..d08a826e 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -71,7 +71,7 @@ Core::~Core() bool Core::queryClose() { // save the the project to open it automaticly on startup if needed - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("General Options"); config->writePathEntry("Last Project",ProjectManager::getInstance()->projectFile().url()); diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp index ef5fede9..34860c26 100644 --- a/src/editorproxy.cpp +++ b/src/editorproxy.cpp @@ -41,7 +41,7 @@ EditorProxy::EditorProxy() { m_delayedLineTimer = new TQTimer( this ); connect( m_delayedLineTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(setLineNumberDelayed()) ); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); m_delayedViewCreationCompatibleUI = true; @@ -125,7 +125,7 @@ void EditorProxy::installPopup( KParts::Part * part ) KAction * action = NULL; //If there is a tab for this file, we don't need to plug the closing menu entries here - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("UI"); bool m_tabBarShown = ! config->readNumEntry("TabWidgetVisibility", 0); if (!m_tabBarShown) diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp index 3a6cdf2c..a034cc52 100644 --- a/src/kdevideextension.cpp +++ b/src/kdevideextension.cpp @@ -53,7 +53,7 @@ void KDevIDEExtension::init() void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg) { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); TQVBox *vbox = dlg->addVBoxPage(i18n("General"), i18n("General"), BarIcon("tdevelop", KIcon::SizeMedium) ); gsw = new SettingsWidget(vbox, "general settings widget"); @@ -87,7 +87,7 @@ void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg) void KDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg) { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("General Options"); config->writeEntry("DesignerApp", gsw->designerButtonGroup->selectedId()); diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index 7046c679..1d67217b 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -302,7 +302,7 @@ void MainWindowShare::slotSettings() ShellExtension::getInstance()->createGlobalSettingsPage(&dlg); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Global Settings Dialog"); int height = config->readNumEntry( "Height", 600 ); diff --git a/src/newui/button.cpp b/src/newui/button.cpp index 311e3631..4381ee2d 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -60,7 +60,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, m_clearAccelAction = new KAction(i18n("Clear Accelerator"), 0, TQT_TQOBJECT(this), TQT_SLOT(clearAccel()), TQT_TQOBJECT(this)); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("UI"); TQString accel = config->readEntry(TQString("button_%1").arg(text), ""); if (!accel.isEmpty()) @@ -70,7 +70,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, Button::~Button() { // m_buttonBar->removeButton(this); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("UI"); TQRegExp r("^&([0-9])\\s.*"); diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp index fbe9edb1..d8abfde7 100644 --- a/src/newui/ddockwindow.cpp +++ b/src/newui/ddockwindow.cpp @@ -68,7 +68,7 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position) break; } - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("UI"); int mode = config->readNumEntry("MDIStyle", 3); Ideal::ButtonMode buttonMode = Ideal::Text; @@ -103,7 +103,7 @@ DDockWindow::~DDockWindow() void DDockWindow::setVisible(bool v) { //write dock width to the config file - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); TQString group = TQString("%1").arg(m_name); config->setGroup(group); @@ -147,7 +147,7 @@ void DDockWindow::loadSettings() void DDockWindow::saveSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); TQString group = TQString("%1").arg(m_name); int invisibleWidth = 0; config->setGroup(group); @@ -199,7 +199,7 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc { //if the widget was selected last time the dock is deleted //we need to show it - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); TQString group = TQString("%1").arg(m_name); config->setGroup(group); if (config->readEntry("ViewLastWidget") == title) diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index 45894178..d8b79f22 100644 --- a/src/newui/dmainwindow.cpp +++ b/src/newui/dmainwindow.cpp @@ -42,7 +42,7 @@ DMainWindow::DMainWindow(TQWidget *parent, const char *name) void DMainWindow::loadSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("UI"); m_openTabAfterCurrent = config->readBoolEntry("OpenNewTabAfterCurrent", true); m_showIconsOnTabs = config->readBoolEntry("ShowTabIcons", false); diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp index c3a0c7d1..92148207 100644 --- a/src/newui/dtabwidget.cpp +++ b/src/newui/dtabwidget.cpp @@ -55,7 +55,7 @@ DTabWidget::DTabWidget(TQWidget *parent, const char *name) void DTabWidget::loadSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("UI"); // m_tabBarShown = config->readBoolEntry("TabBarShown", true); m_tabBarShown = ! config->readNumEntry("TabWidgetVisibility", 0); diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index 05ffc087..0bd2e404 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -277,7 +277,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, } // Make sure the URL exists - if ( !url.isValid() || !KIO::NetAccess::exists(url, false, 0) ) + if ( !url.isValid() || !TDEIO::NetAccess::exists(url, false, 0) ) { bool done = false; @@ -289,7 +289,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, relURL.addPath( url.url() ); kdDebug() << k_funcinfo << "Looking for file in project dir: " << API::getInstance()->project()->projectDirectory() << " url " << url.url() << " transformed to " << relURL.url() << ": " << done << endl; - if (relURL.isValid() && KIO::NetAccess::exists(relURL, false, 0)) { + if (relURL.isValid() && TDEIO::NetAccess::exists(relURL, false, 0)) { url = relURL; done = true; } @@ -297,7 +297,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, KURL relURL(API::getInstance()->project()->buildDirectory()); relURL.addPath( url.url() ); kdDebug() << k_funcinfo << "Looking for file in build dir: " << API::getInstance()->project()->buildDirectory() << " url " << url.url() << " transformed to " << relURL.url() << ": " << done << endl; - if (relURL.isValid() && KIO::NetAccess::exists(relURL, false, 0)) { + if (relURL.isValid() && TDEIO::NetAccess::exists(relURL, false, 0)) { url = relURL; done = true; } @@ -307,7 +307,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, if (!done) { url = findURLInProject(url); - if ( !url.isValid() || !KIO::NetAccess::exists(url, false, 0) ) + if ( !url.isValid() || !TDEIO::NetAccess::exists(url, false, 0) ) // See if this url is relative to the current project's directory url = API::getInstance()->project()->projectDirectory() + "/" + url.path(); @@ -316,7 +316,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, } } - if ( !done && ( !url.isValid() || !KIO::NetAccess::exists(url, false, 0) )) + if ( !done && ( !url.isValid() || !TDEIO::NetAccess::exists(url, false, 0) )) { // Not found - prompt the user to find it? kdDebug(9000) << "cannot find URL: " << url.url() << endl; @@ -382,7 +382,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, m_openNextAsText = true; } - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General Options"); // we don't trust KDE with designer files, let's handle it ourselves @@ -547,7 +547,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, { if ( dlg.always_open_as_text->isChecked() ) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General"); TQStringList texttypeslist = config->readListEntry( "TextTypes" ); texttypeslist << MimeType->name(); @@ -1282,7 +1282,7 @@ void PartController::slotOpenFile() if ( DefaultEncoding.isEmpty() ) { // have a peek at katepart's settings: - KConfig * config = kapp->config(); + TDEConfig * config = kapp->config(); config->setGroup("Kate Document Defaults"); DefaultEncoding = config->readEntry("Encoding", TQString() ); } @@ -1460,7 +1460,7 @@ bool PartController::isDirty( KURL const & url ) bool PartController::reactToDirty( KURL const & url, unsigned char reason ) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Editor"); TQString dirtyAction = config->readEntry( "DirtyAction" ); diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp index 4a75b387..e568313f 100644 --- a/src/profileengine/lib/profile.cpp +++ b/src/profileengine/lib/profile.cpp @@ -33,7 +33,7 @@ Profile::Profile(Profile *parent, const TQString &name) m_parent->addChildProfile(this); TQString profileConfig = locate("data", "tdevelop/profiles" + dirName() + "/profile.config"); - KConfig config(profileConfig); + TDEConfig config(profileConfig); config.setGroup("Information"); m_genericName = config.readEntry("GenericName"); @@ -84,7 +84,7 @@ TQString Profile::dirName() const void Profile::save() { TQString profileConfig = locateLocal("data", "tdevelop/profiles" + dirName() + "/profile.config"); - KConfig config(profileConfig); + TDEConfig config(profileConfig); config.setGroup("Information"); config.writeEntry("GenericName", m_genericName); @@ -167,7 +167,7 @@ bool Profile::remove() { TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdevelop/profiles" + dirName()); if ((dirs.count() == 1) && dirs[0].startsWith(TQDir::homeDirPath())) - return KIO::NetAccess::del(KURL::fromPathOrURL(dirs[0]), 0); + return TDEIO::NetAccess::del(KURL::fromPathOrURL(dirs[0]), 0); return false; } @@ -201,5 +201,5 @@ KURL::List Profile::resources(const TQString &nameFilter) void Profile::addResource(const KURL &url) { TQString saveLocation = TDEGlobal::dirs()->saveLocation("data", "tdevelop/profiles"+dirName(), true); - KIO::NetAccess::file_copy(url, KURL::fromPathOrURL(saveLocation), -1, true); + TDEIO::NetAccess::file_copy(url, KURL::fromPathOrURL(saveLocation), -1, true); } 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"); diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index 4e96785d..6c733c5e 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -249,7 +249,7 @@ void SimpleMainWindow::embedView( DDockWindow::Position pos, TQWidget * view, co DDockWindow::Position SimpleMainWindow::recallToolViewPosition( const TQString & name, DDockWindow::Position defaultPos ) { - KConfig * config = kapp->config(); + TDEConfig * config = kapp->config(); config->setGroup( "DToolDockPosition" ); TQString position = config->readEntry( name ); @@ -268,7 +268,7 @@ DDockWindow::Position SimpleMainWindow::recallToolViewPosition( const TQString & void SimpleMainWindow::rememberToolViewPosition( const TQString & name, DDockWindow::Position pos ) { - KConfig * config = kapp->config(); + TDEConfig * config = kapp->config(); config->setGroup( "DToolDockPosition" ); TQString position = "unknown"; @@ -353,7 +353,7 @@ void SimpleMainWindow::lowerView(TQWidget * view) void SimpleMainWindow::loadSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); ProjectManager::getInstance()->loadSettings(); applyMainWindowSettings(config, "SimpleMainWindow"); @@ -363,7 +363,7 @@ void SimpleMainWindow::loadSettings() void SimpleMainWindow::saveSettings( ) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); ProjectManager::getInstance()->saveSettings(); saveMainWindowSettings(config, "SimpleMainWindow"); -- cgit v1.2.3