diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
commit | 703fb0c89c2eee56a1e613e67a446db9d4287929 (patch) | |
tree | dd8c5ca66075cd89c2638a2b48cf78386a9870a7 /kmdi/kmdi | |
parent | 818e7abec3d5d3809b6b77293558678371c16b71 (diff) | |
download | tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kmdi/kmdi')
-rw-r--r-- | kmdi/kmdi/dockcontainer.cpp | 4 | ||||
-rw-r--r-- | kmdi/kmdi/dockcontainer.h | 4 | ||||
-rw-r--r-- | kmdi/kmdi/guiclient.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp index 79e319964..c9523f230 100644 --- a/kmdi/kmdi/dockcontainer.cpp +++ b/kmdi/kmdi/dockcontainer.cpp @@ -460,7 +460,7 @@ void DockContainer::setPixmap(KDockWidget* widget ,const TQPixmap& pixmap) tab->setIcon(pixmap.isNull()?SmallIcon("misc"):pixmap); } -void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix) +void DockContainer::save(TDEConfig* cfg,const TQString& group_or_prefix) { // group name TQString grp=cfg->group(); @@ -504,7 +504,7 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix) cfg->setGroup(grp); } -void DockContainer::load(KConfig* cfg,const TQString& group_or_prefix) +void DockContainer::load(TDEConfig* cfg,const TQString& group_or_prefix) { TQString grp=cfg->group(); cfg->setGroup(group_or_prefix+TQString("::%1").arg(parent()->name())); diff --git a/kmdi/kmdi/dockcontainer.h b/kmdi/kmdi/dockcontainer.h index ac27f8644..9b7478378 100644 --- a/kmdi/kmdi/dockcontainer.h +++ b/kmdi/kmdi/dockcontainer.h @@ -91,8 +91,8 @@ class DockContainer: public TQWidget, public KDockContainer void hideIfNeeded(); - virtual void save(KConfig *,const TQString& group_or_prefix); - virtual void load(KConfig *,const TQString& group_or_prefix); + virtual void save(TDEConfig *,const TQString& group_or_prefix); + virtual void load(TDEConfig *,const TQString& group_or_prefix); void setStyle(int); protected: diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp index 1233bc64b..64b375ef0 100644 --- a/kmdi/kmdi/guiclient.cpp +++ b/kmdi/kmdi/guiclient.cpp @@ -139,7 +139,7 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva) // try to read the action shortcut KShortcut sc; - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); TQString _grp = cfg->group(); cfg->setGroup("Shortcuts"); sc = KShortcut( cfg->readEntry( aname, "" ) ); |