diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:00:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:00:08 -0600 |
| commit | 7ff7bcc7ea84846c0e4dd51a4589300aea74acf5 (patch) | |
| tree | 18df88bd6d1cf9404e082111fe54f1e4d4ddfdaa /src | |
| parent | fb26e15f2ed02caaa029409b2240690aaa693107 (diff) | |
| download | kvirc-7ff7bcc7ea84846c0e4dd51a4589300aea74acf5.tar.gz kvirc-7ff7bcc7ea84846c0e4dd51a4589300aea74acf5.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvilib/ext/kvi_dcophelper.cpp | 2 | ||||
| -rw-r--r-- | src/kvilib/tal/kvi_tal_application.cpp | 4 | ||||
| -rw-r--r-- | src/kvilib/tal/kvi_tal_application_kde.h | 2 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_dcopinterface.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/kvilib/ext/kvi_dcophelper.cpp b/src/kvilib/ext/kvi_dcophelper.cpp index a181d10d..8c7f7c04 100644 --- a/src/kvilib/ext/kvi_dcophelper.cpp +++ b/src/kvilib/ext/kvi_dcophelper.cpp @@ -311,7 +311,7 @@ int KviDCOPHelper::detectApp(const TQString &szApp,bool bStart,int iScoreWhenFou bool KviDCOPHelper::startApp(const TQString &szApp,int iWaitMSecs) { - // we could use KApplication::startServiceByDesktopName here + // we could use TDEApplication::startServiceByDesktopName here // but we want to be able to wait a defined amount of time TQStringList tmp; TQByteArray data, replyData; diff --git a/src/kvilib/tal/kvi_tal_application.cpp b/src/kvilib/tal/kvi_tal_application.cpp index a637c676..b372dfaa 100644 --- a/src/kvilib/tal/kvi_tal_application.cpp +++ b/src/kvilib/tal/kvi_tal_application.cpp @@ -33,14 +33,14 @@ // ../tal/kvi_tal_application.cpp:31: warning: `__base_ctor' is deprecated // (declared at /opt/kde/include/kapplication.h:198) // - // The KApplication constructor has been declared as deprecated + // The TDEApplication constructor has been declared as deprecated // in favor of a complexier initialization that uses TDECmdLineArgs // and can't be abstracted easily. // The other constructors are not "old" and "stable" enough // to be safely used at this time. We'll rethink this when KDE 4 is out. KviTalApplication::KviTalApplication(int &argc,char ** argv) - : KApplication(argc,argv,"kvirc") + : TDEApplication(argc,argv,"kvirc") { diff --git a/src/kvilib/tal/kvi_tal_application_kde.h b/src/kvilib/tal/kvi_tal_application_kde.h index ee6e653c..c9118509 100644 --- a/src/kvilib/tal/kvi_tal_application_kde.h +++ b/src/kvilib/tal/kvi_tal_application_kde.h @@ -26,7 +26,7 @@ #include <kapp.h> -class KVILIB_API KviTalApplication : public KApplication +class KVILIB_API KviTalApplication : public TDEApplication { Q_OBJECT diff --git a/src/modules/mediaplayer/mp_dcopinterface.cpp b/src/modules/mediaplayer/mp_dcopinterface.cpp index 639c0757..d32b99f3 100644 --- a/src/modules/mediaplayer/mp_dcopinterface.cpp +++ b/src/modules/mediaplayer/mp_dcopinterface.cpp @@ -178,7 +178,7 @@ int KviMediaPlayerDCOPInterface::detectApp(const TQString &szApp,bool bStart,int bool KviMediaPlayerDCOPInterface::startApp(const TQString &szApp,int iWaitMSecs) { - // we could use KApplication::startServiceByDesktopName here + // we could use TDEApplication::startServiceByDesktopName here // but we want to be able to wait a defined amount of time TQStringList tmp; TQByteArray data, replyData; |