From b363d2579af0a11b77e698aed2e1021c2233b644 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:17:50 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- libkcal/CMakeLists.txt | 4 ++-- libkcal/Makefile.am | 8 ++++---- libkcal/calendarresources.cpp | 4 ++-- libkcal/calendarresources.h | 2 +- libkcal/resourcecached.cpp | 2 +- libkcal/resourcecalendar.h | 6 +++--- libkcal/resourcelocal.cpp | 2 +- libkcal/resourcelocalconfig.h | 4 ++-- libkcal/resourcelocaldir.cpp | 2 +- libkcal/resourcelocaldirconfig.h | 4 ++-- libkcal/tests/Makefile.am | 28 ++++++++++++++-------------- libkcal/tests/testresource.cpp | 4 ++-- 12 files changed, 35 insertions(+), 35 deletions(-) (limited to 'libkcal') diff --git a/libkcal/CMakeLists.txt b/libkcal/CMakeLists.txt index 81a5b8bec..a4113e36c 100644 --- a/libkcal/CMakeLists.txt +++ b/libkcal/CMakeLists.txt @@ -54,8 +54,8 @@ install( FILES ##### other data ################################ -install( FILES local.desktop localdir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal ) -install( FILES kcal_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources ) +install( FILES local.desktop localdir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) +install( FILES kcal_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources ) ##### kcal_local (module) ####################### diff --git a/libkcal/Makefile.am b/libkcal/Makefile.am index 7ecd005a5..75aa7d8aa 100644 --- a/libkcal/Makefile.am +++ b/libkcal/Makefile.am @@ -12,7 +12,7 @@ libkcal_la_LIBADD = versit/libversit.la $(LIB_KIO) \ $(top_builddir)/ktnef/lib/libktnef.la \ ../libkmime/libkmime.la \ ../libemailfunctions/libemailfunctions.la \ - -lkresources -lkabc + -ltderesources -lkabc libkcal_la_SOURCES = \ assignmentvisitor.cpp comparisonvisitor.cpp \ @@ -65,16 +65,16 @@ EXTRA_PROGRAMS = convertqtopia convertqtopia_SOURCES = convertqtopia.cpp convertqtopia_LDADD = libkcal.la -servicedir = $(kde_servicesdir)/kresources/kcal +servicedir = $(kde_servicesdir)/tderesources/kcal service_DATA = local.desktop localdir.desktop manager_DATA = kcal_manager.desktop -managerdir = $(kde_servicesdir)/kresources +managerdir = $(kde_servicesdir)/tderesources METASOURCES = AUTO messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/libkcal.pot -DOXYGEN_REFERENCES=kresources +DOXYGEN_REFERENCES=tderesources include $(top_srcdir)/admin/Doxyfile.am diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp index 5ab08bd76..d39564e9a 100644 --- a/libkcal/calendarresources.cpp +++ b/libkcal/calendarresources.cpp @@ -44,8 +44,8 @@ #include "journal.h" #include "filestorage.h" -#include -#include +#include +#include #include #include "resourcecalendar.h" diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h index 921fb227a..c9d2e3341 100644 --- a/libkcal/calendarresources.h +++ b/libkcal/calendarresources.h @@ -37,7 +37,7 @@ #include "libkcal_export.h" -#include +#include class TQWidget; diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index aab9216db..5be335e96 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -417,7 +417,7 @@ KPIM::IdMapper& ResourceCached::idMapper() TQString ResourceCached::cacheFile() const { - return locateLocal( "cache", "kcal/kresources/" + identifier() ); + return locateLocal( "cache", "kcal/tderesources/" + identifier() ); } TQString ResourceCached::changesCacheFile( const TQString &type ) const diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h index e63a2ad61..5202563b6 100644 --- a/libkcal/resourcecalendar.h +++ b/libkcal/resourcecalendar.h @@ -38,8 +38,8 @@ #include "calendar.h" #include "exceptions.h" -#include -#include +#include +#include #include #include @@ -49,7 +49,7 @@ class CalFormat; /** This class provides the interfaces for a calendar resource. It makes use of - the kresources framework. + the tderesources framework. \warning This code is still under heavy development. Don't expect source or binary compatibility in future versions. diff --git a/libkcal/resourcelocal.cpp b/libkcal/resourcelocal.cpp index 8b0bc1cca..8cfb3a9cd 100644 --- a/libkcal/resourcelocal.cpp +++ b/libkcal/resourcelocal.cpp @@ -42,7 +42,7 @@ #include "journal.h" #include "filestorage.h" -#include +#include #include "resourcelocalconfig.h" diff --git a/libkcal/resourcelocalconfig.h b/libkcal/resourcelocalconfig.h index 3fd42a6f2..7a1e7f721 100644 --- a/libkcal/resourcelocalconfig.h +++ b/libkcal/resourcelocalconfig.h @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include "libkcal_export.h" diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp index 63221ca04..47b19d7c4 100644 --- a/libkcal/resourcelocaldir.cpp +++ b/libkcal/resourcelocaldir.cpp @@ -44,7 +44,7 @@ #include "journal.h" #include "filestorage.h" -#include +#include #include "resourcelocaldirconfig.h" diff --git a/libkcal/resourcelocaldirconfig.h b/libkcal/resourcelocaldirconfig.h index 7e223320a..46994ef48 100644 --- a/libkcal/resourcelocaldirconfig.h +++ b/libkcal/resourcelocaldirconfig.h @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include "libkcal_export.h" diff --git a/libkcal/tests/Makefile.am b/libkcal/tests/Makefile.am index 563473604..83a5a8cfe 100644 --- a/libkcal/tests/Makefile.am +++ b/libkcal/tests/Makefile.am @@ -25,60 +25,60 @@ check_PROGRAMS = testtostring \ METASOURCES = AUTO testincidence_SOURCES = testincidence.cpp -testincidence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testincidence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testincidence_LDADD = ../libkcal.la testcalendar_SOURCES = testcalendar.cpp -testcalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testcalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testcalendar_LDADD = ../libkcal.la testtostring_SOURCES = testtostring.cpp -testtostring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testtostring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testtostring_LDADD = ../libkcal.la fbrecurring_SOURCES = fbrecurring.cpp -fbrecurring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +fbrecurring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor fbrecurring_LDADD = ../libkcal.la readandwrite_SOURCES = readandwrite.cpp -readandwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +readandwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor readandwrite_LDADD = ../libkcal.la testresource_SOURCES = testresource.cpp -testresource_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testresource_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testresource_LDADD = ../libkcal.la testrecurrence_SOURCES = testrecurrence.cpp -testrecurrence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testrecurrence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testrecurrence_LDADD = ../libkcal.la testrecurprevious_SOURCES = testrecurprevious.cpp -testrecurprevious_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testrecurprevious_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testrecurprevious_LDADD = ../libkcal.la testrecurson_SOURCES = testrecurson.cpp -testrecurson_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testrecurson_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testrecurson_LDADD = ../libkcal.la testrecurrencetype_SOURCES = testrecurrencetype.cpp -testrecurrencetype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testrecurrencetype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testrecurrencetype_LDADD = ../libkcal.la testvcalexport_SOURCES = testvcalexport.cpp -testvcalexport_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testvcalexport_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testvcalexport_LDADD = ../libkcal.la testfields_SOURCES = testfields.cpp -testfields_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testfields_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testfields_LDADD = ../libkcal.la testfields_CXXFLAGS= -DINPUT='"$(srcdir)/data/test_pilot.ics"' testfb_SOURCES = testfb.cpp -testfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testfb_LDADD = ../libkcal.la testcalselectdialog_SOURCES = testcalselectdialog.cpp -testcalselectdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testcalselectdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testcalselectdialog_LDADD = ../libkcal.la TESTFILES = test1.ics test2.ics test3.ics test4.ics test5.ics test_Mozilla.ics diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp index 25c9e5d6c..fbd42da68 100644 --- a/libkcal/tests/testresource.cpp +++ b/libkcal/tests/testresource.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include @@ -55,7 +55,7 @@ static const KCmdLineOptions options[] = int main(int argc, char *argv[]) { // Use another directory than the real one, just to keep things clean - // TDEHOME needs to be writable though, for a ksycoca database + // TDEHOME needs to be writable though, for a tdesycoca database setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testresource" ), true ); setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup -- cgit v1.2.1