diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:38 -0600 |
| commit | be13585f6ed9a63a3a45b48364cbfcfc91cbd65e (patch) | |
| tree | 3dd6b0748ebd393744ca761fe8a8ac9ea503e24a | |
| parent | 3fd129675e74c6517addc6679cf56f5e0fa6f5a2 (diff) | |
| download | kcmldap-be13585f6ed9a63a3a45b48364cbfcfc91cbd65e.tar.gz kcmldap-be13585f6ed9a63a3a45b48364cbfcfc91cbd65e.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | src/bondwizard.cpp | 2 | ||||
| -rw-r--r-- | src/ldapbonding.cpp | 2 | ||||
| -rw-r--r-- | src/ldapbonding.desktop | 2 | ||||
| -rw-r--r-- | src/ldapbonding.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/bondwizard.cpp b/src/bondwizard.cpp index e29e4f9..c869447 100644 --- a/src/bondwizard.cpp +++ b/src/bondwizard.cpp @@ -38,7 +38,7 @@ #include <klistview.h> #include <krun.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <knuminput.h> #include <klineedit.h> #include <ktextedit.h> diff --git a/src/ldapbonding.cpp b/src/ldapbonding.cpp index 6a81b62..fc94f46 100644 --- a/src/ldapbonding.cpp +++ b/src/ldapbonding.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 <knuminput.h> diff --git a/src/ldapbonding.desktop b/src/ldapbonding.desktop index 29fd5c7..f0828d2 100644 --- a/src/ldapbonding.desktop +++ b/src/ldapbonding.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Exec=kcmshell ldapbonding +Exec=tdecmshell ldapbonding Icon=tdmconfig Type=Application diff --git a/src/ldapbonding.h b/src/ldapbonding.h index 8e28834..ff227ae 100644 --- a/src/ldapbonding.h +++ b/src/ldapbonding.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> |