diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:54:06 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:54:06 -0600 |
commit | 71049a71c6648791e95cf421b19047415a2c4c84 (patch) | |
tree | 4f75fdaee1cce5a44f58f1f54980099f50a82b10 /kaddressbook-plugins | |
parent | 6fe537d6dff11f4c638c51ed1f652765b63f8591 (diff) | |
download | tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.tar.gz tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook-plugins')
-rw-r--r-- | kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp | 6 | ||||
-rw-r--r-- | kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp index a068e4b..0548c38 100644 --- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp +++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp @@ -34,10 +34,10 @@ #include <tdefiledialog.h> #include <tdeio/netaccess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <kurl.h> #include <kdebug.h> diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp index 48a3901..d6fc76b 100644 --- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp +++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp @@ -22,8 +22,8 @@ */ #include <tdeconfig.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <float.h> |