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/samba | |
| 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/samba')
| -rw-r--r-- | kcontrol/samba/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcontrol/samba/kcmsambaimports.h | 2 | ||||
| -rw-r--r-- | kcontrol/samba/kcmsambalog.h | 2 | ||||
| -rw-r--r-- | kcontrol/samba/ksmbstatus.h | 2 | ||||
| -rw-r--r-- | kcontrol/samba/smbstatus.desktop | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/samba/CMakeLists.txt b/kcontrol/samba/CMakeLists.txt index 1358e0d53..20a39f232 100644 --- a/kcontrol/samba/CMakeLists.txt +++ b/kcontrol/samba/CMakeLists.txt @@ -31,6 +31,6 @@ tde_add_kpart( kcm_samba AUTOMOC SOURCES main.cpp ksmbstatus.cpp kcmsambaimports.cpp kcmsambalog.cpp kcmsambastatistics.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/samba/kcmsambaimports.h b/kcontrol/samba/kcmsambaimports.h index bad8ab2fd..0897af021 100644 --- a/kcontrol/samba/kcmsambaimports.h +++ b/kcontrol/samba/kcmsambaimports.h @@ -26,7 +26,7 @@ #include <tqtimer.h> #include <tqlistview.h> -#include <kconfig.h> +#include <tdeconfig.h> class ImportsView: public TQWidget { diff --git a/kcontrol/samba/kcmsambalog.h b/kcontrol/samba/kcmsambalog.h index 05f6c3040..c3c8c07ea 100644 --- a/kcontrol/samba/kcmsambalog.h +++ b/kcontrol/samba/kcmsambalog.h @@ -30,7 +30,7 @@ #include <tqlistview.h> #include <tqevent.h> #include <tqapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurlrequester.h> diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h index 2d6c10fba..f787293ae 100644 --- a/kcontrol/samba/ksmbstatus.h +++ b/kcontrol/samba/ksmbstatus.h @@ -24,7 +24,7 @@ #include <kprocess.h> #include <tqcstring.h> #include <tqlistview.h> -#include <kconfig.h> +#include <tdeconfig.h> #define SCREEN_XY_OFFSET 20 diff --git a/kcontrol/samba/smbstatus.desktop b/kcontrol/samba/smbstatus.desktop index 19dfdb2fb..c4b32d115 100644 --- a/kcontrol/samba/smbstatus.desktop +++ b/kcontrol/samba/smbstatus.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell smbstatus +Exec=tdecmshell smbstatus Icon=samba Type=Application DocPath=kinfocenter/samba/index.html |