From cc74f360bb40da3d79f58048f8e8611804980aa6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:30:47 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- konsole/ChangeLog | 2 +- konsole/konsole/TEWidget.cpp | 2 +- konsole/konsole/konsole.cpp | 22 +++++++++++----------- konsole/konsole/konsole.h | 8 ++++---- konsole/konsole/konsole_part.cpp | 14 +++++++------- konsole/konsole/konsolebookmarkhandler.cpp | 4 ++-- konsole/konsole/main.cpp | 4 ++-- konsole/konsole/schema.cpp | 12 ++++++------ konsole/konsole/schema.h | 8 ++++---- 9 files changed, 38 insertions(+), 38 deletions(-) (limited to 'konsole') diff --git a/konsole/ChangeLog b/konsole/ChangeLog index 55aacd580..07bdf7be7 100644 --- a/konsole/ChangeLog +++ b/konsole/ChangeLog @@ -27,7 +27,7 @@ Lots happened here... - Added checks for new schema files when accessing the schema menu. - When schema files are removed the corresponding schemas are removed too. - Fixed some i18n problems in schema.C. -- Laid groundwork for switch to KConfig (from schema files). +- Laid groundwork for switch to TDEConfig (from schema files). - Check for new schema's every time the schema menu is accessed. I realise this may be resource intensive on some people's machines. Maybe we need a little timeout mechanism to prevent checks all too often. diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index e13a5eb1d..c00349022 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -2238,7 +2238,7 @@ void TEWidget::dropEvent(TQDropEvent* event) dropText += " "; m_drop->setItemEnabled(cd,false); } - KURL url = KIO::NetAccess::mostLocalURL( *it, 0 ); + KURL url = TDEIO::NetAccess::mostLocalURL( *it, 0 ); TQString tmp; if (url.isLocalFile()) { tmp = url.path(); // local URL : remove protocol. This helps "ln" & "cd" and doesn't harm the others diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 225f6687d..b9940e697 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -297,7 +297,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo // read and apply default values /////////////////////////////////////////// resize(321, 321); // Dummy. TQSize currentSize = size(); - KConfig * config = TDEGlobal::config(); + TDEConfig * config = TDEGlobal::config(); config->setDesktopGroup(); applyMainWindowSettings(config); if (currentSize != size()) @@ -316,7 +316,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo if (isRestored) { n_tabbar = wanted_tabbar; - KConfig *c = TDEApplication::kApplication()->sessionConfig(); + TDEConfig *c = TDEApplication::kApplication()->sessionConfig(); // c->setDesktopGroup(); // Reads from wrong group b_dynamicTabHide = c->readBoolEntry("DynamicTabHide", false); } @@ -1167,7 +1167,7 @@ void Konsole::makeBasicGUI() new KAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); // Should we load all *.desktop files now? Required for Session shortcuts. - if ( KConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) { + if ( TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) { b_sessionShortcutsEnabled = true; loadSessionCommands(); loadScreenSessions(); @@ -1449,7 +1449,7 @@ void Konsole::slotSaveSessionsProfile() } } -void Konsole::saveProperties(KConfig* config) { +void Konsole::saveProperties(TDEConfig* config) { uint counter=0; uint active=0; TQString key; @@ -1554,7 +1554,7 @@ void Konsole::saveProperties(KConfig* config) { // Called by constructor (with config = TDEGlobal::config()) // and by session-management (with config = sessionconfig). // So it has to apply the settings when reading them. -void Konsole::readProperties(KConfig* config) +void Konsole::readProperties(TDEConfig* config) { readProperties(config, TQString::null, false); } @@ -1564,7 +1564,7 @@ void Konsole::readProperties(KConfig* config) // // When globalConfigOnly is true only the options that are shared among all // konsoles are being read. -void Konsole::readProperties(KConfig* config, const TQString &schema, bool globalConfigOnly) +void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool globalConfigOnly) { if (config==TDEGlobal::config()) @@ -1840,7 +1840,7 @@ void Konsole::slotInstallBitmapFonts() it != sl_installFonts.end(); ++it ) { TQString sf = "fonts/" + *it; - if ( KIO::NetAccess::copy( locate( "appdata", sf ), + if ( TDEIO::NetAccess::copy( locate( "appdata", sf ), "fonts:/Personal/", 0 ) ) { b_installBitmapFonts = false; @@ -2013,7 +2013,7 @@ void Konsole::slotSelectTabbar() { void Konsole::slotSaveSettings() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setDesktopGroup(); saveProperties(config); saveMainWindowSettings(config); @@ -2047,7 +2047,7 @@ void Konsole::slotConfigureKeys() m_shortcuts->action( i )->shortcut().count() && TQString(m_shortcuts->action( i )->name()).startsWith("SSC_") ) { b_sessionShortcutsEnabled = true; - KConfigGroup group(TDEGlobal::config(), "General"); + TDEConfigGroup group(TDEGlobal::config(), "General"); group.writeEntry("SessionShortcutsEnabled", true); } } @@ -2727,7 +2727,7 @@ void Konsole::allowPrevNext() KSimpleConfig *Konsole::defaultSession() { if (!m_defaultSession) { - KConfig * config = TDEGlobal::config(); + TDEConfig * config = TDEGlobal::config(); config->setDesktopGroup(); setDefaultSession(config->readEntry("DefaultSession","shell.desktop")); } @@ -4086,7 +4086,7 @@ void Konsole::slotSaveHistory() KURL s_url = KFileDialog::getSaveURL(TQString::null, TQString::null, 0L, i18n("Save History")); if( s_url.isEmpty()) return; - KURL url = KIO::NetAccess::mostLocalURL( s_url, 0 ); + KURL url = TDEIO::NetAccess::mostLocalURL( s_url, 0 ); if( !url.isLocalFile() ) { KMessageBox::sorry(this, i18n("This is not a local file.\n")); diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h index cdf1ebad1..f24f823ce 100644 --- a/konsole/konsole/konsole.h +++ b/konsole/konsole/konsole.h @@ -118,7 +118,7 @@ public: virtual bool processDynamic(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData); virtual QCStringList functionsDynamic(); - void callReadPropertiesInternal(KConfig *config, int number) { readPropertiesInternal(config,number); } + void callReadPropertiesInternal(TDEConfig *config, int number) { readPropertiesInternal(config,number); } enum TabPosition { TabNone, TabTop, TabBottom }; enum TabViewModes { ShowIconAndText = 0, ShowTextOnly = 1, ShowIconOnly = 2 }; @@ -138,8 +138,8 @@ public slots: protected: bool queryClose(); - void saveProperties(KConfig* config); - void readProperties(KConfig* config); + void saveProperties(TDEConfig* config); + void readProperties(TDEConfig* config); private slots: void configureRequest(TEWidget*,int,int,int); @@ -260,7 +260,7 @@ private: TQString newSession(KSimpleConfig *co, TQString pgm = TQString::null, const TQStrList &args = TQStrList(), const TQString &_term = TQString::null, const TQString &_icon = TQString::null, const TQString &_title = TQString::null, const TQString &_cwd = TQString::null); - void readProperties(KConfig *config, const TQString &schema, bool globalConfigOnly); + void readProperties(TDEConfig *config, const TQString &schema, bool globalConfigOnly); void applySettingsToGUI(); void makeTabWidget(); void makeBasicGUI(); diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index 34550fd30..6562ea0d9 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -150,7 +150,7 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje colors->sort(); // Check to see which config file we use: konsolepartrc or konsolerc - KConfig* config = new KConfig("konsolepartrc", true); + TDEConfig* config = new TDEConfig("konsolepartrc", true); config->setDesktopGroup(); b_useKonsoleSettings = config->readBoolEntry("use_konsole_settings", false); delete config; @@ -524,7 +524,7 @@ void konsolePart::applyProperties() se->setKeymapNo( n_keytab ); // FIXME: Move this somewhere else... - KConfig* config = new KConfig("konsolerc",true); + TDEConfig* config = new TDEConfig("konsolerc",true); config->setGroup("UTMP"); se->setAddToUtmp( config->readBoolEntry("AddToUtmp",true)); delete config; @@ -550,12 +550,12 @@ void konsolePart::setSettingsMenuEnabled( bool enable ) void konsolePart::readProperties() { - KConfig* config; + TDEConfig* config; if ( b_useKonsoleSettings ) - config = new KConfig( "konsolerc", true ); + config = new TDEConfig( "konsolerc", true ); else - config = new KConfig( "konsolepartrc", true ); + config = new TDEConfig( "konsolepartrc", true ); config->setDesktopGroup(); @@ -616,7 +616,7 @@ void konsolePart::readProperties() delete config; - config = new KConfig("konsolerc",true); + config = new TDEConfig("konsolerc",true); config->setDesktopGroup(); te->setTerminalSizeHint( config->readBoolEntry("TerminalSizeHint",true) ); delete config; @@ -624,7 +624,7 @@ void konsolePart::readProperties() void konsolePart::saveProperties() { - KConfig* config = new KConfig("konsolepartrc"); + TDEConfig* config = new TDEConfig("konsolepartrc"); config->setDesktopGroup(); if ( b_useKonsoleSettings ) { // Don't save Settings if using konsolerc diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp index c2e31ab4d..b5960727e 100644 --- a/konsole/konsole/konsolebookmarkhandler.cpp +++ b/konsole/konsole/konsolebookmarkhandler.cpp @@ -44,9 +44,9 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( Konsole *konsole, bool toplevel TQString old_bm_file = locateLocal( "data", "kfile/bookmarks.xml" ); if ( TQFile::exists( old_bm_file ) ) // We want sync here... - if ( !KIO::NetAccess::copy( KURL( old_bm_file ), + if ( !TDEIO::NetAccess::copy( KURL( old_bm_file ), KURL ( new_bm_file ), 0 ) ) { - kdWarning()<isSet("schema")) schema = args->getOption("schema"); - KConfig * sessionconfig = 0; + TDEConfig * sessionconfig = 0; TQString profile = ""; if (args->isSet("profile")) { profile = args->getOption("profile"); TQString path = locate( "data", "konsole/profiles/" + profile ); if ( TQFile::exists( path ) ) - sessionconfig=new KConfig( path, true ); + sessionconfig=new TDEConfig( path, true ); else profile = ""; } diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp index 8befb2e56..2d3e3901f 100644 --- a/konsole/konsole/schema.cpp +++ b/konsole/konsole/schema.cpp @@ -158,7 +158,7 @@ ColorSchema::ColorSchema() m_numb = 0; } -ColorSchema::ColorSchema(KConfig& c) +ColorSchema::ColorSchema(TDEConfig& c) :m_fileRead(false) ,fRelPath(TQString::null) ,lastRead(0L) @@ -240,22 +240,22 @@ void ColorSchema::setDefaultSchema() return TQString(colornames[i]); } -void ColorSchema::writeConfigColor(KConfig& c, +void ColorSchema::writeConfigColor(TDEConfig& c, const TQString& name, const ColorEntry& e) const { - KConfigGroupSaver(&c,name); + TDEConfigGroupSaver(&c,name); c.setGroup(name); c.writeEntry("Color",e.color); c.writeEntry("Transparency",(bool) e.transparent); c.writeEntry("Bold",(bool) e.bold); } -void ColorSchema::readConfigColor(KConfig& c, +void ColorSchema::readConfigColor(TDEConfig& c, const TQString& name, ColorEntry& e) { - KConfigGroupSaver(&c,name); + TDEConfigGroupSaver(&c,name); c.setGroup(name); e.color = c.readColorEntry("Color"); @@ -268,7 +268,7 @@ void ColorSchema::writeConfig(const TQString& path) const { // KONSOLEDEBUG << "Writing schema " << relPath << " to file " << path << endl; - KConfig c(path,false,false); + TDEConfig c(path,false,false); c.setGroup("SchemaGeneral"); c.writeEntry("Title",m_title); diff --git a/konsole/konsole/schema.h b/konsole/konsole/schema.h index fa9f32412..618683c17 100644 --- a/konsole/konsole/schema.h +++ b/konsole/konsole/schema.h @@ -56,7 +56,7 @@ #endif class TQDateTime; -class KConfig; +class TDEConfig; class ColorSchema { @@ -76,7 +76,7 @@ public: * because that reads the hackneyed schema file syntax and * this is a KDE config file) */ - ColorSchema(KConfig&); + ColorSchema(TDEConfig&); /** * Constructor for the default schema (with no path). @@ -136,13 +136,13 @@ protected: * Write a single ColorEntry to the config file * under the given name (ie. in the group name). */ - void writeConfigColor(KConfig& c, + void writeConfigColor(TDEConfig& c, const TQString& name, const ColorEntry& e) const; /** * Read a single ColorEntry from the config file. */ - void readConfigColor(KConfig& c, + void readConfigColor(TDEConfig& c, const TQString& name, ColorEntry& e) ; -- cgit v1.2.3