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

pull/1/head
Timothy Pearson 12 years ago
parent 96c62f7e35
commit 76ce0b1e44

@ -68,7 +68,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_gtk, KcmGtkFactory("gtk"))*/
extern "C" extern "C"
{ {
KCModule *create_kcmgtk( TQWidget * parent, const char * name ) TDECModule *create_kcmgtk( TQWidget * parent, const char * name )
{ {
TDEGlobal::locale()->insertCatalogue( "gtkqtengine" ); TDEGlobal::locale()->insertCatalogue( "gtkqtengine" );
return new KcmGtk( parent, "kcmgtk" ); return new KcmGtk( parent, "kcmgtk" );
@ -160,14 +160,14 @@ TQFont GtkRcParser::parseFont(TQString fontString)
} }
KcmGtk::KcmGtk(TQWidget *parent, const char *name, const TQStringList&) KcmGtk::KcmGtk(TQWidget *parent, const char *name, const TQStringList&)
: KCModule(parent, name), : TDECModule(parent, name),
myAboutData(0), myAboutData(0),
emacsDetailsDialog(NULL), emacsDetailsDialog(NULL),
searchPathsDialog(NULL) searchPathsDialog(NULL)
{ {
TDEGlobal::locale()->insertCatalogue("gtkqtengine"); TDEGlobal::locale()->insertCatalogue("gtkqtengine");
config = new KConfig("kcmgtkrc"); config = new TDEConfig("kcmgtkrc");
TQStringList gtkSearchPathsDefault; TQStringList gtkSearchPathsDefault;
gtkSearchPathsDefault.append("/usr"); gtkSearchPathsDefault.append("/usr");
@ -370,7 +370,7 @@ void KcmGtk::load()
bool usingGtk3TQtEngine = false; bool usingGtk3TQtEngine = false;
if (TQFile::exists(GTK3_INI_DIR + GTK3_INI_FILE)) { if (TQFile::exists(GTK3_INI_DIR + GTK3_INI_FILE)) {
TQString activeGtk3Style; TQString activeGtk3Style;
KConfig gtk3Config(GTK3_INI_DIR + GTK3_INI_FILE); TDEConfig gtk3Config(GTK3_INI_DIR + GTK3_INI_FILE);
gtk3Config.setGroup("Settings"); gtk3Config.setGroup("Settings");
activeGtk3Style = gtk3Config.readEntry("gtk-theme-name"); activeGtk3Style = gtk3Config.readEntry("gtk-theme-name");
if (activeGtk3Style == "tdegtk") { if (activeGtk3Style == "tdegtk") {
@ -533,7 +533,7 @@ void KcmGtk::save()
int KcmGtk::buttons() int KcmGtk::buttons()
{ {
return KCModule::Apply; return TDECModule::Apply;
} }
TQString KcmGtk::quickHelp() const TQString KcmGtk::quickHelp() const
@ -601,7 +601,7 @@ void KcmGtk::getProfiles(const TQString& basePath, int type)
TQString fileName = basePath + "/profiles.ini"; TQString fileName = basePath + "/profiles.ini";
if (TQFile::exists(fileName)) if (TQFile::exists(fileName))
{ {
KConfig config(fileName, true, false); TDEConfig config(fileName, true, false);
TQStringList groups = config.groupList(); TQStringList groups = config.groupList();
for ( TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it ) for ( TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it )

@ -44,7 +44,7 @@ private:
TQFont parseFont(TQString fontString); TQFont parseFont(TQString fontString);
}; };
class KcmGtk: public KCModule class KcmGtk: public TDECModule
{ {
Q_OBJECT Q_OBJECT
@ -103,7 +103,7 @@ private:
EmacsDetails* emacsDetailsDialog; EmacsDetails* emacsDetailsDialog;
TQStringList gtkSearchPaths; TQStringList gtkSearchPaths;
SearchPaths* searchPathsDialog; SearchPaths* searchPathsDialog;
KConfig* config; TDEConfig* config;
}; };
#endif #endif

@ -513,14 +513,14 @@ GdkFilterReturn gdkEventFilter(GdkXEvent *xevent, GdkEvent *gevent, gpointer dat
TQString kdeConfigValue(const TQString& section, const TQString& name, const TQString& def) TQString kdeConfigValue(const TQString& section, const TQString& name, const TQString& def)
{ {
KConfig currentConfig; TDEConfig currentConfig;
currentConfig.setGroup(section); currentConfig.setGroup(section);
return currentConfig.readEntry(name, def); return currentConfig.readEntry(name, def);
} }
bool kdeBoolConfigValue(const TQString& section, const TQString& name, bool def) bool kdeBoolConfigValue(const TQString& section, const TQString& name, bool def)
{ {
KConfig currentConfig; TDEConfig currentConfig;
currentConfig.setGroup(section); currentConfig.setGroup(section);
return currentConfig.readBoolEntry(name, def); return currentConfig.readBoolEntry(name, def);
} }

Loading…
Cancel
Save