Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 3ebc2c64f2
commit 1d04ca9aed

@ -45,10 +45,10 @@
#include "crystalconfig.h" #include "crystalconfig.h"
CrystalConfig::CrystalConfig(KConfig*, TQWidget* parent) CrystalConfig::CrystalConfig(TDEConfig*, TQWidget* parent)
: TQObject(parent), config_(0), dialog_(0) : TQObject(parent), config_(0), dialog_(0)
{ {
config_ = new KConfig("twincrystalrc"); config_ = new TDEConfig("twincrystalrc");
dialog_ = new ConfigDialog(parent); dialog_ = new ConfigDialog(parent);
dialog_->show(); dialog_->show();
@ -148,7 +148,7 @@ void CrystalConfig::selectionChanged(int)
emit changed(); emit changed();
} }
void CrystalConfig::load(KConfig*) void CrystalConfig::load(TDEConfig*)
{ {
TQColor color(255,255,255); TQColor color(255,255,255);
@ -251,7 +251,7 @@ void CrystalConfig::load(KConfig*)
updateLogo(); updateLogo();
} }
void CrystalConfig::save(KConfig*) void CrystalConfig::save(TDEConfig*)
{ {
config_->setGroup("General"); config_->setGroup("General");
@ -376,7 +376,7 @@ void CrystalConfig::defaults()
extern "C" extern "C"
{ {
TQObject* allocate_config(KConfig* config, TQWidget* parent) { TQObject* allocate_config(TDEConfig* config, TQWidget* parent) {
return (new CrystalConfig(config, parent)); return (new CrystalConfig(config, parent));
} }
} }

@ -29,7 +29,7 @@
#define BOT_LEFT 4 #define BOT_LEFT 4
#define BOT_RIGHT 8 #define BOT_RIGHT 8
class KConfig; class TDEConfig;
class ConfigDialog; class ConfigDialog;
class CrystalConfig : public TQObject class CrystalConfig : public TQObject
@ -37,15 +37,15 @@ class CrystalConfig : public TQObject
Q_OBJECT Q_OBJECT
public: public:
CrystalConfig(KConfig* config, TQWidget* parent); CrystalConfig(TDEConfig* config, TQWidget* parent);
~CrystalConfig(); ~CrystalConfig();
signals: signals:
void changed(); void changed();
public slots: public slots:
void load(KConfig*); void load(TDEConfig*);
void save(KConfig*); void save(TDEConfig*);
void defaults(); void defaults();
void infoDialog(); void infoDialog();
@ -59,7 +59,7 @@ protected slots:
void logoTextChanged(const TQString&); void logoTextChanged(const TQString&);
private: private:
KConfig *config_; TDEConfig *config_;
ConfigDialog *dialog_; ConfigDialog *dialog_;
void updateLogo(); void updateLogo();

@ -186,7 +186,7 @@ void setupOverlay(WND_CONFIG *cfg,int mode,TQString filename)
bool CrystalFactory::readConfig() bool CrystalFactory::readConfig()
{ {
// create a config object // create a config object
KConfig config("twincrystalrc"); TDEConfig config("twincrystalrc");
config.setGroup("General"); config.setGroup("General");
TQColor c; TQColor c;

Loading…
Cancel
Save