diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:10:32 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:10:32 -0600 |
commit | 3fe437def8063926892bddf2dcc733861308836d (patch) | |
tree | 021d66ad023a32bc8ea0074a1ab3d01316aff8b0 /lib/kopalette/kopalettemanager.cc | |
parent | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (diff) | |
download | koffice-3fe437def8063926892bddf2dcc733861308836d.tar.gz koffice-3fe437def8063926892bddf2dcc733861308836d.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'lib/kopalette/kopalettemanager.cc')
-rw-r--r-- | lib/kopalette/kopalettemanager.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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(""); |