summaryrefslogtreecommitdiffstats
path: root/kmdi
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
commit703fb0c89c2eee56a1e613e67a446db9d4287929 (patch)
treedd8c5ca66075cd89c2638a2b48cf78386a9870a7 /kmdi
parent818e7abec3d5d3809b6b77293558678371c16b71 (diff)
downloadtdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz
tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kmdi')
-rw-r--r--kmdi/kmdi/dockcontainer.cpp4
-rw-r--r--kmdi/kmdi/dockcontainer.h4
-rw-r--r--kmdi/kmdi/guiclient.cpp2
-rw-r--r--kmdi/kmdidockcontainer.cpp4
-rw-r--r--kmdi/kmdidockcontainer.h8
-rw-r--r--kmdi/kmdiguiclient.cpp2
6 files changed, 12 insertions, 12 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, "" ) );
diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp
index 7c3da3878..af086ee51 100644
--- a/kmdi/kmdidockcontainer.cpp
+++ b/kmdi/kmdidockcontainer.cpp
@@ -624,7 +624,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
TQTimer::singleShot( 0, this, TQT_SLOT( init() ) );
}
-void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
+void KMdiDockContainer::save( TDEConfig* cfg, const TQString& group_or_prefix )
{
TQString grp = cfg->group();
cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) );
@@ -671,7 +671,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
}
-void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix )
+void KMdiDockContainer::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/kmdidockcontainer.h b/kmdi/kmdidockcontainer.h
index cb0d6e4ce..8dfe6664b 100644
--- a/kmdi/kmdidockcontainer.h
+++ b/kmdi/kmdidockcontainer.h
@@ -88,22 +88,22 @@ public:
void hideIfNeeded();
/**
- * Save the config using a KConfig object
+ * Save the config using a TDEConfig object
*
* The combination of the group_or_prefix variable and the parent
* dockwidget's name will be the group the configuration is saved in
* \param group_or_prefix the prefix to append to the parent dockwidget's name
*/
- virtual void save( KConfig *, const TQString& group_or_prefix );
+ virtual void save( TDEConfig *, const TQString& group_or_prefix );
/**
- * Load the config using a KConfig object
+ * Load the config using a TDEConfig object
*
* The combination of the group_or_prefix variable and the parent
* dockwidget's name will be the group the configuration is loaded from
* \param group_or_prefix the prefix to append to the parent dockwidget's name
*/
- virtual void load( KConfig *, const TQString& group_or_prefix );
+ virtual void load( TDEConfig *, const TQString& group_or_prefix );
/**
* Save the config to a QDomElement
diff --git a/kmdi/kmdiguiclient.cpp b/kmdi/kmdiguiclient.cpp
index 0057172d6..c2c34c55f 100644
--- a/kmdi/kmdiguiclient.cpp
+++ b/kmdi/kmdiguiclient.cpp
@@ -251,7 +251,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva )
// try to read the action shortcut
KShortcut sc;
- KConfig *cfg = kapp->config();
+ TDEConfig *cfg = kapp->config();
TQString _grp = cfg->group();
cfg->setGroup( "Shortcuts" );
// if ( cfg->hasKey( aname ) )