From d9c883ab09c9b7d383c34a1b49f6f574c910933a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 02:21:43 -0600 Subject: Additional kde to tde renaming --- conduits/abbrowserconduit/Makefile.am | 2 +- conduits/abbrowserconduit/abbrowser-conduit.cc | 2 +- conduits/docconduit/CMakeLists.txt | 2 +- conduits/docconduit/Makefile.am | 4 ++-- conduits/docconduit/kpalmdoc.upd | 2 +- conduits/knotes/Makefile.am | 2 +- conduits/malconduit/Makefile.am | 2 +- conduits/memofileconduit/Makefile.am | 2 +- conduits/notepadconduit/Makefile.am | 2 +- conduits/null/Makefile.am | 2 +- conduits/popmail/Makefile.am | 2 +- conduits/recordconduit/Makefile.am | 2 +- conduits/sysinfoconduit/Makefile.am | 2 +- conduits/timeconduit/Makefile.am | 2 +- conduits/vcalconduit/Makefile.am | 4 ++-- 15 files changed, 17 insertions(+), 17 deletions(-) (limited to 'conduits') 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=,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 -- cgit v1.2.1