summaryrefslogtreecommitdiffstats
path: root/kjsembed/plugin
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-20 00:17:51 -0600
committerTimothy Pearson <[email protected]>2013-01-20 00:17:51 -0600
commit95c43a0f38217a41c246b1b324c92cc2cba78e5e (patch)
treefe11835688057219e383ad91e286490e46f1eff4 /kjsembed/plugin
parent8a69eba2f0eddce05cf86e0df8aec6e9f473d485 (diff)
downloadtdebindings-95c43a0f38217a41c246b1b324c92cc2cba78e5e.tar.gz
tdebindings-95c43a0f38217a41c246b1b324c92cc2cba78e5e.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kjsembed/plugin')
-rw-r--r--kjsembed/plugin/jsconsoleplugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kjsembed/plugin/jsconsoleplugin.cpp b/kjsembed/plugin/jsconsoleplugin.cpp
index f53afc0c..15e67506 100644
--- a/kjsembed/plugin/jsconsoleplugin.cpp
+++ b/kjsembed/plugin/jsconsoleplugin.cpp
@@ -64,7 +64,7 @@ void JSConsolePlugin::init()
KJS::Object global( interp->globalObject() );
js->addObject( js->view(), global, "console" );
js->addObject( parent(), global, "plugin_parent" );
- js->addObject( KApplication::kApplication(), global, "application" );
+ js->addObject( TDEApplication::kApplication(), global, "application" );
if ( parent()->inherits("KParts::Part") ) {
KParts::Part *part = static_cast<KParts::Part *>( parent() );