summaryrefslogtreecommitdiffstats
path: root/twin/kcmtwin/twinrules
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /twin/kcmtwin/twinrules
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'twin/kcmtwin/twinrules')
-rw-r--r--twin/kcmtwin/twinrules/kcm.cpp10
-rw-r--r--twin/kcmtwin/twinrules/kcm.h6
-rw-r--r--twin/kcmtwin/twinrules/main.cpp4
-rw-r--r--twin/kcmtwin/twinrules/ruleslist.cpp4
4 files changed, 12 insertions, 12 deletions
diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp
index 9b3b1676e..c80869147 100644
--- a/twin/kcmtwin/twinrules/kcm.cpp
+++ b/twin/kcmtwin/twinrules/kcm.cpp
@@ -28,7 +28,7 @@
#include "ruleslist.h"
extern "C"
- KDE_EXPORT KCModule *create_twinrules( TQWidget *parent, const char *name )
+ KDE_EXPORT TDECModule *create_twinrules( TQWidget *parent, const char *name )
{
//CT there's need for decision: kwm or twin?
TDEGlobal::locale()->insertCatalogue( "kcmtwinrules" );
@@ -39,7 +39,7 @@ namespace KWinInternal
{
KCMRules::KCMRules( TQWidget *parent, const char *name )
-: KCModule( parent, name )
+: TDECModule( parent, name )
, config( "twinrulesrc" )
{
TQVBoxLayout *layout = new TQVBoxLayout( this );
@@ -57,13 +57,13 @@ void KCMRules::load()
{
config.reparseConfiguration();
widget->load();
- emit KCModule::changed( false );
+ emit TDECModule::changed( false );
}
void KCMRules::save()
{
widget->save();
- emit KCModule::changed( false );
+ emit TDECModule::changed( false );
// Send signal to twin
config.sync();
if( !kapp->dcopClient()->isAttached())
@@ -87,7 +87,7 @@ TQString KCMRules::quickHelp() const
void KCMRules::moduleChanged( bool state )
{
- emit KCModule::changed( state );
+ emit TDECModule::changed( state );
}
}
diff --git a/twin/kcmtwin/twinrules/kcm.h b/twin/kcmtwin/twinrules/kcm.h
index d02bfc112..1237a5a64 100644
--- a/twin/kcmtwin/twinrules/kcm.h
+++ b/twin/kcmtwin/twinrules/kcm.h
@@ -23,7 +23,7 @@
#include <kcmodule.h>
#include <kconfig.h>
-class KConfig;
+class TDEConfig;
class TDEAboutData;
namespace KWinInternal
@@ -32,7 +32,7 @@ namespace KWinInternal
class KCMRulesList;
class KCMRules
- : public KCModule
+ : public TDECModule
{
Q_OBJECT
public:
@@ -45,7 +45,7 @@ class KCMRules
void moduleChanged( bool state );
private:
KCMRulesList* widget;
- KConfig config;
+ TDEConfig config;
};
} // namespace
diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp
index b97db201a..4b36bd795 100644
--- a/twin/kcmtwin/twinrules/main.cpp
+++ b/twin/kcmtwin/twinrules/main.cpp
@@ -34,7 +34,7 @@ namespace KWinInternal
static void loadRules( TQValueList< Rules* >& rules )
{
- KConfig cfg( "twinrulesrc", true );
+ TDEConfig cfg( "twinrulesrc", true );
cfg.setGroup( "General" );
int count = cfg.readNumEntry( "count" );
for( int i = 1;
@@ -49,7 +49,7 @@ static void loadRules( TQValueList< Rules* >& rules )
static void saveRules( const TQValueList< Rules* >& rules )
{
- KConfig cfg( "twinrulesrc" );
+ TDEConfig cfg( "twinrulesrc" );
TQStringList groups = cfg.groupList();
for( TQStringList::ConstIterator it = groups.begin();
it != groups.end();
diff --git a/twin/kcmtwin/twinrules/ruleslist.cpp b/twin/kcmtwin/twinrules/ruleslist.cpp
index 29e02549d..c7634c3ac 100644
--- a/twin/kcmtwin/twinrules/ruleslist.cpp
+++ b/twin/kcmtwin/twinrules/ruleslist.cpp
@@ -150,7 +150,7 @@ void KCMRulesList::load()
++it )
delete *it;
rules.clear();
- KConfig cfg( "twinrulesrc", true );
+ TDEConfig cfg( "twinrulesrc", true );
cfg.setGroup( "General" );
int count = cfg.readNumEntry( "count" );
rules.reserve( count );
@@ -171,7 +171,7 @@ void KCMRulesList::load()
void KCMRulesList::save()
{
- KConfig cfg( "twinrulesrc" );
+ TDEConfig cfg( "twinrulesrc" );
TQStringList groups = cfg.groupList();
for( TQStringList::ConstIterator it = groups.begin();
it != groups.end();