diff options
Diffstat (limited to 'twin')
52 files changed, 231 insertions, 231 deletions
diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp index 027987b9c..4e174cf44 100644 --- a/twin/clients/b2/b2client.cpp +++ b/twin/clients/b2/b2client.cpp @@ -103,7 +103,7 @@ static void read_config(B2ClientFactory *f) buttonSize = (TQFontMetrics(options()->font(true)).height() + 1) & 0x3e; if (buttonSize < 16) buttonSize = 16; - KConfig conf("twinb2rc"); + TDEConfig conf("twinb2rc"); conf.setGroup("General"); colored_frame = conf.readBoolEntry("UseTitleBarBorderColors", false); do_draw_handle = conf.readBoolEntry("DrawGrabHandle", true); diff --git a/twin/clients/b2/config/config.cpp b/twin/clients/b2/config/config.cpp index 6289ec992..ca2e77c4a 100644 --- a/twin/clients/b2/config/config.cpp +++ b/twin/clients/b2/config/config.cpp @@ -15,7 +15,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent ) + KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return(new B2Config(conf, parent)); } @@ -30,11 +30,11 @@ extern "C" * Configure tab in twindecoration */ -B2Config::B2Config( KConfig* conf, TQWidget* parent ) +B2Config::B2Config( TDEConfig* conf, TQWidget* parent ) : TQObject( parent ) { TDEGlobal::locale()->insertCatalogue("twin_b2_config"); - b2Config = new KConfig("twinb2rc"); + b2Config = new TDEConfig("twinb2rc"); gb = new TQVBox(parent); cbColorBorder = new TQCheckBox( @@ -96,7 +96,7 @@ void B2Config::slotSelectionChanged() // Loads the configurable options from the twinrc config file // It is passed the open config from twindecoration to improve efficiency -void B2Config::load(KConfig * /*conf*/) +void B2Config::load(TDEConfig * /*conf*/) { b2Config->setGroup("General"); @@ -141,7 +141,7 @@ static TQString opToString(int op) // Saves the configurable options to the twinrc config file -void B2Config::save(KConfig * /*conf*/) +void B2Config::save(TDEConfig * /*conf*/) { b2Config->setGroup("General"); b2Config->writeEntry("UseTitleBarBorderColors", cbColorBorder->isChecked()); diff --git a/twin/clients/b2/config/config.h b/twin/clients/b2/config/config.h index 99d664ad1..53bd42767 100644 --- a/twin/clients/b2/config/config.h +++ b/twin/clients/b2/config/config.h @@ -21,7 +21,7 @@ class B2Config: public TQObject Q_OBJECT public: - B2Config( KConfig* conf, TQWidget* parent ); + B2Config( TDEConfig* conf, TQWidget* parent ); ~B2Config(); // These public signals/slots work similar to KCM modules @@ -29,15 +29,15 @@ class B2Config: public TQObject void changed(); public slots: - void load( KConfig* conf ); - void save( KConfig* conf ); + void load( TDEConfig* conf ); + void save( TDEConfig* conf ); void defaults(); protected slots: void slotSelectionChanged(); // Internal use private: - KConfig* b2Config; + TDEConfig* b2Config; TQCheckBox* cbColorBorder; TQCheckBox* showGrabHandleCb; TQHGroupBox* actionsGB; diff --git a/twin/clients/default/config/config.cpp b/twin/clients/default/config/config.cpp index 43302b552..8e53dcc75 100644 --- a/twin/clients/default/config/config.cpp +++ b/twin/clients/default/config/config.cpp @@ -17,7 +17,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent ) + KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return(new KDEDefaultConfig(conf, parent)); } @@ -29,7 +29,7 @@ extern "C" // 'parent' is the parent of the TQObject, which is a VBox inside the // Configure tab in twindecoration -KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, TQWidget* parent ) +KDEDefaultConfig::KDEDefaultConfig( TDEConfig* conf, TQWidget* parent ) : TQObject( parent ) { TDEGlobal::locale()->insertCatalogue("twin_clients"); @@ -88,7 +88,7 @@ void KDEDefaultConfig::slotSelectionChanged() // Loads the configurable options from the twinrc config file // It is passed the open config from twindecoration to improve efficiency -void KDEDefaultConfig::load( KConfig* conf ) +void KDEDefaultConfig::load( TDEConfig* conf ) { conf->setGroup("KDEDefault"); bool override = conf->readBoolEntry( "ShowTitleBarStipple", true ); @@ -105,7 +105,7 @@ void KDEDefaultConfig::load( KConfig* conf ) // Saves the configurable options to the twinrc config file -void KDEDefaultConfig::save( KConfig* conf ) +void KDEDefaultConfig::save( TDEConfig* conf ) { conf->setGroup("KDEDefault"); conf->writeEntry( "ShowTitleBarStipple", cbShowStipple->isChecked() ); diff --git a/twin/clients/default/config/config.h b/twin/clients/default/config/config.h index 733b96141..fcd9fbf23 100644 --- a/twin/clients/default/config/config.h +++ b/twin/clients/default/config/config.h @@ -22,7 +22,7 @@ class KDEDefaultConfig: public TQObject Q_OBJECT public: - KDEDefaultConfig( KConfig* conf, TQWidget* parent ); + KDEDefaultConfig( TDEConfig* conf, TQWidget* parent ); ~KDEDefaultConfig(); // These public signals/slots work similar to KCM modules @@ -30,8 +30,8 @@ class KDEDefaultConfig: public TQObject void changed(); public slots: - void load( KConfig* conf ); - void save( KConfig* conf ); + void load( TDEConfig* conf ); + void save( TDEConfig* conf ); void defaults(); protected slots: diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp index 3c8ce2365..52fff00f3 100644 --- a/twin/clients/default/kdedefault.cpp +++ b/twin/clients/default/kdedefault.cpp @@ -192,7 +192,7 @@ bool KDEDefaultHandler::reset( unsigned long changed ) unsigned long KDEDefaultHandler::readConfig( bool update ) { unsigned long changed = 0; - KConfig* conf = TDEGlobal::config(); + TDEConfig* conf = TDEGlobal::config(); conf->setGroup("KDEDefault"); bool new_showGrabBar = conf->readBoolEntry("ShowGrabBar", true); diff --git a/twin/clients/keramik/config/config.cpp b/twin/clients/keramik/config/config.cpp index a11695dd2..6d4695da2 100644 --- a/twin/clients/keramik/config/config.cpp +++ b/twin/clients/keramik/config/config.cpp @@ -33,7 +33,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent ) + KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return ( new KeramikConfig( conf, parent ) ); } @@ -48,11 +48,11 @@ extern "C" * Configure tab in twindecoration */ -KeramikConfig::KeramikConfig( KConfig* conf, TQWidget* parent ) +KeramikConfig::KeramikConfig( TDEConfig* conf, TQWidget* parent ) : TQObject( parent ) { TDEGlobal::locale()->insertCatalogue("twin_clients"); - c = new KConfig( "twinkeramikrc" ); + c = new TDEConfig( "twinkeramikrc" ); ui = new KeramikConfigUI( parent ); connect( ui->showAppIcons, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) ); @@ -74,7 +74,7 @@ KeramikConfig::~KeramikConfig() // Loads the configurable options from the twinrc config file // It is passed the open config from twindecoration to improve efficiency -void KeramikConfig::load( KConfig* ) +void KeramikConfig::load( TDEConfig* ) { c->setGroup("General"); ui->showAppIcons->setChecked( c->readBoolEntry("ShowAppIcons", true) ); @@ -85,7 +85,7 @@ void KeramikConfig::load( KConfig* ) // Saves the configurable options to the twinrc config file -void KeramikConfig::save( KConfig* ) +void KeramikConfig::save( TDEConfig* ) { c->setGroup( "General" ); c->writeEntry( "ShowAppIcons", ui->showAppIcons->isChecked() ); diff --git a/twin/clients/keramik/config/config.h b/twin/clients/keramik/config/config.h index 911af89fb..4138fe958 100644 --- a/twin/clients/keramik/config/config.h +++ b/twin/clients/keramik/config/config.h @@ -35,7 +35,7 @@ class KeramikConfig: public TQObject public: - KeramikConfig( KConfig* conf, TQWidget* parent ); + KeramikConfig( TDEConfig* conf, TQWidget* parent ); ~KeramikConfig(); // These public signals/slots work similar to KCM modules @@ -43,13 +43,13 @@ class KeramikConfig: public TQObject void changed(); public slots: - void load( KConfig* conf ); - void save( KConfig* conf ); + void load( TDEConfig* conf ); + void save( TDEConfig* conf ); void defaults(); private: KeramikConfigUI *ui; - KConfig *c; + TDEConfig *c; }; diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp index 2ffbbdfee..3825a851a 100644 --- a/twin/clients/keramik/keramik.cpp +++ b/twin/clients/keramik/keramik.cpp @@ -562,7 +562,7 @@ void KeramikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir ) void KeramikHandler::readConfig() { - KConfig *c = new KConfig( "twinkeramikrc" ); + TDEConfig *c = new TDEConfig( "twinkeramikrc" ); c->setGroup( "General" ); showIcons = c->readBoolEntry( "ShowAppIcons", true ); diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp index 2d944e344..4e5166c2e 100644 --- a/twin/clients/kwmtheme/cli_installer/main.cpp +++ b/twin/clients/kwmtheme/cli_installer/main.cpp @@ -69,7 +69,7 @@ int main(int argc, char **argv) TQFileInfo fi(f); KSimpleConfig input(fi.absFilePath()); srcStr = fi.dirPath(true) + "/"; - KConfig *output = TDEGlobal::config(); + TDEConfig *output = TDEGlobal::config(); input.setGroup("Window Border"); output->setGroup("General"); diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp index 012cacc0e..33b71994e 100644 --- a/twin/clients/kwmtheme/kwmthemeclient.cpp +++ b/twin/clients/kwmtheme/kwmthemeclient.cpp @@ -83,7 +83,7 @@ static void create_pixmaps() return; pixmaps_created = true; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); TQString tmpStr; @@ -270,7 +270,7 @@ void KWMThemeClient::init() TQBoxLayout* hb = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0); layout->addLayout( hb, 1, 1 ); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Buttons"); TQString val; MyButton *btn; diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp index 84bc23506..4c87829be 100644 --- a/twin/clients/modernsystem/config/config.cpp +++ b/twin/clients/modernsystem/config/config.cpp @@ -12,7 +12,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config(KConfig* conf, TQWidget* parent) + KDE_EXPORT TQObject* allocate_config(TDEConfig* conf, TQWidget* parent) { return(new ModernSysConfig(conf, parent)); } @@ -25,9 +25,9 @@ extern "C" // 'parent' is the parent of the TQObject, which is a VBox inside the // Configure tab in twindecoration -ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(parent) +ModernSysConfig::ModernSysConfig(TDEConfig* conf, TQWidget* parent) : TQObject(parent) { - clientrc = new KConfig("twinmodernsysrc"); + clientrc = new TDEConfig("twinmodernsysrc"); TDEGlobal::locale()->insertCatalogue("twin_clients"); mainw = new TQWidget(parent); vbox = new TQVBoxLayout(mainw); @@ -95,7 +95,7 @@ void ModernSysConfig::slotSelectionChanged() } -void ModernSysConfig::load(KConfig* /*conf*/) +void ModernSysConfig::load(TDEConfig* /*conf*/) { clientrc->setGroup("General"); bool i = clientrc->readBoolEntry("ShowHandle", true ); @@ -109,7 +109,7 @@ void ModernSysConfig::load(KConfig* /*conf*/) } -void ModernSysConfig::save(KConfig* /*conf*/) +void ModernSysConfig::save(TDEConfig* /*conf*/) { clientrc->setGroup("General"); clientrc->writeEntry("ShowHandle", cbShowHandle->isChecked()); diff --git a/twin/clients/modernsystem/config/config.h b/twin/clients/modernsystem/config/config.h index 3a04573cf..20ce5539e 100644 --- a/twin/clients/modernsystem/config/config.h +++ b/twin/clients/modernsystem/config/config.h @@ -13,7 +13,7 @@ class ModernSysConfig : public TQObject Q_OBJECT public: - ModernSysConfig(KConfig* conf, TQWidget* parent); + ModernSysConfig(TDEConfig* conf, TQWidget* parent); ~ModernSysConfig(); // These public signals/slots work similar to KCM modules @@ -21,15 +21,15 @@ class ModernSysConfig : public TQObject void changed(); public slots: - void load(KConfig* conf); - void save(KConfig* conf); + void load(TDEConfig* conf); + void save(TDEConfig* conf); void defaults(); protected slots: void slotSelectionChanged(); // Internal use private: - KConfig *clientrc; + TDEConfig *clientrc; TQWidget *mainw; TQVBoxLayout *vbox; TQWidget *handleBox; diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp index 3d71afd7e..8fbd1e38c 100644 --- a/twin/clients/modernsystem/modernsys.cpp +++ b/twin/clients/modernsystem/modernsys.cpp @@ -217,7 +217,7 @@ void ModernSysFactory::read_config() bool showh; int hsize, hwidth, bwidth, theight; - KConfig c("twinmodernsysrc"); + TDEConfig c("twinmodernsysrc"); c.setGroup("General"); showh = c.readBoolEntry("ShowHandle", true); diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp index 73a749bdb..d79800d4a 100644 --- a/twin/clients/plastik/config/config.cpp +++ b/twin/clients/plastik/config/config.cpp @@ -34,11 +34,11 @@ #include "config.h" #include "configdialog.h" -PlastikConfig::PlastikConfig(KConfig* config, TQWidget* parent) +PlastikConfig::PlastikConfig(TDEConfig* config, TQWidget* parent) : TQObject(parent), m_config(0), m_dialog(0) { // create the configuration object - m_config = new KConfig("twinplastikrc"); + m_config = new TDEConfig("twinplastikrc"); TDEGlobal::locale()->insertCatalogue("twin_clients"); // create and show the configuration dialog @@ -67,7 +67,7 @@ PlastikConfig::~PlastikConfig() if (m_config) delete m_config; } -void PlastikConfig::load(KConfig*) +void PlastikConfig::load(TDEConfig*) { m_config->setGroup("General"); @@ -85,7 +85,7 @@ void PlastikConfig::load(KConfig*) m_dialog->coloredBorder->setChecked(coloredBorder); } -void PlastikConfig::save(KConfig*) +void PlastikConfig::save(TDEConfig*) { m_config->setGroup("General"); @@ -115,7 +115,7 @@ void PlastikConfig::defaults() extern "C" { - KDE_EXPORT TQObject* allocate_config(KConfig* config, TQWidget* parent) { + KDE_EXPORT TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { return (new PlastikConfig(config, parent)); } } diff --git a/twin/clients/plastik/config/config.h b/twin/clients/plastik/config/config.h index d06bd30b8..73231c50f 100644 --- a/twin/clients/plastik/config/config.h +++ b/twin/clients/plastik/config/config.h @@ -27,26 +27,26 @@ class TQButtonGroup; class TQGroupBox; -class KConfig; +class TDEConfig; class ConfigDialog; class PlastikConfig : public TQObject { Q_OBJECT public: - PlastikConfig(KConfig* config, TQWidget* parent); + PlastikConfig(TDEConfig* config, TQWidget* parent); ~PlastikConfig(); signals: void changed(); public slots: - void load(KConfig *config); - void save(KConfig *config); + void load(TDEConfig *config); + void save(TDEConfig *config); void defaults(); private: - KConfig *m_config; + TDEConfig *m_config; ConfigDialog *m_dialog; }; diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp index 76d643904..2072302d7 100644 --- a/twin/clients/plastik/plastik.cpp +++ b/twin/clients/plastik/plastik.cpp @@ -162,7 +162,7 @@ bool PlastikHandler::supports( Ability ability ) void PlastikHandler::readConfig() { // create a config object - KConfig config("twinplastikrc"); + TDEConfig config("twinplastikrc"); config.setGroup("General"); // grab settings diff --git a/twin/clients/quartz/config/config.cpp b/twin/clients/quartz/config/config.cpp index 31ac3b83b..d3364af14 100644 --- a/twin/clients/quartz/config/config.cpp +++ b/twin/clients/quartz/config/config.cpp @@ -15,7 +15,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent ) + KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return(new QuartzConfig(conf, parent)); } @@ -30,10 +30,10 @@ extern "C" * Configure tab in twindecoration */ -QuartzConfig::QuartzConfig( KConfig* conf, TQWidget* parent ) +QuartzConfig::QuartzConfig( TDEConfig* conf, TQWidget* parent ) : TQObject( parent ) { - quartzConfig = new KConfig("twinquartzrc"); + quartzConfig = new TDEConfig("twinquartzrc"); TDEGlobal::locale()->insertCatalogue("twin_clients"); gb = new TQVBox( parent ); cbColorBorder = new TQCheckBox( @@ -72,7 +72,7 @@ void QuartzConfig::slotSelectionChanged() // Loads the configurable options from the twinrc config file // It is passed the open config from twindecoration to improve efficiency -void QuartzConfig::load( KConfig* /*conf*/ ) +void QuartzConfig::load( TDEConfig* /*conf*/ ) { quartzConfig->setGroup("General"); bool override = quartzConfig->readBoolEntry( "UseTitleBarBorderColors", true ); @@ -83,7 +83,7 @@ void QuartzConfig::load( KConfig* /*conf*/ ) // Saves the configurable options to the twinrc config file -void QuartzConfig::save( KConfig* /*conf*/ ) +void QuartzConfig::save( TDEConfig* /*conf*/ ) { quartzConfig->setGroup("General"); quartzConfig->writeEntry( "UseTitleBarBorderColors", cbColorBorder->isChecked() ); diff --git a/twin/clients/quartz/config/config.h b/twin/clients/quartz/config/config.h index 6bd1ba384..d334930c8 100644 --- a/twin/clients/quartz/config/config.h +++ b/twin/clients/quartz/config/config.h @@ -19,7 +19,7 @@ class QuartzConfig: public TQObject Q_OBJECT public: - QuartzConfig( KConfig* conf, TQWidget* parent ); + QuartzConfig( TDEConfig* conf, TQWidget* parent ); ~QuartzConfig(); // These public signals/slots work similar to KCM modules @@ -27,15 +27,15 @@ class QuartzConfig: public TQObject void changed(); public slots: - void load( KConfig* conf ); - void save( KConfig* conf ); + void load( TDEConfig* conf ); + void save( TDEConfig* conf ); void defaults(); protected slots: void slotSelectionChanged(); // Internal use private: - KConfig* quartzConfig; + TDEConfig* quartzConfig; TQCheckBox* cbColorBorder; TQCheckBox* cbExtraSmall; TQVBox* gb; diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp index 21b4c039c..09d3ccf52 100644 --- a/twin/clients/quartz/quartz.cpp +++ b/twin/clients/quartz/quartz.cpp @@ -201,7 +201,7 @@ bool QuartzHandler::supports( Ability ability ) void QuartzHandler::readConfig() { - KConfig conf("twinquartzrc"); + TDEConfig conf("twinquartzrc"); conf.setGroup("General"); coloredFrame = conf.readBoolEntry( "UseTitleBarBorderColors", true ); extraSlim = conf.readBoolEntry( "UseQuartzExtraSlim", false ); diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp index f799e1b8b..94bf98f35 100644 --- a/twin/clients/web/Web.cpp +++ b/twin/clients/web/Web.cpp @@ -183,7 +183,7 @@ WebClient::init() if (0 != titleHeight_ % 2) titleHeight_ += 1; - KConfig c("twinwebrc"); + TDEConfig c("twinwebrc"); c.setGroup("General"); shape_ = c.readBoolEntry("Shape", true); diff --git a/twin/data/update_default_rules.cpp b/twin/data/update_default_rules.cpp index 349c0c6e5..61b03d3c4 100644 --- a/twin/data/update_default_rules.cpp +++ b/twin/data/update_default_rules.cpp @@ -27,8 +27,8 @@ int main( int argc, char* argv[] ) kdWarning() << "File " << argv[ 1 ] << " not found!" << endl; return 1; } - KConfig src_cfg( file ); - KConfig dest_cfg( "twinrulesrc" ); + TDEConfig src_cfg( file ); + TDEConfig dest_cfg( "twinrulesrc" ); src_cfg.setGroup( "General" ); dest_cfg.setGroup( "General" ); int count = src_cfg.readNumEntry( "count", 0 ); diff --git a/twin/data/update_window_settings.cpp b/twin/data/update_window_settings.cpp index 0cbd28353..40b25db9c 100644 --- a/twin/data/update_window_settings.cpp +++ b/twin/data/update_window_settings.cpp @@ -62,7 +62,7 @@ NET::WindowType txtToWindowType( const char* txt ) return static_cast< NET::WindowType >( -2 ); // undefined } -void loadFakeSessionInfo( KConfig* config ) +void loadFakeSessionInfo( TDEConfig* config ) { fakeSession.clear(); config->setGroup("FakeSession" ); @@ -97,7 +97,7 @@ void loadFakeSessionInfo( KConfig* config ) config->deleteGroup( "FakeSession" ); } -void writeRules( KConfig& cfg ) +void writeRules( TDEConfig& cfg ) { cfg.setGroup( "General" ); int pos = cfg.readNumEntry( "count" ); @@ -156,8 +156,8 @@ void writeRules( KConfig& cfg ) int main() { TDEInstance inst( "twin_update_window_settings" ); - KConfig src_cfg( "twinrc" ); - KConfig dest_cfg( "twinrulesrc" ); + TDEConfig src_cfg( "twinrc" ); + TDEConfig dest_cfg( "twinrulesrc" ); loadFakeSessionInfo( &src_cfg ); writeRules( dest_cfg ); src_cfg.sync(); 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(); diff --git a/twin/lib/kdecoration_p.cpp b/twin/lib/kdecoration_p.cpp index fbf35c285..66d886aec 100644 --- a/twin/lib/kdecoration_p.cpp +++ b/twin/lib/kdecoration_p.cpp @@ -63,7 +63,7 @@ void KDecorationOptionsPrivate::defaultKWinSettings() OpMaxButtonLeftClick = HMaximizeOp; } -unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config ) +unsigned long KDecorationOptionsPrivate::updateKWinSettings( TDEConfig* config ) { unsigned long changed = 0; TQString old_group = config->group(); diff --git a/twin/lib/kdecoration_p.h b/twin/lib/kdecoration_p.h index 58f386c9b..2634ea140 100644 --- a/twin/lib/kdecoration_p.h +++ b/twin/lib/kdecoration_p.h @@ -33,7 +33,7 @@ DEALINGS IN THE SOFTWARE. #include <tqwidget.h> #include <tqvaluelist.h> -class KConfig; +class TDEConfig; class KWIN_EXPORT KDecorationOptionsPrivate : public KDecorationDefines { @@ -41,7 +41,7 @@ class KWIN_EXPORT KDecorationOptionsPrivate : public KDecorationDefines KDecorationOptionsPrivate(); virtual ~KDecorationOptionsPrivate(); void defaultKWinSettings(); // shared implementation - unsigned long updateKWinSettings( KConfig* ); // shared implementation + unsigned long updateKWinSettings( TDEConfig* ); // shared implementation BorderSize findPreferredBorderSize( BorderSize size, TQValueList< BorderSize > ) const; // shared implementation TQColor colors[NUM_COLORS*2]; diff --git a/twin/lib/kdecoration_plugins_p.cpp b/twin/lib/kdecoration_plugins_p.cpp index b680170c3..e6c6cfe36 100644 --- a/twin/lib/kdecoration_plugins_p.cpp +++ b/twin/lib/kdecoration_plugins_p.cpp @@ -36,7 +36,7 @@ DEALINGS IN THE SOFTWARE. #include "kdecorationfactory.h" -KDecorationPlugins::KDecorationPlugins( KConfig* cfg ) +KDecorationPlugins::KDecorationPlugins( TDEConfig* cfg ) : create_ptr( NULL ), library( NULL ), fact( NULL ), @@ -95,7 +95,7 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr ) { if( nameStr.isEmpty()) { - KConfigGroupSaver saver( config, "Style" ); + TDEConfigGroupSaver saver( config, "Style" ); nameStr = config->readEntry("PluginLib", defaultPlugin ); } // make sure people can switch between HEAD and twin_iii branch diff --git a/twin/lib/kdecoration_plugins_p.h b/twin/lib/kdecoration_plugins_p.h index 81dbb6b68..e45f5b674 100644 --- a/twin/lib/kdecoration_plugins_p.h +++ b/twin/lib/kdecoration_plugins_p.h @@ -37,7 +37,7 @@ DEALINGS IN THE SOFTWARE. #include "kdecoration.h" class KLibrary; -class KConfig; +class TDEConfig; class KDecoration; class KDecorationBridge; class KDecorationFactory; @@ -46,7 +46,7 @@ class KWIN_EXPORT KDecorationPlugins : public KDecorationProvides { public: - KDecorationPlugins( KConfig* cfg ); + KDecorationPlugins( TDEConfig* cfg ); virtual ~KDecorationPlugins(); bool loadPlugin( TQString name ); void destroyPreviousPlugin(); @@ -64,7 +64,7 @@ class KWIN_EXPORT KDecorationPlugins KLibrary *old_library; KDecorationFactory* old_fact; TQString pluginStr; - KConfig* config; + TDEConfig* config; }; /* diff --git a/twin/options.cpp b/twin/options.cpp index c78cec2d9..d1dc123c5 100644 --- a/twin/options.cpp +++ b/twin/options.cpp @@ -46,7 +46,7 @@ Options::~Options() unsigned long Options::updateSettings() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); unsigned long changed = 0; changed |= d->updateKWinSettings( config ); // read decoration settings @@ -84,7 +84,7 @@ unsigned long Options::updateSettings() if( !focusPolicyIsReasonable()) // #48786, comments #7 and later focusStealingPreventionLevel = 0; - KConfig *gc = new KConfig("kdeglobals", false, false); + TDEConfig *gc = new TDEConfig("kdeglobals", false, false); gc->setGroup("Windows"); xineramaEnabled = gc->readBoolEntry ("XineramaEnabled", true ); xineramaPlacementEnabled = gc->readBoolEntry ("XineramaPlacementEnabled", true); @@ -218,11 +218,11 @@ unsigned long Options::updateSettings() // Since we want to allow users to enable window decoration tooltips // and not kstyle tooltips and vise-versa, we don't read the // "EffectNoTooltip" setting from kdeglobals. - KConfig globalConfig("kdeglobals"); + TDEConfig globalConfig("kdeglobals"); globalConfig.setGroup("KDE"); topmenus = globalConfig.readBoolEntry( "macStyle", false ); - KConfig kdesktopcfg( "kdesktoprc", true ); + TDEConfig kdesktopcfg( "kdesktoprc", true ); kdesktopcfg.setGroup( "Menubar" ); desktop_topmenu = kdesktopcfg.readBoolEntry( "ShowMenubar", false ); if( desktop_topmenu ) diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp index ea05dae04..e047981cc 100644 --- a/twin/popupinfo.cpp +++ b/twin/popupinfo.cpp @@ -116,7 +116,7 @@ void PopupInfo::hide() void PopupInfo::reconfigure() { - KConfig * c(TDEGlobal::config()); + TDEConfig * c(TDEGlobal::config()); c->setGroup("PopupInfo"); m_show = c->readBoolEntry("ShowPopup", false ); m_delayTime = c->readNumEntry("PopupHideDelay", 350 ); diff --git a/twin/rules.cpp b/twin/rules.cpp index 6d2d66906..6f2b3b615 100644 --- a/twin/rules.cpp +++ b/twin/rules.cpp @@ -107,7 +107,7 @@ Rules::Rules( const TQString& str, bool temporary ) var##rule = readForceRule( cfg, #var "rule" ); -Rules::Rules( KConfig& cfg ) +Rules::Rules( TDEConfig& cfg ) : temporary_state( 0 ) { readFromCfg( cfg ); @@ -115,7 +115,7 @@ Rules::Rules( KConfig& cfg ) static int limit0to4( int i ) { return QMAX( 0, QMIN( 4, i )); } -void Rules::readFromCfg( KConfig& cfg ) +void Rules::readFromCfg( TDEConfig& cfg ) { description = cfg.readEntry( "Description" ); if( description.isEmpty()) // capitalized first, lowercase for backwards compatibility @@ -216,7 +216,7 @@ void Rules::readFromCfg( KConfig& cfg ) cfg.deleteEntry( #var ); -void Rules::write( KConfig& cfg ) const +void Rules::write( TDEConfig& cfg ) const { cfg.writeEntry( "Description", description ); // always write wmclass @@ -293,7 +293,7 @@ bool Rules::isEmpty() const && disableglobalshortcutsrule == UnusedForceRule ); } -Rules::SetRule Rules::readSetRule( KConfig& cfg, const TQString& key ) +Rules::SetRule Rules::readSetRule( TDEConfig& cfg, const TQString& key ) { int v = cfg.readNumEntry( key ); if( v >= DontAffect && v <= ForceTemporarily ) @@ -301,7 +301,7 @@ Rules::SetRule Rules::readSetRule( KConfig& cfg, const TQString& key ) return UnusedSetRule; } -Rules::ForceRule Rules::readForceRule( KConfig& cfg, const TQString& key ) +Rules::ForceRule Rules::readForceRule( TDEConfig& cfg, const TQString& key ) { int v = cfg.readNumEntry( key ); if( v == DontAffect || v == Force || v == ForceTemporarily ) @@ -309,7 +309,7 @@ Rules::ForceRule Rules::readForceRule( KConfig& cfg, const TQString& key ) return UnusedForceRule; } -NET::WindowType Rules::readType( KConfig& cfg, const TQString& key ) +NET::WindowType Rules::readType( TDEConfig& cfg, const TQString& key ) { int v = cfg.readNumEntry( key ); if( v >= NET::Normal && v <= NET::Splash ) @@ -960,7 +960,7 @@ void Workspace::loadWindowRules() delete rules.front(); rules.pop_front(); } - KConfig cfg( "twinrulesrc", true ); + TDEConfig cfg( "twinrulesrc", true ); cfg.setGroup( "General" ); int count = cfg.readNumEntry( "count" ); for( int i = 1; @@ -976,7 +976,7 @@ void Workspace::loadWindowRules() void Workspace::writeWindowRules() { rulesUpdatedTimer.stop(); - KConfig cfg( "twinrulesrc" ); + TDEConfig cfg( "twinrulesrc" ); TQStringList groups = cfg.groupList(); for( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); diff --git a/twin/rules.h b/twin/rules.h index 061f0ce80..38e0bf2df 100644 --- a/twin/rules.h +++ b/twin/rules.h @@ -22,7 +22,7 @@ License. See the file "COPYING" for the exact licensing terms. #include "options.h" #include "utils.h" -class KConfig; +class TDEConfig; namespace KWinInternal { @@ -83,9 +83,9 @@ class Rules { public: Rules(); - Rules( KConfig& ); + Rules( TDEConfig& ); Rules( const TQString&, bool temporary ); - void write( KConfig& ) const; + void write( TDEConfig& ) const; bool isEmpty() const; #ifndef KCMRULES void discardUsed( bool withdrawn ); @@ -160,10 +160,10 @@ class Rules RegExpMatch, LastStringMatch = RegExpMatch }; - void readFromCfg( KConfig& cfg ); - static SetRule readSetRule( KConfig&, const TQString& key ); - static ForceRule readForceRule( KConfig&, const TQString& key ); - static NET::WindowType readType( KConfig&, const TQString& key ); + void readFromCfg( TDEConfig& cfg ); + static SetRule readSetRule( TDEConfig&, const TQString& key ); + static ForceRule readForceRule( TDEConfig&, const TQString& key ); + static NET::WindowType readType( TDEConfig&, const TQString& key ); #ifndef KCMRULES static bool checkSetRule( SetRule rule, bool init ); static bool checkForceRule( ForceRule rule ); diff --git a/twin/sm.cpp b/twin/sm.cpp index 752ea988c..af8217bfb 100644 --- a/twin/sm.cpp +++ b/twin/sm.cpp @@ -67,7 +67,7 @@ bool SessionManaged::commitData( TQSessionManager& sm ) \sa loadSessionInfo() */ -void Workspace::storeSession( KConfig* config, SMSavePhase phase ) +void Workspace::storeSession( TDEConfig* config, SMSavePhase phase ) { config->setGroup("Session" ); int count = 0; @@ -149,7 +149,7 @@ void Workspace::storeSession( KConfig* config, SMSavePhase phase ) void Workspace::loadSessionInfo() { session.clear(); - KConfig* config = kapp->sessionConfig(); + TDEConfig* config = kapp->sessionConfig(); config->setGroup("Session" ); int count = config->readNumEntry( "count" ); int active_client = config->readNumEntry( "active" ); diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp index b66e0df71..de5006903 100644 --- a/twin/tabbox.cpp +++ b/twin/tabbox.cpp @@ -667,7 +667,7 @@ void TabBox::hide() void TabBox::reconfigure() { - KConfig * c(TDEGlobal::config()); + TDEConfig * c(TDEGlobal::config()); c->setGroup("TabBox"); options_traverse_all = c->readBoolEntry("TraverseAll", false ); } @@ -692,7 +692,7 @@ void TabBox::reconfigure() */ void TabBox::delayedShow() { - KConfig * c(TDEGlobal::config()); + TDEConfig * c(TDEGlobal::config()); c->setGroup("TabBox"); bool delay = c->readBoolEntry("ShowDelay", true); @@ -1060,7 +1060,7 @@ void Workspace::CDEWalkThroughWindows( bool forward ) Client* nc = c; bool options_traverse_all; { - KConfigGroupSaver saver( TDEGlobal::config(), "TabBox" ); + TDEConfigGroupSaver saver( TDEGlobal::config(), "TabBox" ); options_traverse_all = TDEGlobal::config()->readBoolEntry("TraverseAll", false ); } diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp index 8115c3534..db625ba15 100644 --- a/twin/tools/decobenchmark/main.cpp +++ b/twin/tools/decobenchmark/main.cpp @@ -49,7 +49,7 @@ DecoBenchApplication::DecoBenchApplication(const TQString &library, Tests tests, m_tests(tests), m_count(count) { - KConfig twinConfig("twinrc"); + TDEConfig twinConfig("twinrc"); twinConfig.setGroup("Style"); plugins = new KDecorationPreviewPlugins( &twinConfig ); diff --git a/twin/tools/decobenchmark/preview.cpp b/twin/tools/decobenchmark/preview.cpp index 2accb7644..ece91c734 100644 --- a/twin/tools/decobenchmark/preview.cpp +++ b/twin/tools/decobenchmark/preview.cpp @@ -397,7 +397,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/tools/decobenchmark/preview.h b/twin/tools/decobenchmark/preview.h index 9f2445036..2138c51b7 100644 --- a/twin/tools/decobenchmark/preview.h +++ b/twin/tools/decobenchmark/preview.h @@ -125,11 +125,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/workspace.cpp b/twin/workspace.cpp index 85491fe76..4778caaa3 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -388,7 +388,7 @@ void Workspace::init() initial_desktop = client_info.currentDesktop(); else { - KConfigGroupSaver saver( kapp->sessionConfig(), "Session" ); + TDEConfigGroupSaver saver( kapp->sessionConfig(), "Session" ); initial_desktop = kapp->sessionConfig()->readNumEntry( "desktop", 1 ); } if( !setCurrentDesktop( initial_desktop )) @@ -1146,13 +1146,13 @@ void Workspace::slotReconfigure() void Workspace::loadDesktopSettings() { - KConfig* c = TDEGlobal::config(); + TDEConfig* c = TDEGlobal::config(); TQCString groupname; if (screen_number == 0) groupname = "Desktops"; else groupname.sprintf("Desktops-screen-%d", screen_number); - KConfigGroupSaver saver(c,groupname); + TDEConfigGroupSaver saver(c,groupname); int n = c->readNumEntry("Number", 4); number_of_desktops = n; @@ -1175,13 +1175,13 @@ void Workspace::loadDesktopSettings() void Workspace::saveDesktopSettings() { - KConfig* c = TDEGlobal::config(); + TDEConfig* c = TDEGlobal::config(); TQCString groupname; if (screen_number == 0) groupname = "Desktops"; else groupname.sprintf("Desktops-screen-%d", screen_number); - KConfigGroupSaver saver(c,groupname); + TDEConfigGroupSaver saver(c,groupname); c->writeEntry("Number", number_of_desktops ); for(int i = 1; i <= number_of_desktops; i++) @@ -2765,7 +2765,7 @@ void Workspace::helperDialog( const TQString& message, const Client* c ) proc << "kdialog" << args; if( !type.isEmpty()) { - KConfig cfg( "twin_dialogsrc" ); + TDEConfig cfg( "twin_dialogsrc" ); cfg.setGroup( "Notification Messages" ); // this depends on KMessageBox if( !cfg.readBoolEntry( type, true )) // has don't show again checked return; // save launching kdialog diff --git a/twin/workspace.h b/twin/workspace.h index 386219e07..8abb669f8 100644 --- a/twin/workspace.h +++ b/twin/workspace.h @@ -27,7 +27,7 @@ License. See the file "COPYING" for the exact licensing terms. #include <X11/Xlib.h> class TQPopupMenu; -class KConfig; +class TDEConfig; class TDEGlobalAccel; class KShortcutDialog; class KStartupInfo; @@ -222,7 +222,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin void performWindowOperation( Client* c, WindowOperation op ); - void storeSession( KConfig* config, SMSavePhase phase ); + void storeSession( TDEConfig* config, SMSavePhase phase ); SessionInfo* takeSessionInfo( Client* ); WindowRules findWindowRules( const Client*, bool ); |