From cc74f360bb40da3d79f58048f8e8611804980aa6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:30:47 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kcontrol/konq/main.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'kcontrol/konq/main.cpp') diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp index e0a0d0780..e57a84859 100644 --- a/kcontrol/konq/main.cpp +++ b/kcontrol/konq/main.cpp @@ -48,48 +48,48 @@ static TQCString configname() extern "C" { - KDE_EXPORT KCModule *create_browser(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_browser(TQWidget *parent, const char *name) { - KConfig *config = new KConfig("konquerorrc", false, true); + TDEConfig *config = new TDEConfig("konquerorrc", false, true); return new KBrowserOptions(config, "FMSettings", parent, name); } - KDE_EXPORT KCModule *create_behavior(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_behavior(TQWidget *parent, const char *name) { - KConfig *config = new KConfig("konquerorrc", false, true); + TDEConfig *config = new TDEConfig("konquerorrc", false, true); return new KBehaviourOptions(config, "FMSettings", parent, name); } - KDE_EXPORT KCModule *create_appearance(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_appearance(TQWidget *parent, const char *name) { - KConfig *config = new KConfig("konquerorrc", false, true); + TDEConfig *config = new TDEConfig("konquerorrc", false, true); return new KonqFontOptions(config, "FMSettings", false, parent, name); } - KDE_EXPORT KCModule *create_previews(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_previews(TQWidget *parent, const char *name) { return new KPreviewOptions(parent, name); } - KDE_EXPORT KCModule *create_dbehavior(TQWidget *parent, const char* /*name*/) + KDE_EXPORT TDECModule *create_dbehavior(TQWidget *parent, const char* /*name*/) { - KConfig *config = new KConfig(configname(), false, false); + TDEConfig *config = new TDEConfig(configname(), false, false); return new DesktopBehaviorModule(config, parent); } - KDE_EXPORT KCModule *create_dappearance(TQWidget *parent, const char* /*name*/) + KDE_EXPORT TDECModule *create_dappearance(TQWidget *parent, const char* /*name*/) { - KConfig *config = new KConfig(configname(), false, false); + TDEConfig *config = new TDEConfig(configname(), false, false); return new KonqFontOptions(config, "FMSettings", true, parent); } - KDE_EXPORT KCModule *create_dpath(TQWidget *parent, const char* /*name*/) + KDE_EXPORT TDECModule *create_dpath(TQWidget *parent, const char* /*name*/) { - //KConfig *config = new KConfig(configname(), false, false); + //TDEConfig *config = new TDEConfig(configname(), false, false); return new DesktopPathConfig(parent); } - KDE_EXPORT KCModule *create_ddesktop(TQWidget *parent, const char* /*name*/) + KDE_EXPORT TDECModule *create_ddesktop(TQWidget *parent, const char* /*name*/) { return new KDesktopConfig(parent, "VirtualDesktops"); } -- cgit v1.2.1