diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /twin/clients | |
parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'twin/clients')
21 files changed, 63 insertions, 63 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); |