diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:15 -0600 |
| commit | 64df902cf71a8ee258fb85f6be26248f399aa01f (patch) | |
| tree | dba58f705042c22cea26b678d5b0e4e9a34bf202 /libkcal | |
| parent | de53c98cab07e9c4b0f5e25dab82830fb6fc67ec (diff) | |
| download | tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.tar.gz tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'libkcal')
| -rw-r--r-- | libkcal/attachmenthandler.cpp | 4 | ||||
| -rw-r--r-- | libkcal/convertqtopia.cpp | 2 | ||||
| -rw-r--r-- | libkcal/freebusyurlstore.cpp | 2 | ||||
| -rw-r--r-- | libkcal/htmlexportsettings.kcfgc | 2 | ||||
| -rw-r--r-- | libkcal/resourcecached.h | 2 | ||||
| -rw-r--r-- | libkcal/resourcecalendar.cpp | 2 | ||||
| -rw-r--r-- | libkcal/resourcecalendar.h | 2 | ||||
| -rw-r--r-- | libkcal/resourcelocaldir.cpp | 2 | ||||
| -rwxr-xr-x | libkcal/tests/runtestcase.pl | 4 | ||||
| -rw-r--r-- | libkcal/tests/testresource.cpp | 4 |
10 files changed, 13 insertions, 13 deletions
diff --git a/libkcal/attachmenthandler.cpp b/libkcal/attachmenthandler.cpp index 20035bc58..9b4926769 100644 --- a/libkcal/attachmenthandler.cpp +++ b/libkcal/attachmenthandler.cpp @@ -35,13 +35,13 @@ #include "scheduler.h" #include <kapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kmessagebox.h> #include <kmimetype.h> #include <krun.h> #include <ktempfile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqfile.h> diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp index a546de191..2467e83d0 100644 --- a/libkcal/convertqtopia.cpp +++ b/libkcal/convertqtopia.cpp @@ -29,7 +29,7 @@ #include <klocale.h> #include <kcmdlineargs.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <iostream> diff --git a/libkcal/freebusyurlstore.cpp b/libkcal/freebusyurlstore.cpp index 62cf26e6e..a4a42b5ca 100644 --- a/libkcal/freebusyurlstore.cpp +++ b/libkcal/freebusyurlstore.cpp @@ -22,7 +22,7 @@ #include "freebusyurlstore.h" #include <kstaticdeleter.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> using namespace KCal; diff --git a/libkcal/htmlexportsettings.kcfgc b/libkcal/htmlexportsettings.kcfgc index 62c526154..db2360aac 100644 --- a/libkcal/htmlexportsettings.kcfgc +++ b/libkcal/htmlexportsettings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=htmlexportsettings.kcfg ClassName=HTMLExportSettings Singleton=false diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h index 5f56e3907..94c00ae49 100644 --- a/libkcal/resourcecached.h +++ b/libkcal/resourcecached.h @@ -27,7 +27,7 @@ #include "incidence.h" #include "calendarlocal.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <tqptrlist.h> #include <tqstring.h> diff --git a/libkcal/resourcecalendar.cpp b/libkcal/resourcecalendar.cpp index 36a0932b0..76f12ed13 100644 --- a/libkcal/resourcecalendar.cpp +++ b/libkcal/resourcecalendar.cpp @@ -22,7 +22,7 @@ Boston, MA 02110-1301, USA. */ -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h index 5202563b6..c84554833 100644 --- a/libkcal/resourcecalendar.h +++ b/libkcal/resourcecalendar.h @@ -29,7 +29,7 @@ #include <tqdatetime.h> #include <tqptrlist.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "alarm.h" #include "todo.h" diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp index 47b19d7c4..5ca0518ef 100644 --- a/libkcal/resourcelocaldir.cpp +++ b/libkcal/resourcelocaldir.cpp @@ -30,7 +30,7 @@ #include <kdebug.h> #include <klocale.h> #include <kurl.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include "vcaldrag.h" diff --git a/libkcal/tests/runtestcase.pl b/libkcal/tests/runtestcase.pl index 4cad27cc6..ce8254792 100755 --- a/libkcal/tests/runtestcase.pl +++ b/libkcal/tests/runtestcase.pl @@ -61,11 +61,11 @@ if ( system( $cmd ) != 0 ) { exit 1; } -checkfile( $file, $outfile ); +chectdefile( $file, $outfile ); exit 0; -sub checkfile() +sub chectdefile() { my $file = shift; my $outfile = shift; diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp index fbd42da68..31f8d9b10 100644 --- a/libkcal/tests/testresource.cpp +++ b/libkcal/tests/testresource.cpp @@ -24,8 +24,8 @@ #include <kabc/stdaddressbook.h> #include <kurl.h> #include <kapplication.h> -#include <kio/netaccess.h> -#include <kio/job.h> +#include <tdeio/netaccess.h> +#include <tdeio/job.h> #include <kdebug.h> #include <kcmdlineargs.h> #include <kinputdialog.h> |