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 /korganizer/korgac | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'korganizer/korgac')
| -rw-r--r-- | korganizer/korgac/alarmdialog.cpp | 4 | ||||
| -rw-r--r-- | korganizer/korgac/alarmdockwindow.cpp | 4 | ||||
| -rw-r--r-- | korganizer/korgac/koalarmclient.cpp | 2 | ||||
| -rw-r--r-- | korganizer/korgac/korgacmain.cpp | 4 | ||||
| -rw-r--r-- | korganizer/korgac/testalarmdlg.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index fc3369461..edeffaf38 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -40,11 +40,11 @@ #include <tdeconfig.h> #include <kdcopservicestarter.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <kaudioplayer.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knotifyclient.h> #include <kcombobox.h> #include <tdelistview.h> diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index d1eb5347a..f8f15addf 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -28,14 +28,14 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdeversion.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeconfig.h> #include <kurl.h> #include <kstandarddirs.h> #include <dcopclient.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeaction.h> #include <kstdaction.h> diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp index 7707e0eca..2a87c7fd2 100644 --- a/korganizer/korgac/koalarmclient.cpp +++ b/korganizer/korgac/koalarmclient.cpp @@ -33,7 +33,7 @@ #include <kstandarddirs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <twin.h> diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp index 6dce72116..d44ac4a2e 100644 --- a/korganizer/korgac/korgacmain.cpp +++ b/korganizer/korgac/korgacmain.cpp @@ -24,9 +24,9 @@ #include <stdlib.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <kuniqueapplication.h> diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp index 38b6310e0..de4f839e6 100644 --- a/korganizer/korgac/testalarmdlg.cpp +++ b/korganizer/korgac/testalarmdlg.cpp @@ -27,7 +27,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kstandarddirs.h> |