diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:00 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:00 -0600 |
| commit | 2d84c9d3ad0aaea0620658024537d54e6a7939f4 (patch) | |
| tree | 35675532f42e78dbfcd56c6b344e1f0e79013a2e /kjsembed/customobject_imp.cpp | |
| parent | 980972d200e109a643e5a10037d7f9fcf02382ed (diff) | |
| download | tdebindings-2d84c9d3ad0aaea0620658024537d54e6a7939f4.tar.gz tdebindings-2d84c9d3ad0aaea0620658024537d54e6a7939f4.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kjsembed/customobject_imp.cpp')
| -rw-r--r-- | kjsembed/customobject_imp.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp index 04b20c68..ab006c77 100644 --- a/kjsembed/customobject_imp.cpp +++ b/kjsembed/customobject_imp.cpp @@ -45,7 +45,7 @@ #ifndef QT_ONLY -#include <khtml_part.h> +#include <tdehtml_part.h> #include <kaction.h> #include <klistview.h> @@ -435,14 +435,14 @@ KJS::Value CustomObjectImp::call( KJS::ExecState *exec, KJS::Object &self, const return KJS::Value(); break; case KHTMLPartSelectAll: - khtmlPartSelectAll( exec, self, args ); + tdehtmlPartSelectAll( exec, self, args ); return KJS::Value(); break; case KHTMLPartHasSelection: - return khtmlPartHasSelection( exec, self, args ); + return tdehtmlPartHasSelection( exec, self, args ); break; case KHTMLPartSelectedText: - return khtmlPartSelectedText( exec, self, args ); + return tdehtmlPartSelectedText( exec, self, args ); break; case KSystemTrayContextMenu: return ksystemtrayContextMenu( exec, self, args ); @@ -1094,7 +1094,7 @@ void CustomObjectImp::hboxSpacing( KJS::ExecState *exec, KJS::Object &, const KJ box->setSpacing( extractInt( exec, args, 0 ) ); } -void CustomObjectImp::khtmlPartSelectAll( KJS::ExecState *, KJS::Object &, const KJS::List & ) +void CustomObjectImp::tdehtmlPartSelectAll( KJS::ExecState *, KJS::Object &, const KJS::List & ) { #ifndef QT_ONLY @@ -1105,7 +1105,7 @@ void CustomObjectImp::khtmlPartSelectAll( KJS::ExecState *, KJS::Object &, const #endif // QT_ONLY } -KJS::Value CustomObjectImp::khtmlPartHasSelection( KJS::ExecState *, KJS::Object &, const KJS::List & ) +KJS::Value CustomObjectImp::tdehtmlPartHasSelection( KJS::ExecState *, KJS::Object &, const KJS::List & ) { #ifndef QT_ONLY @@ -1118,7 +1118,7 @@ KJS::Value CustomObjectImp::khtmlPartHasSelection( KJS::ExecState *, KJS::Object return KJS::Null(); } -KJS::Value CustomObjectImp::khtmlPartSelectedText( KJS::ExecState *, KJS::Object &, const KJS::List & ) +KJS::Value CustomObjectImp::tdehtmlPartSelectedText( KJS::ExecState *, KJS::Object &, const KJS::List & ) { #ifndef QT_ONLY |