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 /kaddressbook/common | |
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 'kaddressbook/common')
-rw-r--r-- | kaddressbook/common/filter.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/common/filter.h | 2 | ||||
-rw-r--r-- | kaddressbook/common/kabprefs.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/common/kabprefs_base.kcfgc | 2 | ||||
-rw-r--r-- | kaddressbook/common/locationmap.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp index 1872ecea0..e312fbcdc 100644 --- a/kaddressbook/common/filter.cpp +++ b/kaddressbook/common/filter.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "kabprefs.h" diff --git a/kaddressbook/common/filter.h b/kaddressbook/common/filter.h index e8518b8e8..68df1036f 100644 --- a/kaddressbook/common/filter.h +++ b/kaddressbook/common/filter.h @@ -29,7 +29,7 @@ #include <tqvaluelist.h> #include <kabc/addressee.h> -#include <kconfig.h> +#include <tdeconfig.h> /** Filter for AddressBook related objects (Addressees) diff --git a/kaddressbook/common/kabprefs.cpp b/kaddressbook/common/kabprefs.cpp index 8a45fc14d..1f9e2410a 100644 --- a/kaddressbook/common/kabprefs.cpp +++ b/kaddressbook/common/kabprefs.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kstaticdeleter.h> diff --git a/kaddressbook/common/kabprefs_base.kcfgc b/kaddressbook/common/kabprefs_base.kcfgc index 75e0d84de..bc54ae65e 100644 --- a/kaddressbook/common/kabprefs_base.kcfgc +++ b/kaddressbook/common/kabprefs_base.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kaddressbook.kcfg ClassName=KABPrefsBase Singleton=false diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp index e1f23e662..11fd2c110 100644 --- a/kaddressbook/common/locationmap.cpp +++ b/kaddressbook/common/locationmap.cpp @@ -22,7 +22,7 @@ */ #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include <kglobal.h> #include <klocale.h> |