diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:46:31 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:46:31 -0600 |
commit | 969e918e16b749e77b149b7d7ae53a91ad774b6c (patch) | |
tree | 9f2a4ec9fa25776e276dd870bdef9896a2731c70 | |
parent | f5457542263e7546ad17b3be30a1c9b99e80e5b4 (diff) | |
download | kiosktool-969e918e16b749e77b149b7d7ae53a91ad774b6c.tar.gz kiosktool-969e918e16b749e77b149b7d7ae53a91ad774b6c.zip |
Rename additional header files to avoid conflicts with KDE4
-rw-r--r-- | kiosktool/componentPage.cpp | 4 | ||||
-rw-r--r-- | kiosktool/componentSelectionPage.cpp | 2 | ||||
-rw-r--r-- | kiosktool/desktopComponent.cpp | 2 | ||||
-rw-r--r-- | kiosktool/kcms/autostart/kcmautostart.cpp | 2 | ||||
-rw-r--r-- | kiosktool/kioskConfigDialog.cpp | 2 | ||||
-rw-r--r-- | kiosktool/kioskdata.cpp | 2 | ||||
-rw-r--r-- | kiosktool/kioskgui.cpp | 8 | ||||
-rw-r--r-- | kiosktool/kioskrun.cpp | 4 | ||||
-rw-r--r-- | kiosktool/kiosksync.cpp | 2 | ||||
-rw-r--r-- | kiosktool/kiosktool-tdedirs.cpp | 4 | ||||
-rw-r--r-- | kiosktool/main.cpp | 4 | ||||
-rw-r--r-- | kiosktool/profilePropsPage.cpp | 4 | ||||
-rw-r--r-- | kiosktool/userManagement.cpp | 4 |
13 files changed, 22 insertions, 22 deletions
diff --git a/kiosktool/componentPage.cpp b/kiosktool/componentPage.cpp index 530bb15..105a606 100644 --- a/kiosktool/componentPage.cpp +++ b/kiosktool/componentPage.cpp @@ -31,8 +31,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kstdguiitem.h> diff --git a/kiosktool/componentSelectionPage.cpp b/kiosktool/componentSelectionPage.cpp index 99fa536..b047b13 100644 --- a/kiosktool/componentSelectionPage.cpp +++ b/kiosktool/componentSelectionPage.cpp @@ -25,7 +25,7 @@ #include <tdeconfig.h> #include <kiconloader.h> #include <kiconview.h> -#include <klocale.h> +#include <tdelocale.h> #include "kioskdata.h" diff --git a/kiosktool/desktopComponent.cpp b/kiosktool/desktopComponent.cpp index 5456687..5dea814 100644 --- a/kiosktool/desktopComponent.cpp +++ b/kiosktool/desktopComponent.cpp @@ -27,7 +27,7 @@ #include <kprocess.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kurl.h> #include "kioskrun.h" diff --git a/kiosktool/kcms/autostart/kcmautostart.cpp b/kiosktool/kcms/autostart/kcmautostart.cpp index 2c38eef..0649569 100644 --- a/kiosktool/kcms/autostart/kcmautostart.cpp +++ b/kiosktool/kcms/autostart/kcmautostart.cpp @@ -32,7 +32,7 @@ Boston, MA 02111-1307, USA. #include <kdialog.h> #include <kgenericfactory.h> #include <tdelistview.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kservice.h> #include <kstandarddirs.h> diff --git a/kiosktool/kioskConfigDialog.cpp b/kiosktool/kioskConfigDialog.cpp index 0254a4f..2580894 100644 --- a/kiosktool/kioskConfigDialog.cpp +++ b/kiosktool/kioskConfigDialog.cpp @@ -27,7 +27,7 @@ #include <tdefiledialog.h> #include <knuminput.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include "kioskrun.h" diff --git a/kiosktool/kioskdata.cpp b/kiosktool/kioskdata.cpp index f191260..3f898d5 100644 --- a/kiosktool/kioskdata.cpp +++ b/kiosktool/kioskdata.cpp @@ -24,7 +24,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kstdaction.h> diff --git a/kiosktool/kioskgui.cpp b/kiosktool/kioskgui.cpp index b9f0f2a..5233d7a 100644 --- a/kiosktool/kioskgui.cpp +++ b/kiosktool/kioskgui.cpp @@ -29,12 +29,12 @@ #include <kcombobox.h> #include <tdeconfig.h> #include <tdefiledialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kiconview.h> -#include <klocale.h> -#include <kmenubar.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemenubar.h> +#include <tdemessagebox.h> #include <kstatusbar.h> #include <tdestdaccel.h> #include <kstdaction.h> diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp index b6e5f11..fc8e8bb 100644 --- a/kiosktool/kioskrun.cpp +++ b/kiosktool/kioskrun.cpp @@ -33,8 +33,8 @@ #include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <ksavefile.h> #include <ksimpleconfig.h> diff --git a/kiosktool/kiosksync.cpp b/kiosktool/kiosksync.cpp index 3f20044..bed9519 100644 --- a/kiosktool/kiosksync.cpp +++ b/kiosktool/kiosksync.cpp @@ -23,7 +23,7 @@ #include <tqwidget.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/kiosktool/kiosktool-tdedirs.cpp b/kiosktool/kiosktool-tdedirs.cpp index 07682d5..a959c44 100644 --- a/kiosktool/kiosktool-tdedirs.cpp +++ b/kiosktool/kiosktool-tdedirs.cpp @@ -29,8 +29,8 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kinstance.h> #include <kshell.h> #include <ksimpleconfig.h> diff --git a/kiosktool/main.cpp b/kiosktool/main.cpp index 2bee59a..8f8f2b8 100644 --- a/kiosktool/main.cpp +++ b/kiosktool/main.cpp @@ -26,8 +26,8 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeversion.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> static const char *description = I18N_NOOP("KIOSK Admin Tool"); diff --git a/kiosktool/profilePropsPage.cpp b/kiosktool/profilePropsPage.cpp index 7c31fac..4c59ffe 100644 --- a/kiosktool/profilePropsPage.cpp +++ b/kiosktool/profilePropsPage.cpp @@ -25,8 +25,8 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kurlrequester.h> #include <kuser.h> diff --git a/kiosktool/userManagement.cpp b/kiosktool/userManagement.cpp index f0c7c31..f69288a 100644 --- a/kiosktool/userManagement.cpp +++ b/kiosktool/userManagement.cpp @@ -31,8 +31,8 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "kioskrun.h" |