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 /kontact/src | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kontact/src')
| -rw-r--r-- | kontact/src/aboutdialog.cpp | 2 | ||||
| -rw-r--r-- | kontact/src/iconsidepane.cpp | 2 | ||||
| -rw-r--r-- | kontact/src/kcmkontact.cpp | 2 | ||||
| -rw-r--r-- | kontact/src/main.cpp | 4 | ||||
| -rw-r--r-- | kontact/src/mainwindow.cpp | 6 | ||||
| -rw-r--r-- | kontact/src/profiledialog.cpp | 4 | ||||
| -rw-r--r-- | kontact/src/profilemanager.cpp | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp index ca3bc265a..9059d09ba 100644 --- a/kontact/src/aboutdialog.cpp +++ b/kontact/src/aboutdialog.cpp @@ -27,7 +27,7 @@ #include "core.h" #include "plugin.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeaboutdata.h> #include <kactivelabel.h> diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index d4eb6d3d1..39deb330c 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -39,7 +39,7 @@ #include <tdepopupmenu.h> #include <tdeapplication.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <sidebarextension.h> diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index 61628bf9d..622d597b1 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -29,7 +29,7 @@ #include <tdeaboutdata.h> #include <kdebug.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <ktrader.h> #include <tqbuttongroup.h> diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index 268acb897..a243db711 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -26,8 +26,8 @@ #include <tdecmdlineargs.h> #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> -#include <kstartupinfo.h> +#include <tdelocale.h> +#include <tdestartupinfo.h> #include <kuniqueapplication.h> #include <twin.h> #include <kstandarddirs.h> diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index e36cd8270..d1a054edb 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -44,8 +44,8 @@ #include <kkeydialog.h> #include <klibloader.h> #include <tdelistbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeparts/componentfactory.h> #include <kplugininfo.h> #include <tdepopupmenu.h> @@ -66,7 +66,7 @@ #include <kcursor.h> #include <krun.h> #include <tdeaboutdata.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <tdestdaccel.h> #include <kcmultidialog.h> #include <kipc.h> diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp index 328848401..e85d90c51 100644 --- a/kontact/src/profiledialog.cpp +++ b/kontact/src/profiledialog.cpp @@ -27,8 +27,8 @@ #include <tdefiledialog.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqlayout.h> #include <tqpushbutton.h> diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp index 80fdc8139..0d87b9bf7 100644 --- a/kontact/src/profilemanager.cpp +++ b/kontact/src/profilemanager.cpp @@ -28,7 +28,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> #include <kurl.h> |