From 533bad2a1503973aaf8186691422c2eda91d02d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 20:02:55 +0200 Subject: Additional k => tde renaming and fixes --- kmobile/Makefile.am | 4 ++-- kmobile/tdeioslave/Makefile.am | 2 +- kmobile/tdeioslave/tdeio_mobile.cpp | 4 ++-- kmobile/tdeioslave/tdeio_mobile.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kmobile') diff --git a/kmobile/Makefile.am b/kmobile/Makefile.am index 268cd6ab..6d2640ee 100644 --- a/kmobile/Makefile.am +++ b/kmobile/Makefile.am @@ -8,7 +8,7 @@ lib_LTLIBRARIES = libkmobiledevice.la libkmobileclient.la INCLUDES = $(all_includes) -kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kmobile_LDADD = $(LIB_TDEFILE) $(LIB_TDEABC) libkmobiledevice.la kmobile_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\ pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \ @@ -29,7 +29,7 @@ libkmobileclient_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version libkmobileclient_la_LIBADD = $(LIB_TDECORE) -lDCOP EXTRA_PROGRAMS = testlibkmobile -testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testlibkmobile_LDADD = libkmobileclient.la testlibkmobile_SOURCES = testlibkmobile.cpp diff --git a/kmobile/tdeioslave/Makefile.am b/kmobile/tdeioslave/Makefile.am index 2e2fc943..175c8834 100644 --- a/kmobile/tdeioslave/Makefile.am +++ b/kmobile/tdeioslave/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/kmobile -I$(top_srcdir) $(all_includes) kde_module_LTLIBRARIES = tdeio_mobile.la tdeio_mobile_la_SOURCES = tdeio_mobile.cpp -tdeio_mobile_la_LIBADD = $(LIB_KIO) ../libkmobileclient.la +tdeio_mobile_la_LIBADD = $(LIB_TDEIO) ../libkmobileclient.la tdeio_mobile_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN) kde_services_DATA = mobile.protocol cellphone.protocol \ diff --git a/kmobile/tdeioslave/tdeio_mobile.cpp b/kmobile/tdeioslave/tdeio_mobile.cpp index f30742fe..db531417 100644 --- a/kmobile/tdeioslave/tdeio_mobile.cpp +++ b/kmobile/tdeioslave/tdeio_mobile.cpp @@ -37,8 +37,8 @@ using namespace TDEIO; -#define KIO_MOBILE_DEBUG_AREA 7126 -#define PRINT_DEBUG kdDebug(KIO_MOBILE_DEBUG_AREA) << "tdeio_mobile: " +#define TDEIO_MOBILE_DEBUG_AREA 7126 +#define PRINT_DEBUG kdDebug(TDEIO_MOBILE_DEBUG_AREA) << "tdeio_mobile: " extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } diff --git a/kmobile/tdeioslave/tdeio_mobile.h b/kmobile/tdeioslave/tdeio_mobile.h index 05a30a22..c825f877 100644 --- a/kmobile/tdeioslave/tdeio_mobile.h +++ b/kmobile/tdeioslave/tdeio_mobile.h @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef __KIO_MOBILE_H__ -#define __KIO_MOBILE_H__ +#ifndef __TDEIO_MOBILE_H__ +#define __TDEIO_MOBILE_H__ #include #include -- cgit v1.2.3