From d6d75dc9ff326e0bd6fc673adae71d53277fb8e4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:23:08 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- kmailcvt/filters.cxx | 6 +++--- kmailcvt/kmailcvt.cpp | 2 +- kmailcvt/main.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kmailcvt') diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx index 7f9a5f97b..78728d2c3 100644 --- a/kmailcvt/filters.cxx +++ b/kmailcvt/filters.cxx @@ -136,7 +136,7 @@ bool Filter::addMessage( FilterInfo* info, const TQString& folderName, msgURL.setPath( msgPath ); if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) ) - KApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started + TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage", folderName, msgURL, msgStatusFlags ); @@ -172,7 +172,7 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName msgURL.setPath( msgPath ); if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) ) - KApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started + TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage_fastImport", folderName, msgURL, msgStatusFlags ); if ( !reply.isValid() ) @@ -200,7 +200,7 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName void Filter::showKMailImportArchiveDialog( FilterInfo* info ) { if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) ) - KApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started + TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "showImportArchiveDialog" ); if ( !reply.isValid() ) diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp index e24f9a205..4599fe250 100644 --- a/kmailcvt/kmailcvt.cpp +++ b/kmailcvt/kmailcvt.cpp @@ -41,7 +41,7 @@ KMailCVT::~KMailCVT() { void KMailCVT::endImport() { if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) ) - KApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started + TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage", TQString(), TQString(), TQString()); if ( !reply.isValid() ) diff --git a/kmailcvt/main.cpp b/kmailcvt/main.cpp index 9121acfaa..f8ad5e222 100644 --- a/kmailcvt/main.cpp +++ b/kmailcvt/main.cpp @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KApplication a; + TDEApplication a; KMailCVT *kmailcvt = new KMailCVT(); a.setMainWidget(kmailcvt); kmailcvt->show(); -- cgit v1.2.1