diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
commit | cfb328d59024a251690b6e47c9f8d343fd8c241c (patch) | |
tree | 7c11070cd07e5e023a26ddcfa41832c208c63732 /kaddressbook/kcmconfigs | |
parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook/kcmconfigs')
-rw-r--r-- | kaddressbook/kcmconfigs/addhostdialog.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/addhostdialog.h | 2 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/addresseewidget.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/extensionconfigdialog.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kabconfigwidget.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kcmkabconfig.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kcmkabldapconfig.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/ldapoptionswidget.cpp | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp index 0c2484404..44a51680e 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.cpp +++ b/kaddressbook/kcmconfigs/addhostdialog.cpp @@ -30,7 +30,7 @@ #include <tdeaccelmanager.h> #include <kbuttonbox.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include "addhostdialog.h" AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const char* name ) diff --git a/kaddressbook/kcmconfigs/addhostdialog.h b/kaddressbook/kcmconfigs/addhostdialog.h index da6cc392b..1ea1865fd 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.h +++ b/kaddressbook/kcmconfigs/addhostdialog.h @@ -25,7 +25,7 @@ #define ADDHOSTDIALOG_H #include <kdialogbase.h> -#include <kabc/ldapconfigwidget.h> +#include <tdeabc/ldapconfigwidget.h> #include <libtdepim/ldapclient.h> class KLineEdit; diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp index ce58d2720..6d8522f6f 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.cpp +++ b/kaddressbook/kcmconfigs/addresseewidget.cpp @@ -35,7 +35,7 @@ #include <tdeconfig.h> #include <kdialog.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include "addresseewidget.h" diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp index 5bdec2f86..55eecb18a 100644 --- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp +++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include "configurewidget.h" #include "extensionconfigdialog.h" diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index 6e2c4f68b..83e0bc89b 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -36,8 +36,8 @@ #include <kdebug.h> #include <kdialog.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ktrader.h> #include "addresseewidget.h" diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index 6f1706974..db05432cf 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -25,7 +25,7 @@ #include <tdeaboutdata.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kabconfigwidget.h" diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index a95fa2c84..73e8c5a22 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -26,7 +26,7 @@ #include <tqlayout.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include "ldapoptionswidget.h" diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp index 71a41ba48..462418558 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -33,7 +33,7 @@ #include <kbuttonbox.h> #include <tdeconfig.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include "addhostdialog.h" #include "ldapoptionswidget.h" |