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 --- kabc/frontend/main.cpp | 2 +- kabc/kabc2mutt/main.cpp | 4 ++-- kabc/kabcdistlistupdater/kabcdistlistupdater.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kabc') diff --git a/kabc/frontend/main.cpp b/kabc/frontend/main.cpp index 9f35c359..169e52a3 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 4a406a39..f9f41f8a 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 33dcd915..78fa54ee 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(); -- cgit v1.2.3