diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:42 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:42 -0600 |
| commit | c92252ae3e3414b845276e32f8bee63b2903550e (patch) | |
| tree | 285630c7880e74e7c6b869ebdd7ffbacf416f318 /src | |
| parent | 2838587c8a20d2cbd7028d113d6c063c527e02fd (diff) | |
| download | kcmldapmanager-c92252ae3e3414b845276e32f8bee63b2903550e.tar.gz kcmldapmanager-c92252ae3e3414b845276e32f8bee63b2903550e.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src')
| -rw-r--r-- | src/groupconfigdlg.cpp | 2 | ||||
| -rw-r--r-- | src/ldapmgr.cpp | 8 | ||||
| -rw-r--r-- | src/ldapmgr.h | 2 | ||||
| -rw-r--r-- | src/serviceconfigdlg.cpp | 2 | ||||
| -rw-r--r-- | src/userconfigdlg.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/groupconfigdlg.cpp b/src/groupconfigdlg.cpp index 977ac32..38e2850 100644 --- a/src/groupconfigdlg.cpp +++ b/src/groupconfigdlg.cpp @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <ktextedit.h> #include <knuminput.h> diff --git a/src/ldapmgr.cpp b/src/ldapmgr.cpp index 716c88b..5da7169 100644 --- a/src/ldapmgr.cpp +++ b/src/ldapmgr.cpp @@ -21,11 +21,11 @@ #include <tqlayout.h> #include <tqapplication.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeparts/genericfactory.h> #include <ksimpleconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> #include <kurlrequester.h> #include <tdelistview.h> @@ -36,7 +36,7 @@ #include <tqheader.h> #include <ksimpleconfig.h> #include <kcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> #include <kiconloader.h> diff --git a/src/ldapmgr.h b/src/ldapmgr.h index 62f5c1f..bb3e407 100644 --- a/src/ldapmgr.h +++ b/src/ldapmgr.h @@ -26,7 +26,7 @@ #include <kpushbutton.h> #include <tdelistview.h> #include <tdefileitem.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqpushbutton.h> #include <tqcombobox.h> diff --git a/src/serviceconfigdlg.cpp b/src/serviceconfigdlg.cpp index 4e29b61..f649988 100644 --- a/src/serviceconfigdlg.cpp +++ b/src/serviceconfigdlg.cpp @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <ktextedit.h> #include <knuminput.h> diff --git a/src/userconfigdlg.cpp b/src/userconfigdlg.cpp index 57af8c4..0eabcaa 100644 --- a/src/userconfigdlg.cpp +++ b/src/userconfigdlg.cpp @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <ktextedit.h> #include <knuminput.h> |