summaryrefslogtreecommitdiffstats
path: root/kcontrol/konq/desktopbehavior_impl.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:30:47 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/konq/desktopbehavior_impl.h
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/konq/desktopbehavior_impl.h')
-rw-r--r--kcontrol/konq/desktopbehavior_impl.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/konq/desktopbehavior_impl.h b/kcontrol/konq/desktopbehavior_impl.h
index ba9904d37..1dcb3bee1 100644
--- a/kcontrol/konq/desktopbehavior_impl.h
+++ b/kcontrol/konq/desktopbehavior_impl.h
@@ -30,7 +30,7 @@ class DesktopBehavior : public DesktopBehaviorBase
{
Q_OBJECT
public:
- DesktopBehavior(KConfig *config, TQWidget *parent = 0L, const char *name = 0L );
+ DesktopBehavior(TDEConfig *config, TQWidget *parent = 0L, const char *name = 0L );
virtual void load();
virtual void load( bool useDefaults );
virtual void save();
@@ -49,7 +49,7 @@ private slots:
void mediaListViewChanged(TQListViewItem * item);
private:
- KConfig *g_pConfig;
+ TDEConfig *g_pConfig;
void fillMediaListView();
void saveMediaListView();
@@ -62,15 +62,15 @@ private:
bool m_bHasMedia;
};
-class DesktopBehaviorModule : public KCModule
+class DesktopBehaviorModule : public TDECModule
{
Q_OBJECT
public:
- DesktopBehaviorModule(KConfig *config, TQWidget *parent = 0L, const char *name = 0L );
- virtual void load() { m_behavior->load(); emit KCModule::changed( false ); }
- virtual void save() { m_behavior->save(); emit KCModule::changed( false ); }
- virtual void defaults() { m_behavior->defaults(); emit KCModule::changed( true ); }
+ DesktopBehaviorModule(TDEConfig *config, TQWidget *parent = 0L, const char *name = 0L );
+ virtual void load() { m_behavior->load(); emit TDECModule::changed( false ); }
+ virtual void save() { m_behavior->save(); emit TDECModule::changed( false ); }
+ virtual void defaults() { m_behavior->defaults(); emit TDECModule::changed( true ); }
private slots:
void changed();