diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:16:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:16:20 -0600 |
| commit | dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 (patch) | |
| tree | 4ebcd3dac0133d8d3fa880bbf83692c305b7350d /kicker/kicker | |
| parent | 1a9478c6e1b77b05814af8fa02cd563a5da8946b (diff) | |
| download | tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.tar.gz tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kicker/kicker')
| -rw-r--r-- | kicker/kicker/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kicker/kicker/core/container_button.cpp | 2 | ||||
| -rw-r--r-- | kicker/kicker/ui/addbutton_mnu.cpp | 2 | ||||
| -rw-r--r-- | kicker/kicker/ui/itemview.cpp | 2 | ||||
| -rw-r--r-- | kicker/kicker/ui/k_new_mnu.cpp | 2 | ||||
| -rw-r--r-- | kicker/kicker/ui/service_mnu.cpp | 4 | ||||
| -rw-r--r-- | kicker/kicker/ui/service_mnu.h | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/kicker/kicker/CMakeLists.txt b/kicker/kicker/CMakeLists.txt index 5ec37ac53..313187cee 100644 --- a/kicker/kicker/CMakeLists.txt +++ b/kicker/kicker/CMakeLists.txt @@ -54,5 +54,5 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy tde_add_tdeinit_executable( kicker SOURCES dummy.cpp EMBED kicker_core-static - LINK kicker_buttons-static kicker_ui-static kickermain-shared kabc-shared kutils-shared + LINK kicker_buttons-static kicker_ui-static kickermain-shared kabc-shared tdeutils-shared ) diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index 0ec70bc93..30c31401d 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kconfig.h> #include <kdebug.h> #include <kglobal.h> -#include <kmultipledrag.h> +#include <tdemultipledrag.h> #include <kpanelapplet.h> #include <kurldrag.h> diff --git a/kicker/kicker/ui/addbutton_mnu.cpp b/kicker/kicker/ui/addbutton_mnu.cpp index 02c4718d4..a544d0f74 100644 --- a/kicker/kicker/ui/addbutton_mnu.cpp +++ b/kicker/kicker/ui/addbutton_mnu.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqdragobject.h> -#include <ksycocaentry.h> +#include <tdesycocaentry.h> #include <kservice.h> #include <kservicegroup.h> #include <kstandarddirs.h> diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index 431b62e6c..3d33a825a 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -62,7 +62,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <twin.h> #include <kdebug.h> #include <kmimetype.h> -#include <kmultipledrag.h> +#include <tdemultipledrag.h> #include "client_mnu.h" #include "container_base.h" diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index eba68ed1c..6f2c4eacb 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -75,7 +75,7 @@ #include <dcopref.h> #include <konq_popupmenu.h> #include <konqbookmarkmanager.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "client_mnu.h" #include "container_base.h" diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index 6432cf032..1e77a1731 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -40,8 +40,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kprocess.h> #include <krun.h> #include <kservicegroup.h> -#include <ksycoca.h> -#include <ksycocaentry.h> +#include <tdesycoca.h> +#include <tdesycocaentry.h> #include <kservice.h> #include <kurldrag.h> #include <kio/job.h> diff --git a/kicker/kicker/ui/service_mnu.h b/kicker/kicker/ui/service_mnu.h index 44e35a6c2..dbc8f496c 100644 --- a/kicker/kicker/ui/service_mnu.h +++ b/kicker/kicker/ui/service_mnu.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <set> #include <tqvaluevector.h> -#include <ksycocaentry.h> +#include <tdesycocaentry.h> #include <kservice.h> #include <kpanelmenu.h> #include <kservicegroup.h> |