summaryrefslogtreecommitdiffstats
path: root/libkcal
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 /libkcal
parent32b66c9ae78f439199a6d281cc33218e57c5106d (diff)
downloadtdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.tar.gz
tdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'libkcal')
-rw-r--r--libkcal/calformat.cpp2
-rw-r--r--libkcal/convertqtopia.cpp2
-rw-r--r--libkcal/tests/readandwrite.cpp2
-rw-r--r--libkcal/tests/testcalendar.cpp4
-rw-r--r--libkcal/tests/testcalselectdialog.cpp2
-rw-r--r--libkcal/tests/testfields.cpp4
-rw-r--r--libkcal/tests/testincidence.cpp2
-rw-r--r--libkcal/tests/testrecurprevious.cpp2
-rw-r--r--libkcal/tests/testrecurrence.cpp2
-rw-r--r--libkcal/tests/testrecurrencetype.cpp2
-rw-r--r--libkcal/tests/testrecurson.cpp2
-rw-r--r--libkcal/tests/testresource.cpp4
-rw-r--r--libkcal/tests/testvcalexport.cpp2
13 files changed, 16 insertions, 16 deletions
diff --git a/libkcal/calformat.cpp b/libkcal/calformat.cpp
index e506b8dfe..c29437ac5 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 b1af7f8c2..2a8712c89 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 1f53a450d..0c8f55861 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 e6eb6973b..323d9175c 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 65004d34f..976a6ffea 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 e24baec54..9f57d3b20 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 c6a5ef572..4647c2b5c 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 3d2216b7e..0b1e756c4 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 14d470cf3..9b1652979 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 14d470cf3..9b1652979 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 cd5edf76b..a1df982a6 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 6fc8fc2a4..b7f2f24c4 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 16a15afaf..8d32e9407 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();