Rename KApplication to TDEApplication to avoid conflicts with KDE4

16 files changed, 19 insertions, 19 deletions

diff --git a/languages/cpp/app_templates/kapp/app_client.cpp b/languages/cpp/app_templates/kapp/app_client.cpp
index ecde60fb..4098f8a8 100644
--- a/languages/cpp/app_templates/kapp/app_client.cpp
+++ b/languages/cpp/app_templates/kapp/app_client.cpp
@@ -7,7 +7,7 @@
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "%{APPNAMELC}_client", false);
+    TDEApplication app(argc, argv, "%{APPNAMELC}_client", false);
 
     // get our DCOP client and attach so that we may use it
     DCOPClient *client = app.dcopClient();
diff --git a/languages/cpp/app_templates/kapp/main.cpp b/languages/cpp/app_templates/kapp/main.cpp
index cfc877b4..2649e228 100644
--- a/languages/cpp/app_templates/kapp/main.cpp
+++ b/languages/cpp/app_templates/kapp/main.cpp
@@ -25,7 +25,7 @@ int main(int argc, char **argv)
     about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions(options);
-    KApplication app;
+    TDEApplication app;
 
     // register ourselves as a dcop client
     app.dcopClient()->registerAs(app.name(), false);
diff --git a/languages/cpp/app_templates/kconfig35/main.cpp b/languages/cpp/app_templates/kconfig35/main.cpp
index ac88952e..7927da59 100644
--- a/languages/cpp/app_templates/kconfig35/main.cpp
+++ b/languages/cpp/app_templates/kconfig35/main.cpp
@@ -24,7 +24,7 @@ int main(int argc, char **argv)
     about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions(options);
-    KApplication app;
+    TDEApplication app;
 
     // see if we are starting with session management
     if (app.isRestored())
diff --git a/languages/cpp/app_templates/kde4app/main.cpp b/languages/cpp/app_templates/kde4app/main.cpp
index e164ac59..8719e21a 100644
--- a/languages/cpp/app_templates/kde4app/main.cpp
+++ b/languages/cpp/app_templates/kde4app/main.cpp
@@ -21,7 +21,7 @@ int main(int argc, char **argv)
     KCmdLineOptions options;
     options.add("+[URL]", ki18n( "Document to open" ));
     TDECmdLineArgs::addCmdLineOptions(options);
-    KApplication app;
+    TDEApplication app;
 
     %{APPNAME} *widget = new %{APPNAME};
 
diff --git a/languages/cpp/app_templates/kdedcop/main.cpp b/languages/cpp/app_templates/kdedcop/main.cpp
index e643ed21..2462c3fe 100644
--- a/languages/cpp/app_templates/kdedcop/main.cpp
+++ b/languages/cpp/app_templates/kdedcop/main.cpp
@@ -24,7 +24,7 @@ int main(int argc, char **argv)
     about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app;
+    TDEApplication app;
     %{APPNAME} *mainWin = 0;
 
     if (app.isRestored())
diff --git a/languages/cpp/app_templates/khello/main.cpp b/languages/cpp/app_templates/khello/main.cpp
index fb84ad48..2ad5ebcc 100644
--- a/languages/cpp/app_templates/khello/main.cpp
+++ b/languages/cpp/app_templates/khello/main.cpp
@@ -24,7 +24,7 @@ int main(int argc, char **argv)
     about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app;
+    TDEApplication app;
     %{APPNAME} *mainWin = 0;
 
     if (app.isRestored())
diff --git a/languages/cpp/app_templates/khello2/main.cpp b/languages/cpp/app_templates/khello2/main.cpp
index b50fb446..71d897a4 100644
--- a/languages/cpp/app_templates/khello2/main.cpp
+++ b/languages/cpp/app_templates/khello2/main.cpp
@@ -24,7 +24,7 @@ int main(int argc, char **argv)
     about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app;
+    TDEApplication app;
     %{APPNAME} *mainWin = 0;
 
     if (app.isRestored())
diff --git a/languages/cpp/app_templates/kmake/app.cpp b/languages/cpp/app_templates/kmake/app.cpp
index d0352538..ba44bf40 100644
--- a/languages/cpp/app_templates/kmake/app.cpp
+++ b/languages/cpp/app_templates/kmake/app.cpp
@@ -24,7 +24,7 @@ int main(int argc, char **argv)
 	TDECmdLineArgs::init(argc, argv, &about);
 	TDECmdLineArgs::addCmdLineOptions(options);
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
-	KApplication app;
+	TDEApplication app;
 	MainViewImp *widget = new MainViewImp;
 	app.setMainWidget(widget);
 	widget->show();
diff --git a/languages/cpp/app_templates/kpartapp/main.cpp b/languages/cpp/app_templates/kpartapp/main.cpp
index ea94c304..81b3e40d 100644
--- a/languages/cpp/app_templates/kpartapp/main.cpp
+++ b/languages/cpp/app_templates/kpartapp/main.cpp
@@ -23,7 +23,7 @@ int main(int argc, char **argv)
     about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app;
+    TDEApplication app;
 
     // see if we are starting with session management
     if (app.isRestored())
diff --git a/languages/cpp/app_templates/kscons_kmdi/main.cpp b/languages/cpp/app_templates/kscons_kmdi/main.cpp
index ac324166..5795feb9 100644
--- a/languages/cpp/app_templates/kscons_kmdi/main.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/main.cpp
@@ -31,7 +31,7 @@ int main(int argc, char **argv)
 	TDECmdLineArgs::init(argc, argv, &about);
 	TDECmdLineArgs::addCmdLineOptions(options);
 
-	KApplication app;
+	TDEApplication app;
 
 	// see if we are starting with session management
 	/*if (app.isRestored())
diff --git a/languages/cpp/app_templates/kscons_kxt/main.cpp b/languages/cpp/app_templates/kscons_kxt/main.cpp
index 2fd5430b..9da16af6 100644
--- a/languages/cpp/app_templates/kscons_kxt/main.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/main.cpp
@@ -24,7 +24,7 @@ int main(int argc, char **argv)
     about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions(options);
-    KApplication app;
+    TDEApplication app;
 
     // see if we are starting with session management
     if (app.isRestored())
diff --git a/languages/cpp/app_templates/kxt/main.cpp b/languages/cpp/app_templates/kxt/main.cpp
index ac88952e..7927da59 100644
--- a/languages/cpp/app_templates/kxt/main.cpp
+++ b/languages/cpp/app_templates/kxt/main.cpp
@@ -24,7 +24,7 @@ int main(int argc, char **argv)
     about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions(options);
-    KApplication app;
+    TDEApplication app;
 
     // see if we are starting with session management
     if (app.isRestored())
diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp
index 668c5599..ab89713f 100644
--- a/languages/cpp/backgroundparser.cpp
+++ b/languages/cpp/backgroundparser.cpp
@@ -420,7 +420,7 @@ void BackgroundParser::fileParsed( ParsedFile& file ) {
 	
 	m_unitDict.insert( file.fileName(), unit );
 	
-	KApplication::postEvent( m_cppSupport, new FileParsedEvent( file.fileName(), unit->problems, m_readFromDisk ) );
+	TDEApplication::postEvent( m_cppSupport, new FileParsedEvent( file.fileName(), unit->problems, m_readFromDisk ) );
 	
 	m_currentFile = TQString();
 	
diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp
index 4abbe69b..bc8b7733 100644
--- a/languages/cpp/debugger/variablewidget.cpp
+++ b/languages/cpp/debugger/variablewidget.cpp
@@ -988,7 +988,7 @@ void VariableTree::keyPressEvent(TQKeyEvent* e)
 
 void VariableTree::copyToClipboard(TQListViewItem* item)
 {
-    TQClipboard *qb = KApplication::clipboard();
+    TQClipboard *qb = TDEApplication::clipboard();
     TQString text = item->text( 1 );
 
     qb->setText( text, TQClipboard::Clipboard );
diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc
index 8c7325b9..115f0ee9 100644
--- a/languages/cpp/doc/kde2book.toc
+++ b/languages/cpp/doc/kde2book.toc
@@ -431,7 +431,7 @@
 <entry name="classes, documentation" url="ch15.html"/>
 <entry name="classes, KAction" url="ch05.html"/>
 <entry name="classes, KAction" url="ch06.html"/>
-<entry name="classes, KApplication" url="ch02lev1sec3.html"/>
+<entry name="classes, TDEApplication" url="ch02lev1sec3.html"/>
 <entry name="classes, KAudioPlayer" url="ch14lev1sec6.html"/>
 <entry name="classes, TDE versus Qt" url="ch03lev1sec2.html"/>
 <entry name="classes, KDialogBase" url="ch08lev1sec5.html"/>
@@ -1275,7 +1275,7 @@
 <entry name="kabdemo.h class declaration (KabDemo)" url="ch10lev1sec4.html"/>
 <entry name="KAction class" url="ch05.html"/>
 <entry name="KAction class" url="ch06.html"/>
-<entry name="KApplication class" url="ch02lev1sec3.html"/>
+<entry name="TDEApplication class" url="ch02lev1sec3.html"/>
 <entry name="KAudioPlayer class" url="ch14lev1sec6.html"/>
 <entry name="KButtonBox manager widget" url="ch08lev1sec4.html"/>
 <entry name="kchildren.cpp class definition (KChildren widget)" url="ch04lev1sec3.html"/>
@@ -2236,7 +2236,7 @@
 <entry name="programs, GUI elements, toolbars" url="ch02lev1sec4.html"/>
 <entry name="programs, programming conventions, class documentation" url="ch02lev1sec5.html"/>
 <entry name="programs, programming conventions, naming conventions" url="ch02lev1sec5.html"/>
-<entry name="programs, structure of, KApplication class" url="ch02lev1sec3.html"/>
+<entry name="programs, structure of, TDEApplication class" url="ch02lev1sec3.html"/>
 <entry name="programs, structure of, KTMainWindow class" url="ch02lev1sec3.html"/>
 <entry name="programs, structure of, main() method" url="ch02lev1sec3.html"/>
 <entry name="programs, structure of" url="ch02lev1sec3.html"/>
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
index 0575d254..ae9675d2 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
@@ -41,8 +41,8 @@ TQListBoxItem* TQListBox_selectedItem( TQListBox* cpTQListBox )
 SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl )
 : SettingsDialogBase( parent, name, fl )
 {
-	KApplication::kApplication()->dirs()->addResourceType("include","include");
-	TQStringList tdedirs=KApplication::kApplication()->dirs()->findDirs("include","");
+	TDEApplication::kApplication()->dirs()->addResourceType("include","include");
+	TQStringList tdedirs=TDEApplication::kApplication()->dirs()->findDirs("include","");
 	for( TQStringList::Iterator it=tdedirs.begin(); it!=tdedirs.end();    ++it )
 	{
 		TQString tdedir = *it;