summaryrefslogtreecommitdiffstats
path: root/kjsembed
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:51 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:51 -0600
commit95c43a0f38217a41c246b1b324c92cc2cba78e5e (patch)
treefe11835688057219e383ad91e286490e46f1eff4 /kjsembed
parent8a69eba2f0eddce05cf86e0df8aec6e9f473d485 (diff)
downloadtdebindings-95c43a0f38217a41c246b1b324c92cc2cba78e5e.tar.gz
tdebindings-95c43a0f38217a41c246b1b324c92cc2cba78e5e.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kjsembed')
-rw-r--r--kjsembed/cpptests/jsaccess/jsaccess.cpp2
-rw-r--r--kjsembed/docs/embedding/simple-embed/main.cpp2
-rw-r--r--kjsembed/kjscmd.cpp8
-rw-r--r--kjsembed/plugin/jsconsoleplugin.cpp2
-rw-r--r--kjsembed/testkjsembed.cpp2
-rw-r--r--kjsembed/tests/testkjsembed.cpp2
6 files changed, 9 insertions, 9 deletions
diff --git a/kjsembed/cpptests/jsaccess/jsaccess.cpp b/kjsembed/cpptests/jsaccess/jsaccess.cpp
index d211b019..adfa2692 100644
--- a/kjsembed/cpptests/jsaccess/jsaccess.cpp
+++ b/kjsembed/cpptests/jsaccess/jsaccess.cpp
@@ -39,7 +39,7 @@ int main( int argc, char **argv )
I18N_NOOP("Test"),
KAboutData::License_LGPL, I18N_NOOP("(c) 2004 Ian Reinhart Geiser") );
TDECmdLineArgs::init( argc, argv, &about );
- KApplication app;
+ TDEApplication app;
// Setup Interpreter
KJSEmbed::JSSecurityPolicy::setDefaultPolicy( KJSEmbed::JSSecurityPolicy::CapabilityAll );
diff --git a/kjsembed/docs/embedding/simple-embed/main.cpp b/kjsembed/docs/embedding/simple-embed/main.cpp
index 8a3f75fe..b70bb61c 100644
--- a/kjsembed/docs/embedding/simple-embed/main.cpp
+++ b/kjsembed/docs/embedding/simple-embed/main.cpp
@@ -35,7 +35,7 @@ int main(int argc, char **argv)
KAboutData::License_LGPL, "(C) 2004 Ian Reinhart Geiser", 0, 0, "geiseri@kde.org");
about.addAuthor( "Ian Reinhart Geiser", 0, "geiseri@kde.org" );
TDECmdLineArgs::init(argc, argv, &about);
- KApplication app;
+ TDEApplication app;
EmbedViewImp *view = new EmbedViewImp;
app.setMainWidget(view);
diff --git a/kjsembed/kjscmd.cpp b/kjsembed/kjscmd.cpp
index 220a1b50..5e6ae15a 100644
--- a/kjsembed/kjscmd.cpp
+++ b/kjsembed/kjscmd.cpp
@@ -92,13 +92,13 @@ int main( int argc, char **argv )
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
- // Setup KApplication
- KApplication *app;
+ // Setup TDEApplication
+ TDEApplication *app;
if ( nogui ) {
- app = new KApplication( false, false );
+ app = new TDEApplication( false, false );
}
else {
- app = new KApplication;
+ app = new TDEApplication;
app->connect( app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) );
}
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() );
diff --git a/kjsembed/testkjsembed.cpp b/kjsembed/testkjsembed.cpp
index 2b72a8cd..8cc4d222 100644
--- a/kjsembed/testkjsembed.cpp
+++ b/kjsembed/testkjsembed.cpp
@@ -34,7 +34,7 @@ int main( int argc, char **argv )
I18N_NOOP("Test"),
KAboutData::License_LGPL, I18N_NOOP("(c) 2001-2003 Richard Moore") );
TDECmdLineArgs::init( argc, argv, &about );
- KApplication app;
+ TDEApplication app;
// Setup Interpreter
KJS::Interpreter *js = KJSEmbed::JSFactory::defaultJS();
diff --git a/kjsembed/tests/testkjsembed.cpp b/kjsembed/tests/testkjsembed.cpp
index 53c5f5da..cfc4fd2d 100644
--- a/kjsembed/tests/testkjsembed.cpp
+++ b/kjsembed/tests/testkjsembed.cpp
@@ -37,7 +37,7 @@ int main( int argc, char **argv )
I18N_NOOP("Test"),
KAboutData::License_LGPL, I18N_NOOP("(c) 2001-2002 Richard Moore") );
TDECmdLineArgs::init( argc, argv, &about );
- KApplication app;
+ TDEApplication app;
// Setup Interpreter
KJS::Interpreter *js = Factory::defaultJS();