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/views | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook/views')
| -rw-r--r-- | kaddressbook/views/cardview.cpp | 2 | ||||
| -rw-r--r-- | kaddressbook/views/configurecardviewdialog.cpp | 6 | ||||
| -rw-r--r-- | kaddressbook/views/configuretableviewdialog.cpp | 4 | ||||
| -rw-r--r-- | kaddressbook/views/contactlistview.cpp | 8 | ||||
| -rw-r--r-- | kaddressbook/views/contactlistview.h | 2 | ||||
| -rw-r--r-- | kaddressbook/views/kaddressbookcardview.cpp | 6 | ||||
| -rw-r--r-- | kaddressbook/views/kaddressbookiconview.cpp | 8 | ||||
| -rw-r--r-- | kaddressbook/views/kaddressbooktableview.cpp | 8 |
8 files changed, 22 insertions, 22 deletions
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index 2979ee5d2..9b1ef52a6 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -33,7 +33,7 @@ #include <tqtooltip.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "cardview.h" diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 2c520ce74..a386743c9 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -32,9 +32,9 @@ #include <tqwhatsthis.h> #include <kdebug.h> -#include <kglobal.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeconfig.h> #include <tdefontdialog.h> diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index 4e478e255..f14a5c451 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -30,8 +30,8 @@ #include <tqbuttongroup.h> #include <tdeversion.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <klineedit.h> #include <kurlrequester.h> #include <kiconloader.h> diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index f4b98e468..0d7942f95 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -30,14 +30,14 @@ #include <tqbrush.h> #include <tqevent.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <kdebug.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kurl.h> -#include <kabc/addressbook.h> -#include <kabc/addressee.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/addressee.h> #include <tdeimproxy.h> #include "kaddressbooktableview.h" diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h index 0ca029f64..b893cc352 100644 --- a/kaddressbook/views/contactlistview.h +++ b/kaddressbook/views/contactlistview.h @@ -31,7 +31,7 @@ #include <tdelistview.h> -#include <kabc/field.h> +#include <tdeabc/field.h> class TQDropEvent; class KAddressBookTableView; diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index f69ce0c1a..f60d171a3 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -28,11 +28,11 @@ #include <tqlayout.h> #include <tqstringlist.h> -#include <kabc/addressbook.h> -#include <kabc/addressee.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/addressee.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "core.h" #include "configurecardviewdialog.h" diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index e5f4ab259..f88af5ffe 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -26,13 +26,13 @@ #include <tqlayout.h> #include <tqstringlist.h> -#include <kabc/addressbook.h> -#include <kabc/addressee.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/addressee.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "core.h" #include "kabprefs.h" diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 4c726ca30..6d8d0c971 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -36,16 +36,16 @@ #include <tqurl.h> #include <tqpixmap.h> -#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <kcolorbutton.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kurl.h> #include <kurlrequester.h> #include <tdeimproxy.h> |