From d5e71b118ef627832c7444497293376c45a2185e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 20:01:42 +0200 Subject: [PATCH] Additional k => tde renaming and fixes --- kcron/Makefile.am | 2 +- kdat/Makefile.am | 2 +- kpackage/Makefile.am | 2 +- kpackage/kpackage.cpp | 4 ++-- kpackage/pkgInterface.cpp | 4 ++-- kpackage/tdeio.h | 4 ++-- ksysv/Makefile.am | 2 +- kuser/Makefile.am | 2 +- lilo-config/kde/Makefile.am | 2 +- secpolicy/Makefile.am | 4 ++-- tdefile-plugins/deb/Makefile.am | 2 +- tdefile-plugins/rpm/Makefile.am | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/kcron/Makefile.am b/kcron/Makefile.am index d6a90c6..e495b90 100644 --- a/kcron/Makefile.am +++ b/kcron/Makefile.am @@ -97,7 +97,7 @@ INCLUDES= $(all_includes) kcron_METASOURCES = AUTO -kcron_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kcron_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcron.pot diff --git a/kdat/Makefile.am b/kdat/Makefile.am index 5d01caa..7007e06 100644 --- a/kdat/Makefile.am +++ b/kdat/Makefile.am @@ -63,7 +63,7 @@ kdat_SOURCES = \ # the library search path -kdat_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kdat_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/kpackage/Makefile.am b/kpackage/Makefile.am index 1a4eb3c..4d07f68 100644 --- a/kpackage/Makefile.am +++ b/kpackage/Makefile.am @@ -20,7 +20,7 @@ kpackage_SOURCES = kpackage.cpp managementWidget.cpp packageDisplay.cpp \ kpackage_METASOURCES = AUTO # the library search path -kpackage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kpackage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp index 2ba15bf..ffed1a4 100644 --- a/kpackage/kpackage.cpp +++ b/kpackage/kpackage.cpp @@ -645,9 +645,9 @@ TQString KPACKAGE::fetchNetFile( const KURL & url ) setStatus(i18n("Starting TDEIO")); - Kio kio; + Kio tdeio; - if (kio.download(url, cf)) { + if (tdeio.download(url, cf)) { setStatus(i18n("TDEIO finished")); TQFileInfo fi(cf); if (!(fi.exists() && fi.size() > 0)) { diff --git a/kpackage/pkgInterface.cpp b/kpackage/pkgInterface.cpp index c32bef4..288caf4 100644 --- a/kpackage/pkgInterface.cpp +++ b/kpackage/pkgInterface.cpp @@ -259,8 +259,8 @@ TQString pkgInterface::getPackList(cacheObj *cp) if (kpkg) kpackage->setStatus(i18n("Starting Kio")); - Kio kio; - if (kio.download(url, tmpf)) { + Kio tdeio; + if (tdeio.download(url, tmpf)) { if (kpkg) kpackage->setStatus(i18n("Kio finished")); TQFileInfo f(tmpf); diff --git a/kpackage/tdeio.h b/kpackage/tdeio.h index 83e9794..30c35b8 100644 --- a/kpackage/tdeio.h +++ b/kpackage/tdeio.h @@ -25,8 +25,8 @@ */ -#ifndef KP_KIO_H -#define KP_KIO_H +#ifndef KP_TDEIO_H +#define KP_TDEIO_H #include diff --git a/ksysv/Makefile.am b/ksysv/Makefile.am index c1db389..2983d25 100644 --- a/ksysv/Makefile.am +++ b/ksysv/Makefile.am @@ -38,7 +38,7 @@ ksysv_SOURCES = main.cpp \ # the library search path ksysv_METASOURCES = AUTO -ksysv_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +ksysv_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor ksysv_LDADD = $(LIB_TDEFILE) -ltdeprint # this option you can leave out. Just, if you use "make dist", you need it diff --git a/kuser/Makefile.am b/kuser/Makefile.am index 22ca82e..740deec 100644 --- a/kuser/Makefile.am +++ b/kuser/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I.. -I$(top_srcdir)/kuser $(all_includes) # May be -D_XU_QUOTA -D_XU_SHADOW #AM_CXXFLAGS = $(KU_NIS) $(KU_QUOTA) $(QUOTACTL) -D_KU_DEBUG -kuser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kuser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kuser_LDADD = $(LIB_TDEUI) $(LIBCRYPT) $(LIBSHADOW) $(LIBGEN) $(LIB_TDEABC) -ltdentlm ####### Files diff --git a/lilo-config/kde/Makefile.am b/lilo-config/kde/Makefile.am index 08c52b8..af23803 100644 --- a/lilo-config/kde/Makefile.am +++ b/lilo-config/kde/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_lilo.la kcm_lilo_la_SOURCES = kcontrol.cpp Details.cpp InputBox.cpp kcm_lilo_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_lilo_la_LIBADD = ../kde-qt-common/libwidgets.la $(LIB_KIO) +kcm_lilo_la_LIBADD = ../kde-qt-common/libwidgets.la $(LIB_TDEIO) kcm_lilo_la_METASOURCES = AUTO AM_CXXFLAGS = -DUSE_KDE diff --git a/secpolicy/Makefile.am b/secpolicy/Makefile.am index 36666ad..c777048 100644 --- a/secpolicy/Makefile.am +++ b/secpolicy/Makefile.am @@ -3,8 +3,8 @@ METASOURCES = AUTO bin_PROGRAMS = secpolicy secpolicy_SOURCES = main.cpp secpolicywin.cpp pamview.cpp ppitem.cpp -secpolicy_LDADD = $(LIB_KIO) -secpolicy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +secpolicy_LDADD = $(LIB_TDEIO) +secpolicy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor noinst_HEADERS = secpolicywin.h pamview.h ppitem.h diff --git a/tdefile-plugins/deb/Makefile.am b/tdefile-plugins/deb/Makefile.am index 60de00c..e874ae5 100644 --- a/tdefile-plugins/deb/Makefile.am +++ b/tdefile-plugins/deb/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_deb.la tdefile_deb_la_SOURCES = tdefile_deb.cpp tdefile_deb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -tdefile_deb_la_LIBADD = $(LIB_KSYCOCA) +tdefile_deb_la_LIBADD = $(LIB_TDESYCOCA) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/rpm/Makefile.am b/tdefile-plugins/rpm/Makefile.am index e97997c..bfed7ce 100644 --- a/tdefile-plugins/rpm/Makefile.am +++ b/tdefile-plugins/rpm/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_rpm.la tdefile_rpm_la_SOURCES = tdefile_rpm.cpp tdefile_rpm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -tdefile_rpm_la_LIBADD = $(LIB_KSYCOCA) +tdefile_rpm_la_LIBADD = $(LIB_TDESYCOCA) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO