Rename KApplication to TDEApplication to avoid conflicts with KDE4

4 files changed, 12 insertions, 12 deletions

diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp
index 90e9c54a..eb45c929 100644
--- a/kmplot/kmplot/MainDlg.cpp
+++ b/kmplot/kmplot/MainDlg.cpp
@@ -369,7 +369,7 @@ void MainDlg::slotOpenRecent( const KURL &url )
 		TQByteArray data;
 		TQDataStream stream(data, IO_WriteOnly);
 		stream << url;
-		KApplication::kApplication()->dcopClient()->send(KApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","openFileInNewWindow(KURL)", data);
+		TDEApplication::kApplication()->dcopClient()->send(TDEApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","openFileInNewWindow(KURL)", data);
 		return;
 	}
 
@@ -752,12 +752,12 @@ void MainDlg::setReadOnlyStatusBarText(const TQString &text)
 
 void MainDlg::optionsConfigureKeys()
 {
-	KApplication::kApplication()->dcopClient()->send(KApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","optionsConfigureKeys()", TQByteArray());
+	TDEApplication::kApplication()->dcopClient()->send(TDEApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","optionsConfigureKeys()", TQByteArray());
 }
 
 void MainDlg::optionsConfigureToolbars()
 {
-	KApplication::kApplication()->dcopClient()->send(KApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","optionsConfigureToolbars()", TQByteArray());
+	TDEApplication::kApplication()->dcopClient()->send(TDEApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","optionsConfigureToolbars()", TQByteArray());
 }
 
 void MainDlg::resetZoom()
diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp
index d9d88613..c72ba6da 100644
--- a/kmplot/kmplot/View.cpp
+++ b/kmplot/kmplot/View.cpp
@@ -56,7 +56,7 @@ double View::xmin = 0;
 double View::xmax = 0;
 
 
-View::View(bool const r, bool &mo, KPopupMenu *p, TQWidget* parent, const char* name ) : DCOPObject("View"), TQWidget( parent, name , WStaticContents ),  buffer( width(), height() ), m_popupmenu(p), m_modified(mo), m_readonly(r), m_dcop_client(KApplication::kApplication()->dcopClient())
+View::View(bool const r, bool &mo, KPopupMenu *p, TQWidget* parent, const char* name ) : DCOPObject("View"), TQWidget( parent, name , WStaticContents ),  buffer( width(), height() ), m_popupmenu(p), m_modified(mo), m_readonly(r), m_dcop_client(TDEApplication::kApplication()->dcopClient())
 {
 	csmode = csparam = -1;
 	cstype = 0;
@@ -346,7 +346,7 @@ void View::plotfkt(Ufkt *ufkt, TQPainter *pDC)
 							y = m_parser->euler_method(x, ufkt);
 							if ( int(x*100)%2==0)
 							{
-								KApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function
+								TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function
 								increaseProgressBar();
 							}
 							break;
@@ -1283,7 +1283,7 @@ void View::findMinMaxValue(Ufkt *ufkt, char p_mode, bool minimum, double &dmin,
 				y = m_parser->euler_method(x, ufkt);
 				if ( int(x*100)%2==0)
 				{
-					KApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function
+					TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function
 					increaseProgressBar();
 				}
 				break;
@@ -1416,7 +1416,7 @@ void View::getYValue(Ufkt *ufkt, char p_mode,  double x, double &y, const TQStri
 			y = m_parser->euler_method( x, ufkt );
 			if ( int(x*100)%2==0)
 			{
-				KApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function
+				TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function
 				increaseProgressBar();
 			}
 
@@ -1716,7 +1716,7 @@ void View::areaUnderGraph( Ufkt *ufkt, char const p_mode,  double &dmin, double
 				y = m_parser->euler_method(x, ufkt);
 				if ( int(x*100)%2==0)
 				{
-					KApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function
+					TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function
 						increaseProgressBar();
 				}
 				break;
diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp
index 1f33bb66..47161609 100644
--- a/kmplot/kmplot/kmplot.cpp
+++ b/kmplot/kmplot/kmplot.cpp
@@ -171,8 +171,8 @@ void KmPlot::fileNew()
 	// says that it should open a new window if the document is _not_
 	// in its initial state.  This is what we do here..
 	if ( !m_part->url().isEmpty() || isModified() )
-		//KApplication::startServiceByDesktopName("kmplot");
-		KApplication::tdeinitExec("kmplot");
+		//TDEApplication::startServiceByDesktopName("kmplot");
+		TDEApplication::tdeinitExec("kmplot");
 }
 
 bool KmPlot::stopProgressBar()
@@ -258,7 +258,7 @@ void KmPlot::fileOpen(const KURL &url)
 
 void KmPlot::openFileInNewWindow(const KURL url)
 {
- KApplication::startServiceByDesktopName("kmplot",url.url());
+ TDEApplication::startServiceByDesktopName("kmplot",url.url());
 }
 
 bool KmPlot::checkModified()
diff --git a/kmplot/kmplot/main.cpp b/kmplot/kmplot/main.cpp
index 60d8c239..5db19c03 100644
--- a/kmplot/kmplot/main.cpp
+++ b/kmplot/kmplot/main.cpp
@@ -72,7 +72,7 @@ int main( int argc, char **argv )
 	TDECmdLineArgs::init( argc, argv, &aboutData );
 	TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-	KApplication ka;
+	TDEApplication ka;
 	TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 	KmPlot *w = new KmPlot( args );
 	w->show();