diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:49:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:49:33 -0600 |
| commit | 51cb17939cc986de61b7cce799076ee6ddcbf3b2 (patch) | |
| tree | 30b6c628b25f1dece45df9dbb11bfd546dba5406 /tests | |
| parent | cbf5d0cef8875e3a03b49338d42784e23f96b26d (diff) | |
| download | kpilot-51cb17939cc986de61b7cce799076ee6ddcbf3b2.tar.gz kpilot-51cb17939cc986de61b7cce799076ee6ddcbf3b2.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/exportdatebook.cc | 2 | ||||
| -rw-r--r-- | tests/importaddresses.cc | 6 | ||||
| -rw-r--r-- | tests/importdatebook.cc | 2 | ||||
| -rw-r--r-- | tests/mergecalendars.cc | 2 | ||||
| -rw-r--r-- | tests/testaddress.cc | 2 | ||||
| -rw-r--r-- | tests/testcategories.cc | 2 | ||||
| -rw-r--r-- | tests/testdatabase.cc | 2 | ||||
| -rw-r--r-- | tests/testdatebook.cc | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/tests/exportdatebook.cc b/tests/exportdatebook.cc index 2f6533b..45cfa01 100644 --- a/tests/exportdatebook.cc +++ b/tests/exportdatebook.cc @@ -31,7 +31,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeconfigskeleton.h> diff --git a/tests/importaddresses.cc b/tests/importaddresses.cc index 4d37fa4..7e21c77 100644 --- a/tests/importaddresses.cc +++ b/tests/importaddresses.cc @@ -31,11 +31,11 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> -#include <kabc/addressbook.h> -#include <kabc/resourcefile.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/resourcefile.h> #include "pilot.h" #include "pilotLocalDatabase.h" diff --git a/tests/importdatebook.cc b/tests/importdatebook.cc index d3e83b6..99f81f2 100644 --- a/tests/importdatebook.cc +++ b/tests/importdatebook.cc @@ -31,7 +31,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <libkcal/calendar.h> diff --git a/tests/mergecalendars.cc b/tests/mergecalendars.cc index 926b8a5..010755d 100644 --- a/tests/mergecalendars.cc +++ b/tests/mergecalendars.cc @@ -28,7 +28,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeconfigskeleton.h> diff --git a/tests/testaddress.cc b/tests/testaddress.cc index 1f5b466..c24101d 100644 --- a/tests/testaddress.cc +++ b/tests/testaddress.cc @@ -31,7 +31,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include "pilot.h" diff --git a/tests/testcategories.cc b/tests/testcategories.cc index e2d4b25..35d5cd3 100644 --- a/tests/testcategories.cc +++ b/tests/testcategories.cc @@ -31,7 +31,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include "pilotLocalDatabase.h" diff --git a/tests/testdatabase.cc b/tests/testdatabase.cc index fd397be..68b3965 100644 --- a/tests/testdatabase.cc +++ b/tests/testdatabase.cc @@ -31,7 +31,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include "pilotLocalDatabase.h" diff --git a/tests/testdatebook.cc b/tests/testdatebook.cc index 5852585..82cc46a 100644 --- a/tests/testdatebook.cc +++ b/tests/testdatebook.cc @@ -31,7 +31,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include "pilot.h" |