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 --- libkcal/calformat.cpp | 2 +- libkcal/convertqtopia.cpp | 2 +- libkcal/tests/readandwrite.cpp | 2 +- libkcal/tests/testcalendar.cpp | 4 ++-- libkcal/tests/testcalselectdialog.cpp | 2 +- libkcal/tests/testfields.cpp | 4 ++-- libkcal/tests/testincidence.cpp | 2 +- libkcal/tests/testrecurprevious.cpp | 2 +- libkcal/tests/testrecurrence.cpp | 2 +- libkcal/tests/testrecurrencetype.cpp | 2 +- libkcal/tests/testrecurson.cpp | 2 +- libkcal/tests/testresource.cpp | 4 ++-- libkcal/tests/testvcalexport.cpp | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) (limited to 'libkcal') diff --git a/libkcal/calformat.cpp b/libkcal/calformat.cpp index e506b8df..c29437ac 100644 --- a/libkcal/calformat.cpp +++ b/libkcal/calformat.cpp @@ -71,7 +71,7 @@ TQString CalFormat::createUniqueId() TQTime::currentTime().msec(); TQString uidStr = TQString("%1-%2.%3") .arg(mApplication) - .arg(KApplication::random()) + .arg(TDEApplication::random()) .arg(hashTime); return uidStr; } diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp index b1af7f8c..2a8712c8 100644 --- a/libkcal/convertqtopia.cpp +++ b/libkcal/convertqtopia.cpp @@ -56,7 +56,7 @@ int main(int argc,char **argv) TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/libkcal/tests/readandwrite.cpp b/libkcal/tests/readandwrite.cpp index 1f53a450..0c8f5586 100644 --- a/libkcal/tests/readandwrite.cpp +++ b/libkcal/tests/readandwrite.cpp @@ -50,7 +50,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(); diff --git a/libkcal/tests/testcalendar.cpp b/libkcal/tests/testcalendar.cpp index e6eb6973..323d9175 100644 --- a/libkcal/tests/testcalendar.cpp +++ b/libkcal/tests/testcalendar.cpp @@ -41,8 +41,8 @@ int main(int argc,char **argv) TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); -// KApplication app( false, false ); - KApplication app; +// TDEApplication app( false, false ); + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/libkcal/tests/testcalselectdialog.cpp b/libkcal/tests/testcalselectdialog.cpp index 65004d34..976a6ffe 100644 --- a/libkcal/tests/testcalselectdialog.cpp +++ b/libkcal/tests/testcalselectdialog.cpp @@ -30,7 +30,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, "testcalselectdialog", 0, "KCalSelectDialogTest", "1.0", "kcalselectedialog test app" ); - KApplication app; + TDEApplication app; TQStringList cals; cals << "standard" << "shared" << "mine" << "yours"; TQString cal = CalSelectDialog::getItem( i18n( "Calendar Selection" ), diff --git a/libkcal/tests/testfields.cpp b/libkcal/tests/testfields.cpp index e24baec5..9f57d3b2 100644 --- a/libkcal/tests/testfields.cpp +++ b/libkcal/tests/testfields.cpp @@ -43,8 +43,8 @@ int main(int argc,char **argv) TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); -// KApplication app( false, false ); - KApplication app; +// TDEApplication app( false, false ); + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/libkcal/tests/testincidence.cpp b/libkcal/tests/testincidence.cpp index c6a5ef57..4647c2b5 100644 --- a/libkcal/tests/testincidence.cpp +++ b/libkcal/tests/testincidence.cpp @@ -43,7 +43,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(); diff --git a/libkcal/tests/testrecurprevious.cpp b/libkcal/tests/testrecurprevious.cpp index 3d2216b7..0b1e756c 100644 --- a/libkcal/tests/testrecurprevious.cpp +++ b/libkcal/tests/testrecurprevious.cpp @@ -53,7 +53,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(); diff --git a/libkcal/tests/testrecurrence.cpp b/libkcal/tests/testrecurrence.cpp index 14d470cf..9b165297 100644 --- a/libkcal/tests/testrecurrence.cpp +++ b/libkcal/tests/testrecurrence.cpp @@ -53,7 +53,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(); diff --git a/libkcal/tests/testrecurrencetype.cpp b/libkcal/tests/testrecurrencetype.cpp index 14d470cf..9b165297 100644 --- a/libkcal/tests/testrecurrencetype.cpp +++ b/libkcal/tests/testrecurrencetype.cpp @@ -53,7 +53,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(); diff --git a/libkcal/tests/testrecurson.cpp b/libkcal/tests/testrecurson.cpp index cd5edf76..a1df982a 100644 --- a/libkcal/tests/testrecurson.cpp +++ b/libkcal/tests/testrecurson.cpp @@ -53,7 +53,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(); diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp index 6fc8fc2a..b7f2f24c 100644 --- a/libkcal/tests/testresource.cpp +++ b/libkcal/tests/testresource.cpp @@ -59,11 +59,11 @@ int main(int argc, char *argv[]) setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testresource" ), true ); setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); TDECmdLineArgs::init(argc,argv,"testresource", 0, 0, 0, 0); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQString type = TQString(); if ( args->getOption( "resource" ) ) diff --git a/libkcal/tests/testvcalexport.cpp b/libkcal/tests/testvcalexport.cpp index 16a15afa..8d32e940 100644 --- a/libkcal/tests/testvcalexport.cpp +++ b/libkcal/tests/testvcalexport.cpp @@ -54,7 +54,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