summaryrefslogtreecommitdiffstats
path: root/kicker/libkicker
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 01:02:02 -0600
committerTimothy Pearson <[email protected]>2013-01-27 01:02:02 -0600
commitde7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch)
treedbb3152c372f8620f9290137d461f3d9f9eba1cb /kicker/libkicker
parent936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff)
downloadtdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz
tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kicker/libkicker')
-rw-r--r--kicker/libkicker/CMakeLists.txt2
-rw-r--r--kicker/libkicker/global.cpp2
-rw-r--r--kicker/libkicker/panelbutton.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/kicker/libkicker/CMakeLists.txt b/kicker/libkicker/CMakeLists.txt
index 036095728..e2ec5a6ba 100644
--- a/kicker/libkicker/CMakeLists.txt
+++ b/kicker/libkicker/CMakeLists.txt
@@ -37,6 +37,6 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 1.0.0
- LINK kio-shared
+ LINK tdeio-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index f300df3a2..87f990b30 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kiconeffect.h>
#include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
#include <kstandarddirs.h>
#include <kservice.h>
#include <ksimpleconfig.h>
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index e9481ea85..1f011da5a 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqpixmap.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kcursor.h>
#include <kdialog.h>
#include <kdirwatch.h>