diff options
author | Timothy Pearson <[email protected]> | 2013-01-26 13:16:20 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-26 13:16:20 -0600 |
commit | dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 (patch) | |
tree | 4ebcd3dac0133d8d3fa880bbf83692c305b7350d /kcontrol/konqhtml/main.cpp | |
parent | 1a9478c6e1b77b05814af8fa02cd563a5da8946b (diff) | |
download | tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.tar.gz tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/konqhtml/main.cpp')
-rw-r--r-- | kcontrol/konqhtml/main.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp index 35a958b46..45559809b 100644 --- a/kcontrol/konqhtml/main.cpp +++ b/kcontrol/konqhtml/main.cpp @@ -43,33 +43,33 @@ extern "C" { - KDE_EXPORT TDECModule *create_khtml_behavior(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_tdehtml_behavior(TQWidget *parent, const char *name) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KMiscHTMLOptions(c, "HTML Settings", parent, name); } - KDE_EXPORT TDECModule *create_khtml_fonts(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_tdehtml_fonts(TQWidget *parent, const char *name) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KAppearanceOptions(c, "HTML Settings", parent, name); } - KDE_EXPORT TDECModule *create_khtml_java_js(TQWidget *parent, const char* /*name*/) + KDE_EXPORT TDECModule *create_tdehtml_java_js(TQWidget *parent, const char* /*name*/) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KJSParts(c, parent, "kcmkonqhtml"); } - KDE_EXPORT TDECModule *create_khtml_plugins(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_tdehtml_plugins(TQWidget *parent, const char *name) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KPluginOptions(c, "Java/JavaScript Settings", parent, name); } - KDE_EXPORT TDECModule *create_khtml_filter(TQWidget *parent, const char *name ) + KDE_EXPORT TDECModule *create_tdehtml_filter(TQWidget *parent, const char *name ) { - TDEConfig *c = new TDEConfig( "khtmlrc", false, false ); + TDEConfig *c = new TDEConfig( "tdehtmlrc", false, false ); return new KCMFilter(c, "Filter Settings", parent, name); } } |