diff options
Diffstat (limited to 'kcontrol')
60 files changed, 126 insertions, 126 deletions
diff --git a/kcontrol/Makefile.am b/kcontrol/Makefile.am index 30f03338c..6871483fd 100644 --- a/kcontrol/Makefile.am +++ b/kcontrol/Makefile.am @@ -33,7 +33,7 @@ endif # 'colors' and 'fonts' should come after 'krdb' SUBDIRS = bell background dnssd filetypes samba krdb input info ioslaveinfo tdm\ - kicker locale launch keys kio konq style kded \ + kicker locale launch keys tdeio konq style kded \ konqhtml ebrowsing arts kcontrol knotify\ clock pics $(ACCESS_SUBDIR) colors energy fonts css \ icons screensaver taskbar crypto privacy smserver \ diff --git a/kcontrol/access/Makefile.am b/kcontrol/access/Makefile.am index 6ea38b8b9..792c33fbf 100644 --- a/kcontrol/access/Makefile.am +++ b/kcontrol/access/Makefile.am @@ -13,7 +13,7 @@ kaccess_la_LIBADD = $(LIB_TDEUI) kcm_access_la_SOURCES = kcmaccess.cpp kcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_access_la_LIBADD = $(LIB_KIO) +kcm_access_la_LIBADD = $(LIB_TDEIO) noinst_HEADERS = kcmaccess.h diff --git a/kcontrol/accessibility/Makefile.am b/kcontrol/accessibility/Makefile.am index 67eb8957a..7a0da941a 100644 --- a/kcontrol/accessibility/Makefile.am +++ b/kcontrol/accessibility/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_accessibility.la kcm_accessibility_la_SOURCES = accessibility.cpp accessibilityconfigwidget.ui kcm_accessibility_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_accessibility_la_LIBADD = $(LIB_KIO) +kcm_accessibility_la_LIBADD = $(LIB_TDEIO) noinst_HEADERS = accessibility.h diff --git a/kcontrol/arts/Makefile.am b/kcontrol/arts/Makefile.am index 3959f3109..9d0e7000f 100644 --- a/kcontrol/arts/Makefile.am +++ b/kcontrol/arts/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_arts.la kcm_arts_la_SOURCES = arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp kcm_arts_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_arts_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS) -ltdemid +kcm_arts_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUTILS) -ltdemid AM_CPPFLAGS = -I$(kde_includes)/arts $(all_includes) diff --git a/kcontrol/clock/Makefile.am b/kcontrol/clock/Makefile.am index 0348e5878..0572d26dc 100644 --- a/kcontrol/clock/Makefile.am +++ b/kcontrol/clock/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_clock.la kcm_clock_la_SOURCES = dtime.cpp tzone.cpp main.cpp kcm_clock_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_clock_la_LIBADD = $(LIB_KIO) +kcm_clock_la_LIBADD = $(LIB_TDEIO) AM_CPPFLAGS = $(all_includes) diff --git a/kcontrol/colors/Makefile.am b/kcontrol/colors/Makefile.am index c5d813d65..f21102eea 100644 --- a/kcontrol/colors/Makefile.am +++ b/kcontrol/colors/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_colors.la kcm_colors_la_SOURCES = colorscm.cpp widgetcanvas.cpp kcm_colors_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined -kcm_colors_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/kcontrol/krdb/libkrdb.la +kcm_colors_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/kcontrol/krdb/libkrdb.la METASOURCES = colorscm.moc widgetcanvas.moc noinst_HEADERS = colorscm.h widgetcanvas.h diff --git a/kcontrol/componentchooser/Makefile.am b/kcontrol/componentchooser/Makefile.am index 6abd5f414..3280ace2b 100644 --- a/kcontrol/componentchooser/Makefile.am +++ b/kcontrol/componentchooser/Makefile.am @@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kcm_componentchooser.la kcm_componentchooser_la_SOURCES = componentchooser_ui.ui componentconfig_ui.ui emailclientconfig_ui.ui terminalemulatorconfig_ui.ui browserconfig_ui.ui componentchooser.cpp kcm_componentchooser.cpp kcm_componentchooser_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_componentchooser_la_LIBADD = $(LIB_KIO) +kcm_componentchooser_la_LIBADD = $(LIB_TDEIO) xdg_apps_DATA = componentchooser.desktop diff --git a/kcontrol/crypto/Makefile.am b/kcontrol/crypto/Makefile.am index 84ef0a0cd..a2b600f44 100644 --- a/kcontrol/crypto/Makefile.am +++ b/kcontrol/crypto/Makefile.am @@ -6,7 +6,7 @@ kcm_crypto_la_SOURCES = crypto.cpp certexport.cpp kdatetimedlg.cpp AM_CXXFLAGS = $(CXXFLAGS) -DLIBDIR=$(libdir) kcm_crypto_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(SSL_LDFLAGS) -module -avoid-version -no-undefined -kcm_crypto_la_LIBADD = -ltdeui $(LIB_KIO) $(LIBSSL) +kcm_crypto_la_LIBADD = -ltdeui $(LIB_TDEIO) $(LIBSSL) METASOURCES = AUTO diff --git a/kcontrol/css/Makefile.am b/kcontrol/css/Makefile.am index 10d2f3d4f..95c093fdf 100644 --- a/kcontrol/css/Makefile.am +++ b/kcontrol/css/Makefile.am @@ -6,7 +6,7 @@ templatedir = $(kde_datadir)/kcmcss kde_module_LTLIBRARIES = kcm_css.la kcm_css_la_SOURCES = template.cpp cssconfig.ui csscustom.ui kcmcss.cpp preview.ui kcm_css_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_css_la_LIBADD = -ltdeui $(LIB_KIO) +kcm_css_la_LIBADD = -ltdeui $(LIB_TDEIO) METASOURCES = AUTO diff --git a/kcontrol/display/Makefile.am b/kcontrol/display/Makefile.am index 442639b38..00a10de02 100644 --- a/kcontrol/display/Makefile.am +++ b/kcontrol/display/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_display.la kcm_display_la_SOURCES = display.cpp kcm_display_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_display_la_LIBADD = $(LIB_KUTILS) +kcm_display_la_LIBADD = $(LIB_TDEUTILS) AM_CPPFLAGS = $(all_includes) METASOURCES = AUTO diff --git a/kcontrol/displayconfig/Makefile.am b/kcontrol/displayconfig/Makefile.am index a2c2607e4..cdeb29ea2 100644 --- a/kcontrol/displayconfig/Makefile.am +++ b/kcontrol/displayconfig/Makefile.am @@ -5,7 +5,7 @@ kcm_displayconfig_la_SOURCES = displayconfig.cpp displayconfigbase.ui displaycon kcm_displayconfig_la_LDFLAGS = $(all_libraries) -ltderandr -module -avoid-version -no-undefined -kcm_displayconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR) +kcm_displayconfig_la_LIBADD = -ltdeui $(LIB_TDEIO) $(LIB_XRANDR) METASOURCES = AUTO diff --git a/kcontrol/dnssd/Makefile.am b/kcontrol/dnssd/Makefile.am index da4ffdb5d..79c1698c2 100644 --- a/kcontrol/dnssd/Makefile.am +++ b/kcontrol/dnssd/Makefile.am @@ -5,7 +5,7 @@ kcm_tdednssd_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) kcm_tdednssd_la_SOURCES = configdialog.ui kcmdnssd.cpp kcmdnssd.h xdg_apps_DATA = kcm_tdednssd.desktop -kcm_tdednssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_TDEUI) +kcm_tdednssd_la_LIBADD = $(LIB_TDEDNSSD) $(LIB_TDEUI) messages: rc.cpp $(EXTRACTRC) *.ui *.rc >> rc.cpp diff --git a/kcontrol/ebrowsing/Makefile.am b/kcontrol/ebrowsing/Makefile.am index 87587fd4e..7f59498bd 100644 --- a/kcontrol/ebrowsing/Makefile.am +++ b/kcontrol/ebrowsing/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = kcm_kurifilt.la kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp kcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA) +kcm_kurifilt_la_LIBADD = $(LIB_TDESYCOCA) # Don't link this lib to the plugins. They are dlopened and linking to them # results in crashes when closing tdecmshell. # plugins/ikws/libkuriikwsfilter.la plugins/shorturi/libtdeshorturifilter.la diff --git a/kcontrol/ebrowsing/plugins/ikws/Makefile.am b/kcontrol/ebrowsing/plugins/ikws/Makefile.am index 4cdb46d42..6482d7a3e 100644 --- a/kcontrol/ebrowsing/plugins/ikws/Makefile.am +++ b/kcontrol/ebrowsing/plugins/ikws/Makefile.am @@ -9,10 +9,10 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libkuriikwsfilter.la libkurisearchfilter.la libkuriikwsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -libkuriikwsfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) +libkuriikwsfilter_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI) libkurisearchfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -libkurisearchfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) +libkurisearchfilter_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI) libkuriikwsfilter_la_SOURCES = kuriikwsfiltereng.cpp kuriikwsfilter.skel \ kuriikwsfilter.cpp searchprovider.cpp diff --git a/kcontrol/ebrowsing/plugins/localdomain/Makefile.am b/kcontrol/ebrowsing/plugins/localdomain/Makefile.am index 362aacbf5..e9713b8ef 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/Makefile.am +++ b/kcontrol/ebrowsing/plugins/localdomain/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = $(all_includes) -DQT_NO_CAST_ASCII kde_module_LTLIBRARIES = liblocaldomainurifilter.la liblocaldomainurifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -liblocaldomainurifilter_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) +liblocaldomainurifilter_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) liblocaldomainurifilter_la_SOURCES = localdomainurifilter.cpp localdomainurifilter.skel diff --git a/kcontrol/ebrowsing/plugins/shorturi/Makefile.am b/kcontrol/ebrowsing/plugins/shorturi/Makefile.am index fccf0ef62..c9ad8e085 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/Makefile.am +++ b/kcontrol/ebrowsing/plugins/shorturi/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = $(all_includes) -DQT_NO_CAST_ASCII kde_module_LTLIBRARIES = libtdeshorturifilter.la libtdeshorturifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -libtdeshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) +libtdeshorturifilter_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI) libtdeshorturifilter_la_SOURCES = tdeshorturifilter.cpp tdeshorturifilter.skel diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h index db3f1480f..1d48e7c2a 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h +++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _KSHORTURIFILTER_H_ -#define _KSHORTURIFILTER_H_ +#ifndef _TDESHORTURIFILTER_H_ +#define _TDESHORTURIFILTER_H_ #include <dcopobject.h> #include <kgenericfactory.h> diff --git a/kcontrol/energy/Makefile.am b/kcontrol/energy/Makefile.am index e7a9b24b9..7d42e5afa 100644 --- a/kcontrol/energy/Makefile.am +++ b/kcontrol/energy/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_energy.la kcm_energy_la_SOURCES = energy.cpp kcm_energy_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined -kcm_energy_la_LIBADD = $(DPMSLIB) $(LIB_TDEUI) $(LIB_KIO) +kcm_energy_la_LIBADD = $(DPMSLIB) $(LIB_TDEUI) $(LIB_TDEIO) METASOURCES = energy.moc noinst_HEADERS = energy.h diff --git a/kcontrol/filetypes/Makefile.am b/kcontrol/filetypes/Makefile.am index 31a1d60a2..d69f552f4 100644 --- a/kcontrol/filetypes/Makefile.am +++ b/kcontrol/filetypes/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = $(all_includes) -kcm_filetypes_la_LIBADD = libfiletypes.la $(LIB_KIO) +kcm_filetypes_la_LIBADD = libfiletypes.la $(LIB_TDEIO) kcm_filetypes_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) METASOURCES = AUTO @@ -20,8 +20,8 @@ libfiletypes_la_SOURCES = filetypesview.cpp filetypedetails.cpp filegroupdetails kserviceselectdlg.cpp keditfiletype_SOURCES = keditfiletype.cpp -keditfiletype_LDADD = libfiletypes.la $(LIB_KIO) -keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +keditfiletype_LDADD = libfiletypes.la $(LIB_TDEIO) +keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor messages: $(XGETTEXT) *.cpp -o $(podir)/filetypes.pot diff --git a/kcontrol/iccconfig/Makefile.am b/kcontrol/iccconfig/Makefile.am index 098e5aae1..1462fd428 100644 --- a/kcontrol/iccconfig/Makefile.am +++ b/kcontrol/iccconfig/Makefile.am @@ -5,7 +5,7 @@ kcm_iccconfig_la_SOURCES = iccconfig.cpp iccconfigbase.ui iccconfig.skel kcm_iccconfig_la_LDFLAGS = $(all_libraries) -ltderandr -module -avoid-version -no-undefined -kcm_iccconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR) +kcm_iccconfig_la_LIBADD = -ltdeui $(LIB_TDEIO) $(LIB_XRANDR) METASOURCES = AUTO diff --git a/kcontrol/icons/Makefile.am b/kcontrol/icons/Makefile.am index 6de8b72cf..87fd4f0d9 100644 --- a/kcontrol/icons/Makefile.am +++ b/kcontrol/icons/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_icons.la kcm_icons_la_SOURCES = iconthemes.cpp icons.cpp main.cpp kcm_icons_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined -kcm_icons_la_LIBADD = $(LIB_KIO) +kcm_icons_la_LIBADD = $(LIB_TDEIO) METASOURCES = AUTO diff --git a/kcontrol/input/Makefile.am b/kcontrol/input/Makefile.am index 840029c26..ec7a4ad8c 100644 --- a/kcontrol/input/Makefile.am +++ b/kcontrol/input/Makefile.am @@ -22,7 +22,7 @@ kde_module_LTLIBRARIES = kcm_input.la kcm_input_la_SOURCES = mouse.cpp kmousedlg.ui main.cpp logitechmouse.cpp logitechmouse_base.ui kcm_input_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_input_la_LIBADD = $(THEMEPAGE_LIB) $(XTESTLIB) $(LIB_KIO) $(LIB_XCURSOR) $(USB_LIBS) +kcm_input_la_LIBADD = $(THEMEPAGE_LIB) $(XTESTLIB) $(LIB_TDEIO) $(LIB_XCURSOR) $(USB_LIBS) METASOURCES = AUTO diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index d84d470b1..cdffbd1bd 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -269,7 +269,7 @@ void ThemePage::removeClicked() // theme with the same name, we shouldn't remove the theme from the list if it's // still available elsewhere. This could be solved by calling insertThemes() here, // but since TDEIO::del() is an asynchronos operation, the theme we're deleting will - // be readded to the list again before KIO has removed it. + // be readded to the list again before TDEIO has removed it. } diff --git a/kcontrol/ioslaveinfo/Makefile.am b/kcontrol/ioslaveinfo/Makefile.am index 75def7ba6..598f193f1 100644 --- a/kcontrol/ioslaveinfo/Makefile.am +++ b/kcontrol/ioslaveinfo/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_ioslaveinfo.la kcm_ioslaveinfo_la_SOURCES = kcmioslaveinfo.cpp kcm_ioslaveinfo_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_ioslaveinfo_la_LIBADD = -ltdeui $(LIB_KIO) +kcm_ioslaveinfo_la_LIBADD = -ltdeui $(LIB_TDEIO) AM_CPPFLAGS= $(all_includes) diff --git a/kcontrol/ioslaveinfo/ioslaveinfo.desktop b/kcontrol/ioslaveinfo/ioslaveinfo.desktop index 451ded7f4..f545071e3 100644 --- a/kcontrol/ioslaveinfo/ioslaveinfo.desktop +++ b/kcontrol/ioslaveinfo/ioslaveinfo.desktop @@ -97,7 +97,7 @@ Keywords[es]=Protocolo,Slaves de E/S,Slaves,Red,Información,Tiempo de expiraci Keywords[et]=protokoll,IO moodulid,moodulid,võrk,info,taimaut,aegumine Keywords[eu]=Protocol,IO morroiak,Morroiak,Sarea,Informazioa,Denbora-muga Keywords[fa]=قرارداد، IO slaves، Slaves، شبکه، اطلاعات، اتمام وقت -Keywords[fi]=Protokolla,Yhteyskäytäntö,KIO,KIO-palvelu,Verkko,Aikavalvonta,aikakatkaisu +Keywords[fi]=Protokolla,Yhteyskäytäntö,TDEIO,TDEIO-palvelu,Verkko,Aikavalvonta,aikakatkaisu Keywords[fr]=protocole,modules,entrées/sorties,réseau,informations,délai Keywords[fy]=protocol,IO slaves,slaves,network,ynformaasje,timeout,netwurk,tiidslimyt Keywords[gl]=Protocolo,escravos IO,Escravos,Rede,Información,Tempo de agarda,Timeout diff --git a/kcontrol/kcontrol/Makefile.am b/kcontrol/kcontrol/Makefile.am index 9de9b6f15..9ae27d42f 100644 --- a/kcontrol/kcontrol/Makefile.am +++ b/kcontrol/kcontrol/Makefile.am @@ -32,7 +32,7 @@ kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \ moduleIface.cpp moduleIface.skel global.cpp modules.cpp \ proxywidget.cpp kcrootonly.cpp searchwidget.cpp -kcontrol_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) $(LIB_TDEHTML) +kcontrol_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS) $(LIB_TDEHTML) kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version rccontroldir = $(kde_datadir)/kcontrol diff --git a/kcontrol/kded/Makefile.am b/kcontrol/kded/Makefile.am index af2d54142..e631b7271 100644 --- a/kcontrol/kded/Makefile.am +++ b/kcontrol/kded/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_kded.la kcm_kded_la_SOURCES = kcmkded.cpp kcm_kded_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_kded_la_LIBADD = $(LIB_KIO) +kcm_kded_la_LIBADD = $(LIB_TDEIO) AM_CPPFLAGS= $(all_includes) diff --git a/kcontrol/keys/tdeaccelaction.h b/kcontrol/keys/tdeaccelaction.h index 5cc6ca02a..f95a50157 100644 --- a/kcontrol/keys/tdeaccelaction.h +++ b/kcontrol/keys/tdeaccelaction.h @@ -20,8 +20,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KACCELACTION_H -#define _KACCELACTION_H +#ifndef _TDEACCELACTION_H +#define _TDEACCELACTION_H #include <tqmap.h> #include <tqptrvector.h> @@ -202,4 +202,4 @@ class TDEAccelActions friend class TDEAccelBase; }; -#endif // _KACCELACTION_H +#endif // _TDEACCELACTION_H diff --git a/kcontrol/kicker/Makefile.am b/kcontrol/kicker/Makefile.am index 2fa9a2ad9..78d010738 100644 --- a/kcontrol/kicker/Makefile.am +++ b/kcontrol/kicker/Makefile.am @@ -7,7 +7,7 @@ kcm_kicker_la_SOURCES = positiontab.ui hidingtab.ui lookandfeeltab.ui menutab.ui positionconfig.cpp hidingconfig.cpp menuconfig.cpp lookandfeelconfig.cpp kcm_kicker_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_kicker_la_LIBADD = $(top_builddir)/kicker/libkicker/libkickermain.la ../background/libbgnd.la $(LIB_KIO) $(LIB_KUTILS) +kcm_kicker_la_LIBADD = $(top_builddir)/kicker/libkicker/libkickermain.la ../background/libbgnd.la $(LIB_TDEIO) $(LIB_TDEUTILS) AM_CPPFLAGS = -I$(top_srcdir)/kicker/kicker/core -I$(top_srcdir)/kicker/libkicker \ -I$(top_builddir)/kicker/libkicker -I$(srcdir)/../background $(all_includes) diff --git a/kcontrol/knotify/Makefile.am b/kcontrol/knotify/Makefile.am index 1fc878b67..ffe9e0525 100644 --- a/kcontrol/knotify/Makefile.am +++ b/kcontrol/knotify/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_knotify.la kcm_knotify_la_SOURCES = knotify.cpp playersettings.ui kcm_knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_knotify_la_LIBADD = $(LIB_KIO) +kcm_knotify_la_LIBADD = $(LIB_TDEIO) AM_CPPFLAGS = $(all_includes) METASOURCES = AUTO diff --git a/kcontrol/konq/Makefile.am b/kcontrol/konq/Makefile.am index 2dddd9426..a42ac90d8 100644 --- a/kcontrol/konq/Makefile.am +++ b/kcontrol/konq/Makefile.am @@ -11,7 +11,7 @@ kcm_konq_la_SOURCES = behaviour.cpp desktop.cpp rootopts.cpp \ desktopbehavior.ui kcm_konq_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_KSYCOCA) $(LIB_KUTILS) +kcm_konq_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDESYCOCA) $(LIB_TDEUTILS) kcm_konq_la_DATA = overlapping.png onlyone.png kcm_konq_ladir = $(kde_datadir)/kcontrol/pics diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp index e21910594..6a702559e 100644 --- a/kcontrol/konqhtml/javaopts.cpp +++ b/kcontrol/konqhtml/javaopts.cpp @@ -86,7 +86,7 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group, grid->addWidget( javaSecurityManagerCB, 0, 0 ); connect( javaSecurityManagerCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) ); - useKioCB = new TQCheckBox( i18n("Use &KIO"), checkboxes ); + useKioCB = new TQCheckBox( i18n("Use &TDEIO"), checkboxes ); grid->addWidget( useKioCB, 0, 1 ); connect( useKioCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) ); @@ -158,7 +158,7 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group, "policytool utility to give code downloaded from certain sites more " "permissions." ) ); - TQWhatsThis::add( useKioCB, i18n( "Enabling this will cause the jvm to use KIO for network transport ") ); + TQWhatsThis::add( useKioCB, i18n( "Enabling this will cause the jvm to use TDEIO for network transport ") ); TQWhatsThis::add( pathED, i18n("Enter the path to the java executable. If you want to use the jre in " "your path, simply leave it as 'java'. If you need to use a different jre, " diff --git a/kcontrol/konsole/Makefile.am b/kcontrol/konsole/Makefile.am index 91be65e2a..f45149ed7 100644 --- a/kcontrol/konsole/Makefile.am +++ b/kcontrol/konsole/Makefile.am @@ -4,7 +4,7 @@ kcm_konsole_la_SOURCES = schemaeditor.cpp sessioneditor.cpp kcmkonsole.cpp \ schemadialog.ui sessiondialog.ui kcmkonsoledialog.ui kcm_konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_konsole_la_LIBADD = -ltdeui $(LIB_KIO) +kcm_konsole_la_LIBADD = -ltdeui $(LIB_TDEIO) AM_CPPFLAGS = $(all_includes) METASOURCES = AUTO diff --git a/kcontrol/kthememanager/Makefile.am b/kcontrol/kthememanager/Makefile.am index be71094cb..cbc241dd9 100644 --- a/kcontrol/kthememanager/Makefile.am +++ b/kcontrol/kthememanager/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kcm_kthememanager.la kcm_kthememanager_la_SOURCES = kthemedlg.ui newthemewidget.ui knewthemedlg.cpp ktheme.cpp kthememanager.cpp -kcm_kthememanager_la_LIBADD = $(LIB_KIO) +kcm_kthememanager_la_LIBADD = $(LIB_TDEIO) kcm_kthememanager_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module noinst_HEADERS = kthememanager.h ktheme.h knewthemedlg.h kthemedlg.ui.h diff --git a/kcontrol/locale/Makefile.am b/kcontrol/locale/Makefile.am index 6872f1436..0eaa24ae4 100644 --- a/kcontrol/locale/Makefile.am +++ b/kcontrol/locale/Makefile.am @@ -10,7 +10,7 @@ METASOURCES = AUTO noinst_HEADERS = toplevel.h kcmlocale.h klocalesample.h localenum.h localemon.h localetime.h localeother.h kcm_locale_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined -kcm_locale_la_LIBADD = $(LIB_KIO) +kcm_locale_la_LIBADD = $(LIB_TDEIO) # Note: newer glibc (e.g. zonetab version 1.31 (cvs revision 1.22) have more/other data than older ones (e.g. zonetab version 1.28) diff --git a/kcontrol/nics/Makefile.am b/kcontrol/nics/Makefile.am index 6bcf92088..7e1cd0ee9 100644 --- a/kcontrol/nics/Makefile.am +++ b/kcontrol/nics/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_nic.la kcm_nic_la_SOURCES = nic.cpp kcm_nic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_nic_la_LIBADD = -ltdeui $(LIB_KIO) $(LIBSOCKET) +kcm_nic_la_LIBADD = -ltdeui $(LIB_TDEIO) $(LIBSOCKET) AM_CPPFLAGS= $(all_includes) diff --git a/kcontrol/randr/Makefile.am b/kcontrol/randr/Makefile.am index 7a5357c63..cb28fd1c2 100644 --- a/kcontrol/randr/Makefile.am +++ b/kcontrol/randr/Makefile.am @@ -30,7 +30,7 @@ bin_PROGRAMS = tderandrtray tderandrtray_SOURCES = main.cpp tderandrtray.cpp tderandrapp.cpp tderandrpassivepopup.cpp configdialog.cpp tderandrtray_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltderandr -tderandrtray_LDADD = $(LIB_TDEFILE) $(LIB_KUTILS) $(LIB_XRANDR) +tderandrtray_LDADD = $(LIB_TDEFILE) $(LIB_TDEUTILS) $(LIB_XRANDR) messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/tderandr.pot diff --git a/kcontrol/samba/Makefile.am b/kcontrol/samba/Makefile.am index 42c3f6618..4eabf0d8d 100644 --- a/kcontrol/samba/Makefile.am +++ b/kcontrol/samba/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_samba.la kcm_samba_la_SOURCES = main.cpp ksmbstatus.cpp kcmsambaimports.cpp kcmsambalog.cpp kcmsambastatistics.cpp kcm_samba_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_samba_la_LIBADD = $(LIB_KIO) +kcm_samba_la_LIBADD = $(LIB_TDEIO) AM_CPPFLAGS = $(all_includes) diff --git a/kcontrol/screensaver/Makefile.am b/kcontrol/screensaver/Makefile.am index 995b29626..cf79d11b6 100644 --- a/kcontrol/screensaver/Makefile.am +++ b/kcontrol/screensaver/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_screensaver.la kcm_screensaver_la_SOURCES = advanceddialogimpl.ui scrnsave.cpp testwin.cpp saverlist.cpp \ saverconfig.cpp advanceddialog.cpp kswidget.cpp kcm_screensaver_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined -kcm_screensaver_la_LIBADD = $(LIB_KSYCOCA) $(DPMSLIB) $(GLLIB) +kcm_screensaver_la_LIBADD = $(LIB_TDESYCOCA) $(DPMSLIB) $(GLLIB) METASOURCES = AUTO noinst_HEADERS = scrnsave.h diff --git a/kcontrol/smartcard/Makefile.am b/kcontrol/smartcard/Makefile.am index ee2546c66..61d49dfb2 100644 --- a/kcontrol/smartcard/Makefile.am +++ b/kcontrol/smartcard/Makefile.am @@ -5,7 +5,7 @@ kcm_smartcard_la_SOURCES = smartcard.cpp smartcardbase.ui nosmartcardbase.ui sma kcm_smartcard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_smartcard_la_LIBADD = -ltdeui -lksmartcard $(LIB_KIO) +kcm_smartcard_la_LIBADD = -ltdeui -lksmartcard $(LIB_TDEIO) METASOURCES = AUTO diff --git a/kcontrol/style/Makefile.am b/kcontrol/style/Makefile.am index 27f38de72..6029c770f 100644 --- a/kcontrol/style/Makefile.am +++ b/kcontrol/style/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_style.la kcm_style_la_SOURCES = kcmstyle.cpp stylepreview.ui menupreview.cpp styleconfdialog.cpp kcm_style_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined -kcm_style_la_LIBADD = $(LIB_KIO) ../krdb/libkrdb.la +kcm_style_la_LIBADD = $(LIB_TDEIO) ../krdb/libkrdb.la METASOURCES = AUTO noinst_HEADERS = kcmstyle.h stylepreview.h menupreview.h diff --git a/kcontrol/tdefontinst/Makefile.am b/kcontrol/tdefontinst/Makefile.am index f81ef525a..2cea3e766 100644 --- a/kcontrol/tdefontinst/Makefile.am +++ b/kcontrol/tdefontinst/Makefile.am @@ -3,7 +3,7 @@ FONTINST_TN_SUBDIR=thumbnail FONTINST_VP_SUBDIR=viewpart endif -SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin tdefontinst kio +SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin tdefontinst tdeio EXTRA_DIST = TODO diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp index 9f939324a..cbe8eed5f 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp @@ -146,7 +146,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) TQString previousPath=itsConfig.readEntry(CFG_PATH); - itsDirOp = new KDirOperator(Misc::root() ? TQString("fonts:/") : TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER), + itsDirOp = new KDirOperator(Misc::root() ? TQString("fonts:/") : TQString("fonts:/")+i18n(KFI_TDEIO_FONTS_USER), fontsFrame); itsDirOp->setViewConfig(&itsConfig, "ListView Settings"); itsDirOp->setMinimumSize(TQSize(96, 64)); @@ -439,7 +439,7 @@ void CKCmFontInst::removeFonts() { KURL url((*it)->url()); - url.setQuery(KFI_KIO_NO_CLEAR); + url.setQuery(KFI_TDEIO_NO_CLEAR); files.append((*it)->text()); urls.append(url); } @@ -596,7 +596,7 @@ void CKCmFontInst::delResult(TDEIO::Job *job) stream << KFI::SPECIAL_RESCAN; - TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this); + TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_TDEIO_FONTS_PROTOCOL ":/", packedArgs), this); jobResult(job); } diff --git a/kcontrol/tdefontinst/kcmfontinst/Makefile.am b/kcontrol/tdefontinst/kcmfontinst/Makefile.am index b6e658096..3c6d21940 100644 --- a/kcontrol/tdefontinst/kcmfontinst/Makefile.am +++ b/kcontrol/tdefontinst/kcmfontinst/Makefile.am @@ -4,7 +4,7 @@ FONTINST_PRINT_LIB=../viewpart/libtdefontinstprint.la endif kde_module_LTLIBRARIES = kcm_fontinst.la -kcm_fontinst_la_LIBADD = $(LIB_KIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libtdefontinst.la +kcm_fontinst_la_LIBADD = $(LIB_TDEIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libtdefontinst.la METASOURCES = AUTO kcm_fontinst_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined AM_CPPFLAGS = -I$(srcdir)/../lib $(FONTINST_PRINT_INC) -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) diff --git a/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp index 4840b7219..8ac0d9bc2 100644 --- a/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp @@ -90,7 +90,7 @@ void CSettingsDialog::slotOk() stream << KFI::SPECIAL_RECONFIG; - TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this); + TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_TDEIO_FONTS_PROTOCOL ":/", packedArgs), this); } hide(); diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp index ab89689d9..1956a34a6 100644 --- a/kcontrol/tdefontinst/lib/FcEngine.cpp +++ b/kcontrol/tdefontinst/lib/FcEngine.cpp @@ -909,7 +909,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all) // fonts:/System/times.ttf // file:/home/wibble/hmm.ttf // - if(KFI_KIO_FONTS_PROTOCOL==url.protocol()) + if(KFI_TDEIO_FONTS_PROTOCOL==url.protocol()) { TDEIO::UDSEntry udsEntry; TQString name; @@ -948,7 +948,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all) TQTextStream stream(&file); thumbUrl=stream.readLine(); - isThumbnailUrl=0==thumbUrl.find(KFI_KIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all); + isThumbnailUrl=0==thumbUrl.find(KFI_TDEIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all); file.close(); } diff --git a/kcontrol/tdefontinst/lib/KfiConstants.h b/kcontrol/tdefontinst/lib/KfiConstants.h index 5e8633539..06688c6d5 100644 --- a/kcontrol/tdefontinst/lib/KfiConstants.h +++ b/kcontrol/tdefontinst/lib/KfiConstants.h @@ -6,10 +6,10 @@ #define KFI_CATALOGUE "tdefontinst" // io-slave -#define KFI_KIO_FONTS_PROTOCOL "fonts" -#define KFI_KIO_FONTS_USER I18N_NOOP("Personal") -#define KFI_KIO_FONTS_SYS I18N_NOOP("System") -#define KFI_KIO_NO_CLEAR "?noclear" +#define KFI_TDEIO_FONTS_PROTOCOL "fonts" +#define KFI_TDEIO_FONTS_USER I18N_NOOP("Personal") +#define KFI_TDEIO_FONTS_SYS I18N_NOOP("System") +#define KFI_TDEIO_NO_CLEAR "?noclear" // Config #define KFI_UI_CFG_FILE KFI_CATALOGUE"uirc" diff --git a/kcontrol/tdefontinst/lib/Makefile.am b/kcontrol/tdefontinst/lib/Makefile.am index a0ecdfbbf..dca66c639 100644 --- a/kcontrol/tdefontinst/lib/Makefile.am +++ b/kcontrol/tdefontinst/lib/Makefile.am @@ -9,6 +9,6 @@ Misc.h \ FcEngine.h \ KfiConstants.h -libtdefontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB) +libtdefontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_TDEIO) $(LIBXFT_LIB) libtdefontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE diff --git a/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp b/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp index 6cbeb5b3b..0456c1d3d 100644 --- a/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp +++ b/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp @@ -320,7 +320,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what) slantAll; KURL url(info.url()); TQString fName; - bool fontsProt = KFI_KIO_FONTS_PROTOCOL == url.protocol(), + bool fontsProt = KFI_TDEIO_FONTS_PROTOCOL == url.protocol(), fileProt = "file" == url.protocol(), downloaded = false, status = false; diff --git a/kcontrol/tdefontinst/tdefile-plugin/Makefile.am b/kcontrol/tdefontinst/tdefile-plugin/Makefile.am index a7f829214..04ff87062 100644 --- a/kcontrol/tdefontinst/tdefile-plugin/Makefile.am +++ b/kcontrol/tdefontinst/tdefile-plugin/Makefile.am @@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = tdefile_font.la tdefile_font_la_SOURCES = KFileFont.cpp tdefile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) -tdefile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libtdefontinst.la +tdefile_font_la_LIBADD = $(LIB_TDEIO) $(LIBFREETYPE_LIBS) ../lib/libtdefontinst.la kdelnkdir = $(kde_servicesdir) kde_services_DATA = tdefile_font.desktop diff --git a/kcontrol/tdefontinst/tdefontinst/Makefile.am b/kcontrol/tdefontinst/tdefontinst/Makefile.am index a8b782b85..ae4733ff5 100644 --- a/kcontrol/tdefontinst/tdefontinst/Makefile.am +++ b/kcontrol/tdefontinst/tdefontinst/Makefile.am @@ -11,6 +11,6 @@ FontEngine.h \ Fontmap.h \ XConfig.h -tdefontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIBZ) $(LIB_KIO) ../lib/libtdefontinst.la +tdefontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIBZ) $(LIB_TDEIO) ../lib/libtdefontinst.la tdefontinst_LDFLAGS = $(all_libraries) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_RPATH) AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp index 949b0d4cb..54de7bdcf 100644 --- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp +++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp @@ -104,13 +104,13 @@ int kdemain(int argc, char **argv) { if (argc != 4) { - fprintf(stderr, "Usage: tdeio_" KFI_KIO_FONTS_PROTOCOL " protocol domain-socket1 domain-socket2\n"); + fprintf(stderr, "Usage: tdeio_" KFI_TDEIO_FONTS_PROTOCOL " protocol domain-socket1 domain-socket2\n"); exit(-1); } TDELocale::setMainCatalogue(KFI_CATALOGUE); - TDEInstance instance("tdeio_" KFI_KIO_FONTS_PROTOCOL); + TDEInstance instance("tdeio_" KFI_TDEIO_FONTS_PROTOCOL); KFI::CKioFonts slave(argv[2], argv[3]); slave.dispatchLoop(); @@ -123,12 +123,12 @@ namespace KFI inline bool isSysFolder(const TQString §) { - return i18n(KFI_KIO_FONTS_SYS)==sect || KFI_KIO_FONTS_SYS==sect; + return i18n(KFI_TDEIO_FONTS_SYS)==sect || KFI_TDEIO_FONTS_SYS==sect; } inline bool isUserFolder(const TQString §) { - return i18n(KFI_KIO_FONTS_USER)==sect || KFI_KIO_FONTS_USER==sect; + return i18n(KFI_TDEIO_FONTS_USER)==sect || KFI_TDEIO_FONTS_USER==sect; } static TQString removeMultipleExtension(const KURL &url) @@ -289,10 +289,10 @@ static bool createFolderUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, c addAtom(entry, TDEIO::UDS_ACCESS_TIME, buff.st_atime); addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, sys - ? KFI_KIO_FONTS_PROTOCOL"/system-folder" - : KFI_KIO_FONTS_PROTOCOL"/folder"); + ? KFI_TDEIO_FONTS_PROTOCOL"/system-folder" + : KFI_TDEIO_FONTS_PROTOCOL"/folder"); addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); - TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/")); + TQString url(KFI_TDEIO_FONTS_PROTOCOL+TQString::fromLatin1(":/")); return true; } else if (sys && !Misc::root()) // Default system fonts folder does not actually exist yet! @@ -303,7 +303,7 @@ static bool createFolderUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, c addAtom(entry, TDEIO::UDS_ACCESS, 0744); addAtom(entry, TDEIO::UDS_USER, 0, "root"); addAtom(entry, TDEIO::UDS_GROUP, 0, "root"); - addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KFI_KIO_FONTS_PROTOCOL"/system-folder"); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KFI_TDEIO_FONTS_PROTOCOL"/system-folder"); addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); return true; @@ -393,11 +393,11 @@ static bool createFontUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, TQV addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name()); addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); - TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/")); + TQString url(KFI_TDEIO_FONTS_PROTOCOL+TQString::fromLatin1(":/")); if(!Misc::root()) { - url+=sys ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER); + url+=sys ? i18n(KFI_TDEIO_FONTS_SYS) : i18n(KFI_TDEIO_FONTS_USER); url+=TQString::fromLatin1("/"); } if(multiple) @@ -706,7 +706,7 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma } CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app) - : TDEIO::SlaveBase(KFI_KIO_FONTS_PROTOCOL, pool, app), + : TDEIO::SlaveBase(KFI_TDEIO_FONTS_PROTOCOL, pool, app), itsRoot(Misc::root()), itsUsingFcFpe(false), itsUsingXfsFpe(false), @@ -855,9 +855,9 @@ void CKioFonts::listDir(const KURL &url) { size=2; totalSize(size); - createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_USER), itsFolders[FOLDER_USER].location, false); + createFolderUDSEntry(entry, i18n(KFI_TDEIO_FONTS_USER), itsFolders[FOLDER_USER].location, false); listEntry(entry, false); - createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_SYS), itsFolders[FOLDER_SYS].location, true); + createFolderUDSEntry(entry, i18n(KFI_TDEIO_FONTS_SYS), itsFolders[FOLDER_SYS].location, true); listEntry(entry, false); } @@ -896,13 +896,13 @@ void CKioFonts::stat(const KURL &url) err=!createStatEntry(entry, url, FOLDER_SYS); else if(isUserFolder(pathList[0])) - err=!createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_USER), itsFolders[FOLDER_USER].location, false); + err=!createFolderUDSEntry(entry, i18n(KFI_TDEIO_FONTS_USER), itsFolders[FOLDER_USER].location, false); else if(isSysFolder(pathList[0])) - err=!createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_SYS), itsFolders[FOLDER_USER].location, true); + err=!createFolderUDSEntry(entry, i18n(KFI_TDEIO_FONTS_SYS), itsFolders[FOLDER_USER].location, true); else { error(TDEIO::ERR_SLAVE_DEFINED, - i18n("Please specify \"%1\" or \"%2\".").arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); + i18n("Please specify \"%1\" or \"%2\".").arg(i18n(KFI_TDEIO_FONTS_USER)).arg(i18n(KFI_TDEIO_FONTS_SYS))); return; } break; @@ -1098,7 +1098,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume) if(passwd.isEmpty()) { - error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS))); + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS))); return; } } @@ -1150,7 +1150,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume) } else { - error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS))); + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS))); return; } } @@ -1165,7 +1165,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume) } else { - error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_USER))); + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_USER))); return; } } @@ -1317,7 +1317,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite) return; } - bool fromFonts=KFI_KIO_FONTS_PROTOCOL==src.protocol(); + bool fromFonts=KFI_TDEIO_FONTS_PROTOCOL==src.protocol(); if((!fromFonts || updateFontList()) // CPD: dont update font list upon a copy from file - is too slow. Just stat on filename! && checkUrl(src) && checkAllowed(src)) @@ -1390,7 +1390,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite) } else { - error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS))); + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS))); return; } } @@ -1595,7 +1595,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite) } else { - error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS))); + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS))); return; } } @@ -1619,7 +1619,7 @@ void CKioFonts::del(const KURL &url, bool) TQValueList<FcPattern *>::Iterator it, end=entries->end(); CDirList modifiedDirs; - bool clearList=KFI_KIO_NO_CLEAR!=url.query(); + bool clearList=KFI_TDEIO_NO_CLEAR!=url.query(); if(nonRootSys(url)) { @@ -1656,7 +1656,7 @@ void CKioFonts::del(const KURL &url, bool) if(doRootCmd(cmd)) modified(FOLDER_SYS, clearList, modifiedDirs); else - error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS))); + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS))); } else { @@ -1905,7 +1905,7 @@ TQString CKioFonts::getRootPasswd(bool askPasswd) int attempts=0; TQString errorMsg; - authInfo.url=KURL(KFI_KIO_FONTS_PROTOCOL ":///"); + authInfo.url=KURL(KFI_TDEIO_FONTS_PROTOCOL ":///"); authInfo.username=SYS_USER; authInfo.keepPassword=true; @@ -1964,19 +1964,19 @@ bool CKioFonts::confirmUrl(KURL &url) "case the font will only be usable by you), or \"%2\" (" "the font will be usable by all users - but you will " "need to know the administrator's password)?") - .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)), - i18n("Where to Install"), i18n(KFI_KIO_FONTS_USER), - i18n(KFI_KIO_FONTS_SYS)); + .arg(i18n(KFI_TDEIO_FONTS_USER)).arg(i18n(KFI_TDEIO_FONTS_SYS)), + i18n("Where to Install"), i18n(KFI_TDEIO_FONTS_USER), + i18n(KFI_TDEIO_FONTS_SYS)); if(changeToSystem) { itsLastDest=DEST_SYS; - url.setPath(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+url.fileName()); + url.setPath(TQChar('/')+i18n(KFI_TDEIO_FONTS_SYS)+TQChar('/')+url.fileName()); } else { itsLastDest=DEST_USER; - url.setPath(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+url.fileName()); + url.setPath(TQChar('/')+i18n(KFI_TDEIO_FONTS_USER)+TQChar('/')+url.fileName()); } KFI_DBUG << "Changed URL to:" << url.path() << endl; @@ -2150,7 +2150,7 @@ bool CKioFonts::checkFile(const TQString &file) bool CKioFonts::getSourceFiles(const KURL &src, TQStringList &files) { - if(KFI_KIO_FONTS_PROTOCOL==src.protocol()) + if(KFI_TDEIO_FONTS_PROTOCOL==src.protocol()) { TQValueList<FcPattern *> *entries=getEntries(src); @@ -2275,7 +2275,7 @@ bool CKioFonts::checkDestFiles(const KURL &src, TQMap<TQString, TQString> &map, // (such as there would be for a TTC font), then ask the user for confirmation of the action. bool CKioFonts::confirmMultiple(const KURL &url, const TQStringList &files, EFolder folder, EOp op) { - if(KFI_KIO_FONTS_PROTOCOL!=url.protocol()) + if(KFI_TDEIO_FONTS_PROTOCOL!=url.protocol()) return true; TQStringList::ConstIterator it, @@ -2330,7 +2330,7 @@ bool CKioFonts::confirmMultiple(const KURL &url, const TQStringList &files, EFol bool CKioFonts::confirmMultiple(const KURL &url, TQValueList<FcPattern *> *patterns, EFolder folder, EOp op) { - if(KFI_KIO_FONTS_PROTOCOL!=url.protocol()) + if(KFI_TDEIO_FONTS_PROTOCOL!=url.protocol()) return true; TQStringList files; @@ -2349,7 +2349,7 @@ bool CKioFonts::confirmMultiple(const KURL &url, TQValueList<FcPattern *> *patte bool CKioFonts::checkUrl(const KURL &u, bool rootOk) { - if(KFI_KIO_FONTS_PROTOCOL==u.protocol() && (!rootOk || (rootOk && "/"!=u.path()))) + if(KFI_TDEIO_FONTS_PROTOCOL==u.protocol() && (!rootOk || (rootOk && "/"!=u.path()))) { TQString sect(getSect(u.path())); @@ -2369,7 +2369,7 @@ bool CKioFonts::checkUrl(const KURL &u, bool rootOk) if(!isSysFolder(sect) && !isUserFolder(sect)) { error(TDEIO::ERR_SLAVE_DEFINED, i18n("Please specify \"%1\" or \"%2\".") - .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); + .arg(i18n(KFI_TDEIO_FONTS_USER)).arg(i18n(KFI_TDEIO_FONTS_SYS))); return false; } } @@ -2379,17 +2379,17 @@ bool CKioFonts::checkUrl(const KURL &u, bool rootOk) bool CKioFonts::checkAllowed(const KURL &u) { - if (KFI_KIO_FONTS_PROTOCOL==u.protocol()) + if (KFI_TDEIO_FONTS_PROTOCOL==u.protocol()) { TQString ds(Misc::dirSyntax(u.path())); - if(ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')) || - ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')) || - ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) || - ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/'))) + if(ds==TQString(TQChar('/')+i18n(KFI_TDEIO_FONTS_USER)+TQChar('/')) || + ds==TQString(TQChar('/')+i18n(KFI_TDEIO_FONTS_SYS)+TQChar('/')) || + ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_TDEIO_FONTS_USER)+TQChar('/')) || + ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_TDEIO_FONTS_SYS)+TQChar('/'))) { error(TDEIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".") - .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \ + .arg(i18n(KFI_TDEIO_FONTS_USER)).arg(i18n(KFI_TDEIO_FONTS_SYS))); \ return false; } } diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.h b/kcontrol/tdefontinst/tdeio/KioFonts.h index 4f3c465d2..52516fe62 100644 --- a/kcontrol/tdefontinst/tdeio/KioFonts.h +++ b/kcontrol/tdefontinst/tdeio/KioFonts.h @@ -1,5 +1,5 @@ -#ifndef __KIO_FONTS_H__ -#define __KIO_FONTS_H__ +#ifndef __TDEIO_FONTS_H__ +#define __TDEIO_FONTS_H__ //////////////////////////////////////////////////////////////////////////////// // diff --git a/kcontrol/tdefontinst/tdeio/Makefile.am b/kcontrol/tdefontinst/tdeio/Makefile.am index bde654358..f5c48c9ac 100644 --- a/kcontrol/tdefontinst/tdeio/Makefile.am +++ b/kcontrol/tdefontinst/tdeio/Makefile.am @@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = tdeio_fonts.la tdeio_fonts_la_SOURCES = \ KioFonts.cpp -tdeio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libtdefontinst.la +tdeio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_TDEIO) -ltdesu ../lib/libtdefontinst.la tdeio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE diff --git a/kcontrol/tdefontinst/thumbnail/Makefile.am b/kcontrol/tdefontinst/thumbnail/Makefile.am index d9005a335..7eaacbf2f 100644 --- a/kcontrol/tdefontinst/thumbnail/Makefile.am +++ b/kcontrol/tdefontinst/thumbnail/Makefile.am @@ -1,7 +1,7 @@ kde_module_LTLIBRARIES = fontthumbnail.la fontthumbnail_la_SOURCES = FontThumbnail.cpp -fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_KIO) ../lib/libtdefontinst.la +fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_TDEIO) ../lib/libtdefontinst.la fontthumbnail_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) METASOURCES = AUTO diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp index 2f289649b..e31510ad3 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp @@ -59,7 +59,7 @@ static KURL getDest(const KURL &url, bool system) { return KURL(KFI::Misc::root() ? TQString("fonts:/") + url.fileName() - : TQString("fonts:/") + TQString(system ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER)) + : TQString("fonts:/") + TQString(system ? i18n(KFI_TDEIO_FONTS_SYS) : i18n(KFI_TDEIO_FONTS_USER)) + TQChar('/') + url.fileName()); } @@ -122,7 +122,7 @@ bool CFontViewPart::openURL(const KURL &url) if (!url.isValid() || !closeURL()) return false; - if(KFI_KIO_FONTS_PROTOCOL==url.protocol() || url.isLocalFile()) + if(KFI_TDEIO_FONTS_PROTOCOL==url.protocol() || url.isLocalFile()) { m_url=url; emit started(0); @@ -150,7 +150,7 @@ bool CFontViewPart::openFile() void CFontViewPart::timeout() { bool showFs=false, - isFonts=KFI_KIO_FONTS_PROTOCOL==m_url.protocol(); + isFonts=KFI_TDEIO_FONTS_PROTOCOL==m_url.protocol(); itsShowInstallButton=false; @@ -169,12 +169,12 @@ void CFontViewPart::timeout() } else { - destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url); + destUrl=TQString("fonts:/")+i18n(KFI_TDEIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url); if(TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget())) itsShowInstallButton=false; else { - destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url); + destUrl=TQString("fonts:/")+i18n(KFI_TDEIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url); itsShowInstallButton=!TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()); } } @@ -198,7 +198,7 @@ void CFontViewPart::previewStatus(bool st) itsInstallButton->setShown(st && itsShowInstallButton); itsToolsFrame->setShown(itsInstallButton->isShown()||itsFaceSelector->isShown()); itsChangeTextAction->setEnabled(st); - itsPrintAction->setEnabled(st && KFI_KIO_FONTS_PROTOCOL==m_url.protocol()); + itsPrintAction->setEnabled(st && KFI_TDEIO_FONTS_PROTOCOL==m_url.protocol()); } void CFontViewPart::install() @@ -211,10 +211,10 @@ void CFontViewPart::install() "password)") .arg(itsPreview->engine().getName(m_url)) .arg(m_url.fileName()) - .arg(i18n(KFI_KIO_FONTS_USER)) - .arg(i18n(KFI_KIO_FONTS_SYS)), - i18n("Install"), i18n(KFI_KIO_FONTS_USER), - i18n(KFI_KIO_FONTS_SYS)); + .arg(i18n(KFI_TDEIO_FONTS_USER)) + .arg(i18n(KFI_TDEIO_FONTS_SYS)), + i18n("Install"), i18n(KFI_TDEIO_FONTS_USER), + i18n(KFI_TDEIO_FONTS_SYS)); if(KMessageBox::Cancel!=resp) { diff --git a/kcontrol/tdefontinst/viewpart/Makefile.am b/kcontrol/tdefontinst/viewpart/Makefile.am index 22403916d..c088942da 100644 --- a/kcontrol/tdefontinst/viewpart/Makefile.am +++ b/kcontrol/tdefontinst/viewpart/Makefile.am @@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = libtdefontviewpart.la libtdefontviewpart_la_SOURCES = FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp libtdefontviewpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -libtdefontviewpart_la_LIBADD = $(LIB_KPARTS) libtdefontinstprint.la ../lib/libtdefontinst.la +libtdefontviewpart_la_LIBADD = $(LIB_TDEPARTS) libtdefontinstprint.la ../lib/libtdefontinst.la noinst_HEADERS = FontViewPart.h FontViewPartFactory.h FontPreview.h FontViewerApp.h KfiPrint.h @@ -16,8 +16,8 @@ kde_services_DATA = tdefontviewpart.desktop AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) METASOURCES = AUTO -tdefontview_LDADD = $(LIB_KPARTS) -tdefontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdefontview_LDADD = $(LIB_TDEPARTS) +tdefontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor bin_PROGRAMS = tdefontview xdg_apps_DATA = tdefontview.desktop diff --git a/kcontrol/tdeio/Makefile.am b/kcontrol/tdeio/Makefile.am index 8252bc487..3bebf748d 100644 --- a/kcontrol/tdeio/Makefile.am +++ b/kcontrol/tdeio/Makefile.am @@ -17,7 +17,7 @@ kcm_tdeio_la_SOURCES = policydlg.cpp kcookiesmain.cpp kcookiespolicies.cpp \ manualproxy_ui.ui envvarproxy_ui.ui cache_ui.ui kcm_tdeio_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kcm_tdeio_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS) +kcm_tdeio_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUTILS) messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcmtdeio.pot diff --git a/kcontrol/tdeio/lanbrowser.desktop b/kcontrol/tdeio/lanbrowser.desktop index 87901589e..4c1e16d6b 100644 --- a/kcontrol/tdeio/lanbrowser.desktop +++ b/kcontrol/tdeio/lanbrowser.desktop @@ -104,10 +104,10 @@ Comment[de]=Einrichtung von LISa, resLISa und Ein-/Ausgabemodulen Comment[el]=Ρύθμιση του lisa, reslisa και των ioslaves Comment[eo]=Agordo de Lisa, Reslisa kaj la Enel-sklavoj Comment[es]=Configuración de lisa, reslisa y los ioslaves -Comment[et]=Lisa, reslisa ja KIO moodulite seadistamine +Comment[et]=Lisa, reslisa ja TDEIO moodulite seadistamine Comment[eu]=Konfiguratu lisa, reslisa eta ioslave-ak Comment[fa]=برپایی lisa، reslisa و ioslaves -Comment[fi]=Lisan, Reslisan ja KIO-palveluiden asetukset +Comment[fi]=Lisan, Reslisan ja TDEIO-palveluiden asetukset Comment[fr]=Configuration de LISa, ResLISa et des modules d'entrées-sorties Comment[fy]=Lisa, reslisa en de ioslaves ynstelle Comment[ga]=Socraigh lisa, reslisa agus ioslaves diff --git a/kcontrol/tdm/Makefile.am b/kcontrol/tdm/Makefile.am index e6193d7df..ae0e6a99e 100644 --- a/kcontrol/tdm/Makefile.am +++ b/kcontrol/tdm/Makefile.am @@ -5,7 +5,7 @@ kcm_tdm_la_SOURCES = background.cpp tdm-appear.cpp tdm-font.cpp tdm-shut.cpp \ tdm-users.cpp tdm-conv.cpp main.cpp kbackedcombobox.cpp kcm_tdm_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -kcm_tdm_la_LIBADD = $(top_builddir)/kcontrol/background/libkcmbgnd.la $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO) $(LIB_KNEWSTUFF) +kcm_tdm_la_LIBADD = $(top_builddir)/kcontrol/background/libkcmbgnd.la $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_TDEIO) $(LIB_KNEWSTUFF) AM_CPPFLAGS= -I$(top_builddir)/kcontrol/background \ -I$(top_srcdir)/kcontrol/background \ |