summaryrefslogtreecommitdiffstats
path: root/kmailcvt
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:08 -0600
commitd6d75dc9ff326e0bd6fc673adae71d53277fb8e4 (patch)
tree56a87e6a48bdf5e310958f1943a834e59eddbba1 /kmailcvt
parent32b66c9ae78f439199a6d281cc33218e57c5106d (diff)
downloadtdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.tar.gz
tdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kmailcvt')
-rw-r--r--kmailcvt/filters.cxx6
-rw-r--r--kmailcvt/kmailcvt.cpp2
-rw-r--r--kmailcvt/main.cpp2
3 files changed, 5 insertions, 5 deletions
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();