diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:04 -0600 |
| commit | 783715b853042d24841e3e888051f3a184e78a40 (patch) | |
| tree | 33ce107e439bb622368ba17b8a2a6485ef28e3b5 /kdelirc | |
| parent | 980088ed866120f458c10c1ec64295e84ad8ba82 (diff) | |
| download | tdeutils-783715b853042d24841e3e888051f3a184e78a40.tar.gz tdeutils-783715b853042d24841e3e888051f3a184e78a40.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kdelirc')
| -rw-r--r-- | kdelirc/irkick/irkick.cpp | 6 | ||||
| -rw-r--r-- | kdelirc/irkick/klircclient.cpp | 4 | ||||
| -rw-r--r-- | kdelirc/irkick/main.cpp | 4 | ||||
| -rw-r--r-- | kdelirc/kcmlirc/addaction.cpp | 4 | ||||
| -rw-r--r-- | kdelirc/kcmlirc/editaction.cpp | 2 | ||||
| -rw-r--r-- | kdelirc/kcmlirc/kcmlirc.cpp | 6 | ||||
| -rw-r--r-- | kdelirc/kdelirc/iraction.cpp | 2 | ||||
| -rw-r--r-- | kdelirc/kdelirc/profileserver.cpp | 2 | ||||
| -rw-r--r-- | kdelirc/kdelirc/remoteserver.cpp | 2 |
9 files changed, 16 insertions, 16 deletions
diff --git a/kdelirc/irkick/irkick.cpp b/kdelirc/irkick/irkick.cpp index 12122ae..2d042f0 100644 --- a/kdelirc/irkick/irkick.cpp +++ b/kdelirc/irkick/irkick.cpp @@ -24,16 +24,16 @@ #include <ksystemtray.h> #include <kiconloader.h> #include <kpassivepopup.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdialog.h> #include <tdeabouttde.h> #include <twinmodule.h> #include <twin.h> #include <khelpmenu.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstdguiitem.h> #include <dcopclient.h> diff --git a/kdelirc/irkick/klircclient.cpp b/kdelirc/irkick/klircclient.cpp index f6c8f00..b7051fc 100644 --- a/kdelirc/irkick/klircclient.cpp +++ b/kdelirc/irkick/klircclient.cpp @@ -30,10 +30,10 @@ #include <ksystemtray.h> #include <kiconloader.h> #include <kpassivepopup.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdialog.h> #include <tdeabouttde.h> diff --git a/kdelirc/irkick/main.cpp b/kdelirc/irkick/main.cpp index 2aa30e0..aa9d697 100644 --- a/kdelirc/irkick/main.cpp +++ b/kdelirc/irkick/main.cpp @@ -7,11 +7,11 @@ // This program is free software. -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <twin.h> #include <tdeaboutdata.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <kuniqueapplication.h> diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp index 38cd1d5..8a87775 100644 --- a/kdelirc/kcmlirc/addaction.cpp +++ b/kdelirc/kcmlirc/addaction.cpp @@ -19,10 +19,10 @@ #include <klineedit.h> #include <tdelistview.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <keditlistbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include <irkick_stub.h> diff --git a/kdelirc/kcmlirc/editaction.cpp b/kdelirc/kcmlirc/editaction.cpp index 392b20d..8d8a0cb 100644 --- a/kdelirc/kcmlirc/editaction.cpp +++ b/kdelirc/kcmlirc/editaction.cpp @@ -22,7 +22,7 @@ #include <klineedit.h> #include <tdelistview.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <keditlistbox.h> diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp index 6ddf888..bf18895 100644 --- a/kdelirc/kcmlirc/kcmlirc.cpp +++ b/kdelirc/kcmlirc/kcmlirc.cpp @@ -19,8 +19,8 @@ #include <kpushbutton.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kicondialog.h> #include <kiconloader.h> @@ -28,7 +28,7 @@ #include <ksimpleconfig.h> #include <kgenericfactory.h> #include <tdelistview.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <dcopclient.h> diff --git a/kdelirc/kdelirc/iraction.cpp b/kdelirc/kdelirc/iraction.cpp index 00be5da..46b581f 100644 --- a/kdelirc/kdelirc/iraction.cpp +++ b/kdelirc/kdelirc/iraction.cpp @@ -14,7 +14,7 @@ #include <tqvariant.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include "iraction.h" #include "profileserver.h" diff --git a/kdelirc/kdelirc/profileserver.cpp b/kdelirc/kdelirc/profileserver.cpp index 880b50f..ba39442 100644 --- a/kdelirc/kdelirc/profileserver.cpp +++ b/kdelirc/kdelirc/profileserver.cpp @@ -14,7 +14,7 @@ #include <tqfile.h> #include <tqxml.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kdebug.h> diff --git a/kdelirc/kdelirc/remoteserver.cpp b/kdelirc/kdelirc/remoteserver.cpp index 706bb0d..dafa67d 100644 --- a/kdelirc/kdelirc/remoteserver.cpp +++ b/kdelirc/kdelirc/remoteserver.cpp @@ -14,7 +14,7 @@ #include <tqfile.h> #include <tqxml.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kdebug.h> |