From f9ced3b3f13f3136ef63c33ef163042010d6e80b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:39:24 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kommander/editor/main.cpp | 2 +- kommander/editor/mainwindow.cpp | 14 +++++++------- kommander/factory/kommanderfactory.cpp | 2 +- kommander/pluginmanager/pluginmanager.cpp | 2 +- kommander/pluginmanager/pluginmanager.h | 4 ++-- kommander/widget/functionlib.cpp | 4 ++-- kommander/widget/kommanderfunctions.cpp | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) (limited to 'kommander') diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp index 7f790f0b..a4c4b27b 100644 --- a/kommander/editor/main.cpp +++ b/kommander/editor/main.cpp @@ -57,7 +57,7 @@ int main( int argc, char *argv[] ) KLocale::setMainCatalogue("kommander"); TDEApplication a(true, true); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General"); bool splashScreen = config->readBoolEntry("SplashScreen", true); KSplashScreen* splash = 0; diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 43aea773..36d23b04 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -434,7 +434,7 @@ void MainWindow::runForm() bool readOnlyFile = !TQFileInfo(m_fileName).isWritable(); struct stat statbuf; ::stat(m_fileName.local8Bit(), &statbuf); - if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true)) + if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true)) { KMessageBox::error(this, i18n("Cannot create temporary file %1.").arg(m_backupName)); return; @@ -444,7 +444,7 @@ void MainWindow::runForm() form->formFile()->setModified(true); if (form->formFile()->save(false)) { - if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true)) + if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true)) { KMessageBox::error(this, i18n("Cannot create backup file %1.").arg(m_fileName + ".backup")); } @@ -498,7 +498,7 @@ void MainWindow::runForm4() bool readOnlyFile = !TQFileInfo(m_fileName).isWritable(); struct stat statbuf; ::stat(m_fileName.local8Bit(), &statbuf); - if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true)) + if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true)) { KMessageBox::error(this, i18n("Cannot create temporary file %1.").arg(m_backupName)); return; @@ -508,7 +508,7 @@ void MainWindow::runForm4() form->formFile()->setModified(true); if (form->formFile()->save(false)) { - if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true)) + if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true)) { KMessageBox::error(this, i18n("Cannot create backup file %1.").arg(m_fileName + ".backup")); } @@ -537,7 +537,7 @@ void MainWindow::closeRunningForm(TDEProcess* process) struct stat statbuf; ::stat(m_fileName.local8Bit(), &statbuf); FormWindow* form = activeForm(); - KIO::NetAccess::file_move(KURL::fromPathOrURL(m_backupName), KURL::fromPathOrURL(m_fileName), statbuf.st_mode, true); + TDEIO::NetAccess::file_move(KURL::fromPathOrURL(m_backupName), KURL::fromPathOrURL(m_fileName), statbuf.st_mode, true); form->formFile()->setModified(m_modified); } } @@ -1448,7 +1448,7 @@ void MainWindow::selectionChanged() void MainWindow::writeConfig() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("General"); config->writeEntry("RestoreWorkspace", restoreConfig); @@ -1485,7 +1485,7 @@ void MainWindow::writeConfig() void MainWindow::readConfig() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General"); restoreConfig = config->readBoolEntry("RestoreWorkspace", true); diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp index 1aa27412..7c717a68 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -449,7 +449,7 @@ int KommanderFactory::loadPlugins(bool force) return num_plugins_loaded; num_plugins_loaded = 0; - KConfig cfg("kommanderrc", true); + TDEConfig cfg("kommanderrc", true); TQStringList plugins = "libkommanderwidgets"; plugins += cfg.readListEntry("plugins"); TQStringList::Iterator it; diff --git a/kommander/pluginmanager/pluginmanager.cpp b/kommander/pluginmanager/pluginmanager.cpp index 01ffacf5..e5de0841 100644 --- a/kommander/pluginmanager/pluginmanager.cpp +++ b/kommander/pluginmanager/pluginmanager.cpp @@ -21,7 +21,7 @@ PluginManager::PluginManager() { - m_cfg = new KConfig("kommanderrc"); + m_cfg = new TDEConfig("kommanderrc"); m_list = new TQStringList(m_cfg->readListEntry("plugins")); } diff --git a/kommander/pluginmanager/pluginmanager.h b/kommander/pluginmanager/pluginmanager.h index 28a7a66e..47d0fa87 100644 --- a/kommander/pluginmanager/pluginmanager.h +++ b/kommander/pluginmanager/pluginmanager.h @@ -19,7 +19,7 @@ #include -class KConfig; +class TDEConfig; class PluginManager { @@ -45,7 +45,7 @@ private: TQString libraryName(const TQString& plugin) const; TQStringList* m_list; - KConfig *m_cfg; + TDEConfig *m_cfg; }; diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp index d4151015..a43fbfaf 100644 --- a/kommander/widget/functionlib.cpp +++ b/kommander/widget/functionlib.cpp @@ -883,7 +883,7 @@ static ParseNode f_read_setting(Parser* parser, const ParameterList& params) TQString fname = parser->currentWidget()->fileName(); if (fname.isEmpty()) return ParseNode(); - KConfig cfg("kommanderrc", true); + TDEConfig cfg("kommanderrc", true); cfg.setGroup(fname); return cfg.readEntry(params[0].toString(), def); } @@ -897,7 +897,7 @@ static ParseNode f_write_setting(Parser* parser, const ParameterList& params) TQString fname = parser->currentWidget()->fileName(); if (fname.isEmpty()) return ParseNode(); - KConfig cfg("kommanderrc", false); + TDEConfig cfg("kommanderrc", false); cfg.setGroup(fname); cfg.writeEntry(params[0].toString(), params[1].toString()); } diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp index 9470108a..b36a7251 100644 --- a/kommander/widget/kommanderfunctions.cpp +++ b/kommander/widget/kommanderfunctions.cpp @@ -77,7 +77,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL TQString fname = fileName(); if (!fname.isEmpty()) { - KConfig cfg("kommanderrc", true); + TDEConfig cfg("kommanderrc", true); cfg.setGroup(fname); return cfg.readEntry(args[0], args[1]); } @@ -88,7 +88,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL TQString fname = fileName(); if (!fname.isEmpty()) { - KConfig cfg("kommanderrc", false); + TDEConfig cfg("kommanderrc", false); cfg.setGroup(fname); cfg.writeEntry(args[0], args[1]); } -- cgit v1.2.1