Bladeren bron

Rename KApplication to TDEApplication to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 7 jaren geleden
bovenliggende
commit
7ff7bcc7ea
7 gewijzigde bestanden met toevoegingen van 8 en 8 verwijderingen
  1. +1
    -1
      ChangeLog
  2. +1
    -1
      acinclude.m4
  3. +1
    -1
      admin/acinclude.m4.in
  4. +1
    -1
      src/kvilib/ext/kvi_dcophelper.cpp
  5. +2
    -2
      src/kvilib/tal/kvi_tal_application.cpp
  6. +1
    -1
      src/kvilib/tal/kvi_tal_application_kde.h
  7. +1
    -1
      src/modules/mediaplayer/mp_dcopinterface.cpp

+ 1
- 1
ChangeLog Bestand weergeven

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


+ 1
- 1
acinclude.m4 Bestand weergeven

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


+ 1
- 1
admin/acinclude.m4.in Bestand weergeven

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


+ 1
- 1
src/kvilib/ext/kvi_dcophelper.cpp Bestand weergeven

@@ -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;


+ 2
- 2
src/kvilib/tal/kvi_tal_application.cpp Bestand weergeven

@@ -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")
{



+ 1
- 1
src/kvilib/tal/kvi_tal_application_kde.h Bestand weergeven

@@ -26,7 +26,7 @@
#include <kapp.h>


class KVILIB_API KviTalApplication : public KApplication
class KVILIB_API KviTalApplication : public TDEApplication
{
Q_OBJECT


+ 1
- 1
src/modules/mediaplayer/mp_dcopinterface.cpp Bestand weergeven

@@ -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;


Laden…
Annuleren
Opslaan