TDE
/
kpilot
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kpilot
0
0
Fork 0
Code Issues Releases Wiki Activity

Convert remaining references to kde3 (e.g. in paths) to trinity

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 9abdf0551e
commit 0ef0bc641a
20 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File

4
CMakeLists.txt
Unescape View File

@ -55,7 +55,7 @@ if (NOT builddebug)
endif(NOT builddebug) endif(NOT builddebug)
# Get the kde3 dir. This is a bit tricky, i'm not sure how well # Get the trinity dir. This is a bit tricky, i'm not sure how well
# this works on other systems. # this works on other systems.
STRING(REPLACE "/lib" "" KDE3_DIR ${KDE3_LIB_DIR}) STRING(REPLACE "/lib" "" KDE3_DIR ${KDE3_LIB_DIR})
@ -68,7 +68,7 @@ set(KDE3_SERVICETYPES_DIR ${CMAKE_INSTALL_PREFIX}/share/servicetypes)
set(KDE3_SERVICES_DIR ${CMAKE_INSTALL_PREFIX}/share/services) set(KDE3_SERVICES_DIR ${CMAKE_INSTALL_PREFIX}/share/services)
set(KDE3_XDG_APPS_DIR ${CMAKE_INSTALL_PREFIX}/share/applications/kde) set(KDE3_XDG_APPS_DIR ${CMAKE_INSTALL_PREFIX}/share/applications/kde)
set(KDE3_LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib) set(KDE3_LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib)
set(KDE3_PLUGIN_INSTALL_DIR ${KDE3_LIB_INSTALL_DIR}/kde3) set(KDE3_PLUGIN_INSTALL_DIR ${KDE3_LIB_INSTALL_DIR}/trinity)
# tell cmake where to search for libraries: # tell cmake where to search for libraries:
link_directories(${KDE3_LIB_DIR}) link_directories(${KDE3_LIB_DIR})

2
ChangeLog
Unescape View File

@ -1036,7 +1036,7 @@ KPilot Developer's notes for July 9th
2003-7-5 Adriaan de Groot 2003-7-5 Adriaan de Groot
* Renamed all conduit plugins from lib<bla>conduit (and variants) to * Renamed all conduit plugins from lib<bla>conduit (and variants) to
conduit_<bla>, so that they're easier to identify in $KDEDIR/lib/kde3. conduit_<bla>, so that they're easier to identify in $KDEDIR/lib/trinity.
Of course, this doesn't work right. Feh. Of course, this doesn't work right. Feh.
* Removed listCat again. * Removed listCat again.
* Implemented a notion of "internal conduit", so that we can move * Implemented a notion of "internal conduit", so that we can move

2
Documentation/ConduitProgrammingTutorial/index.tex
Unescape View File

