diff options
27 files changed, 63 insertions, 63 deletions
@@ -16,7 +16,7 @@ TODO: give the knotes conduit a decent test mode. TODO: only re-write a local database if it is changed. 2007-12-30 Jason 'vanRijn' Kasper -* Fixing bug reported by Pablo Yepes on kdepim-users mailing list. We did +* Fixing bug reported by Pablo Yepes on tdepim-users mailing list. We did severe goofiness with middle names... The Palm can't handle them, so we blindly tacked firstname + " " + lastname and stuck it into the Palm's firstname field. The problem is that whenever a copy from palm->pc is @@ -39,7 +39,7 @@ TODO: only re-write a local database if it is changed. thread to match what is done in kpilotdevicelink. 2007-04-15 Jason 'vanRijn' Kasper -* merging all development and bug fixes from kdepim-3.5.5+ branch into +* merging all development and bug fixes from tdepim-3.5.5+ branch into stable branches/KDE/3.5 in preparation for KDE 3.5.7 * cmake cleanups * namespacing and cleanups in sysinfoconduit @@ -201,7 +201,7 @@ TODO: only re-write a local database if it is changed. 2005-05-13 Adriaan de Groot * Friday the 13th! I merged HEAD to BRANCH and am now working in - BRANCH (branches/KDE/3.4/kdepim/kpilot) to do bugfixes. New features + BRANCH (branches/KDE/3.4/tdepim/kpilot) to do bugfixes. New features and strings go in HEAD, and we'll forward-port bugfixes at some point. The cutover is revision 413061. @@ -789,9 +789,9 @@ TODO: only re-write a local database if it is changed. new KCM config dialog. 2004-01-02 - 2004-01-11 Reinhold Kainhofer -* This was work done in osnabrueck_branch, at the 2004 kdepim meeting +* This was work done in osnabrueck_branch, at the 2004 tdepim meeting and the week afterwards. This issue is one of the feature targets - for the kdepim 3.3 release in Q1 2004. + for the tdepim 3.3 release in Q1 2004. * Moved the general setup dialog from a separate dialog to a page of the conduit config dlg. Combined the kpilot setup and conduit config dialog to one dialog. @@ -817,7 +817,7 @@ TODO: only re-write a local database if it is changed. 2004-01-02 - 2004-01-04 Adriaan de Groot -* This was work done in osnabrueck_branch, at the 2004 kdepim meeting. +* This was work done in osnabrueck_branch, at the 2004 tdepim meeting. * Fixed the TODO_I18N -> they're all i18n() now. * Discovered ttypatch, which is da bong. Thanks to Dan Clemmensen for writing it, and Bernhard Reiter for showing it to me. All of @@ -1879,7 +1879,7 @@ KPilot Developer's notes for november 10th, 2002 * Finally got a separate build tree of KPilot working. Can distribute sources again, now, assuming SLAC can suffer the bandwidth penalty. * Most of libkcal's header files aren't installed. Why? Is it really intended - to be totally internal to the kdepim module in KDE's CVS? + to be totally internal to the tdepim module in KDE's CVS? 2002-10-31 Adriaan de Groot * Happy Hallowe'en, eh. @@ -2016,7 +2016,7 @@ Moving on past 3.0.2 and trying to sort things out. 2002-06-24 Reinhold Kainhofer Still fighting with the addressbook conduit. The Palm -> PC way already seems to work. Haven't committed anything yet to prevent breaking - compilation of the kdepim module with a conduit which won't work yet anyway. + compilation of the tdepim module with a conduit which won't work yet anyway. KPilot Developer's notes for june 16th, 2002 @@ -3304,7 +3304,7 @@ did remember mothers' day though. Changes relevant to KPilot: * abbrowser has moved into kdebase, so the abbrowser conduit will now be available to everyone, not just those that also compile - all of kdepim. + all of tdepim. 2001-05-08 Marko Gronroos @@ -3412,7 +3412,7 @@ through it again to see how things stand. I've added comments in * Clean up more of the butt-ugly parts of the code base [less of this now!] * KPilot is an i18n nightmare [less of this now!] * The password dialog in the popmail conduit is probably a very bad idea - I think kdesud should come into play here. [not looked into] + I think tdesud should come into play here. [not looked into] * The messages need validation - Pilot vs pilot, HotSync vs whatever * Actually *doing* a fast sync for Heiko * More and better information in the progress bar @@ -3664,7 +3664,7 @@ Todo: - get rid of most of the strcpy, strcat, etc. But not all! We're stuck with pilot-link, after all. * The password dialog in the popmail conduit is probably a very bad idea - I think kdesud should come into play here. Anyway, a KMail conduit would + I think tdesud should come into play here. Anyway, a KMail conduit would be much cooler and safer. Sigh. @@ -3732,7 +3732,7 @@ Todo: KPilot Developer's notes for december 18th 2000 =============================================== -It looks like kdepim and KPilot aren't going to make the 2.1 release. +It looks like tdepim and KPilot aren't going to make the 2.1 release. Darn. This does give us more time to deal with docs and bugfixes. Every time I get something done though I find I've discovered two new things to do :(. I hope Lukas will help out with a lot of the @@ -3937,7 +3937,7 @@ a nifty feature to the desktop as a whole) I think feature creep should be abandoned for the time being and we should try to fix as many bugs in what we have before the release (around the middle of december, IIRC). This means testing, lots of it. So -people, take the plunge, give it a try, compile the latest kdepim +people, take the plunge, give it a try, compile the latest tdepim CVS stuff with KPilot in it and then complain when your Pilot catches fire, OK? O yeah .. when you *do* give it a try, make sure you do something like: diff --git a/Documentation/ConduitProgrammingTutorial/index.tex b/Documentation/ConduitProgrammingTutorial/index.tex index 66b17f3..679fcc0 100644 --- a/Documentation/ConduitProgrammingTutorial/index.tex +++ b/Documentation/ConduitProgrammingTutorial/index.tex @@ -182,11 +182,11 @@ with the handheld. Figure \ref{ConduitStructure} shows this as a diagram: Before we delve into programming details, let us look a bit at the compilation framework. -If you develop your conduit inside the \file{kdepim/kpilot/conduits} directory of KDE's +If you develop your conduit inside the \file{tdepim/kpilot/conduits} directory of KDE's CVS tree, all you need to do is to provide a Makefile.am in your conduit directory -(e.g. \file{kdepim/kpilot/conduits/malconduit}), and add the name of your +(e.g. \file{tdepim/kpilot/conduits/malconduit}), and add the name of your directory (\file{malconduit} in this example) to the variable \code{SUBDIRS} -in \file{kdepim/kpilot/conduits/Makefile.am}: +in \file{tdepim/kpilot/conduits/Makefile.am}: {\small \begin{verbatim} SUBDIRS = knotes expense null vcalconduit \ @@ -249,7 +249,7 @@ pointing to the headers and the library of libmal, and are set by \vspace{1em} If you have special library requirements (e.g. the malconduit needs libmal to work), -you need to add special configure checks to the autoconf file \file{kdepim/kpilot/conduits/configure.in.in} (for an +you need to add special configure checks to the autoconf file \file{tdepim/kpilot/conduits/configure.in.in} (for an example, you should look at the checks the malconduit added to the file in CVS) and include the directory only if the appropriate libraries and header files are installed. One way to achieve this is to add the following line after your configure checks, which set @@ -262,7 +262,7 @@ AM_CONDITIONAL(include_malconduit, test "$HAVE_MAL" = "1") } You can then use "\code{include\_malconduit}" in the KPilot conduit -directory's makefile \file{kdepim/kpilot/conduits/Makefile.am}: +directory's makefile \file{tdepim/kpilot/conduits/Makefile.am}: {\footnotesize \begin{verbatim} MALSUBDIR= @@ -333,7 +333,7 @@ Debugging KPilot conduits is not an easy task, as one cannot use a debugger in the background when it is started). So printing debug output is the only way to get any information about what -the conduit is doing. If you don't configure kdepim it with \code{--no-debug}, or don't add +the conduit is doing. If you don't configure tdepim it with \code{--no-debug}, or don't add \code{--NDEBUG} in Makefile.am, then you can easily print out debug messages using the \code{DEBUGCONDUIT} stream. However, at the beginning of each function where you want to use it, you need to add the macro \code{FUNCTIONSETUP;}, @@ -1528,7 +1528,7 @@ These code pieces from the docconduit are supposed to give you an insight into h \section{A record-based conduit}\label{SectionRecordBasedConduit} -If you work with record-based conduits (e.g. addressbook, calendar conduits etc.), you might proceed similar to a document-based conduit (where records correspond to documents, of course), although you probably want to do the synchronization step immediately instead of storing all information about the states in a big list and only later sync the data. To dig deeper into the structure of such conduits (which I admit are the most common ones, but also the most complex), take a look at the addressbook conduit of KDE 3.1 (e.g. using KDE's webcvs at \htmladdnormallink{http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdepim/kpilot/conduits/abbrowserconduit/}{http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdepim/kpilot/conduits/abbrowserconduit/}). +If you work with record-based conduits (e.g. addressbook, calendar conduits etc.), you might proceed similar to a document-based conduit (where records correspond to documents, of course), although you probably want to do the synchronization step immediately instead of storing all information about the states in a big list and only later sync the data. To dig deeper into the structure of such conduits (which I admit are the most common ones, but also the most complex), take a look at the addressbook conduit of KDE 3.1 (e.g. using KDE's webcvs at \htmladdnormallink{http://webcvs.kde.org/cgi-bin/cvsweb.cgi/tdepim/kpilot/conduits/abbrowserconduit/}{http://webcvs.kde.org/cgi-bin/cvsweb.cgi/tdepim/kpilot/conduits/abbrowserconduit/}). %TODO diff --git a/Documentation/README-4.0.0 b/Documentation/README-4.0.0 index f9fdccb..9b68a81 100644 --- a/Documentation/README-4.0.0 +++ b/Documentation/README-4.0.0 @@ -20,8 +20,8 @@ INSTALLATION INSTRUCTIONS ========================= The file ../README contains minimal information on how to compile -and install KPilot. Since KPilot is part of the kdepim package, you -should also have the INSTALL file for kdepim, probably in ../../INSTALL. +and install KPilot. Since KPilot is part of the tdepim package, you +should also have the INSTALL file for tdepim, probably in ../../INSTALL. This README file only contains the release notes for KPilot 4.0.0. diff --git a/Documentation/README-4.2.1 b/Documentation/README-4.2.1 index 71db728..5316384 100644 --- a/Documentation/README-4.2.1 +++ b/Documentation/README-4.2.1 @@ -20,8 +20,8 @@ INSTALLATION INSTRUCTIONS ========================= The file ../README contains minimal information on how to compile -and install KPilot. Since KPilot is part of the kdepim package, you -should also have the INSTALL file for kdepim, probably in ../../INSTALL. +and install KPilot. Since KPilot is part of the tdepim package, you +should also have the INSTALL file for tdepim, probably in ../../INSTALL. This README file only contains the release notes for KPilot 4.2.1. diff --git a/Documentation/README-4.2.2 b/Documentation/README-4.2.2 index 604460f..69ce2cd 100644 --- a/Documentation/README-4.2.2 +++ b/Documentation/README-4.2.2 @@ -21,8 +21,8 @@ INSTALLATION INSTRUCTIONS ========================= The file ../README contains minimal information on how to compile -and install KPilot. Since KPilot is part of the kdepim package, you -should also have the INSTALL file for kdepim, probably in ../../INSTALL. +and install KPilot. Since KPilot is part of the tdepim package, you +should also have the INSTALL file for tdepim, probably in ../../INSTALL. This README file only contains the release notes for KPilot 4.2.2. diff --git a/conduits/abbrowserconduit/Makefile.am b/conduits/abbrowserconduit/Makefile.am index 40c739a..f1cf64d 100644 --- a/conduits/abbrowserconduit/Makefile.am +++ b/conduits/abbrowserconduit/Makefile.am @@ -11,7 +11,7 @@ conduit_address_la_SOURCES = \ abbrowser-setup.cc \ kabcRecord.cc \ abbrowser-conduit.cc -conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui +conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_address_la_LIBADD = ../../lib/libkpilot.la -lkabc -lkabc_file servicedir = $(kde_servicesdir) diff --git a/conduits/abbrowserconduit/abbrowser-conduit.cc b/conduits/abbrowserconduit/abbrowser-conduit.cc index 8885bbf..59dc242 100644 --- a/conduits/abbrowserconduit/abbrowser-conduit.cc +++ b/conduits/abbrowserconduit/abbrowser-conduit.cc @@ -1367,7 +1367,7 @@ bool AbbrowserConduit::_equal(const PilotAddress *piAddress, const Addressee &ab PhoneNumber abPhone = *it; // see if we have the same number here... // * Note * We used to check for preferred number matching, but - // this seems to have broke in kdepim 3.5 and I don't have time to + // this seems to have broke in tdepim 3.5 and I don't have time to // figure out why, so we won't check to see if preferred number match if ( _equal(piPhone.number(), abPhone.number()) ) { found = true; diff --git a/conduits/docconduit/CMakeLists.txt b/conduits/docconduit/CMakeLists.txt index e0a3a1a..be3119b 100644 --- a/conduits/docconduit/CMakeLists.txt +++ b/conduits/docconduit/CMakeLists.txt @@ -58,7 +58,7 @@ kde3_add_kcfg_files(kpalmdoc_SRCS kpalmdocSettings.kcfgc) trinity_add_ui_files(kpalmdoc_SRCS kpalmdoc_dlgbase.ui) trinity_automoc(${kpalmdoc_SRCS}) add_executable(kpalmdoc ${kpalmdoc_SRCS}) -target_link_libraries(kpalmdoc ${QT_LIBRARIES} kpilot kdeui kio) +target_link_libraries(kpalmdoc ${QT_LIBRARIES} kpilot tdeui kio) kpilot_rpath(kpalmdoc) install( diff --git a/conduits/docconduit/Makefile.am b/conduits/docconduit/Makefile.am index de90467..2f2f082 100644 --- a/conduits/docconduit/Makefile.am +++ b/conduits/docconduit/Makefile.am @@ -21,14 +21,14 @@ libpalmdoc_shared_la_LDFLAGS = $(PISOCK_LDFLAGS) $(PISOCK_LIB) libpalmdoc_shared_la_LIBADD = $(PISOCK_LDFLAGS) $(PISOCK_LIB) conduit_doc_la_SOURCES = docconduitSettings.kcfgc doc-factory.cc doc-setup.cc doc-conduit.cc doc-setupdialog.ui doc-conflictdialog.cc -conduit_doc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui +conduit_doc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \ $(LIB_KDEUI) $(LIB_KFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB) ##libpalmdoc_shared.la kpalmdoc_SOURCES = kpalmdocSettings.kcfgc kpalmdoc_dlgbase.ui kpalmdoc_dlg.cc kpalmdoc.cpp -kpalmdoc_LDFLAGS = $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kpalmdoc_LDFLAGS = $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kpalmdoc_LDADD = $(LIB_KFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB) ../../lib/libkpilot.la libpalmdoc_shared.la xdg_apps_DATA = kpalmdoc.desktop diff --git a/conduits/docconduit/kpalmdoc.upd b/conduits/docconduit/kpalmdoc.upd index 77d3d1e..5a90aad 100644 --- a/conduits/docconduit/kpalmdoc.upd +++ b/conduits/docconduit/kpalmdoc.upd @@ -1,4 +1,4 @@ -Id=kdepim_3.3 +Id=tdepim_3.3 File=converterrc Group=<default>,General AllKeys diff --git a/conduits/knotes/Makefile.am b/conduits/knotes/Makefile.am index 3161798..44005f9 100644 --- a/conduits/knotes/Makefile.am +++ b/conduits/knotes/Makefile.am @@ -15,7 +15,7 @@ conduit_knotes_la_SOURCES = \ knotes-action.cc \ setup_base.ui -conduit_knotes_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui -lkcal +conduit_knotes_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -lkcal conduit_knotes_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) kde_kcfg_DATA = knotesconduit.kcfg diff --git a/conduits/malconduit/Makefile.am b/conduits/malconduit/Makefile.am index 081d129..bb2388a 100644 --- a/conduits/malconduit/Makefile.am +++ b/conduits/malconduit/Makefile.am @@ -13,6 +13,6 @@ kde_kcfg_DATA = malconduit.kcfg kde_module_LTLIBRARIES = conduit_mal.la conduit_mal_la_SOURCES = malconduitSettings.kcfgc mal-setup_dialog.ui mal-factory.cc mal-setup.cc mal-conduit.cc -conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui +conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_mal_la_LIBADD = ../../lib/libkpilot.la $(MAL_LIB) $(LIB_KDEUI) diff --git a/conduits/memofileconduit/Makefile.am b/conduits/memofileconduit/Makefile.am index 020c569..6b8d5f1 100644 --- a/conduits/memofileconduit/Makefile.am +++ b/conduits/memofileconduit/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = conduit_memofile.la conduit_memofile_la_SOURCES = memofileSettings.kcfgc setup_base.ui \ memofile-factory.cc memofile.cc memofiles.cc memofile-conduit.cc -conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui +conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_memofile_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KFILE) kde_kcfg_DATA = memofileconduit.kcfg diff --git a/conduits/notepadconduit/Makefile.am b/conduits/notepadconduit/Makefile.am index ce08524..efe0794 100644 --- a/conduits/notepadconduit/Makefile.am +++ b/conduits/notepadconduit/Makefile.am @@ -9,6 +9,6 @@ kde_module_LTLIBRARIES = conduit_notepad.la conduit_notepad_la_SOURCES = notepadconduit.kcfgc notepad-setup.ui \ notepad-conduit.cc notepad-factory.cc -conduit_notepad_la_LDFLAGS= -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui +conduit_notepad_la_LDFLAGS= -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_notepad_la_LIBADD= ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KIO) diff --git a/conduits/null/Makefile.am b/conduits/null/Makefile.am index bdcc43f..db7598c 100644 --- a/conduits/null/Makefile.am +++ b/conduits/null/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = conduit_null.la conduit_null_la_SOURCES = nullSettings.kcfgc setup_base.ui null-conduit.cc null-factory.cc -conduit_null_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui +conduit_null_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_null_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) kde_kcfg_DATA = nullconduit.kcfg diff --git a/conduits/popmail/Makefile.am b/conduits/popmail/Makefile.am index 365cd1b..07cfcdc 100644 --- a/conduits/popmail/Makefile.am +++ b/conduits/popmail/Makefile.am @@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = conduit_popmail.la conduit_popmail_la_SOURCES = popmailSettings.kcfgc setup-dialog.ui \ popmail-factory.cc setupDialog.cc \ popmail-conduit.cc -conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui -lDCOP +conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -lDCOP conduit_popmail_la_LIBADD = ../../lib/libkpilot.la $(LIB_KIO) # this option you can leave out. Just, if you use "make dist", you need it diff --git a/conduits/recordconduit/Makefile.am b/conduits/recordconduit/Makefile.am index e00693a..03b55e0 100644 --- a/conduits/recordconduit/Makefile.am +++ b/conduits/recordconduit/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = conduit_record.la conduit_record_la_SOURCES = settings.kcfgc setup_base.ui factory.cc -conduit_record_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui +conduit_record_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_record_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) kde_kcfg_DATA = settings.kcfg diff --git a/conduits/sysinfoconduit/Makefile.am b/conduits/sysinfoconduit/Makefile.am index 3a5b59a..732fbb2 100644 --- a/conduits/sysinfoconduit/Makefile.am +++ b/conduits/sysinfoconduit/Makefile.am @@ -15,7 +15,7 @@ conduit_sysinfo_la_SOURCES = sysinfoSettings.kcfgc \ sysinfo-setup.cc \ sysinfo-conduit.cc \ sysinfo-setup_dialog.ui -conduit_sysinfo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui +conduit_sysinfo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_sysinfo_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KIO) kpilot_sysinfo_data_DATA = Template.html Template.txt diff --git a/conduits/timeconduit/Makefile.am b/conduits/timeconduit/Makefile.am index d6018b1..a39c2d8 100644 --- a/conduits/timeconduit/Makefile.am +++ b/conduits/timeconduit/Makefile.am @@ -16,7 +16,7 @@ conduit_time_la_SOURCES = timeConduitSettings.kcfgc \ time-setup.cc \ time-conduit.cc \ time-setup_dialog.ui -conduit_time_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui +conduit_time_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_time_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) kde_kcfg_DATA = timeconduit.kcfg diff --git a/conduits/vcalconduit/Makefile.am b/conduits/vcalconduit/Makefile.am index 76aae3d..87c8c3e 100644 --- a/conduits/vcalconduit/Makefile.am +++ b/conduits/vcalconduit/Makefile.am @@ -24,14 +24,14 @@ libvcalconduit_shared_la_SOURCES = vcalconduitSettings.kcfgc \ conduit_vcal_la_SOURCES = vcal-conduit.cc vcalRecord.cc \ vcal-factory.cc vcal-setup.cc -conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui -lkcal -lkresources +conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -lkcal -lkresources conduit_vcal_la_LIBADD = ../../lib/libkpilot.la \ libvcalconduit_shared.la conduit_vcal_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h conduit_todo_la_SOURCES = todo-conduit.cc todoRecord.cc \ todo-factory.cc todo-setup.cc -conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui -lkcal -lkresources +conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -lkcal -lkresources conduit_todo_la_LIBADD = ../../lib/libkpilot.la \ libvcalconduit_shared.la conduit_todo_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h diff --git a/kpilot/CMakeLists.txt b/kpilot/CMakeLists.txt index fe96550..f0e1fbb 100644 --- a/kpilot/CMakeLists.txt +++ b/kpilot/CMakeLists.txt @@ -79,7 +79,7 @@ kde3_add_dcop_skels(kpilotTest_SRCS loggerDCOP.h) trinity_automoc(${kpilotTest_SRCS}) add_executable(kpilotTest ${kpilotTest_SRCS}) -target_link_libraries(kpilotTest ${QT_LIBRARIES} kpilot kdeui kio) +target_link_libraries(kpilotTest ${QT_LIBRARIES} kpilot tdeui kio) kpilot_rpath(kpilotTest) ### @@ -99,7 +99,7 @@ kde3_add_dcop_skels(kpilotDaemon_SRCS loggerDCOP.h pilotDaemonDCOP.h) kde3_add_dcop_stubs(kpilotDaemon_SRCS loggerDCOP.h kpilotDCOP.h) trinity_automoc(${kpilotDaemon_SRCS}) add_executable(kpilotDaemon ${kpilotDaemon_SRCS}) -target_link_libraries(kpilotDaemon ${QT_LIBRARIES} kpilot kdeui kio) +target_link_libraries(kpilotDaemon ${QT_LIBRARIES} kpilot tdeui kio) kpilot_rpath(kpilotDaemon) ### @@ -137,7 +137,7 @@ kde3_add_dcop_skels(kpilot_SRCS loggerDCOP.h kpilotDCOP.h) kde3_add_dcop_stubs(kpilot_SRCS pilotDaemonDCOP.h) trinity_automoc(${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 tdeui kio) kpilot_rpath(kpilot_bin) set_target_properties(kpilot_bin PROPERTIES OUTPUT_NAME kpilot diff --git a/kpilot/Makefile-standalone b/kpilot/Makefile-standalone index fbaa7a7..e1d1f1f 100644 --- a/kpilot/Makefile-standalone +++ b/kpilot/Makefile-standalone @@ -27,7 +27,7 @@ CONFIG_MOCS=kpilotConfigDialog_base.moc kpilotConfigDialog.moc \ conduitConfigDialog.moc conduitConfigDialog_base.moc CONFIG_EXTRA=kpilotConfigDialog_base.ui conduitConfigDialog_base.ui -CONFIG_LIBS=-lkdeui -lkfile -lkdecore -lqt -lkpilot +CONFIG_LIBS=-ltdeui -lkfile -ltdecore -lqt -lkpilot TEST_DISTDIR=kpilotTest-0.2 TEST_OBJS=kpilotConfig.o \ @@ -36,7 +36,7 @@ TEST_OBJS=kpilotConfig.o \ TEST_MOCS= pilotComponent.moc logWidget.moc \ interactiveSync.moc hotSync.moc TEST_EXTRA=pilotUser.h -TEST_LIBS=-lkpilot -lkfile -lkdeui -lqt -lpisock +TEST_LIBS=-lkpilot -lkfile -ltdeui -lqt -lpisock KPILOT_DISTDIR=kpilot-4.2.9 KPILOT_OBJS= pilotDaemonDCOP_stub.o \ @@ -56,7 +56,7 @@ KPILOT_MOCS=pilotComponent.moc logWidget.moc memoWidget.moc addressWidget.moc \ KPILOT_EXTRA=kpilotConfigDialog_base.ui conduitConfigDialog_base.ui \ pilotDaemonDCOP.h kpilotDCOP.h \ pilotAppCategory.h pilotDatabase.h kpilot_on_pp.h -KPILOT_LIBS=-lkfile -lkdeui -lqt -lkpilot -lpisock +KPILOT_LIBS=-lkfile -ltdeui -lqt -lkpilot -lpisock DAEMON_DISTDIR=kpilotDaemon-4.2.9 DAEMON_OBJS= pilotDaemonDCOP_skel.o kpilotDCOP_stub.o \ @@ -67,7 +67,7 @@ DAEMON_MOCS=pilotDaemon.moc \ fileInstaller.moc DAEMON_EXTRA=pilotDaemonDCOP.h kpilotDCOP.h pilotUser.h \ hotsync.h busysync.h -DAEMON_LIBS=-lkfile -lkdeui -lqt -lkpilot -lpisock +DAEMON_LIBS=-lkfile -ltdeui -lqt -lkpilot -lpisock DISTFILES=kpilotConfig.tar.gz kpilotTest.tar.gz kpilot.tar.gz kpilotDaemon.tar.gz diff --git a/kpilot/Makefile.am b/kpilot/Makefile.am index 89800ed..d8d27ec 100644 --- a/kpilot/Makefile.am +++ b/kpilot/Makefile.am @@ -18,7 +18,7 @@ METASOURCES = AUTO INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes) libconfiguration_la_SOURCES = kpilotConfig.cc kpilotSettings.kcfgc -libconfiguration_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +libconfiguration_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kcm_kpilot_la_SOURCES = pilotDaemonDCOP.stub kpilotConfigDialog.cc \ kpilotConfigDialog_device.ui \ @@ -35,7 +35,7 @@ kcm_kpilot_la_SOURCES = pilotDaemonDCOP.stub kpilotConfigDialog.cc \ kpilotConfigWizard_app.ui \ kpilotConfigWizard.cc \ dbSelectionDialog.cc dbSelection_base.ui -kcm_kpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -module -avoid-version -no-undefined +kcm_kpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module -avoid-version -no-undefined kcm_kpilot_la_LIBADD = $(LIB_KFILE) $(PISOCK_LIB) \ ../lib/libkpilot.la \ libconfiguration.la @@ -68,9 +68,9 @@ kpilotTest_SOURCES = \ main-test.cc -kpilot_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -kpilotDaemon_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -kpilotTest_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kpilot_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kpilotDaemon_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kpilotTest_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor # the libraries to link against. Be aware of the order. First the libraries, @@ -95,7 +95,7 @@ rc_DATA = kpilotui.rc update_DATA = kpilot.upd updatedir = $(kde_datadir)/kconf_update -DOXYGEN_REFERENCES = kdeui kpilot/lib +DOXYGEN_REFERENCES = tdeui kpilot/lib include $(top_srcdir)/admin/Doxyfile.am ### Some additional dependencies: diff --git a/kpilot/kpilot.upd b/kpilot/kpilot.upd index 1fbc36a..6085e69 100644 --- a/kpilot/kpilot.upd +++ b/kpilot/kpilot.upd @@ -1,10 +1,10 @@ -Id=kdepim_3.3 +Id=tdepim_3.3 File=kpilotrc Group=<default>,General AllKeys # split up the kpilotrc into several config files, so the different processes # don't step on each other's toes -Id=kdepim_3.3_SplitConfig +Id=tdepim_3.3_SplitConfig File=kpilotrc,kpilot_addressconduitrc Group=Abbrowser-conduit,General AllKeys diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index bda9b45..27378f4 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -55,7 +55,7 @@ set(lib_SRCS trinity_automoc(${lib_SRCS}) kde3_add_kcfg_files(lib_SRCS kpilotlibSettings.kcfgc) add_library(kpilot SHARED ${lib_SRCS}) -target_link_libraries(kpilot ${PILOTLINK_LIBRARY} ${QT_LIBRARIES} kdeui kio) +target_link_libraries(kpilot ${PILOTLINK_LIBRARY} ${QT_LIBRARIES} tdeui kio) kpilot_rpath(kpilot) #---------- INSTALL -----------------------* diff --git a/lib/Makefile.am b/lib/Makefile.am index e17de18..f45272e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -56,5 +56,5 @@ check-local: done test ! -e FAILED -DOXYGEN_REFERENCES=libkcal kdecore +DOXYGEN_REFERENCES=libkcal tdecore include $(top_srcdir)/admin/Doxyfile.am diff --git a/lib/plugin.cc b/lib/plugin.cc index c16f9a4..fc24e9f 100644 --- a/lib/plugin.cc +++ b/lib/plugin.cc @@ -141,7 +141,7 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) // Experiment with a long non-<qt> string. Use that to find // sensible widths for the columns. // - text->setText(i18n("Send questions and comments to kdepim-users@kde.org")); + text->setText(i18n("Send questions and comments to tdepim-users@kde.org")); text->adjustSize(); int linewidth = text->size().width(); @@ -192,8 +192,8 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) s = TQString(); s += i18n("Send questions and comments to <a href=\"mailto:%1\">%2</a>.") - .tqarg( CSL1("kdepim-users@kde.org") ) - .tqarg( CSL1("kdepim-users@kde.org") ); + .tqarg( CSL1("tdepim-users@kde.org") ) + .tqarg( CSL1("tdepim-users@kde.org") ); s += ' '; s += i18n("Send bug reports to <a href=\"mailto:%1\">%2</a>.") .tqarg(p->bugAddress()) |