From 3fe437def8063926892bddf2dcc733861308836d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:10:32 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- lib/kopalette/kopalette.cc | 2 +- lib/kopalette/kopalettemanager.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/kopalette') diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index 430b972a..8084068c 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -63,7 +63,7 @@ KoPalette::KoPalette(TQWidget * parent, const char * name) void KoPalette::resetFont() { - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); Q_ASSERT(cfg); cfg->setGroup(""); m_font = TDEGlobalSettings::generalFont(); diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc index 7d4a32d9..cf215120 100644 --- a/lib/kopalette/kopalettemanager.cc +++ b/lib/kopalette/kopalettemanager.cc @@ -65,7 +65,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const c connect(m_mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotTogglePalette(int))); m_viewActionMenu = new KActionMenu(i18n("Palettes"), m_actionCollection, "view_palette_action_menu"); - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); cfg->setGroup("palettes"); bool palettesShown = cfg->readBoolEntry("palettesshown", true); @@ -149,7 +149,7 @@ void KoPaletteManager::addWidget(TQWidget * widget, bool visible = true; - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); if (cfg->hasGroup("palettetab-" + name)) { cfg->setGroup("palettetab-" + name); @@ -367,7 +367,7 @@ void KoPaletteManager::placePalette(const TQString & name, TQt::Dock location) if (!palette) return; //XXX: Check whether this name occurs in the config list, retrieve the location, set the location - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); if (cfg->hasGroup("palette-" + name)) { cfg->setGroup("palette-" + name); @@ -529,7 +529,7 @@ void KoPaletteManager::save() if (!m_view) return; if (!m_view->mainWindow()) return; - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); Q_ASSERT(cfg); cfg->setGroup(""); -- cgit v1.2.1