diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:40 -0600 |
| commit | 806df34419fa3bbf944a9b8d307cb95dd09e78c7 (patch) | |
| tree | 58a48cc11c700738d4c95a0e8975efbb768e61eb /src | |
| parent | 3a3f9665cc5e89160ce7e418d7b1d2dbf23c1d7a (diff) | |
| download | kcmldapcontroller-806df34419fa3bbf944a9b8d307cb95dd09e78c7.tar.gz kcmldapcontroller-806df34419fa3bbf944a9b8d307cb95dd09e78c7.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src')
| -rw-r--r-- | src/ldapcontroller.cpp | 4 | ||||
| -rw-r--r-- | src/ldapcontroller.desktop | 2 | ||||
| -rw-r--r-- | src/ldapcontroller.h | 4 | ||||
| -rw-r--r-- | src/primaryrealmwizard/primaryrealmwizard.cpp | 2 | ||||
| -rw-r--r-- | src/processingdialog.cpp | 2 | ||||
| -rw-r--r-- | src/secondaryrealmwizard/secondaryrealmwizard.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/ldapcontroller.cpp b/src/ldapcontroller.cpp index 0f49c68..ddde195 100644 --- a/src/ldapcontroller.cpp +++ b/src/ldapcontroller.cpp @@ -35,7 +35,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 <kcombobox.h> @@ -45,7 +45,7 @@ #include <kprocess.h> #include <tdesu/process.h> #include <libtdeldap.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kpassdlg.h> #include "sha1.h" diff --git a/src/ldapcontroller.desktop b/src/ldapcontroller.desktop index 28d5741..9a44782 100644 --- a/src/ldapcontroller.desktop +++ b/src/ldapcontroller.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Exec=kcmshell ldapcontroller +Exec=tdecmshell ldapcontroller Icon=tdmconfig Type=Application diff --git a/src/ldapcontroller.h b/src/ldapcontroller.h index ba4d351..ff49296 100644 --- a/src/ldapcontroller.h +++ b/src/ldapcontroller.h @@ -25,12 +25,12 @@ #include <kaboutdata.h> #include <kpushbutton.h> #include <klistview.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kglobalsettings.h> #include <tqpushbutton.h> #include <tqcombobox.h> #include <tqtimer.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> #include <libtdeldap.h> diff --git a/src/primaryrealmwizard/primaryrealmwizard.cpp b/src/primaryrealmwizard/primaryrealmwizard.cpp index d86788e..8cf4345 100644 --- a/src/primaryrealmwizard/primaryrealmwizard.cpp +++ b/src/primaryrealmwizard/primaryrealmwizard.cpp @@ -40,7 +40,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/processingdialog.cpp b/src/processingdialog.cpp index b241190..c99489c 100644 --- a/src/processingdialog.cpp +++ b/src/processingdialog.cpp @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kdialog.h> #include <klocale.h> diff --git a/src/secondaryrealmwizard/secondaryrealmwizard.cpp b/src/secondaryrealmwizard/secondaryrealmwizard.cpp index f7dfe18..5c0c1aa 100644 --- a/src/secondaryrealmwizard/secondaryrealmwizard.cpp +++ b/src/secondaryrealmwizard/secondaryrealmwizard.cpp @@ -40,7 +40,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> |