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 /kcontrol/tdm | |
| 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 'kcontrol/tdm')
| -rw-r--r-- | kcontrol/tdm/tdm-appear.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/tdm/tdm-appear.h | 2 | ||||
| -rw-r--r-- | kcontrol/tdm/tdm-users.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/tdm/tdm.desktop | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index e549b38a1..0189c9e56 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -41,7 +41,7 @@ #include <kcombobox.h> #include <kmessagebox.h> #include <kstandarddirs.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kiconloader.h> #include <kurldrag.h> #include <kimagefilepreview.h> diff --git a/kcontrol/tdm/tdm-appear.h b/kcontrol/tdm/tdm-appear.h index 8ae739c2f..8e0acc93d 100644 --- a/kcontrol/tdm/tdm-appear.h +++ b/kcontrol/tdm/tdm-appear.h @@ -29,7 +29,7 @@ #include <kcolorbutton.h> #include <kurl.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "klanguagebutton.h" diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp index d2fbcf002..daa507a51 100644 --- a/kcontrol/tdm/tdm-users.cpp +++ b/kcontrol/tdm/tdm-users.cpp @@ -29,10 +29,10 @@ #include <tqvgroupbox.h> #include <tqpushbutton.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kimageio.h> #include <kimagefilepreview.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kstandarddirs.h> #include <kmessagebox.h> diff --git a/kcontrol/tdm/tdm.desktop b/kcontrol/tdm/tdm.desktop index 0c1b9af1e..ad8591cb4 100644 --- a/kcontrol/tdm/tdm.desktop +++ b/kcontrol/tdm/tdm.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell tdm +Exec=tdecmshell tdm Icon=tdmconfig Type=Application DocPath=tdm/index.html#configuring-tdm |