From 0ea54195f4400f13a5cc109feee4b3779fbd2f0f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:05:57 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kdelirc/kcmlirc/CMakeLists.txt | 2 +- kdelirc/kcmlirc/kcmlirc.cpp | 2 +- kdelirc/kcmlirc/kcmlirc.desktop | 2 +- kdelirc/kdelirc/iraction.cpp | 2 +- kdelirc/kdelirc/iractions.cpp | 2 +- kdelirc/kdelirc/mode.cpp | 2 +- kdelirc/kdelirc/modes.cpp | 2 +- kdelirc/profiles/CMakeLists.txt | 2 +- kdelirc/profiles/Makefile.am | 2 +- kdelirc/profiles/klauncher.profile.xml | 18 ------------------ kdelirc/profiles/tdelauncher.profile.xml | 18 ++++++++++++++++++ 11 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 kdelirc/profiles/klauncher.profile.xml create mode 100644 kdelirc/profiles/tdelauncher.profile.xml (limited to 'kdelirc') diff --git a/kdelirc/kcmlirc/CMakeLists.txt b/kdelirc/kcmlirc/CMakeLists.txt index 9f09d3e..e5c6e2b 100644 --- a/kdelirc/kcmlirc/CMakeLists.txt +++ b/kdelirc/kcmlirc/CMakeLists.txt @@ -34,7 +34,7 @@ tde_add_kpart( kcm_kcmlirc AUTOMOC addaction.cpp kcmlirc.skel editactionbase.ui editmodebase.ui editmode.cpp editaction.cpp modeslist.cpp - LINK kdelirc-static tdeui-shared kio-shared + LINK kdelirc-static tdeui-shared tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp index c97b203..74856d0 100644 --- a/kdelirc/kcmlirc/kcmlirc.cpp +++ b/kdelirc/kcmlirc/kcmlirc.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kdelirc/kcmlirc/kcmlirc.desktop b/kdelirc/kcmlirc/kcmlirc.desktop index 94a3503..09033c1 100644 --- a/kdelirc/kcmlirc/kcmlirc.desktop +++ b/kdelirc/kcmlirc/kcmlirc.desktop @@ -50,7 +50,7 @@ Comment[tr]=Uzaktan kontrol ayarlarınızı uygulamalarla kullanmak için ayarla Comment[uk]=Налаштування елементів дистанційного керування для використання з програмами Comment[zh_CN]=配置您的远程控制以供应用程序使用 Comment[zh_TW]=設定遙控按鍵與應用程式的關聯 -Exec=kcmshell kcmlirc +Exec=tdecmshell kcmlirc Keywords=KCMLirc,kcmlirc Keywords[bg]=дистанционно устройство, дистанционно, инфрачервени, лъчи, KCMLirc, kcmlirc Keywords[nl]=kcmlirc,linux infrarood,infrarood,afstandsbediening diff --git a/kdelirc/kdelirc/iraction.cpp b/kdelirc/kdelirc/iraction.cpp index 7e2c26e..00be5da 100644 --- a/kdelirc/kdelirc/iraction.cpp +++ b/kdelirc/kdelirc/iraction.cpp @@ -13,7 +13,7 @@ #include -#include +#include #include #include "iraction.h" diff --git a/kdelirc/kdelirc/iractions.cpp b/kdelirc/kdelirc/iractions.cpp index fa5d34f..85d144e 100644 --- a/kdelirc/kdelirc/iractions.cpp +++ b/kdelirc/kdelirc/iractions.cpp @@ -10,7 +10,7 @@ // Copyright: See COPYING file that comes with this distribution // // -#include +#include #include #include "iractions.h" diff --git a/kdelirc/kdelirc/mode.cpp b/kdelirc/kdelirc/mode.cpp index 3acae0a..9402573 100644 --- a/kdelirc/kdelirc/mode.cpp +++ b/kdelirc/kdelirc/mode.cpp @@ -11,7 +11,7 @@ // // -#include +#include #include "modes.h" #include "mode.h" diff --git a/kdelirc/kdelirc/modes.cpp b/kdelirc/kdelirc/modes.cpp index bbab16f..8eedce0 100644 --- a/kdelirc/kdelirc/modes.cpp +++ b/kdelirc/kdelirc/modes.cpp @@ -10,7 +10,7 @@ // Copyright: See COPYING file that comes with this distribution // // -#include +#include #include #include "modes.h" diff --git a/kdelirc/profiles/CMakeLists.txt b/kdelirc/profiles/CMakeLists.txt index c6f8828..7fedebd 100644 --- a/kdelirc/profiles/CMakeLists.txt +++ b/kdelirc/profiles/CMakeLists.txt @@ -10,7 +10,7 @@ ################################################# install( FILES profile.dtd noatun.profile.xml - klauncher.profile.xml konqueror.profile.xml + tdelauncher.profile.xml konqueror.profile.xml DESTINATION ${DATA_INSTALL_DIR}/profiles ) diff --git a/kdelirc/profiles/Makefile.am b/kdelirc/profiles/Makefile.am index e25d1d4..9561d73 100644 --- a/kdelirc/profiles/Makefile.am +++ b/kdelirc/profiles/Makefile.am @@ -1,4 +1,4 @@ -profiledata_DATA = profile.dtd noatun.profile.xml klauncher.profile.xml konqueror.profile.xml +profiledata_DATA = profile.dtd noatun.profile.xml tdelauncher.profile.xml konqueror.profile.xml profiledatadir = $(kde_datadir)/profiles EXTRA_DIST = $(profiledata_DATA) diff --git a/kdelirc/profiles/klauncher.profile.xml b/kdelirc/profiles/klauncher.profile.xml deleted file mode 100644 index 4a19c71..0000000 --- a/kdelirc/profiles/klauncher.profile.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - TDE Program Launcher - Gav Wood - - Execute - Runs a program or script - The executable name and path of the program or script to run - Parameters for the program or script - - - Execute and Wait - Runs a program or script and waits for it to finish - The executable name and path of the program or script to run - Parameters for the program or script - - diff --git a/kdelirc/profiles/tdelauncher.profile.xml b/kdelirc/profiles/tdelauncher.profile.xml new file mode 100644 index 0000000..57eca31 --- /dev/null +++ b/kdelirc/profiles/tdelauncher.profile.xml @@ -0,0 +1,18 @@ + + + + TDE Program Launcher + Gav Wood + + Execute + Runs a program or script + The executable name and path of the program or script to run + Parameters for the program or script + + + Execute and Wait + Runs a program or script and waits for it to finish + The executable name and path of the program or script to run + Parameters for the program or script + + -- cgit v1.2.1