summaryrefslogtreecommitdiffstats
path: root/kabc
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 /kabc
parent32b66c9ae78f439199a6d281cc33218e57c5106d (diff)
downloadtdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.tar.gz
tdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kabc')
-rw-r--r--kabc/frontend/main.cpp2
-rw-r--r--kabc/kabc2mutt/main.cpp4
-rw-r--r--kabc/kabcdistlistupdater/kabcdistlistupdater.cpp6
3 files changed, 6 insertions, 6 deletions
diff --git a/kabc/frontend/main.cpp b/kabc/frontend/main.cpp
index 9f35c359b..169e52a37 100644
--- a/kabc/frontend/main.cpp
+++ b/kabc/frontend/main.cpp
@@ -11,7 +11,7 @@ int main( int argc, char ** argv )
KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
- KApplication app;
+ TDEApplication app;
MainWindow *w = new MainWindow;
w->show();
diff --git a/kabc/kabc2mutt/main.cpp b/kabc/kabc2mutt/main.cpp
index 4a406a393..f9f41f8ae 100644
--- a/kabc/kabc2mutt/main.cpp
+++ b/kabc/kabc2mutt/main.cpp
@@ -43,11 +43,11 @@ static KCmdLineOptions k2moptions[] =
int main( int argc, char **argv )
{
- KApplication::disableAutoDcopRegistration();
+ TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init( argc, argv, appName, programName, description, version );
TDECmdLineArgs::addCmdLineOptions( k2moptions );
- KApplication app( false, false );
+ TDEApplication app( false, false );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
index 33dcd9156..78fa54ee7 100644
--- a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
+++ b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
@@ -50,7 +50,7 @@ void convertDistributionLists()
const TQStringList entries = TQStringList::split( ',', it.data(), true );
KPIM::DistributionList distList;
- distList.setUid( KApplication::randomString( 10 ) );
+ distList.setUid( TDEApplication::randomString( 10 ) );
distList.setName( listName );
if ( entries.count() > 1 ) {
@@ -70,7 +70,7 @@ void convertDistributionLists()
int main( int argc, char **argv )
{
- KApplication::disableAutoDcopRegistration();
+ TDEApplication::disableAutoDcopRegistration();
KAboutData aboutData( "kabcdistlistupdater", "Converter tool for distribution lists", "0.1" );
aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
@@ -78,7 +78,7 @@ int main( int argc, char **argv )
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication app( false, false );
+ TDEApplication app( false, false );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();