summaryrefslogtreecommitdiffstats
path: root/twin/kcmtwin
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
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')
-rw-r--r--twin/kcmtwin/twindecoration/preview.cpp2
-rw-r--r--twin/kcmtwin/twindecoration/preview.h4
-rw-r--r--twin/kcmtwin/twindecoration/twindecoration.cpp36
-rw-r--r--twin/kcmtwin/twindecoration/twindecoration.h16
-rw-r--r--twin/kcmtwin/twinoptions/main.cpp40
-rw-r--r--twin/kcmtwin/twinoptions/main.h10
-rw-r--r--twin/kcmtwin/twinoptions/mouse.cpp8
-rw-r--r--twin/kcmtwin/twinoptions/mouse.h18
-rw-r--r--twin/kcmtwin/twinoptions/windows.cpp46
-rw-r--r--twin/kcmtwin/twinoptions/windows.h30
-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
14 files changed, 117 insertions, 117 deletions
diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp
index 43555ef60..8c12f9048 100644
--- a/twin/kcmtwin/twindecoration/preview.cpp
+++ b/twin/kcmtwin/twindecoration/preview.cpp
@@ -454,7 +454,7 @@ KDecorationPreviewOptions::~KDecorationPreviewOptions()
unsigned long KDecorationPreviewOptions::updateSettings()
{
- KConfig cfg( "twinrc", true );
+ TDEConfig cfg( "twinrc", true );
unsigned long changed = 0;
changed |= d->updateKWinSettings( &cfg );
diff --git a/twin/kcmtwin/twindecoration/preview.h b/twin/kcmtwin/twindecoration/preview.h
index 2a753db69..56a342cfc 100644
--- a/twin/kcmtwin/twindecoration/preview.h
+++ b/twin/kcmtwin/twindecoration/preview.h
@@ -138,11 +138,11 @@ class KDecorationPreviewPlugins
: public KDecorationPlugins
{
public:
- KDecorationPreviewPlugins( KConfig* cfg );
+ KDecorationPreviewPlugins( TDEConfig* cfg );
virtual bool provides( Requirement );
};
-inline KDecorationPreviewPlugins::KDecorationPreviewPlugins( KConfig* cfg )
+inline KDecorationPreviewPlugins::KDecorationPreviewPlugins( TDEConfig* cfg )
: KDecorationPlugins( cfg )
{
}
diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp
index efe46c1bc..30695cdef 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.cpp
+++ b/twin/kcmtwin/twindecoration/twindecoration.cpp
@@ -62,14 +62,14 @@
#include <kdecoration_plugins_p.h>
#include <kdecorationfactory.h>
-// KCModule plugin interface
+// TDECModule plugin interface
// =========================
typedef KGenericFactory<KWinDecorationModule, TQWidget> KWinDecoFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_twindecoration, KWinDecoFactory("kcmtwindecoration") )
KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, const TQStringList &)
: DCOPObject("KWinClientDecoration"),
- KCModule(KWinDecoFactory::instance(), parent, name),
+ TDECModule(KWinDecoFactory::instance(), parent, name),
twinConfig("twinrc"),
pluginObject(0)
{
@@ -477,7 +477,7 @@ void KWinDecorationModule::createThirdPartyWMList()
// Reset the decoration plugin to what the user just selected
void KWinDecorationModule::slotChangeDecoration( const TQString & text)
{
- KConfig twinConfig("twinrc");
+ TDEConfig twinConfig("twinrc");
twinConfig.setGroup("Style");
// Let the user see config options for the currently selected decoration
@@ -488,7 +488,7 @@ void KWinDecorationModule::slotChangeDecoration( const TQString & text)
// This is the selection handler setting
void KWinDecorationModule::slotSelectionChanged()
{
- emit KCModule::changed(true);
+ emit TDECModule::changed(true);
processEnabledDisabledTabs();
}
@@ -555,7 +555,7 @@ void KWinDecorationModule::slotBorderChanged( int size )
{
if( lBorder->isHidden())
return;
- emit KCModule::changed( true );
+ emit TDECModule::changed( true );
TQValueList< BorderSize > sizes;
if( plugins->factory() != NULL )
sizes = plugins->factory()->borderSizes();
@@ -611,7 +611,7 @@ TQString KWinDecorationModule::decorationLibName( const TQString& name )
// Loads/unloads and inserts the decoration config plugin into the
// pluginConfigWidget, allowing for dynamic configuration of decorations
-void KWinDecorationModule::resetPlugin( KConfig* conf, const TQString& currentDecoName )
+void KWinDecorationModule::resetPlugin( TDEConfig* conf, const TQString& currentDecoName )
{
// Config names are "twin_icewm_config"
// for "twin3_icewm" twin client
@@ -656,13 +656,13 @@ void KWinDecorationModule::resetPlugin( KConfig* conf, const TQString& currentDe
if (alloc_ptr != NULL)
{
- allocatePlugin = (TQObject* (*)(KConfig* conf, TQWidget* parent))alloc_ptr;
+ allocatePlugin = (TQObject* (*)(TDEConfig* conf, TQWidget* parent))alloc_ptr;
pluginObject = (TQObject*)(allocatePlugin( conf, pluginConfigWidget ));
// connect required signals and slots together...
connect( pluginObject, TQT_SIGNAL(changed()), this, TQT_SLOT(slotSelectionChanged()) );
- connect( this, TQT_SIGNAL(pluginLoad(KConfig*)), pluginObject, TQT_SLOT(load(KConfig*)) );
- connect( this, TQT_SIGNAL(pluginSave(KConfig*)), pluginObject, TQT_SLOT(save(KConfig*)) );
+ connect( this, TQT_SIGNAL(pluginLoad(TDEConfig*)), pluginObject, TQT_SLOT(load(TDEConfig*)) );
+ connect( this, TQT_SIGNAL(pluginSave(TDEConfig*)), pluginObject, TQT_SLOT(save(TDEConfig*)) );
connect( this, TQT_SIGNAL(pluginDefaults()), pluginObject, TQT_SLOT(defaults()) );
pluginConfigWidget->show();
return;
@@ -675,7 +675,7 @@ void KWinDecorationModule::resetPlugin( KConfig* conf, const TQString& currentDe
// Reads the twin config settings, and sets all UI controls to those settings
// Updating the config plugin if required
-void KWinDecorationModule::readConfig( KConfig* conf )
+void KWinDecorationModule::readConfig( TDEConfig* conf )
{
// General tab
// ============
@@ -767,17 +767,17 @@ void KWinDecorationModule::readConfig( KConfig* conf )
processEnabledDisabledTabs();
- emit KCModule::changed(false);
+ emit TDECModule::changed(false);
}
// Writes the selected user configuration to the twin config file
-void KWinDecorationModule::writeConfig( KConfig* conf )
+void KWinDecorationModule::writeConfig( TDEConfig* conf )
{
TQString name = decorationList->currentText();
TQString libName = decorationLibName( name );
- KConfig twinConfig("twinrc");
+ TDEConfig twinConfig("twinrc");
twinConfig.setGroup("Style");
// General settings
@@ -835,7 +835,7 @@ void KWinDecorationModule::writeConfig( KConfig* conf )
currentLibraryName = libName;
// We saved, so tell kcmodule that there have been no new user changes made.
- emit KCModule::changed(false);
+ emit TDECModule::changed(false);
}
@@ -843,7 +843,7 @@ void KWinDecorationModule::dcopUpdateClientList()
{
// Changes the current active ListBox item, and
// Loads a new plugin configuration tab if required.
- KConfig twinConfig("twinrc");
+ TDEConfig twinConfig("twinrc");
twinConfig.setGroup("Style");
readConfig( &twinConfig );
@@ -851,10 +851,10 @@ void KWinDecorationModule::dcopUpdateClientList()
}
-// Virutal functions required by KCModule
+// Virutal functions required by TDECModule
void KWinDecorationModule::load()
{
- KConfig twinConfig("twinrc");
+ TDEConfig twinConfig("twinrc");
twinConfig.setGroup("Style");
// Reset by re-reading the config
@@ -865,7 +865,7 @@ void KWinDecorationModule::load()
void KWinDecorationModule::save()
{
- KConfig twinConfig("twinrc");
+ TDEConfig twinConfig("twinrc");
twinConfig.setGroup("Style");
writeConfig( &twinConfig );
diff --git a/twin/kcmtwin/twindecoration/twindecoration.h b/twin/kcmtwin/twindecoration/twindecoration.h
index aa9855408..14e24c777 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.h
+++ b/twin/kcmtwin/twindecoration/twindecoration.h
@@ -59,7 +59,7 @@ struct DecorationInfo
};
-class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface, public KDecorationDefines
+class KWinDecorationModule : public TDECModule, virtual public KWinDecorationIface, public KDecorationDefines
{
Q_OBJECT
@@ -76,8 +76,8 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface
virtual void dcopUpdateClientList();
signals:
- void pluginLoad( KConfig* conf );
- void pluginSave( KConfig* conf );
+ void pluginLoad( TDEConfig* conf );
+ void pluginSave( TDEConfig* conf );
void pluginDefaults();
protected slots:
@@ -88,8 +88,8 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface
void slotButtonsChanged();
private:
- void readConfig( KConfig* conf );
- void writeConfig( KConfig* conf );
+ void readConfig( TDEConfig* conf );
+ void writeConfig( TDEConfig* conf );
void findDecorations();
void createDecorationList();
void createThirdPartyWMList();
@@ -98,7 +98,7 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface
TQString decorationLibName( const TQString& name );
TQString decorationName ( TQString& libName );
static TQString styleToConfigLib( TQString& styleLib );
- void resetPlugin( KConfig* conf, const TQString& currentDecoName = TQString::null );
+ void resetPlugin( TDEConfig* conf, const TQString& currentDecoName = TQString::null );
void resetKWin();
void checkSupportedBorderSizes();
static int borderSizeToIndex( BorderSize size, TQValueList< BorderSize > sizes );
@@ -117,7 +117,7 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface
KDecorationPreview* preview;
KDecorationPlugins* plugins;
- KConfig twinConfig;
+ TDEConfig twinConfig;
TQCheckBox* cbUseCustomButtonPositions;
// TQCheckBox* cbUseMiniWindows;
@@ -130,7 +130,7 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface
TQWidget* pluginConfigWidget;
TQString currentLibraryName;
TQString oldLibraryName;
- TQObject* (*allocatePlugin)( KConfig* conf, TQWidget* parent );
+ TQObject* (*allocatePlugin)( TDEConfig* conf, TQWidget* parent );
// Page 2
ButtonPositionWidget *buttonPositionWidget;
diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp
index 3c072996b..0743ca31f 100644
--- a/twin/kcmtwin/twinoptions/main.cpp
+++ b/twin/kcmtwin/twinoptions/main.cpp
@@ -36,46 +36,46 @@
extern "C"
{
- KDE_EXPORT KCModule *create_twinfocus(TQWidget *parent, const char *name)
+ KDE_EXPORT TDECModule *create_twinfocus(TQWidget *parent, const char *name)
{
//CT there's need for decision: kwm or twin?
TDEGlobal::locale()->insertCatalogue("kcmkwm");
- KConfig *c = new KConfig("twinrc", false, true);
+ TDEConfig *c = new TDEConfig("twinrc", false, true);
return new KFocusConfig(true, c, parent, name);
}
- KDE_EXPORT KCModule *create_twinactions(TQWidget *parent, const char *name)
+ KDE_EXPORT TDECModule *create_twinactions(TQWidget *parent, const char *name)
{
//CT there's need for decision: kwm or twin?
TDEGlobal::locale()->insertCatalogue("kcmkwm");
return new KActionsOptions( parent, name);
}
- KDE_EXPORT KCModule *create_twinmoving(TQWidget *parent, const char *name)
+ KDE_EXPORT TDECModule *create_twinmoving(TQWidget *parent, const char *name)
{
//CT there's need for decision: kwm or twin?
TDEGlobal::locale()->insertCatalogue("kcmkwm");
- KConfig *c = new KConfig("twinrc", false, true);
+ TDEConfig *c = new TDEConfig("twinrc", false, true);
return new KMovingConfig(true, c, parent, name);
}
- KDE_EXPORT KCModule *create_twinadvanced(TQWidget *parent, const char *name)
+ KDE_EXPORT TDECModule *create_twinadvanced(TQWidget *parent, const char *name)
{
//CT there's need for decision: kwm or twin?
TDEGlobal::locale()->insertCatalogue("kcmkwm");
- KConfig *c = new KConfig("twinrc", false, true);
+ TDEConfig *c = new TDEConfig("twinrc", false, true);
return new KAdvancedConfig(true, c, parent, name);
}
- KDE_EXPORT KCModule *create_twintranslucency(TQWidget *parent, const char *name)
+ KDE_EXPORT TDECModule *create_twintranslucency(TQWidget *parent, const char *name)
{
//CT there's need for decision: kwm or twin?
TDEGlobal::locale()->insertCatalogue("kcmkwm");
- KConfig *c = new KConfig("twinrc", false, true);
+ TDEConfig *c = new TDEConfig("twinrc", false, true);
return new KTranslucencyConfig(true, c, parent, name);
}
- KDE_EXPORT KCModule *create_twinoptions ( TQWidget *parent, const char* name)
+ KDE_EXPORT TDECModule *create_twinoptions ( TQWidget *parent, const char* name)
{
//CT there's need for decision: kwm or twin?
TDEGlobal::locale()->insertCatalogue("kcmkwm");
@@ -84,9 +84,9 @@ extern "C"
}
KWinOptions::KWinOptions(TQWidget *parent, const char *name)
- : KCModule(parent, name)
+ : TDECModule(parent, name)
{
- mConfig = new KConfig("twinrc", false, true);
+ mConfig = new TDEConfig("twinrc", false, true);
TQVBoxLayout *layout = new TQVBoxLayout(this);
tab = new TQTabWidget(this);
@@ -153,7 +153,7 @@ void KWinOptions::load()
mMoving->load();
mAdvanced->load();
mTranslucency->load();
- emit KCModule::changed( false );
+ emit TDECModule::changed( false );
}
@@ -166,7 +166,7 @@ void KWinOptions::save()
mAdvanced->save();
mTranslucency->save();
- emit KCModule::changed( false );
+ emit TDECModule::changed( false );
// Send signal to twin
mConfig->sync();
if ( !kapp->dcopClient()->isAttached() )
@@ -197,14 +197,14 @@ TQString KWinOptions::quickHelp() const
void KWinOptions::moduleChanged(bool state)
{
- emit KCModule::changed(state);
+ emit TDECModule::changed(state);
}
KActionsOptions::KActionsOptions(TQWidget *parent, const char *name)
- : KCModule(parent, name)
+ : TDECModule(parent, name)
{
- mConfig = new KConfig("twinrc", false, true);
+ mConfig = new TDEConfig("twinrc", false, true);
TQVBoxLayout *layout = new TQVBoxLayout(this);
tab = new TQTabWidget(this);
@@ -230,7 +230,7 @@ void KActionsOptions::load()
{
mTitleBarActions->load();
mWindowActions->load();
- emit KCModule::changed( false );
+ emit TDECModule::changed( false );
}
@@ -239,7 +239,7 @@ void KActionsOptions::save()
mTitleBarActions->save();
mWindowActions->save();
- emit KCModule::changed( false );
+ emit TDECModule::changed( false );
// Send signal to twin
mConfig->sync();
if ( !kapp->dcopClient()->isAttached() )
@@ -256,7 +256,7 @@ void KActionsOptions::defaults()
void KActionsOptions::moduleChanged(bool state)
{
- emit KCModule::changed(state);
+ emit TDECModule::changed(state);
}
#include "main.moc"
diff --git a/twin/kcmtwin/twinoptions/main.h b/twin/kcmtwin/twinoptions/main.h
index 2465c6766..4935cf39f 100644
--- a/twin/kcmtwin/twinoptions/main.h
+++ b/twin/kcmtwin/twinoptions/main.h
@@ -28,14 +28,14 @@
#include <tqtabwidget.h>
#include <kcmodule.h>
-class KConfig;
+class TDEConfig;
class KFocusConfig;
class KTitleBarActionsConfig;
class KWindowActionsConfig;
class KAdvancedConfig;
class KTranslucencyConfig;
-class KWinOptions : public KCModule
+class KWinOptions : public TDECModule
{
Q_OBJECT
@@ -66,10 +66,10 @@ private:
KAdvancedConfig *mAdvanced;
KTranslucencyConfig *mTranslucency;
- KConfig *mConfig;
+ TDEConfig *mConfig;
};
-class KActionsOptions : public KCModule
+class KActionsOptions : public TDECModule
{
Q_OBJECT
@@ -94,7 +94,7 @@ private:
KTitleBarActionsConfig *mTitleBarActions;
KWindowActionsConfig *mWindowActions;
- KConfig *mConfig;
+ TDEConfig *mConfig;
};
#endif
diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp
index 76b4ba2f9..5c1e22d35 100644
--- a/twin/kcmtwin/twinoptions/mouse.cpp
+++ b/twin/kcmtwin/twinoptions/mouse.cpp
@@ -132,8 +132,8 @@ void KTitleBarActionsConfig::paletteChanged()
}
-KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_config, TQWidget * parent, const char *)
- : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
+KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_config, TQWidget * parent, const char *)
+ : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3;
TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
@@ -584,8 +584,8 @@ void KTitleBarActionsConfig::defaults()
}
-KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, TQWidget * parent, const char *)
- : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
+KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config, TQWidget * parent, const char *)
+ : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3, strAllW;
TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
diff --git a/twin/kcmtwin/twinoptions/mouse.h b/twin/kcmtwin/twinoptions/mouse.h
index 49591e5d8..70ff2bfca 100644
--- a/twin/kcmtwin/twinoptions/mouse.h
+++ b/twin/kcmtwin/twinoptions/mouse.h
@@ -22,7 +22,7 @@
#ifndef __KKWMMOUSECONFIG_H__
#define __KKWMMOUSECONFIG_H__
-class KConfig;
+class TDEConfig;
#include <tqwidget.h>
#include <kcmodule.h>
@@ -48,13 +48,13 @@ protected:
-class KTitleBarActionsConfig : public KCModule
+class KTitleBarActionsConfig : public TDECModule
{
Q_OBJECT
public:
- KTitleBarActionsConfig( bool _standAlone, KConfig *_config, TQWidget *parent=0, const char* name=0 );
+ KTitleBarActionsConfig( bool _standAlone, TDEConfig *_config, TQWidget *parent=0, const char* name=0 );
~KTitleBarActionsConfig( );
void load();
@@ -62,7 +62,7 @@ public:
void defaults();
public slots:
- void changed() { emit KCModule::changed(true); }
+ void changed() { emit TDECModule::changed(true); }
private:
TQComboBox* coTiDbl;
@@ -77,7 +77,7 @@ private:
ToolTipComboBox * coMax[3];
- KConfig *config;
+ TDEConfig *config;
bool standAlone;
const char* functionTiDbl(int);
@@ -94,13 +94,13 @@ private slots:
};
-class KWindowActionsConfig : public KCModule
+class KWindowActionsConfig : public TDECModule
{
Q_OBJECT
public:
- KWindowActionsConfig( bool _standAlone, KConfig *_config, TQWidget *parent=0, const char* name=0 );
+ KWindowActionsConfig( bool _standAlone, TDEConfig *_config, TQWidget *parent=0, const char* name=0 );
~KWindowActionsConfig( );
void load();
@@ -108,7 +108,7 @@ public:
void defaults();
public slots:
- void changed() { emit KCModule::changed(true); }
+ void changed() { emit TDECModule::changed(true); }
private:
TQComboBox* coWin1;
@@ -121,7 +121,7 @@ private:
TQComboBox* coAll3;
TQComboBox* coAllW;
- KConfig *config;
+ TDEConfig *config;
bool standAlone;
const char* functionWin(int);
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index fd2152db2..41a593388 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -101,8 +101,8 @@ KFocusConfig::~KFocusConfig ()
}
// removed the LCD display over the slider - this is not good GUI design :) RNolden 051701
-KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * parent, const char *)
- : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
+KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * parent, const char *)
+ : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
TQString wtstr;
TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint());
@@ -437,7 +437,7 @@ void KFocusConfig::setActiveMouseScreen(bool a) {
void KFocusConfig::updateActiveMouseScreen()
{
// on by default for non click to focus policies
- KConfigGroup cfg( config, "Windows" );
+ TDEConfigGroup cfg( config, "Windows" );
if( !cfg.hasKey( KWIN_ACTIVE_MOUSE_SCREEN ))
setActiveMouseScreen( focusCombo->currentItem() != 0 );
}
@@ -514,7 +514,7 @@ void KFocusConfig::load( void )
setTraverseAll( config->readBoolEntry(KWIN_TRAVERSE_ALL, false ));
config->setGroup("Desktops");
- emit KCModule::changed(false);
+ emit TDECModule::changed(false);
}
void KFocusConfig::save( void )
@@ -583,7 +583,7 @@ void KFocusConfig::save( void )
kapp->dcopClient()->attach();
kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
}
- emit KCModule::changed(false);
+ emit TDECModule::changed(false);
}
void KFocusConfig::defaults()
@@ -604,7 +604,7 @@ void KFocusConfig::defaults()
// setFocusStealing(2);
// TODO default to low for now
setFocusStealing(1);
- emit KCModule::changed(true);
+ emit TDECModule::changed(true);
}
KAdvancedConfig::~KAdvancedConfig ()
@@ -613,8 +613,8 @@ KAdvancedConfig::~KAdvancedConfig ()
delete config;
}
-KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, TQWidget *parent, const char *)
- : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
+KAdvancedConfig::KAdvancedConfig (bool _standAlone, TDEConfig *_config, TQWidget *parent, const char *)
+ : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
TQString wtstr;
TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint());
@@ -741,7 +741,7 @@ void KAdvancedConfig::load( void )
setHideUtilityWindowsForInactive( config->readBoolEntry( KWIN_HIDE_UTILITY, true ));
- emit KCModule::changed(false);
+ emit TDECModule::changed(false);
}
void KAdvancedConfig::save( void )
@@ -771,7 +771,7 @@ void KAdvancedConfig::save( void )
kapp->dcopClient()->attach();
kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
}
- emit KCModule::changed(false);
+ emit TDECModule::changed(false);
}
void KAdvancedConfig::defaults()
@@ -782,7 +782,7 @@ void KAdvancedConfig::defaults()
setElectricBorders(0);
setElectricBorderDelay(150);
setHideUtilityWindowsForInactive( true );
- emit KCModule::changed(true);
+ emit TDECModule::changed(true);
}
void KAdvancedConfig::setEBorders()
@@ -826,8 +826,8 @@ KMovingConfig::~KMovingConfig ()
delete config;
}
-KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *parent, const char *)
- : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
+KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *parent, const char *)
+ : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
TQString wtstr;
TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint());
@@ -1163,7 +1163,7 @@ void KMovingConfig::load( void )
else setWindowSnapZone(v);
OverlapSnap->setChecked(config->readBoolEntry("SnapOnlyWhenOverlapping",false));
- emit KCModule::changed(false);
+ emit TDECModule::changed(false);
}
void KMovingConfig::save( void )
@@ -1225,7 +1225,7 @@ void KMovingConfig::save( void )
kapp->dcopClient()->attach();
kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
}
- emit KCModule::changed(false);
+ emit TDECModule::changed(false);
}
void KMovingConfig::defaults()
@@ -1243,7 +1243,7 @@ void KMovingConfig::defaults()
setMinimizeAnim( true );
setMinimizeAnimSpeed( 5 );
- emit KCModule::changed(true);
+ emit TDECModule::changed(true);
}
int KMovingConfig::getBorderSnapZone() {
@@ -1270,8 +1270,8 @@ KTranslucencyConfig::~KTranslucencyConfig ()
kompmgr->detach();
}
-KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, TQWidget *parent, const char *)
- : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
+KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config, TQWidget *parent, const char *)
+ : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
kompmgr = 0L;
resetKompmgr_ = FALSE;
@@ -1558,7 +1558,7 @@ void KTranslucencyConfig::load( void )
movingWindowOpacity->setEnabled(movingWindowTransparency->isChecked());
dockWindowOpacity->setEnabled(dockWindowTransparency->isChecked());
- KConfig conf_(TQDir::homeDirPath() + "/.xcompmgrrc");
+ TDEConfig conf_(TQDir::homeDirPath() + "/.xcompmgrrc");
conf_.setGroup("xcompmgr");
disableARGB->setChecked(conf_.readBoolEntry("DisableARGB",FALSE));
@@ -1589,7 +1589,7 @@ void KTranslucencyConfig::load( void )
fadeInSpeed->setValue((int)(conf_.readDoubleNumEntry("FadeInStep",0.070)*1000.0));
fadeOutSpeed->setValue((int)(conf_.readDoubleNumEntry("FadeOutStep",0.070)*1000.0));
- emit KCModule::changed(false);
+ emit TDECModule::changed(false);
}
void KTranslucencyConfig::save( void )
@@ -1625,7 +1625,7 @@ void KTranslucencyConfig::save( void )
config->writeEntry("OnlyDecoTranslucent", onlyDecoTranslucent->isChecked());
config->writeEntry("ResetKompmgr",resetKompmgr_);
- KConfig *conf_ = new KConfig(TQDir::homeDirPath() + "/.xcompmgrrc");
+ TDEConfig *conf_ = new TDEConfig(TQDir::homeDirPath() + "/.xcompmgrrc");
conf_->setGroup("xcompmgr");
conf_->writeEntry("Compmode",useShadows->isChecked()?"CompClientShadows":"");
@@ -1659,7 +1659,7 @@ void KTranslucencyConfig::save( void )
startKompmgr();
else
stopKompmgr();
- emit KCModule::changed(false);
+ emit TDECModule::changed(false);
}
void KTranslucencyConfig::defaults()
@@ -1701,7 +1701,7 @@ void KTranslucencyConfig::defaults()
fadeOnOpacityChange->setChecked(FALSE);
fadeInSpeed->setValue(70);
fadeOutSpeed->setValue(70);
- emit KCModule::changed(true);
+ emit TDECModule::changed(true);
}
diff --git a/twin/kcmtwin/twinoptions/windows.h b/twin/kcmtwin/twinoptions/windows.h
index 4c6290a4e..f0b0bcd9f 100644
--- a/twin/kcmtwin/twinoptions/windows.h
+++ b/twin/kcmtwin/twinoptions/windows.h
@@ -68,11 +68,11 @@ class KIntNumInput;
class TQSpinBox;
-class KFocusConfig : public KCModule
+class KFocusConfig : public TDECModule
{
Q_OBJECT
public:
- KFocusConfig( bool _standAlone, KConfig *_config, TQWidget *parent=0, const char* name=0 );
+ KFocusConfig( bool _standAlone, TDEConfig *_config, TQWidget *parent=0, const char* name=0 );
~KFocusConfig();
void load();
@@ -87,7 +87,7 @@ private slots:
void clickRaiseOnTog(bool);
void updateAltTabMode();
void updateActiveMouseScreen();
- void changed() { emit KCModule::changed(true); }
+ void changed() { emit TDECModule::changed(true); }
private:
@@ -127,15 +127,15 @@ private:
TQCheckBox *rollOverDesktops;
TQCheckBox *showPopupinfo;
- KConfig *config;
+ TDEConfig *config;
bool standAlone;
};
-class KMovingConfig : public KCModule
+class KMovingConfig : public TDECModule
{
Q_OBJECT
public:
- KMovingConfig( bool _standAlone, KConfig *config, TQWidget *parent=0, const char* name=0 );
+ KMovingConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 );
~KMovingConfig();
void load();
@@ -145,7 +145,7 @@ public:
private slots:
void setMinimizeAnim( bool );
void setMinimizeAnimSpeed( int );
- void changed() { emit KCModule::changed(true); }
+ void changed() { emit TDECModule::changed(true); }
void slotBrdrSnapChanged( int );
void slotWndwSnapChanged( int );
@@ -174,7 +174,7 @@ private:
TQComboBox *placementCombo;
- KConfig *config;
+ TDEConfig *config;
bool standAlone;
int getBorderSnapZone();
@@ -188,11 +188,11 @@ private:
};
-class KAdvancedConfig : public KCModule
+class KAdvancedConfig : public TDECModule
{
Q_OBJECT
public:
- KAdvancedConfig( bool _standAlone, KConfig *config, TQWidget *parent=0, const char* name=0 );
+ KAdvancedConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 );
~KAdvancedConfig();
void load();
@@ -205,7 +205,7 @@ private slots:
//copied from kcontrol/konq/twindesktop, aleXXX
void setEBorders();
- void changed() { emit KCModule::changed(true); }
+ void changed() { emit TDECModule::changed(true); }
private:
@@ -219,7 +219,7 @@ private:
TQCheckBox *shadeHoverOn;
KIntNumInput *shadeHover;
- KConfig *config;
+ TDEConfig *config;
bool standAlone;
int getElectricBorders( void );
@@ -239,11 +239,11 @@ private:
};
class TDEProcess;
-class KTranslucencyConfig : public KCModule
+class KTranslucencyConfig : public TDECModule
{
Q_OBJECT
public:
- KTranslucencyConfig( bool _standAlone, KConfig *config, TQWidget *parent=0, const char* name=0 );
+ KTranslucencyConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 );
~KTranslucencyConfig();
void load();
@@ -281,7 +281,7 @@ private:
KIntNumInput *fadeInSpeed;
KIntNumInput *fadeOutSpeed;
KColorButton *shadowColor;
- KConfig *config;
+ TDEConfig *config;
bool standAlone;
bool alphaActivated;
bool resetKompmgr_;
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();