@ -147,7 +147,7 @@ From your system's point of view, a conduit is a shared library which is loaded
on demand by KPilot. This means that as long as you don't do a sync, the conduit will not on demand by KPilot. This means that as long as you don't do a sync, the conduit will not
be in memory. Once a hotsync is initiated, kpilotDaemon (the process running in be in memory. Once a hotsync is initiated, kpilotDaemon (the process running in
the background that does the actual sync) loads the conduit, let's say its name the background that does the actual sync) loads the conduit, let's say its name
is "malconduit" and it is installed as /opt/kde3/lib/kde3/libmalconduit.so. It is "malconduit" and it is installed as /opt/trinity/lib/trinity/libmalconduit.so. It
then calls the function \code{init\_libmalconduit} (the name after init\_ is the then calls the function \code{init\_libmalconduit} (the name after init\_ is the
filename of the library), which needs to return a pointer to an instance filename of the library), which needs to return a pointer to an instance
of a \class{KLibFactory} subclass. of a \class{KLibFactory} subclass.

8
conduits/abbrowserconduit/CMakeLists.txt
Unescape View File

@ -19,9 +19,9 @@ set(conduit_abbrowser_KCFGS
abbrowserSettings.kcfgc abbrowserSettings.kcfgc
) )
kde3_add_kcfg_files(conduit_abbrowser_SRCS ${conduit_abbrowser_KCFGS}) trinity_add_kcfg_files(conduit_abbrowser_SRCS ${conduit_abbrowser_KCFGS})
kde3_add_ui_files(conduit_abbrowser_SRCS ${conduit_abbrowser_UIS}) trinity_add_ui_files(conduit_abbrowser_SRCS ${conduit_abbrowser_UIS})
kde3_automoc(${conduit_abbrowser_SRCS}) trinity_automoc(${conduit_abbrowser_SRCS})
add_library(conduit_address SHARED ${conduit_abbrowser_SRCS}) add_library(conduit_address SHARED ${conduit_abbrowser_SRCS})
target_link_libraries(conduit_address kabc_file kabc) target_link_libraries(conduit_address kabc_file kabc)
set_target_properties(conduit_address PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR} set_target_properties(conduit_address PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
@ -29,7 +29,7 @@ set_target_properties(conduit_address PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_
PREFIX "" PREFIX ""
) )
kde3_install_libtool_file(conduit_address) trinity_install_libtool_file(conduit_address)
install( install(
TARGETS conduit_address TARGETS conduit_address

14
conduits/docconduit/CMakeLists.txt
Unescape View File

@ -30,9 +30,9 @@ set(conduit_doc_KCFGS
kpalmdocSettings.kcfgc kpalmdocSettings.kcfgc
) )
kde3_add_kcfg_files(conduit_doc_SRCS ${conduit_doc_KCFGS}) trinity_add_kcfg_files(conduit_doc_SRCS ${conduit_doc_KCFGS})
kde3_add_ui_files(conduit_doc_SRCS ${conduit_doc_UIS}) trinity_add_ui_files(conduit_doc_SRCS ${conduit_doc_UIS})
kde3_automoc(${conduit_doc_SRCS}) trinity_automoc(${conduit_doc_SRCS})
add_library(conduit_doc SHARED ${conduit_doc_SRCS}) add_library(conduit_doc SHARED ${conduit_doc_SRCS})
kpilot_rpath(conduit_doc) kpilot_rpath(conduit_doc)
@ -42,7 +42,7 @@ set_target_properties(
PREFIX "" PREFIX ""
) )
kde3_install_libtool_file(conduit_doc) trinity_install_libtool_file(conduit_doc)
install( install(
TARGETS conduit_doc TARGETS conduit_doc
@ -54,9 +54,9 @@ set(kpalmdoc_SRCS
kpalmdoc_dlg.cc kpalmdoc_dlg.cc
kpalmdoc.cpp kpalmdoc.cpp
) )
kde3_add_kcfg_files(kpalmdoc_SRCS kpalmdocSettings.kcfgc) trinity_add_kcfg_files(kpalmdoc_SRCS kpalmdocSettings.kcfgc)
kde3_add_ui_files(kpalmdoc_SRCS kpalmdoc_dlgbase.ui) trinity_add_ui_files(kpalmdoc_SRCS kpalmdoc_dlgbase.ui)
kde3_automoc(${kpalmdoc_SRCS}) trinity_automoc(${kpalmdoc_SRCS})
add_executable(kpalmdoc ${kpalmdoc_SRCS}) add_executable(kpalmdoc ${kpalmdoc_SRCS})
target_link_libraries(kpalmdoc ${QT_LIBRARIES} kpilot kdeui kio) target_link_libraries(kpalmdoc ${QT_LIBRARIES} kpilot kdeui kio)
kpilot_rpath(kpalmdoc) kpilot_rpath(kpalmdoc)

2
conduits/docconduit/Icons/CMakeLists.txt
Unescape View File

@ -1,3 +1,3 @@
kde3_install_icons_custom( hicolor ) trinity_install_icons_custom( hicolor )

12
conduits/knotes/CMakeLists.txt
Unescape View File

@ -20,12 +20,12 @@ set(conduit_knotes_KCFGS
# KNotesIface.h # KNotesIface.h
#) #)
#kde3_add_dcop_skels(conduit_knotes_SRCS ${conduit_knotes_STUBS}) #trinity_add_dcop_skels(conduit_knotes_SRCS ${conduit_knotes_STUBS})
#kde3_add_dcop_stubs(conduit_knotes_SRCS ${conduit_knotes_STUBS}) #trinity_add_dcop_stubs(conduit_knotes_SRCS ${conduit_knotes_STUBS})
kde3_add_kcfg_files(conduit_knotes_SRCS ${conduit_knotes_KCFGS}) trinity_add_kcfg_files(conduit_knotes_SRCS ${conduit_knotes_KCFGS})
kde3_add_ui_files(conduit_knotes_SRCS ${conduit_knotes_UIS}) trinity_add_ui_files(conduit_knotes_SRCS ${conduit_knotes_UIS})
kde3_automoc(${conduit_knotes_SRCS}) trinity_automoc(${conduit_knotes_SRCS})
add_library(conduit_knotes SHARED ${conduit_knotes_SRCS}) add_library(conduit_knotes SHARED ${conduit_knotes_SRCS})
target_link_libraries(conduit_knotes kcal) target_link_libraries(conduit_knotes kcal)
@ -36,7 +36,7 @@ set_target_properties(conduit_knotes PROPERTIES
PREFIX "" PREFIX ""
) )
kde3_install_libtool_file(conduit_knotes) trinity_install_libtool_file(conduit_knotes)
install( install(
TARGETS conduit_knotes TARGETS conduit_knotes

8
conduits/malconduit/CMakeLists.txt
Unescape View File

@ -17,9 +17,9 @@ set(conduit_mal_KCFGS
malconduitSettings.kcfgc malconduitSettings.kcfgc
) )
kde3_add_kcfg_files(conduit_mal_SRCS ${conduit_mal_KCFGS}) trinity_add_kcfg_files(conduit_mal_SRCS ${conduit_mal_KCFGS})
kde3_add_ui_files(conduit_mal_SRCS ${conduit_mal_UIS}) trinity_add_ui_files(conduit_mal_SRCS ${conduit_mal_UIS})
kde3_automoc(${conduit_mal_SRCS}) trinity_automoc(${conduit_mal_SRCS})
add_library(conduit_mal SHARED ${conduit_mal_SRCS}) add_library(conduit_mal SHARED ${conduit_mal_SRCS})
target_link_libraries(conduit_mal ${MAL_LIBRARY}) target_link_libraries(conduit_mal ${MAL_LIBRARY})
@ -31,7 +31,7 @@ set_target_properties(
INSTALL_RPATH_USE_LINK_PATH true INSTALL_RPATH_USE_LINK_PATH true
) )
kde3_install_libtool_file(conduit_mal) trinity_install_libtool_file(conduit_mal)
install( install(
TARGETS conduit_mal TARGETS conduit_mal

8
conduits/memofileconduit/CMakeLists.txt
Unescape View File

@ -17,9 +17,9 @@ set(conduit_memofile_KCFGS
memofileSettings.kcfgc memofileSettings.kcfgc
) )
kde3_add_kcfg_files(conduit_memofile_SRCS ${conduit_memofile_KCFGS}) trinity_add_kcfg_files(conduit_memofile_SRCS ${conduit_memofile_KCFGS})
kde3_add_ui_files(conduit_memofile_SRCS ${conduit_memofile_UIS}) trinity_add_ui_files(conduit_memofile_SRCS ${conduit_memofile_UIS})
kde3_automoc(${conduit_memofile_SRCS}) trinity_automoc(${conduit_memofile_SRCS})
add_library(conduit_memofile SHARED ${conduit_memofile_SRCS}) add_library(conduit_memofile SHARED ${conduit_memofile_SRCS})
set_target_properties( set_target_properties(
@ -28,7 +28,7 @@ set_target_properties(
PREFIX "" PREFIX ""
) )
kde3_install_libtool_file(conduit_memofile) trinity_install_libtool_file(conduit_memofile)
install( install(
TARGETS conduit_memofile TARGETS conduit_memofile

8
conduits/notepadconduit/CMakeLists.txt
Unescape View File

@ -15,9 +15,9 @@ set(conduit_notepad_KCFGS
notepadconduit.kcfgc notepadconduit.kcfgc
) )
kde3_add_kcfg_files(conduit_notepad_SRCS ${conduit_notepad_KCFGS}) trinity_add_kcfg_files(conduit_notepad_SRCS ${conduit_notepad_KCFGS})
kde3_add_ui_files(conduit_notepad_SRCS ${conduit_notepad_UIS}) trinity_add_ui_files(conduit_notepad_SRCS ${conduit_notepad_UIS})
kde3_automoc(${conduit_notepad_SRCS}) trinity_automoc(${conduit_notepad_SRCS})
add_library(conduit_notepad SHARED ${conduit_notepad_SRCS}) add_library(conduit_notepad SHARED ${conduit_notepad_SRCS})
set_target_properties( set_target_properties(
@ -26,7 +26,7 @@ set_target_properties(
PREFIX "" PREFIX ""
) )
kde3_install_libtool_file(conduit_notepad) trinity_install_libtool_file(conduit_notepad)
install( install(
TARGETS conduit_notepad TARGETS conduit_notepad

8
conduits/null/CMakeLists.txt
Unescape View File

@ -15,9 +15,9 @@ set(conduit_null_KCFGS
nullSettings.kcfgc nullSettings.kcfgc
) )
kde3_add_kcfg_files(conduit_null_SRCS ${conduit_null_KCFGS}) trinity_add_kcfg_files(conduit_null_SRCS ${conduit_null_KCFGS})
kde3_add_ui_files(conduit_null_SRCS ${conduit_null_UIS}) trinity_add_ui_files(conduit_null_SRCS ${conduit_null_UIS})
kde3_automoc(${conduit_null_SRCS}) trinity_automoc(${conduit_null_SRCS})
add_library(conduit_null SHARED ${conduit_null_SRCS}) add_library(conduit_null SHARED ${conduit_null_SRCS})
set_target_properties( set_target_properties(
@ -26,7 +26,7 @@ set_target_properties(
PREFIX "" PREFIX ""
) )
kde3_install_libtool_file(conduit_null) trinity_install_libtool_file(conduit_null)
install( install(
TARGETS conduit_null TARGETS conduit_null

8
conduits/popmail/CMakeLists.txt
Unescape View File

@ -16,9 +16,9 @@ set(conduit_popmail_KCFGS
popmailSettings.kcfgc popmailSettings.kcfgc
) )
kde3_add_kcfg_files(conduit_popmail_SRCS ${conduit_popmail_KCFGS}) trinity_add_kcfg_files(conduit_popmail_SRCS ${conduit_popmail_KCFGS})
kde3_add_ui_files(conduit_popmail_SRCS ${conduit_popmail_UIS}) trinity_add_ui_files(conduit_popmail_SRCS ${conduit_popmail_UIS})
kde3_automoc(${conduit_popmail_SRCS}) trinity_automoc(${conduit_popmail_SRCS})
add_library(conduit_popmail SHARED ${conduit_popmail_SRCS}) add_library(conduit_popmail SHARED ${conduit_popmail_SRCS})
set_target_properties( set_target_properties(
@ -27,7 +27,7 @@ set_target_properties(
PREFIX "" PREFIX ""
) )
kde3_install_libtool_file(conduit_popmail) trinity_install_libtool_file(conduit_popmail)
install( install(
TARGETS conduit_popmail TARGETS conduit_popmail

8
conduits/sysinfoconduit/CMakeLists.txt
Unescape View File

@ -16,9 +16,9 @@ set(conduit_sysinfo_KCFGS
sysinfoSettings.kcfgc sysinfoSettings.kcfgc
) )
kde3_add_kcfg_files(conduit_sysinfo_SRCS ${conduit_sysinfo_KCFGS}) trinity_add_kcfg_files(conduit_sysinfo_SRCS ${conduit_sysinfo_KCFGS})
kde3_add_ui_files(conduit_sysinfo_SRCS ${conduit_sysinfo_UIS}) trinity_add_ui_files(conduit_sysinfo_SRCS ${conduit_sysinfo_UIS})
kde3_automoc(${conduit_sysinfo_SRCS}) trinity_automoc(${conduit_sysinfo_SRCS})
add_library(conduit_sysinfo SHARED ${conduit_sysinfo_SRCS}) add_library(conduit_sysinfo SHARED ${conduit_sysinfo_SRCS})
set_target_properties( set_target_properties(
@ -27,7 +27,7 @@ set_target_properties(
PREFIX "" PREFIX ""
) )
kde3_install_libtool_file(conduit_sysinfo) trinity_install_libtool_file(conduit_sysinfo)
install( install(
TARGETS conduit_sysinfo TARGETS conduit_sysinfo

8
conduits/timeconduit/CMakeLists.txt
Unescape View File

@ -16,9 +16,9 @@ set(conduit_time_KCFGS
timeConduitSettings.kcfgc timeConduitSettings.kcfgc
) )
kde3_add_kcfg_files(conduit_time_SRCS ${conduit_time_KCFGS}) trinity_add_kcfg_files(conduit_time_SRCS ${conduit_time_KCFGS})
kde3_add_ui_files(conduit_time_SRCS ${conduit_time_UIS}) trinity_add_ui_files(conduit_time_SRCS ${conduit_time_UIS})
kde3_automoc(${conduit_time_SRCS}) trinity_automoc(${conduit_time_SRCS})
add_library(conduit_time SHARED ${conduit_time_SRCS}) add_library(conduit_time SHARED ${conduit_time_SRCS})
kpilot_rpath(conduit_time) kpilot_rpath(conduit_time)
@ -28,7 +28,7 @@ set_target_properties(
PREFIX "" PREFIX ""
) )
kde3_install_libtool_file(conduit_time) trinity_install_libtool_file(conduit_time)
install( install(
TARGETS conduit_time TARGETS conduit_time

12
conduits/vcalconduit/CMakeLists.txt
Unescape View File

@ -19,8 +19,8 @@ set(conduit_SHARED
todoRecord.cc todoRecord.cc
) )
kde3_add_kcfg_files(conduit_SHARED vcalconduitSettings.kcfgc) trinity_add_kcfg_files(conduit_SHARED vcalconduitSettings.kcfgc)
kde3_add_ui_files(conduit_SHARED korganizerConduit.ui) trinity_add_ui_files(conduit_SHARED korganizerConduit.ui)
set(conduit_vcal_SRCS set(conduit_vcal_SRCS
${conduit_SHARED} ${conduit_SHARED}
@ -29,7 +29,7 @@ set(conduit_vcal_SRCS
vcal-setup.cc vcal-setup.cc
) )
kde3_automoc(${conduit_vcal_SRCS}) trinity_automoc(${conduit_vcal_SRCS})
add_library(conduit_vcal SHARED ${conduit_vcal_SRCS}) add_library(conduit_vcal SHARED ${conduit_vcal_SRCS})
target_link_libraries(conduit_vcal kcal) target_link_libraries(conduit_vcal kcal)
@ -40,7 +40,7 @@ set(conduit_todo_SRCS
todo-conduit.cc todo-conduit.cc
) )
kde3_automoc(${conduit_todo_SRCS}) trinity_automoc(${conduit_todo_SRCS})
add_library(conduit_todo SHARED ${conduit_todo_SRCS}) add_library(conduit_todo SHARED ${conduit_todo_SRCS})
target_link_libraries(conduit_todo kcal) target_link_libraries(conduit_todo kcal)
@ -55,7 +55,7 @@ set_target_properties(
PREFIX "" PREFIX ""
) )
kde3_install_libtool_file(conduit_vcal) trinity_install_libtool_file(conduit_vcal)
install( install(
TARGETS conduit_vcal conduit_todo TARGETS conduit_vcal conduit_todo
@ -63,7 +63,7 @@ install(
LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR} LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
) )
kde3_install_libtool_file(conduit_todo) trinity_install_libtool_file(conduit_todo)
install( install(
FILES vcal-conduit.desktop todo-conduit.desktop FILES vcal-conduit.desktop todo-conduit.desktop

30
kpilot/CMakeLists.txt
Unescape View File

@ -17,7 +17,7 @@ set(settings_SRC
kpilotConfig.cc kpilotConfig.cc
) )
kde3_add_kcfg_files(settings_SRC kpilotSettings.kcfgc) trinity_add_kcfg_files(settings_SRC kpilotSettings.kcfgc)
### ###
# #
@ -49,10 +49,10 @@ set(kcmpilot_UIS
dbSelection_base.ui dbSelection_base.ui
) )
kde3_add_ui_files(kcmpilot_SRCS ${kcmpilot_UIS}) trinity_add_ui_files(kcmpilot_SRCS ${kcmpilot_UIS})
kde3_add_kcfg_files(kcmpilot_SRCS ${kcmpilot_KCFGS}) trinity_add_kcfg_files(kcmpilot_SRCS ${kcmpilot_KCFGS})
kde3_add_dcop_stubs(kcmpilot_SRCS pilotDaemonDCOP.h) trinity_add_dcop_stubs(kcmpilot_SRCS pilotDaemonDCOP.h)
kde3_automoc(${kcmpilot_SRCS}) trinity_automoc(${kcmpilot_SRCS})
# Now add these generated files to the ADD_LIBRARY step # Now add these generated files to the ADD_LIBRARY step
# If this is NOT done, then the ui_*.h files will not be generated # If this is NOT done, then the ui_*.h files will not be generated
@ -75,9 +75,9 @@ set(kpilotTest_SRCS
main-test.cc main-test.cc
) )
# Acts as a receiver for DCOP log messages # Acts as a receiver for DCOP log messages
kde3_add_dcop_skels(kpilotTest_SRCS loggerDCOP.h) trinity_add_dcop_skels(kpilotTest_SRCS loggerDCOP.h)
kde3_automoc(${kpilotTest_SRCS}) trinity_automoc(${kpilotTest_SRCS})
add_executable(kpilotTest ${kpilotTest_SRCS}) add_executable(kpilotTest ${kpilotTest_SRCS})
target_link_libraries(kpilotTest ${QT_LIBRARIES} kpilot kdeui kio) target_link_libraries(kpilotTest ${QT_LIBRARIES} kpilot kdeui kio)
kpilot_rpath(kpilotTest) kpilot_rpath(kpilotTest)
@ -95,9 +95,9 @@ set(kpilotDaemon_SRCS
pilotDaemon.cc pilotDaemon.cc
) )
# Both sends and receives DCOP log messages. Talks to KPilot. # Both sends and receives DCOP log messages. Talks to KPilot.
kde3_add_dcop_skels(kpilotDaemon_SRCS loggerDCOP.h pilotDaemonDCOP.h) trinity_add_dcop_skels(kpilotDaemon_SRCS loggerDCOP.h pilotDaemonDCOP.h)
kde3_add_dcop_stubs(kpilotDaemon_SRCS loggerDCOP.h kpilotDCOP.h) trinity_add_dcop_stubs(kpilotDaemon_SRCS loggerDCOP.h kpilotDCOP.h)
kde3_automoc(${kpilotDaemon_SRCS}) trinity_automoc(${kpilotDaemon_SRCS})
add_executable(kpilotDaemon ${kpilotDaemon_SRCS}) add_executable(kpilotDaemon ${kpilotDaemon_SRCS})
target_link_libraries(kpilotDaemon ${QT_LIBRARIES} kpilot kdeui kio) target_link_libraries(kpilotDaemon ${QT_LIBRARIES} kpilot kdeui kio)
kpilot_rpath(kpilotDaemon) kpilot_rpath(kpilotDaemon)
@ -131,11 +131,11 @@ set(kpilot_UIS
todoEditor_base.ui todoEditor_base.ui
) )
kde3_add_ui_files(kpilot_SRCS ${kpilot_UIS}) trinity_add_ui_files(kpilot_SRCS ${kpilot_UIS})
# Talks to the daemon. Listens as itself. # Talks to the daemon. Listens as itself.
kde3_add_dcop_skels(kpilot_SRCS loggerDCOP.h kpilotDCOP.h) trinity_add_dcop_skels(kpilot_SRCS loggerDCOP.h kpilotDCOP.h)
kde3_add_dcop_stubs(kpilot_SRCS pilotDaemonDCOP.h) trinity_add_dcop_stubs(kpilot_SRCS pilotDaemonDCOP.h)
kde3_automoc(${kpilot_SRCS}) trinity_automoc(${kpilot_SRCS})
add_executable(kpilot_bin ${kpilot_SRCS}) add_executable(kpilot_bin ${kpilot_SRCS})
target_link_libraries(kpilot_bin ${QT_LIBRARIES} kpilot kutils kdeui kio) target_link_libraries(kpilot_bin ${QT_LIBRARIES} kpilot kutils kdeui kio)
kpilot_rpath(kpilot_bin) kpilot_rpath(kpilot_bin)
@ -145,7 +145,7 @@ set_target_properties(kpilot_bin PROPERTIES
######################### INSTALL STUFF ####################################### ######################### INSTALL STUFF #######################################
kde3_install_libtool_file(kcm_kpilot) trinity_install_libtool_file(kcm_kpilot)
install( install(
TARGETS kcm_kpilot kpilot_bin kpilotDaemon TARGETS kcm_kpilot kpilot_bin kpilotDaemon

2
kpilot/Icons/CMakeLists.txt
Unescape View File

@ -1,4 +1,4 @@
kde3_install_icons_custom( hicolor ) trinity_install_icons_custom( hicolor )
install( FILES kpilot-splash.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kpilot/pics/) install( FILES kpilot-splash.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kpilot/pics/)

2
kpilot/kpilotConfig.cc
Unescape View File

@ -234,7 +234,7 @@ static void update440()
const char **s = oldconduits; const char **s = oldconduits;
while (*s) while (*s)
{ {
TQString libname = CSL1("kde3/lib%1conduit.so").tqarg(TQString::tqfromLatin1(*s)); TQString libname = CSL1("trinity/lib%1conduit.so").tqarg(TQString::tqfromLatin1(*s));
TQString foundlib = ::locate("lib",libname); TQString foundlib = ::locate("lib",libname);
if (!foundlib.isEmpty()) if (!foundlib.isEmpty())
{ {

4
lib/CMakeLists.txt
Unescape View File

@ -52,8 +52,8 @@ set(lib_SRCS
pilotTodoEntry.cc pilotTodoEntry.cc
) )
kde3_automoc(${lib_SRCS}) trinity_automoc(${lib_SRCS})
kde3_add_kcfg_files(lib_SRCS kpilotlibSettings.kcfgc) trinity_add_kcfg_files(lib_SRCS kpilotlibSettings.kcfgc)
add_library(kpilot SHARED ${lib_SRCS}) add_library(kpilot SHARED ${lib_SRCS})
target_link_libraries(kpilot ${PILOTLINK_LIBRARY} ${QT_LIBRARIES} kdeui kio) target_link_libraries(kpilot ${PILOTLINK_LIBRARY} ${QT_LIBRARIES} kdeui kio)
kpilot_rpath(kpilot) kpilot_rpath(kpilot)

18
tests/CMakeLists.txt
Unescape View File

@ -9,27 +9,27 @@ add_definitions( -DKDESRCDIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\" )
set(testconstants_SRCS testconstants.cc) set(testconstants_SRCS testconstants.cc)
kde3_add_executable(testconstants ${testconstants_SRCS}) trinity_add_executable(testconstants ${testconstants_SRCS})
target_link_libraries(testconstants kpilot ${QT_LIBRARIES}) target_link_libraries(testconstants kpilot ${QT_LIBRARIES})
add_test(testconstants ${EXECUTABLE_OUTPUT_PATH}/testconstants) add_test(testconstants ${EXECUTABLE_OUTPUT_PATH}/testconstants)
set(testcategories_SRCS testcategories.cc) set(testcategories_SRCS testcategories.cc)
kde3_add_executable(testcategories ${testcategories_SRCS}) trinity_add_executable(testcategories ${testcategories_SRCS})
target_link_libraries(testcategories kpilot ${QT_LIBRARIES}) target_link_libraries(testcategories kpilot ${QT_LIBRARIES})
add_test(testcategories ${EXECUTABLE_OUTPUT_PATH}/testcategories) add_test(testcategories ${EXECUTABLE_OUTPUT_PATH}/testcategories)
set(testaddresses_SRCS testaddress.cc) set(testaddresses_SRCS testaddress.cc)
kde3_add_executable(testaddresses ${testaddresses_SRCS}) trinity_add_executable(testaddresses ${testaddresses_SRCS})
target_link_libraries(testaddresses kpilot ${QT_LIBRARIES}) target_link_libraries(testaddresses kpilot ${QT_LIBRARIES})
add_test(testaddresses ${EXECUTABLE_OUTPUT_PATH}/testaddresses) add_test(testaddresses ${EXECUTABLE_OUTPUT_PATH}/testaddresses)
set(testdatebook_SRCS testdatebook.cc) set(testdatebook_SRCS testdatebook.cc)
kde3_add_executable(testdatebook ${testdatebook_SRCS}) trinity_add_executable(testdatebook ${testdatebook_SRCS})
target_link_libraries(testdatebook kpilot ${QT_LIBRARIES}) target_link_libraries(testdatebook kpilot ${QT_LIBRARIES})
add_test(testdatebook ${EXECUTABLE_OUTPUT_PATH}/testdatebook) add_test(testdatebook ${EXECUTABLE_OUTPUT_PATH}/testdatebook)
set(testidmapper_SRCS testidmapper.cc) set(testidmapper_SRCS testidmapper.cc)
kde3_add_executable(testidmapper ${testidmapper_SRCS}) trinity_add_executable(testidmapper ${testidmapper_SRCS})
target_link_libraries(testidmapper kpilot ${QT_LIBRARIES}) target_link_libraries(testidmapper kpilot ${QT_LIBRARIES})
add_test(testidmapper ${EXECUTABLE_OUTPUT_PATH}/testidmapper) add_test(testidmapper ${EXECUTABLE_OUTPUT_PATH}/testidmapper)
@ -37,9 +37,9 @@ if (HAVE_CALENDARLOCAL_H)
set(importdatebook_SRCS importdatebook.cc) set(importdatebook_SRCS importdatebook.cc)
set(exportdatebook_SRCS exportdatebook.cc) set(exportdatebook_SRCS exportdatebook.cc)
set(mergecalendars_SRCS mergecalendars.cc) set(mergecalendars_SRCS mergecalendars.cc)
kde3_add_executable(importdatebook ${importdatebook_SRCS}) trinity_add_executable(importdatebook ${importdatebook_SRCS})
kde3_add_executable(exportdatebook ${exportdatebook_SRCS}) trinity_add_executable(exportdatebook ${exportdatebook_SRCS})
kde3_add_executable(mergecalendars ${mergecalendars_SRCS}) trinity_add_executable(mergecalendars ${mergecalendars_SRCS})
target_link_libraries(importdatebook kpilot ${QT_LIBRARIES} kcal) target_link_libraries(importdatebook kpilot ${QT_LIBRARIES} kcal)
target_link_libraries(exportdatebook kpilot ${QT_LIBRARIES} kcal) target_link_libraries(exportdatebook kpilot ${QT_LIBRARIES} kcal)
target_link_libraries(mergecalendars ${QT_LIBRARIES} kcal) target_link_libraries(mergecalendars ${QT_LIBRARIES} kcal)
@ -49,7 +49,7 @@ if (HAVE_CALENDARLOCAL_H)
endif (HAVE_CALENDARLOCAL_H) endif (HAVE_CALENDARLOCAL_H)
set(importaddresses_SRCS importaddresses.cc) set(importaddresses_SRCS importaddresses.cc)
kde3_add_executable(importaddresses ${importaddresses_SRCS}) trinity_add_executable(importaddresses ${importaddresses_SRCS})
target_link_libraries(importaddresses kpilot ${QT_LIBRARIES} kabc kabc_file) target_link_libraries(importaddresses kpilot ${QT_LIBRARIES} kabc kabc_file)
add_test(importaddresses ${EXECUTABLE_OUTPUT_PATH}/importaddresses) add_test(importaddresses ${EXECUTABLE_OUTPUT_PATH}/importaddresses)

Write Preview
Loading…
Cancel
Save