diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /kdepasswd | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kdepasswd')
| -rw-r--r-- | kdepasswd/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kdepasswd/kcm/chfacedlg.cpp | 2 | ||||
| -rw-r--r-- | kdepasswd/kcm/kcm_useraccount.desktop | 2 | ||||
| -rw-r--r-- | kdepasswd/kcm/main.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kdepasswd/CMakeLists.txt b/kdepasswd/CMakeLists.txt index a087113da..887362b28 100644 --- a/kdepasswd/CMakeLists.txt +++ b/kdepasswd/CMakeLists.txt @@ -32,6 +32,6 @@ install( FILES kdepasswd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_executable( kdepasswd AUTOMOC SOURCES kdepasswd.cpp passwd.cpp passwddlg.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdepasswd/kcm/chfacedlg.cpp b/kdepasswd/kcm/chfacedlg.cpp index 512b7e55f..baafd651e 100644 --- a/kdepasswd/kcm/chfacedlg.cpp +++ b/kdepasswd/kcm/chfacedlg.cpp @@ -36,7 +36,7 @@ #include <kdialogbase.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconview.h> #include <kimagefilepreview.h> #include <kimageio.h> diff --git a/kdepasswd/kcm/kcm_useraccount.desktop b/kdepasswd/kcm/kcm_useraccount.desktop index 6171810a3..51c168bd5 100644 --- a/kdepasswd/kcm/kcm_useraccount.desktop +++ b/kdepasswd/kcm/kcm_useraccount.desktop @@ -4,7 +4,7 @@ Categories=Qt;TDE;X-TDE-settings-security; X-TDE-ParentApp=kcontrol X-TDE-Library=useraccount Type=Application -Exec=kcmshell kcm_useraccount +Exec=tdecmshell kcm_useraccount Name=Password & User Account Name[af]=Gebruiker rekening en Wagwoord Name[ar]=كلمة المرور و حساب المستخدم diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp index bc763243d..e8135caae 100644 --- a/kdepasswd/kcm/main.cpp +++ b/kdepasswd/kcm/main.cpp @@ -42,7 +42,7 @@ #include <kgenericfactory.h> #include <kmessagebox.h> #include <kprocess.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kurl.h> #include <kurldrag.h> |