diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:52:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:52:41 -0600 |
| commit | 278456de73346b2eda4fac631aa3279ecbd15e79 (patch) | |
| tree | 8144b7a685b388b7a92ea218ad585ebf4c11464e | |
| parent | d9c9c85d81837cb5837293797b274167c014a420 (diff) | |
| download | kcmldapmanager-278456de73346b2eda4fac631aa3279ecbd15e79.tar.gz kcmldapmanager-278456de73346b2eda4fac631aa3279ecbd15e79.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | src/ldapmanager.desktop | 2 | ||||
| -rw-r--r-- | src/ldapmgr.cpp | 2 | ||||
| -rw-r--r-- | src/ldapmgr.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/ldapmanager.desktop b/src/ldapmanager.desktop index 7896810..c43c529 100644 --- a/src/ldapmanager.desktop +++ b/src/ldapmanager.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Exec=kcmshell ldapmanager +Exec=tdecmshell ldapmanager Icon=tdmconfig Type=Application diff --git a/src/ldapmgr.cpp b/src/ldapmgr.cpp index f84351b..18f9f52 100644 --- a/src/ldapmgr.cpp +++ b/src/ldapmgr.cpp @@ -31,7 +31,7 @@ #include <klistview.h> #include <kopenwith.h> #include <kpropertiesdialog.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <tqdir.h> #include <tqheader.h> #include <ksimpleconfig.h> diff --git a/src/ldapmgr.h b/src/ldapmgr.h index 00d20e8..ffb44a4 100644 --- a/src/ldapmgr.h +++ b/src/ldapmgr.h @@ -25,7 +25,7 @@ #include <kaboutdata.h> #include <kpushbutton.h> #include <klistview.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kglobalsettings.h> #include <tqpushbutton.h> #include <tqcombobox.h> |