diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:00:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:00:43 -0600 |
| commit | 2c4a290ae270924340991931a9e0ca793f8e9443 (patch) | |
| tree | 7aa3b953d70dbdd6a5de525cdd7a5f4319ee1dd5 /kuser | |
| parent | 567923f30f7c0700cb526f26c20b5577bfe2a802 (diff) | |
| download | tdeadmin-2c4a290ae270924340991931a9e0ca793f8e9443.tar.gz tdeadmin-2c4a290ae270924340991931a9e0ca793f8e9443.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kuser')
| -rw-r--r-- | kuser/editDefaults.h | 2 | ||||
| -rw-r--r-- | kuser/globals.h | 2 | ||||
| -rw-r--r-- | kuser/kgroupldap.h | 2 | ||||
| -rw-r--r-- | kuser/kuser.cpp | 2 | ||||
| -rw-r--r-- | kuser/kuserldap.cpp | 2 | ||||
| -rw-r--r-- | kuser/kuserldap.h | 2 | ||||
| -rw-r--r-- | kuser/kuserprefs.kcfgc | 2 | ||||
| -rw-r--r-- | kuser/main.cpp | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/kuser/editDefaults.h b/kuser/editDefaults.h index 954ae80..0c39f67 100644 --- a/kuser/editDefaults.h +++ b/kuser/editDefaults.h @@ -22,7 +22,7 @@ #define _KU_EDITDEFAULTS_H_ #include <tqmemarray.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kprogress.h> #include <kabc/ldif.h> #include "ldapsamba.h" diff --git a/kuser/globals.h b/kuser/globals.h index dde58a5..5e0e2f1 100644 --- a/kuser/globals.h +++ b/kuser/globals.h @@ -27,7 +27,7 @@ #ifdef HAVE_PATHS_H #include <paths.h> #endif -#include <kconfig.h> +#include <tdeconfig.h> #include "kuserprefs.h" #define KU_BACKUP_EXT ".bak" diff --git a/kuser/kgroupldap.h b/kuser/kgroupldap.h index acb2ba9..6695619 100644 --- a/kuser/kgroupldap.h +++ b/kuser/kgroupldap.h @@ -28,7 +28,7 @@ #include <kprogress.h> #include <kabc/ldapurl.h> #include <kabc/ldif.h> -#include <kio/job.h> +#include <tdeio/job.h> #include "kgroup.h" diff --git a/kuser/kuser.cpp b/kuser/kuser.cpp index c903500..c1abe52 100644 --- a/kuser/kuser.cpp +++ b/kuser/kuser.cpp @@ -41,7 +41,7 @@ #include <kmessagebox.h> #include <kprocess.h> #include <kdebug.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kurl.h> // class KUser diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp index 36de3b4..c274031 100644 --- a/kuser/kuserldap.cpp +++ b/kuser/kuserldap.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <kmdcodec.h> #include <kmessagebox.h> -#include <kio/tdentlm.h> +#include <tdeio/tdentlm.h> #include "kglobal_.h" #include "kuserldap.h" diff --git a/kuser/kuserldap.h b/kuser/kuserldap.h index d60227d..e39c131 100644 --- a/kuser/kuserldap.h +++ b/kuser/kuserldap.h @@ -28,7 +28,7 @@ #include <kprogress.h> #include <kabc/ldapurl.h> #include <kabc/ldif.h> -#include <kio/job.h> +#include <tdeio/job.h> #include "kuser.h" diff --git a/kuser/kuserprefs.kcfgc b/kuser/kuserprefs.kcfgc index 923cb4d..3efe9ea 100644 --- a/kuser/kuserprefs.kcfgc +++ b/kuser/kuserprefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kuser.kcfg ClassName=KUserPrefsBase SetUserTexts=true diff --git a/kuser/main.cpp b/kuser/main.cpp index f22e8b4..4bc9186 100644 --- a/kuser/main.cpp +++ b/kuser/main.cpp @@ -22,7 +22,7 @@ #include <kiconloader.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kcmdlineargs.h> #include <kaboutdata.h> |