Browse Source

Rename KApplication to TDEApplication to avoid conflicts with KDE4

Timothy Pearson 6 years ago
parent
commit
7ff7bcc7ea

+ 1
- 1
ChangeLog View File

@@ -932,7 +932,7 @@ Oct 2006
932 932
    - Fixed several bugtrack issues.
933 933
    - Cleaned up the -ansi -pedantic compilation. It looks that
934 934
      only one real warning remains and it is related to the "deprecated"
935
-     flags of KApplication constructor which will be removed
935
+     flags of TDEApplication constructor which will be removed
936 936
      in KDE 4.0. We must live with it for a while.
937 937
      All the other warnings are due to the system headers.
938 938
    - Caught a couple of potential segmentation faults in the reguser

+ 1
- 1
acinclude.m4 View File

@@ -2312,7 +2312,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_QT3_AND_KDE],
2312 2312
 				#include "twin.h"
2313 2313
 			],[
2314 2314
 				int a = KWin::currentDesktop();
2315
-				KApplication app(a,0,"kvirc");
2315
+				TDEApplication app(a,0,"kvirc");
2316 2316
 			],
2317 2317
 			SS_KQTX_LINKED_OK="TRUE",
2318 2318
 			SS_KQTX_LINKED_OK="FALSE"

+ 1
- 1
admin/acinclude.m4.in View File

@@ -2339,7 +2339,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_QT3_AND_KDE],
2339 2339
 				#include "twin.h"
2340 2340
 			],[
2341 2341
 				int a = KWin::currentDesktop();
2342
-				KApplication app(a,0,"kvirc");
2342
+				TDEApplication app(a,0,"kvirc");
2343 2343
 			],
2344 2344
 			SS_KQTX_LINKED_OK="TRUE",
2345 2345
 			SS_KQTX_LINKED_OK="FALSE"

+ 1
- 1
src/kvilib/ext/kvi_dcophelper.cpp View File

@@ -311,7 +311,7 @@ int KviDCOPHelper::detectApp(const TQString &szApp,bool bStart,int iScoreWhenFou
311 311
 
312 312
 bool KviDCOPHelper::startApp(const TQString &szApp,int iWaitMSecs)
313 313
 {
314
-	// we could use KApplication::startServiceByDesktopName here
314
+	// we could use TDEApplication::startServiceByDesktopName here
315 315
 	// but we want to be able to wait a defined amount of time
316 316
 	TQStringList tmp;
317 317
 	TQByteArray data, replyData;

+ 2
- 2
src/kvilib/tal/kvi_tal_application.cpp View File

@@ -33,14 +33,14 @@
33 33
 	// ../tal/kvi_tal_application.cpp:31: warning: `__base_ctor' is deprecated 
34 34
 	//   (declared at /opt/kde/include/kapplication.h:198)
35 35
 	//
36
-	// The KApplication constructor has been declared as deprecated
36
+	// The TDEApplication constructor has been declared as deprecated
37 37
 	// in favor of a complexier initialization that uses TDECmdLineArgs
38 38
 	// and can't be abstracted easily.
39 39
 	// The other constructors are not "old" and "stable" enough
40 40
 	// to be safely used at this time. We'll rethink this when KDE 4 is out.
41 41
 
42 42
 	KviTalApplication::KviTalApplication(int &argc,char ** argv)
43
-	: KApplication(argc,argv,"kvirc")
43
+	: TDEApplication(argc,argv,"kvirc")
44 44
 	{
45 45
 	
46 46
 

+ 1
- 1
src/kvilib/tal/kvi_tal_application_kde.h View File

@@ -26,7 +26,7 @@
26 26
 #include <kapp.h>
27 27
 
28 28
 
29
-class KVILIB_API KviTalApplication : public KApplication
29
+class KVILIB_API KviTalApplication : public TDEApplication
30 30
 {
31 31
 	Q_OBJECT
32 32
   

+ 1
- 1
src/modules/mediaplayer/mp_dcopinterface.cpp View File

@@ -178,7 +178,7 @@ int KviMediaPlayerDCOPInterface::detectApp(const TQString &szApp,bool bStart,int
178 178
 
179 179
 bool KviMediaPlayerDCOPInterface::startApp(const TQString &szApp,int iWaitMSecs)
180 180
 {
181
-	// we could use KApplication::startServiceByDesktopName here
181
+	// we could use TDEApplication::startServiceByDesktopName here
182 182
 	// but we want to be able to wait a defined amount of time
183 183
 	TQStringList tmp;
184 184
 	TQByteArray data, replyData;

Loading…
Cancel
Save