diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 19:56:24 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 19:56:24 +0200 |
| commit | 0a163587847e64aac460bc9f8e0d02f36194bbb9 (patch) | |
| tree | a8afddc2267b89984d2ccce66075eb1d72f5845e | |
| parent | ef4e813baa5811808cf717ade61cc2802b1c8726 (diff) | |
| download | digikam-0a163587.tar.gz digikam-0a163587.zip | |
Additional k => tde renaming and fixes
94 files changed, 131 insertions, 131 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 35aeaff..e4418b3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2094,35 +2094,35 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-ltdednssd") - AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") + AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") + AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") diff --git a/admin b/admin -Subproject b4d585c643d92787bfa17b935ce00b09960ee36 +Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46 diff --git a/digikam/digikam/Makefile.am b/digikam/digikam/Makefile.am index 1bc99f6..94eff16 100644 --- a/digikam/digikam/Makefile.am +++ b/digikam/digikam/Makefile.am @@ -112,13 +112,13 @@ libdigikam_la_SOURCES = kdateedit.cpp \ libdigikam_la_LIBADD = $(LIB_SQLITE3) \ $(LIB_SQLITE3_LOCAL) \ $(LIB_QT) \ - $(LIB_KPARTS) \ - $(LIB_KIO) \ + $(LIB_TDEPARTS) \ + $(LIB_TDEIO) \ $(LIB_TDEABC) \ $(LIB_TDEHTML) \ $(LIBKIPI_LIBS) \ $(LIBKEXIV2_LIBS) \ - $(LIB_KUTILS) \ + $(LIB_TDEUTILS) \ $(top_builddir)/digikam/libs/sqlite2/libsqlite2.la \ $(top_builddir)/digikam/libs/thumbbar/libthumbbar.la \ $(top_builddir)/digikam/libs/themeengine/libthemeengine.la \ @@ -150,11 +150,11 @@ digikam_LDADD = $(LIB_QT) \ $(LIB_TDEUI) \ $(LIBSOCKET) \ $(LIB_TDEFILE) \ - $(LIB_KPARTS) \ - $(LIB_KUTILS) \ + $(LIB_TDEPARTS) \ + $(LIB_TDEUTILS) \ libdigikam.la -digikam_LDFLAGS = $(LIBKIPI_LIBS) $(LIBKDCRAW_LIBS) $(LIBKEXIV2_LIBS) $(KDE_RPATH) $(all_libraries) $(LIB_KUTILS) +digikam_LDFLAGS = $(LIBKIPI_LIBS) $(LIBKDCRAW_LIBS) $(LIBKEXIV2_LIBS) $(KDE_RPATH) $(all_libraries) $(LIB_TDEUTILS) rcdir = $(kde_datadir)/digikam rc_DATA = digikamui.rc diff --git a/digikam/digikam/imageinfo.h b/digikam/digikam/imageinfo.h index 826061e..3427b72 100644 --- a/digikam/digikam/imageinfo.h +++ b/digikam/digikam/imageinfo.h @@ -144,7 +144,7 @@ public: TQString filePath() const; /** - * @return the kurl for KIO or rather DIO. Use this instead of kurl() + * @return the kurl for TDEIO or rather DIO. Use this instead of kurl() * for metadata preserving file IO operations. Also, this method needs * to be merged with kurl() */ diff --git a/digikam/digikam/searchwidgets.h b/digikam/digikam/searchwidgets.h index 25c261d..dd95563 100644 --- a/digikam/digikam/searchwidgets.h +++ b/digikam/digikam/searchwidgets.h @@ -254,21 +254,21 @@ public: /** * Gives back the value of the key part of the rule, which can - * be used to build the correct url for the kio + * be used to build the correct url for the tdeio * @return The value of the key part of the rule */ TQString urlKey() const; /** * Gives back the value of the operator part of the rule, which can - * be used to build the correct url for the kio + * be used to build the correct url for the tdeio * @return The value of the operator part of the rule */ TQString urlOperator() const; /** * Gives back the value of the value part of the rule, which can - * be used to build the correct url for the kio + * be used to build the correct url for the tdeio * @return The value of the value part of the rule */ TQString urlValue() const; diff --git a/digikam/digikam/timelineview.cpp b/digikam/digikam/timelineview.cpp index cc9ae2f..2436fb6 100644 --- a/digikam/digikam/timelineview.cpp +++ b/digikam/digikam/timelineview.cpp @@ -311,7 +311,7 @@ SearchTextBar* TimeLineView::searchBar() const void TimeLineView::slotInit() { // Date Maps are loaded from AlbumManager to TimeLineWidget after than GUI is initialized. - // AlbumManager query Date KIO slave to stats items from database and it can take a while. + // AlbumManager query Date TDEIO slave to stats items from database and it can take a while. // We waiting than TimeLineWidget is ready before to set last config from users. readConfig(); @@ -443,7 +443,7 @@ void TimeLineView::createNewDateSearchAlbum(const TQString& name) d->timeLineFolderView->clearSelection(); d->timeLineFolderView->blockSignals(false); - // We will make now the Url for digiKam Search KIO-Slave + // We will make now the Url for digiKam Search TDEIO-Slave KURL url; url.setProtocol("digikamsearch"); @@ -494,7 +494,7 @@ void TimeLineView::slotAlbumSelected(SAlbum* salbum) return; } - // Date Search url for KIO-Slave is something like that : + // Date Search url for TDEIO-Slave is something like that : // digikamsearch:1 AND 2 OR 3 AND 4 OR 5 AND 6? // 1.key=imagedate&1.op=GT&1.val=2006-02-06& // 2.key=imagedate&2.op=LT&2.val=2006-02-07& diff --git a/digikam/imageplugins/adjustcurves/Makefile.am b/digikam/imageplugins/adjustcurves/Makefile.am index 2b15084..a14dcec 100644 --- a/digikam/imageplugins/adjustcurves/Makefile.am +++ b/digikam/imageplugins/adjustcurves/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_adjustcurves_la_SOURCES = imageplugin_adjustcurves.cpp \ adjustcurvestool.cpp -digikamimageplugin_adjustcurves_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_adjustcurves_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_adjustcurves_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/adjustlevels/Makefile.am b/digikam/imageplugins/adjustlevels/Makefile.am index 6748b0b..b830f61 100644 --- a/digikam/imageplugins/adjustlevels/Makefile.am +++ b/digikam/imageplugins/adjustlevels/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_adjustlevels_la_SOURCES = imageplugin_adjustlevels.cpp \ adjustlevelstool.cpp -digikamimageplugin_adjustlevels_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_adjustlevels_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_adjustlevels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/antivignetting/Makefile.am b/digikam/imageplugins/antivignetting/Makefile.am index 460151d..22b17ce 100644 --- a/digikam/imageplugins/antivignetting/Makefile.am +++ b/digikam/imageplugins/antivignetting/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_antivignetting_la_SOURCES = imageplugin_antivignetting.cpp \ antivignettingtool.cpp antivignetting.cpp -digikamimageplugin_antivignetting_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_antivignetting_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_antivignetting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/blurfx/Makefile.am b/digikam/imageplugins/blurfx/Makefile.am index ba56915..cfdae27 100644 --- a/digikam/imageplugins/blurfx/Makefile.am +++ b/digikam/imageplugins/blurfx/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_blurfx_la_SOURCES = imageplugin_blurfx.cpp \ blurfxtool.cpp blurfx.cpp -digikamimageplugin_blurfx_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_blurfx_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_blurfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/border/Makefile.am b/digikam/imageplugins/border/Makefile.am index b641eb4..2a34356 100644 --- a/digikam/imageplugins/border/Makefile.am +++ b/digikam/imageplugins/border/Makefile.am @@ -21,7 +21,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_border_la_SOURCES = imageplugin_border.cpp \ bordertool.cpp border.cpp -digikamimageplugin_border_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_border_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_border_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/channelmixer/Makefile.am b/digikam/imageplugins/channelmixer/Makefile.am index 304dbe2..3aee144 100644 --- a/digikam/imageplugins/channelmixer/Makefile.am +++ b/digikam/imageplugins/channelmixer/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_channelmixer_la_SOURCES = imageplugin_channelmixer.cpp \ channelmixertool.cpp -digikamimageplugin_channelmixer_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_channelmixer_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_channelmixer_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/charcoal/Makefile.am b/digikam/imageplugins/charcoal/Makefile.am index e49b7fe..bc91b35 100644 --- a/digikam/imageplugins/charcoal/Makefile.am +++ b/digikam/imageplugins/charcoal/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_charcoal_la_SOURCES = imageplugin_charcoal.cpp \ charcoaltool.cpp charcoal.cpp -digikamimageplugin_charcoal_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_charcoal_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_charcoal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/colorfx/Makefile.am b/digikam/imageplugins/colorfx/Makefile.am index 3d35704..3888a82 100644 --- a/digikam/imageplugins/colorfx/Makefile.am +++ b/digikam/imageplugins/colorfx/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_colorfx_la_SOURCES = imageplugin_colorfx.cpp \ colorfxtool.cpp -digikamimageplugin_colorfx_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_colorfx_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_colorfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/coreplugin/Makefile.am b/digikam/imageplugins/coreplugin/Makefile.am index b83c6a4..28c3ed5 100644 --- a/digikam/imageplugins/coreplugin/Makefile.am +++ b/digikam/imageplugins/coreplugin/Makefile.am @@ -32,7 +32,7 @@ noinst_HEADERS = autocorrectiontool.h blurtool.h \ rgbtool.h bcgtool.h \ bwsepiatool.h iccprooftool.h redeyetool.h -digikamimageplugin_core_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_core_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/imageplugins/coreplugin/sharpnesseditor/libsharpnesseditor.la \ $(top_builddir)/digikam/imageplugins/coreplugin/hsl/libhsl.la \ $(top_builddir)/digikam/imageplugins/coreplugin/ratiocrop/libratiocrop.la \ diff --git a/digikam/imageplugins/distortionfx/Makefile.am b/digikam/imageplugins/distortionfx/Makefile.am index c7b883a..af33d4c 100644 --- a/digikam/imageplugins/distortionfx/Makefile.am +++ b/digikam/imageplugins/distortionfx/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_distortionfx_la_SOURCES = imageplugin_distortionfx.cpp \ distortionfxtool.cpp distortionfx.cpp -digikamimageplugin_distortionfx_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_distortionfx_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_distortionfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/emboss/Makefile.am b/digikam/imageplugins/emboss/Makefile.am index 75224a5..7eb2d70 100644 --- a/digikam/imageplugins/emboss/Makefile.am +++ b/digikam/imageplugins/emboss/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_emboss_la_SOURCES = imageplugin_emboss.cpp \ embosstool.cpp emboss.cpp -digikamimageplugin_emboss_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_emboss_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_emboss_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/filmgrain/Makefile.am b/digikam/imageplugins/filmgrain/Makefile.am index 22d8dc4..cd4bd31 100644 --- a/digikam/imageplugins/filmgrain/Makefile.am +++ b/digikam/imageplugins/filmgrain/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_filmgrain_la_SOURCES = imageplugin_filmgrain.cpp \ filmgraintool.cpp filmgrain.cpp -digikamimageplugin_filmgrain_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_filmgrain_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_filmgrain_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/freerotation/Makefile.am b/digikam/imageplugins/freerotation/Makefile.am index 4fb632e..d5dee68 100644 --- a/digikam/imageplugins/freerotation/Makefile.am +++ b/digikam/imageplugins/freerotation/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_freerotation_la_SOURCES = imageplugin_freerotation.cpp \ freerotationtool.cpp freerotation.cpp -digikamimageplugin_freerotation_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_freerotation_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_freerotation_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/hotpixels/Makefile.am b/digikam/imageplugins/hotpixels/Makefile.am index c95b8e0..8ea649f 100644 --- a/digikam/imageplugins/hotpixels/Makefile.am +++ b/digikam/imageplugins/hotpixels/Makefile.am @@ -22,7 +22,7 @@ digikamimageplugin_hotpixels_la_SOURCES = blackframeparser.cpp weights.cpp \ hotpixelfixer.cpp imageplugin_hotpixels.cpp \ blackframelistview.cpp hotpixelstool.cpp -digikamimageplugin_hotpixels_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_hotpixels_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_hotpixels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/infrared/Makefile.am b/digikam/imageplugins/infrared/Makefile.am index 9f12959..6086b97 100644 --- a/digikam/imageplugins/infrared/Makefile.am +++ b/digikam/imageplugins/infrared/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_infrared_la_SOURCES = imageplugin_infrared.cpp \ infraredtool.cpp infrared.cpp -digikamimageplugin_infrared_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_infrared_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_infrared_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/inpainting/Makefile.am b/digikam/imageplugins/inpainting/Makefile.am index 71ce322..7b09e8a 100644 --- a/digikam/imageplugins/inpainting/Makefile.am +++ b/digikam/imageplugins/inpainting/Makefile.am @@ -21,7 +21,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_inpainting_la_SOURCES = imageplugin_inpainting.cpp \ inpaintingtool.cpp -digikamimageplugin_inpainting_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_inpainting_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_inpainting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/inserttext/Makefile.am b/digikam/imageplugins/inserttext/Makefile.am index 9e13be9..86605e6 100644 --- a/digikam/imageplugins/inserttext/Makefile.am +++ b/digikam/imageplugins/inserttext/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_inserttext_la_SOURCES = imageplugin_inserttext.cpp inserttextwidget.cpp \ inserttexttool.cpp fontchooserwidget.cpp -digikamimageplugin_inserttext_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_inserttext_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_inserttext_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/lensdistortion/Makefile.am b/digikam/imageplugins/lensdistortion/Makefile.am index 015a260..7343763 100644 --- a/digikam/imageplugins/lensdistortion/Makefile.am +++ b/digikam/imageplugins/lensdistortion/Makefile.am @@ -21,7 +21,7 @@ digikamimageplugin_lensdistortion_la_SOURCES = imageplugin_lensdistortion.cpp \ lensdistortiontool.cpp \ lensdistortion.cpp pixelaccess.cpp -digikamimageplugin_lensdistortion_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_lensdistortion_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_lensdistortion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/noisereduction/Makefile.am b/digikam/imageplugins/noisereduction/Makefile.am index 2dc22fe..ccbc264 100644 --- a/digikam/imageplugins/noisereduction/Makefile.am +++ b/digikam/imageplugins/noisereduction/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_noisereduction_la_SOURCES = imageplugin_noisereduction.cpp \ noisereductiontool.cpp noisereduction.cpp -digikamimageplugin_noisereduction_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_noisereduction_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_noisereduction_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/oilpaint/Makefile.am b/digikam/imageplugins/oilpaint/Makefile.am index 5a82d2b..604425a 100644 --- a/digikam/imageplugins/oilpaint/Makefile.am +++ b/digikam/imageplugins/oilpaint/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_oilpaint_la_SOURCES = imageplugin_oilpaint.cpp \ oilpainttool.cpp oilpaint.cpp -digikamimageplugin_oilpaint_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_oilpaint_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_oilpaint_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/perspective/Makefile.am b/digikam/imageplugins/perspective/Makefile.am index 3d33dbd..0523fa8 100644 --- a/digikam/imageplugins/perspective/Makefile.am +++ b/digikam/imageplugins/perspective/Makefile.am @@ -21,7 +21,7 @@ digikamimageplugin_perspective_la_SOURCES = imageplugin_perspective.cpp \ perspectivetool.cpp \ perspectivewidget.cpp triangle.cpp matrix.cpp -digikamimageplugin_perspective_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_perspective_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_perspective_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/raindrop/Makefile.am b/digikam/imageplugins/raindrop/Makefile.am index 44acec7..463c58f 100644 --- a/digikam/imageplugins/raindrop/Makefile.am +++ b/digikam/imageplugins/raindrop/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_raindrop_la_SOURCES = imageplugin_raindrop.cpp \ raindroptool.cpp raindrop.cpp -digikamimageplugin_raindrop_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_raindrop_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_raindrop_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/restoration/Makefile.am b/digikam/imageplugins/restoration/Makefile.am index 070388b..14d7ddf 100644 --- a/digikam/imageplugins/restoration/Makefile.am +++ b/digikam/imageplugins/restoration/Makefile.am @@ -21,7 +21,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_restoration_la_SOURCES = imageplugin_restoration.cpp \ restorationtool.cpp -digikamimageplugin_restoration_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_restoration_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_restoration_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/sheartool/Makefile.am b/digikam/imageplugins/sheartool/Makefile.am index adf3ecb..7176cf1 100644 --- a/digikam/imageplugins/sheartool/Makefile.am +++ b/digikam/imageplugins/sheartool/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_sheartool_la_SOURCES = imageplugin_sheartool.cpp shear.cpp \ sheartool.cpp -digikamimageplugin_sheartool_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_sheartool_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_sheartool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/superimpose/Makefile.am b/digikam/imageplugins/superimpose/Makefile.am index 9ce0407..7f1a647 100644 --- a/digikam/imageplugins/superimpose/Makefile.am +++ b/digikam/imageplugins/superimpose/Makefile.am @@ -22,7 +22,7 @@ digikamimageplugin_superimpose_la_SOURCES = superimposewidget.cpp superimpose.cp imageplugin_superimpose.cpp superimposetool.cpp -digikamimageplugin_superimpose_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_superimpose_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_superimpose_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/texture/Makefile.am b/digikam/imageplugins/texture/Makefile.am index d26867e..453da08 100644 --- a/digikam/imageplugins/texture/Makefile.am +++ b/digikam/imageplugins/texture/Makefile.am @@ -21,7 +21,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_texture_la_SOURCES = imageplugin_texture.cpp \ texturetool.cpp texture.cpp -digikamimageplugin_texture_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_texture_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_texture_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/imageplugins/whitebalance/Makefile.am b/digikam/imageplugins/whitebalance/Makefile.am index b688424..5d66d73 100644 --- a/digikam/imageplugins/whitebalance/Makefile.am +++ b/digikam/imageplugins/whitebalance/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ digikamimageplugin_whitebalance_la_SOURCES = imageplugin_whitebalance.cpp \ whitebalancetool.cpp -digikamimageplugin_whitebalance_la_LIBADD = $(LIB_KPARTS) \ +digikamimageplugin_whitebalance_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la digikamimageplugin_whitebalance_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio diff --git a/digikam/libs/curves/Makefile.am b/digikam/libs/curves/Makefile.am index 8f468f5..91f2987 100644 --- a/digikam/libs/curves/Makefile.am +++ b/digikam/libs/curves/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libcurves.la libcurves_la_SOURCES = imagecurves.cpp -libcurves_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libcurves_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \ -I$(top_srcdir)/digikam/libs/dimg \ diff --git a/digikam/libs/dialogs/Makefile.am b/digikam/libs/dialogs/Makefile.am index 3855a10..3621a45 100644 --- a/digikam/libs/dialogs/Makefile.am +++ b/digikam/libs/dialogs/Makefile.am @@ -6,14 +6,14 @@ noinst_LTLIBRARIES = libdialog.la libdialogshowfoto.la libdialogshowfoto_la_SOURCES = iccprofileinfodlg.cpp imagedialog.cpp rawcameradlg.cpp -libdialogshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libdialogshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # Dialogs collection used by digiKam. libdialog_la_SOURCES = deletedialogbase.ui imagedialog.cpp rawcameradlg.cpp \ iccprofileinfodlg.cpp deletedialog.cpp dprogressdlg.cpp -libdialog_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libdialog_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor INCLUDES = -I$(top_srcdir)/digikam/digikam \ -I$(top_srcdir)/digikam/libs/dimg \ diff --git a/digikam/libs/dimg/Makefile.am b/digikam/libs/dimg/Makefile.am index e7fda9f..6addac9 100644 --- a/digikam/libs/dimg/Makefile.am +++ b/digikam/libs/dimg/Makefile.am @@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libdimg.la libdimg_la_SOURCES = dimg.cpp dimgscale.cpp dcolor.cpp dcolorcomposer.cpp ddebug.cpp -libdimg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libdimg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libdimg_la_LIBADD = $(top_builddir)/digikam/libs/histogram/libhistogram.la \ $(top_builddir)/digikam/libs/levels/liblevels.la \ diff --git a/digikam/libs/dimg/filters/Makefile.am b/digikam/libs/dimg/filters/Makefile.am index b535aef..6f0b3a8 100644 --- a/digikam/libs/dimg/filters/Makefile.am +++ b/digikam/libs/dimg/filters/Makefile.am @@ -6,7 +6,7 @@ libdimgfilters_la_SOURCES = bcgmodifier.cpp hslmodifier.cpp icctransform.cpp \ dimgimagefilters.cpp dimgthreadedfilter.cpp \ dimggaussianblur.cpp dimgsharpen.cpp colormodifier.cpp -libdimgfilters_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libdimgfilters_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \ -I$(top_srcdir)/digikam/libs/levels \ diff --git a/digikam/libs/dmetadata/Makefile.am b/digikam/libs/dmetadata/Makefile.am index 1920ec9..df15523 100644 --- a/digikam/libs/dmetadata/Makefile.am +++ b/digikam/libs/dmetadata/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libdmetadata.la libdmetadata_la_SOURCES = dmetadata.cpp -libdmetadata_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libdmetadata_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libdmetadata_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) diff --git a/digikam/libs/greycstoration/Makefile.am b/digikam/libs/greycstoration/Makefile.am index 576eafa..419e0b5 100644 --- a/digikam/libs/greycstoration/Makefile.am +++ b/digikam/libs/greycstoration/Makefile.am @@ -6,7 +6,7 @@ noinst_LTLIBRARIES = libgreycstoration.la libgreycstoration_la_SOURCES = greycstorationiface.cpp greycstorationwidget.cpp -libgreycstoration_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libgreycstoration_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \ -I$(top_srcdir)/digikam/libs/dimg/filters \ diff --git a/digikam/libs/histogram/Makefile.am b/digikam/libs/histogram/Makefile.am index f350972..e20b0a0 100644 --- a/digikam/libs/histogram/Makefile.am +++ b/digikam/libs/histogram/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libhistogram.la libhistogram_la_SOURCES = imagehistogram.cpp -libhistogram_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libhistogram_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \ -I$(top_srcdir)/digikam/digikam \ diff --git a/digikam/libs/imageproperties/Makefile.am b/digikam/libs/imageproperties/Makefile.am index 0f77b78..688dea4 100644 --- a/digikam/libs/imageproperties/Makefile.am +++ b/digikam/libs/imageproperties/Makefile.am @@ -7,7 +7,7 @@ noinst_LTLIBRARIES = libimagepropertiesshowfoto.la libimagepropertiesdigikam.la libimagepropertiescamgui_la_SOURCES = imagepropertiessidebarcamgui.cpp cameraitempropertiestab.cpp -libimagepropertiescamgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libimagepropertiescamgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # Image Properties SideBar for Showfoto (without digiKam database support). @@ -21,7 +21,7 @@ libimagepropertiesshowfoto_la_LIBADD = $(top_builddir)/digikam/libs/widgets/libw $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la \ $(top_builddir)/digikam/libs/histogram/libhistogram.la -libimagepropertiesshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libimagepropertiesshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # Image Properties SideBar for digiKam Main interface and Image Editor (digiKam database support). @@ -31,7 +31,7 @@ libimagepropertiesdigikam_la_SOURCES = imagedescedittab.cpp imagepropertiessideb imagepropertiescolorstab.cpp \ navigatebarwidget.cpp imagepropertiestab.cpp navigatebartab.cpp -libimagepropertiesdigikam_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libimagepropertiesdigikam_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \ -I$(top_srcdir)/digikam/libs/themeengine \ diff --git a/digikam/libs/jpegutils/Makefile.am b/digikam/libs/jpegutils/Makefile.am index daccbbf..c6b8493 100644 --- a/digikam/libs/jpegutils/Makefile.am +++ b/digikam/libs/jpegutils/Makefile.am @@ -17,6 +17,6 @@ noinst_LTLIBRARIES = libjpegutils.la libjpegutils_la_SOURCES = jpegutils.cpp transupp.cpp -libjpegutils_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libjpegutils_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libjpegutils_la_LIBADD = $(LIBJPEG) diff --git a/digikam/libs/levels/Makefile.am b/digikam/libs/levels/Makefile.am index 90eff92..11a7740 100644 --- a/digikam/libs/levels/Makefile.am +++ b/digikam/libs/levels/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = liblevels.la liblevels_la_SOURCES = imagelevels.cpp -liblevels_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +liblevels_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \ -I$(top_srcdir)/digikam/libs/histogram \ diff --git a/digikam/libs/themeengine/Makefile.am b/digikam/libs/themeengine/Makefile.am index 2fed719..488bb6c 100644 --- a/digikam/libs/themeengine/Makefile.am +++ b/digikam/libs/themeengine/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libthemeengine.la libthemeengine_la_SOURCES = theme.cpp themeengine.cpp texture.cpp -libthemeengine_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libthemeengine_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \ -I$(top_srcdir)/digikam/digikam \ diff --git a/digikam/libs/threadimageio/Makefile.am b/digikam/libs/threadimageio/Makefile.am index 76b05c6..325184e 100644 --- a/digikam/libs/threadimageio/Makefile.am +++ b/digikam/libs/threadimageio/Makefile.am @@ -12,7 +12,7 @@ libthreadimageio_la_SOURCES = loadsavethread.cpp \ loadingcache.cpp \ loadingcacheinterface.cpp -libthreadimageio_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libthreadimageio_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \ -I$(top_srcdir)/digikam/libs/dimg/loaders \ diff --git a/digikam/libs/thumbbar/Makefile.am b/digikam/libs/thumbbar/Makefile.am index dfce6a9..123286c 100644 --- a/digikam/libs/thumbbar/Makefile.am +++ b/digikam/libs/thumbbar/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libthumbbar.la libthumbbar_la_SOURCES = thumbbar.cpp thumbnailjob.cpp -libthumbbar_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libthumbbar_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \ -I$(top_srcdir)/digikam/libs/dmetadata \ diff --git a/digikam/libs/thumbbar/thumbnailjob.cpp b/digikam/libs/thumbbar/thumbnailjob.cpp index 1df7530..46d4e46 100644 --- a/digikam/libs/thumbbar/thumbnailjob.cpp +++ b/digikam/libs/thumbbar/thumbnailjob.cpp @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2003-10-14 - * Description : digiKam KIO thumbnails generator interface + * Description : digiKam TDEIO thumbnails generator interface * * Copyright (C) 2003-2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu> * Copyright (C) 2006-2007 by Gilles Caulier <caulier dot gilles at gmail dot com> diff --git a/digikam/libs/thumbbar/thumbnailjob.h b/digikam/libs/thumbbar/thumbnailjob.h index d4d81af..637304d 100644 --- a/digikam/libs/thumbbar/thumbnailjob.h +++ b/digikam/libs/thumbbar/thumbnailjob.h @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2003-10-14 - * Description : digiKam KIO thumbnails generator interface + * Description : digiKam TDEIO thumbnails generator interface * * Copyright (C) 2003-2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu> * Copyright (C) 2006-2007 by Gilles Caulier <caulier dot gilles at gmail dot com> diff --git a/digikam/libs/whitebalance/Makefile.am b/digikam/libs/whitebalance/Makefile.am index e9e0c1f..22efd33 100644 --- a/digikam/libs/whitebalance/Makefile.am +++ b/digikam/libs/whitebalance/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libwhitebalance.la libwhitebalance_la_SOURCES = whitebalance.cpp -libwhitebalance_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libwhitebalance_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \ -I$(top_srcdir)/digikam/libs/dimg \ diff --git a/digikam/libs/widgets/Makefile.am b/digikam/libs/widgets/Makefile.am index 4f7fe6d..6b2edaf 100644 --- a/digikam/libs/widgets/Makefile.am +++ b/digikam/libs/widgets/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libwidgets.la libwidgets_la_SOURCES = -libwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libwidgets_la_LIBADD = $(top_builddir)/digikam/libs/widgets/metadata/libmetadatawidgets.la \ $(top_builddir)/digikam/libs/widgets/iccprofiles/libiccprofileswidgets.la \ diff --git a/digikam/libs/widgets/common/Makefile.am b/digikam/libs/widgets/common/Makefile.am index 55187c8..78ffea1 100644 --- a/digikam/libs/widgets/common/Makefile.am +++ b/digikam/libs/widgets/common/Makefile.am @@ -7,7 +7,7 @@ libcommonwidgets_la_SOURCES = histogramwidget.cpp colorgradientwidget.cpp curves statuszoombar.cpp statusnavigatebar.cpp statusprogressbar.cpp searchtextbar.cpp \ dcursortracker.cpp paniconwidget.cpp previewwidget.cpp splashscreen.cpp statusled.cpp -libcommonwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libcommonwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \ -I$(top_srcdir)/digikam/libs/curves \ diff --git a/digikam/libs/widgets/iccprofiles/Makefile.am b/digikam/libs/widgets/iccprofiles/Makefile.am index eb0ef4d..2c2c42a 100644 --- a/digikam/libs/widgets/iccprofiles/Makefile.am +++ b/digikam/libs/widgets/iccprofiles/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libiccprofileswidgets.la libiccprofileswidgets_la_SOURCES = iccprofilewidget.cpp cietonguewidget.cpp iccpreviewwidget.cpp -libiccprofileswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libiccprofileswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libiccprofileswidgets_la_LIBADD = $(top_builddir)/digikam/libs/lprof/liblprof.la diff --git a/digikam/libs/widgets/imageplugins/Makefile.am b/digikam/libs/widgets/imageplugins/Makefile.am index a97ae8e..06273c1 100644 --- a/digikam/libs/widgets/imageplugins/Makefile.am +++ b/digikam/libs/widgets/imageplugins/Makefile.am @@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libimagepluginswidgets.la libimagepluginswidgets_la_SOURCES = imageregionwidget.cpp imagepaniconwidget.cpp imageguidewidget.cpp \ imagewidget.cpp listboxpreviewitem.cpp imagepanelwidget.cpp -libimagepluginswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libimagepluginswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ -I$(top_srcdir)/digikam/libs/dimg \ diff --git a/digikam/libs/widgets/metadata/Makefile.am b/digikam/libs/widgets/metadata/Makefile.am index 623fd2f..0a90389 100644 --- a/digikam/libs/widgets/metadata/Makefile.am +++ b/digikam/libs/widgets/metadata/Makefile.am @@ -6,7 +6,7 @@ libmetadatawidgets_la_SOURCES = metadatalistview.cpp metadatalistviewitem.cpp me iptcwidget.cpp exifwidget.cpp mdkeylistviewitem.cpp \ makernotewidget.cpp gpswidget.cpp worldmapwidget.cpp -libmetadatawidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libmetadatawidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/dmetadata \ -I$(top_srcdir)/digikam/libs/dimg \ diff --git a/digikam/project/NEWS.0.9.4 b/digikam/project/NEWS.0.9.4 index e93ca0a..a7ea38b 100644 --- a/digikam/project/NEWS.0.9.4 +++ b/digikam/project/NEWS.0.9.4 @@ -207,7 +207,7 @@ General : Add capability to display count of items in all Album, Date, Ta The number of items contained in virtual or physical albums can be displayed on the right of album name. If a tree branch is collapsed, parents album sum-up the number of items from all undisplayed children albums. - Count of items is performed in background by digiKam KIO-Slaves. + Count of items is performed in background by digiKam TDEIO-Slaves. A new option from Setup/Album dialog page can toggle on/off this feature. AlbumGUI : Add a new tool to perform Date search around whole albums collection: Time-Line. diff --git a/digikam/showfoto/Makefile.am b/digikam/showfoto/Makefile.am index 5aec0cc..9f9476a 100644 --- a/digikam/showfoto/Makefile.am +++ b/digikam/showfoto/Makefile.am @@ -32,7 +32,7 @@ showfoto_LDADD = $(top_builddir)/digikam/showfoto/setup/libsetup.la \ $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la \ $(top_builddir)/digikam/libs/themeengine/libthemeengine.la \ $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \ - $(LIB_KUTILS) $(LIB_KPARTS) $(LIBJPEG) + $(LIB_TDEUTILS) $(LIB_TDEPARTS) $(LIBJPEG) showfoto_LDFLAGS = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) $(KDE_RPATH) $(all_libraries) diff --git a/digikam/showfoto/setup/Makefile.am b/digikam/showfoto/setup/Makefile.am index e90adc6..e87bff7 100644 --- a/digikam/showfoto/setup/Makefile.am +++ b/digikam/showfoto/setup/Makefile.am @@ -8,7 +8,7 @@ noinst_LTLIBRARIES = libsetup.la libsetup_la_SOURCES = setup.cpp setupeditor.cpp setuptooltip.cpp -libsetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libsetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libsetup_la_LIBADD = $(top_builddir)/digikam/utilities/setup/libshowfotosetup.la diff --git a/digikam/tdeioslave/Makefile.am b/digikam/tdeioslave/Makefile.am index 1e6e6c7..843949d 100644 --- a/digikam/tdeioslave/Makefile.am +++ b/digikam/tdeioslave/Makefile.am @@ -26,47 +26,47 @@ protocoldir = $(kde_servicesdir) # NOTE: if local libsqlite3 is used LIB_SQLITE3 is null. # if shared libsqlite3 is used LIB_SQLITE3_LOCAL is null. -# -- digikam KIO image thumbnails generator ---------------------------------------- +# -- digikam TDEIO image thumbnails generator ---------------------------------------- tdeio_digikamthumbnail_la_SOURCES = digikamthumbnail.cpp -tdeio_digikamthumbnail_la_LIBADD = $(LIB_KIO) $(LIBJPEG) $(LIBPNG) \ +tdeio_digikamthumbnail_la_LIBADD = $(LIB_TDEIO) $(LIBJPEG) $(LIBPNG) \ $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \ $(top_builddir)/digikam/libs/dimg/libdimg.la tdeio_digikamthumbnail_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -# -- digikam tags KIO -------------------------------------------------------------- +# -- digikam tags TDEIO -------------------------------------------------------------- tdeio_digikamtags_la_SOURCES = digikamtags.cpp sqlitedb.cpp -tdeio_digikamtags_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) +tdeio_digikamtags_la_LIBADD = $(LIB_TDEIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) tdeio_digikamtags_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx -# -- digikam albums KIO ------------------------------------------------------------ +# -- digikam albums TDEIO ------------------------------------------------------------ tdeio_digikamalbums_la_SOURCES = digikamalbums.cpp sqlitedb.cpp tdeio_digikamalbums_la_LIBADD = $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \ $(top_builddir)/digikam/libs/dimg/libdimg.la \ - $(LIB_KIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) + $(LIB_TDEIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) tdeio_digikamalbums_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx -# -- digikam dates KIO ------------------------------------------------------------- +# -- digikam dates TDEIO ------------------------------------------------------------- tdeio_digikamdates_la_SOURCES = digikamdates.cpp sqlitedb.cpp -tdeio_digikamdates_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) +tdeio_digikamdates_la_LIBADD = $(LIB_TDEIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) tdeio_digikamdates_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx -# -- digikam search KIO ------------------------------------------------------------ +# -- digikam search TDEIO ------------------------------------------------------------ tdeio_digikamsearch_la_SOURCES = digikamsearch.cpp sqlitedb.cpp -tdeio_digikamsearch_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) +tdeio_digikamsearch_la_LIBADD = $(LIB_TDEIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) tdeio_digikamsearch_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx diff --git a/digikam/tdeioslave/digikamalbums.cpp b/digikam/tdeioslave/digikamalbums.cpp index 299df88..31568f0 100644 --- a/digikam/tdeioslave/digikamalbums.cpp +++ b/digikam/tdeioslave/digikamalbums.cpp @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2005-04-21 - * Description : a kio-slave to process file operations on + * Description : a tdeio-slave to process file operations on * digiKam albums. * * Copyright (C) 2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu> @@ -1945,7 +1945,7 @@ void tdeio_digikamalbums::removeInvalidAlbums() m_sqlDB.execSql("COMMIT TRANSACTION"); } -/* KIO slave registration */ +/* TDEIO slave registration */ extern "C" { diff --git a/digikam/tdeioslave/digikamalbums.protocol b/digikam/tdeioslave/digikamalbums.protocol index 1224504..7bbcfbd 100644 --- a/digikam/tdeioslave/digikamalbums.protocol +++ b/digikam/tdeioslave/digikamalbums.protocol @@ -18,7 +18,7 @@ Description[da]=digiKam albummer-tdeioslave Description[de]=digiKam Ein-/Ausgabemodul für digiKam-Alben Description[el]=tdeioslave Άλμπουμ του digiKam Description[es]=tdeioslave de digiKam para álbumes -Description[et]=DigiKami albumite KIO-moodul +Description[et]=DigiKami albumite TDEIO-moodul Description[fa]=tdeioslave آلبومهای digiKam Description[fi]=digiKamin tdeioslave-palvelu albumeille Description[gl]=Kioslave de albuns de digiKam diff --git a/digikam/tdeioslave/digikamdates.cpp b/digikam/tdeioslave/digikamdates.cpp index 8b6f5c1..1e28c3a 100644 --- a/digikam/tdeioslave/digikamdates.cpp +++ b/digikam/tdeioslave/digikamdates.cpp @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2005-04-21 - * Description : a kio-slave to process date query on + * Description : a tdeio-slave to process date query on * digiKam albums. * * Copyright (C) 2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu> @@ -288,7 +288,7 @@ void tdeio_digikamdates::special(const TQByteArray& data) finished(); } -/* KIO slave registration */ +/* TDEIO slave registration */ extern "C" { diff --git a/digikam/tdeioslave/digikamdates.h b/digikam/tdeioslave/digikamdates.h index d5fea87..4ba7574 100644 --- a/digikam/tdeioslave/digikamdates.h +++ b/digikam/tdeioslave/digikamdates.h @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2005-04-21 - * Description : a kio-slave to process date query on + * Description : a tdeio-slave to process date query on * digiKam albums. * * Copyright (C) 2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu> diff --git a/digikam/tdeioslave/digikamdates.protocol b/digikam/tdeioslave/digikamdates.protocol index b01f8bd..fd9e1ad 100644 --- a/digikam/tdeioslave/digikamdates.protocol +++ b/digikam/tdeioslave/digikamdates.protocol @@ -17,7 +17,7 @@ Description[da]=Digikam datoer-tdeioslave Description[de]=digiKam Ein-/Ausgabemodul für digiKam-Datumsangaben Description[el]=tdeioslave ημερομηνιών του digiKam Description[es]=tdeioslave de digiKam para fechas -Description[et]=DigiKami kuupäevade KIO-moodul +Description[et]=DigiKami kuupäevade TDEIO-moodul Description[fa]=tdeioslave تاریخهای digiKam Description[fi]=digiKamin tdeioslave-palvelu päiväyksille Description[gl]=Kioslave de datas de digiKam diff --git a/digikam/tdeioslave/digikamsearch.cpp b/digikam/tdeioslave/digikamsearch.cpp index 3bc82ed..3952ae5 100644 --- a/digikam/tdeioslave/digikamsearch.cpp +++ b/digikam/tdeioslave/digikamsearch.cpp @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2005-04-21 - * Description : a kio-slave to process search on digiKam albums + * Description : a tdeio-slave to process search on digiKam albums * * Copyright (C) 2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu> * @@ -668,7 +668,7 @@ TQString tdeio_digikamsearch::subQuery(enum tdeio_digikamsearch::SKey key, return query; } -/* KIO slave registration */ +/* TDEIO slave registration */ extern "C" { diff --git a/digikam/tdeioslave/digikamsearch.h b/digikam/tdeioslave/digikamsearch.h index e06b90e..a17a6c8 100644 --- a/digikam/tdeioslave/digikamsearch.h +++ b/digikam/tdeioslave/digikamsearch.h @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2005-04-21 - * Description : a kio-slave to process search on digiKam albums + * Description : a tdeio-slave to process search on digiKam albums * * Copyright (C) 2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu> * diff --git a/digikam/tdeioslave/digikamsearch.protocol b/digikam/tdeioslave/digikamsearch.protocol index e1aaddc..c3f55d0 100644 --- a/digikam/tdeioslave/digikamsearch.protocol +++ b/digikam/tdeioslave/digikamsearch.protocol @@ -11,7 +11,7 @@ Description[da]=Digikam søge-tdeioslave Description[de]=digiKam Ein-/Ausgabemodul für digiKam-Suchen Description[el]=tdeioslave αναζήτησης του digiKam Description[es]=tdeioslave de digiKam de búsqueda -Description[et]=DigiKami otsimise KIO-moodul +Description[et]=DigiKami otsimise TDEIO-moodul Description[fa]=tdeioslave جستجوی digiKam Description[fi]=digiKamin tdeioslave-palvelu hauille Description[gl]=Kioslave de procura de digiKam diff --git a/digikam/tdeioslave/digikamtags.cpp b/digikam/tdeioslave/digikamtags.cpp index d03fda7..3fd1498 100644 --- a/digikam/tdeioslave/digikamtags.cpp +++ b/digikam/tdeioslave/digikamtags.cpp @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2004-07-09 - * Description : a kio-slave to process tag query on + * Description : a tdeio-slave to process tag query on * digiKam albums. * * Copyright (C) 2004 by Renchi Raju <renchi@pooh.tam.uiuc.edu> @@ -297,7 +297,7 @@ void tdeio_digikamtagsProtocol::special(const TQByteArray& data) finished(); } -/* KIO slave registration */ +/* TDEIO slave registration */ extern "C" { diff --git a/digikam/tdeioslave/digikamtags.h b/digikam/tdeioslave/digikamtags.h index 5e364ce..9f9099d 100644 --- a/digikam/tdeioslave/digikamtags.h +++ b/digikam/tdeioslave/digikamtags.h @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2004-07-09 - * Description : a kio-slave to process tag query on + * Description : a tdeio-slave to process tag query on * digiKam albums. * * Copyright (C) 2004 by Renchi Raju <renchi@pooh.tam.uiuc.edu> diff --git a/digikam/tdeioslave/digikamtags.protocol b/digikam/tdeioslave/digikamtags.protocol index 6506f11..5228fa8 100644 --- a/digikam/tdeioslave/digikamtags.protocol +++ b/digikam/tdeioslave/digikamtags.protocol @@ -17,7 +17,7 @@ Description[da]=Digikam mærker-tdeioslave Description[de]=digiKam Ein-/Ausgabemodul für digiKam-Stichwörter Description[el]=tdeioslave ετικετών του digiKam Description[es]=tdeioslave de digiKampara etiquetas -Description[et]=DigiKami siltide KIO-moodul +Description[et]=DigiKami siltide TDEIO-moodul Description[fa]=tdeioslave برچسبهای digikam Description[fi]=digiKamin tdeioslave-palvelu tunnisteille Description[gl]=Kioslave de marcas de digiKam diff --git a/digikam/tdeioslave/digikamthumbnail.cpp b/digikam/tdeioslave/digikamthumbnail.cpp index 60d4be4..f5d9dc8 100644 --- a/digikam/tdeioslave/digikamthumbnail.cpp +++ b/digikam/tdeioslave/digikamthumbnail.cpp @@ -4,8 +4,8 @@ * http://www.digikam.org * * Date : 2003-01-15 - * Description : digiKam KIO slave to get image thumbnails. - * This kio-slave support this freedesktop + * Description : digiKam TDEIO slave to get image thumbnails. + * This tdeio-slave support this freedesktop * specification about thumbnails mamagement: * http://jens.triq.net/thumbnail-spec * @@ -608,7 +608,7 @@ void tdeio_digikamthumbnailProtocol::createThumbnailDirs() TDEStandardDirs::makeDir(bigThumbPath_, 0700); } -// -- KIO slave registration --------------------------------------------------------------------- +// -- TDEIO slave registration --------------------------------------------------------------------- extern "C" { diff --git a/digikam/tdeioslave/digikamthumbnail.h b/digikam/tdeioslave/digikamthumbnail.h index 12dc2ad..a83db66 100644 --- a/digikam/tdeioslave/digikamthumbnail.h +++ b/digikam/tdeioslave/digikamthumbnail.h @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2003-01-15 - * Description : digiKam KIO slave to get image thumbnails. + * Description : digiKam TDEIO slave to get image thumbnails. * * Copyright (C) 2003-2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu> * Copyright (C) 2003-2009 by Gilles Caulier <caulier dot gilles at gmail dot com> diff --git a/digikam/tdeioslave/digikamthumbnail.protocol b/digikam/tdeioslave/digikamthumbnail.protocol index 57f0029..23fd35c 100644 --- a/digikam/tdeioslave/digikamthumbnail.protocol +++ b/digikam/tdeioslave/digikamthumbnail.protocol @@ -12,7 +12,7 @@ Description[da]=Digikam miniature-tdeioslave Description[de]=digiKam Ein-/Ausgabemodul für digiKam-Miniaturbilder Description[el]=tdeioslave εικόνων επισκόπησης του digiKam Description[es]=tdeioslave de digiKam de miniaturas -Description[et]=DigiKami pisipiltide KIO-moodul +Description[et]=DigiKami pisipiltide TDEIO-moodul Description[fa]=tdeioslave ریزنقش digiKam Description[fi]=digiKamin tdeioslave-palvelu pienoiskuville Description[gl]=Kioslave de miniaturas de digiKam diff --git a/digikam/themedesigner/Makefile.am b/digikam/themedesigner/Makefile.am index c0abd0c..1c05b81 100644 --- a/digikam/themedesigner/Makefile.am +++ b/digikam/themedesigner/Makefile.am @@ -16,4 +16,4 @@ digikamthemedesigner_SOURCES = main.cpp mainwindow.cpp themedicongroupitem.cpp \ digikamthemedesigner_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamthemedesigner_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KUTILS) +digikamthemedesigner_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEUTILS) diff --git a/digikam/utilities/batch/Makefile.am b/digikam/utilities/batch/Makefile.am index b670f26..014aeb1 100644 --- a/digikam/utilities/batch/Makefile.am +++ b/digikam/utilities/batch/Makefile.am @@ -15,6 +15,6 @@ noinst_LTLIBRARIES = libbatch.la libbatch_la_SOURCES = batchthumbsgenerator.cpp batchalbumssyncmetadata.cpp \ imageinfojob.cpp imageinfoalbumsjob.cpp batchsyncmetadata.cpp -libbatch_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libbatch_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor diff --git a/digikam/utilities/batch/imageinfojob.cpp b/digikam/utilities/batch/imageinfojob.cpp index 27ead75..9fc5bc3 100644 --- a/digikam/utilities/batch/imageinfojob.cpp +++ b/digikam/utilities/batch/imageinfojob.cpp @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2006-22-01 - * Description : digikamalbum KIO slave interface to get image + * Description : digikamalbum TDEIO slave interface to get image * info from database. * * Copyright (C) 2007 by Gilles Caulier <caulier dot gilles at gmail dot com> diff --git a/digikam/utilities/batch/imageinfojob.h b/digikam/utilities/batch/imageinfojob.h index 5023c56..1509cd7 100644 --- a/digikam/utilities/batch/imageinfojob.h +++ b/digikam/utilities/batch/imageinfojob.h @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2006-22-01 - * Description : digikamalbum KIO slave interface to get image + * Description : digikamalbum TDEIO slave interface to get image * info from database. * * Copyright (C) 2007 by Gilles Caulier <caulier dot gilles at gmail dot com> diff --git a/digikam/utilities/cameragui/Makefile.am b/digikam/utilities/cameragui/Makefile.am index 8dc061c..af7b472 100644 --- a/digikam/utilities/cameragui/Makefile.am +++ b/digikam/utilities/cameragui/Makefile.am @@ -13,7 +13,7 @@ libcameragui_la_SOURCES = gpcamera.cpp cameraui.cpp cameraiconview.cpp \ camerainfodialog.cpp albumselectdialog.cpp \ camerafolderdialog.cpp freespacewidget.cpp -libcameragui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libcameragui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libcameragui_la_LIBADD = $(top_builddir)/digikam/libs/imageproperties/libimagepropertiescamgui.la \ $(LIB_GPHOTO) $(LIBJPEG) diff --git a/digikam/utilities/imageeditor/editor/imagewindow.cpp b/digikam/utilities/imageeditor/editor/imagewindow.cpp index 2a45566..5c5df5e 100644 --- a/digikam/utilities/imageeditor/editor/imagewindow.cpp +++ b/digikam/utilities/imageeditor/editor/imagewindow.cpp @@ -944,7 +944,7 @@ void ImageWindow::deleteCurrentItem(bool ask, bool permanently) u.setPath(d->urlCurrent.directory()); PAlbum *palbum = AlbumManager::instance()->findPAlbum(u); - // if available, provide a digikamalbums:// URL to KIO + // if available, provide a digikamalbums:// URL to TDEIO KURL kioURL; if (d->imageInfoCurrent) kioURL = d->imageInfoCurrent->kurlForKIO(); diff --git a/digikam/utilities/lighttable/Makefile.am b/digikam/utilities/lighttable/Makefile.am index 233ee92..b5f219f 100644 --- a/digikam/utilities/lighttable/Makefile.am +++ b/digikam/utilities/lighttable/Makefile.am @@ -22,7 +22,7 @@ noinst_LTLIBRARIES = liblighttable.la liblighttable_la_SOURCES = lighttablebar.cpp lighttablewindow.cpp lighttablepreview.cpp \ lighttableview.cpp -liblighttable_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +liblighttable_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor rcdir = $(kde_datadir)/digikam rc_DATA = lighttablewindowui.rc diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp index 5cac1dd..885f2be 100644 --- a/digikam/utilities/lighttable/lighttablewindow.cpp +++ b/digikam/utilities/lighttable/lighttablewindow.cpp @@ -956,7 +956,7 @@ void LightTableWindow::slotDeleteItem(ImageInfo* info) if (!palbum) return; - // Provide a digikamalbums:// URL to KIO + // Provide a digikamalbums:// URL to TDEIO KURL kioURL = info->kurlForKIO(); KURL fileURL = u; diff --git a/digikam/utilities/setup/Makefile.am b/digikam/utilities/setup/Makefile.am index 2bcceb1..885187d 100644 --- a/digikam/utilities/setup/Makefile.am +++ b/digikam/utilities/setup/Makefile.am @@ -25,5 +25,5 @@ libsetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_GPHOTO) libshowfotosetup_la_SOURCES = setupiofiles.cpp setupdcraw.cpp \ setupicc.cpp setupslideshow.cpp -libshowfotosetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libshowfotosetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor diff --git a/digikam/utilities/slideshow/Makefile.am b/digikam/utilities/slideshow/Makefile.am index 3ae8e6a..4ae7578 100644 --- a/digikam/utilities/slideshow/Makefile.am +++ b/digikam/utilities/slideshow/Makefile.am @@ -12,6 +12,6 @@ noinst_LTLIBRARIES = libslideshow.la libslideshow_la_SOURCES = toolbar.cpp slideshow.cpp -libslideshow_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libslideshow_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor diff --git a/po/ca/digikam.po b/po/ca/digikam.po index 5f1b3f5..66cc239 100644 --- a/po/ca/digikam.po +++ b/po/ca/digikam.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2009-05-28 10:31+0200\n" "PO-Revision-Date: 2008-06-03 18:28+0200\n" "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n" -"Language-Team: Catalan <tde-i18n-ca@kde.org>\n" +"Language-Team: Catalan <kde-i18n-ca@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/de/digikam.po b/po/de/digikam.po index 276f2f3..946f2e8 100644 --- a/po/de/digikam.po +++ b/po/de/digikam.po @@ -11,7 +11,7 @@ msgstr "" "POT-Creation-Date: 2009-05-28 10:31+0200\n" "PO-Revision-Date: 2008-12-13 23:04+0100\n" "Last-Translator: Oliver Dörr <kde@doerr-privat.de>\n" -"Language-Team: German <tde-i18n-de@lists.kde.org>\n" +"Language-Team: German <kde-i18n-de@lists.kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/fa/digikam.po b/po/fa/digikam.po index e649d7b..8ed7dbf 100644 --- a/po/fa/digikam.po +++ b/po/fa/digikam.po @@ -7,7 +7,7 @@ msgstr "" "POT-Creation-Date: 2009-05-28 10:31+0200\n" "PO-Revision-Date: 2007-02-15 09:17+0330\n" "Last-Translator: Nasim Daniarzadeh <daniarzadeh@itland.ir>\n" -"Language-Team: Persian <tde-i18n-fa@kde.org>\n" +"Language-Team: Persian <kde-i18n-fa@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/it/digikam.po b/po/it/digikam.po index bb34df9..d224ffe 100644 --- a/po/it/digikam.po +++ b/po/it/digikam.po @@ -11,7 +11,7 @@ msgstr "" "POT-Creation-Date: 2009-05-28 10:31+0200\n" "PO-Revision-Date: 2008-08-06 09:14+0200\n" "Last-Translator: Federico Zenith <federico.zenith@member.fsf.org>\n" -"Language-Team: Italian <tde-i18n-it@kde.org>\n" +"Language-Team: Italian <kde-i18n-it@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/lt/digikam.po b/po/lt/digikam.po index e781f75..bfbf320 100644 --- a/po/lt/digikam.po +++ b/po/lt/digikam.po @@ -11,7 +11,7 @@ msgstr "" "POT-Creation-Date: 2009-05-28 10:31+0200\n" "PO-Revision-Date: 2005-09-10 19:41+0300\n" "Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n" -"Language-Team: Lithuanian <tde-i18n-lt@kde.org>\n" +"Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/nds/digikam.po b/po/nds/digikam.po index 8177a5b..d7988f8 100644 --- a/po/nds/digikam.po +++ b/po/nds/digikam.po @@ -8,7 +8,7 @@ msgstr "" "POT-Creation-Date: 2009-05-28 10:31+0200\n" "PO-Revision-Date: 2007-12-07 22:25+0100\n" "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n" -"Language-Team: Low Saxon <tde-i18n-nds@kde.org>\n" +"Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/nl/digikam.po b/po/nl/digikam.po index f3c8379..40e9cd3 100644 --- a/po/nl/digikam.po +++ b/po/nl/digikam.po @@ -23,7 +23,7 @@ msgstr "" "POT-Creation-Date: 2009-05-28 10:31+0200\n" "PO-Revision-Date: 2009-02-03 00:18+0100\n" "Last-Translator: Freek de Kruijf <f.de.kruijf@hetnet.nl>\n" -"Language-Team: Dutch <tde-i18n-nl@kde.org>\n" +"Language-Team: Dutch <kde-i18n-nl@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/pt/digikam.po b/po/pt/digikam.po index fca0af5..23b9854 100644 --- a/po/pt/digikam.po +++ b/po/pt/digikam.po @@ -4,7 +4,7 @@ msgstr "" "POT-Creation-Date: 2009-05-28 10:31+0200\n" "PO-Revision-Date: 2008-01-30 22:43+0000\n" "Last-Translator: Pedro Morais <morais@kde.org>\n" -"Language-Team: pt <tde-i18n-pt@kde.org>\n" +"Language-Team: pt <kde-i18n-pt@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/pt_BR/digikam.po b/po/pt_BR/digikam.po index ca9a269..10b8f4e 100644 --- a/po/pt_BR/digikam.po +++ b/po/pt_BR/digikam.po @@ -8,7 +8,7 @@ msgstr "" "POT-Creation-Date: 2009-05-28 10:31+0200\n" "PO-Revision-Date: 2009-05-06 22:58-0300\n" "Last-Translator: Fernando Boaglio <fernando@boaglio.com>\n" -"Language-Team: Brazilian Portuguese <tde-i18n-doc@kde.org>\n" +"Language-Team: Brazilian Portuguese <kde-i18n-doc@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/ro/digikam.po b/po/ro/digikam.po index 3ad2e46..8c2d936 100644 --- a/po/ro/digikam.po +++ b/po/ro/digikam.po @@ -6,7 +6,7 @@ msgstr "" "POT-Creation-Date: 2009-05-28 10:31+0200\n" "PO-Revision-Date: 2004-06-13 19:19+0300\n" "Last-Translator: Claudiu Costin <claudiuc@kde.org>\n" -"Language-Team: Romanian <tde-i18n-ro@kde.org>\n" +"Language-Team: Romanian <kde-i18n-ro@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/sr/digikam.po b/po/sr/digikam.po index b212ca3..5d2389f 100644 --- a/po/sr/digikam.po +++ b/po/sr/digikam.po @@ -7,7 +7,7 @@ msgstr "" "POT-Creation-Date: 2009-05-28 10:31+0200\n" "PO-Revision-Date: 2008-04-09 11:32+0200\n" "Last-Translator: Slobodan Simic <simicsl@verat.net>\n" -"Language-Team: Serbian <tde-i18n-sr@kde.org>\n" +"Language-Team: Serbian <kde-i18n-sr@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/sr@Latn/digikam.po b/po/sr@Latn/digikam.po index c9f38e7..2a0da73 100644 --- a/po/sr@Latn/digikam.po +++ b/po/sr@Latn/digikam.po @@ -7,7 +7,7 @@ msgstr "" "POT-Creation-Date: 2009-05-28 10:31+0200\n" "PO-Revision-Date: 2007-07-13 12:12+0200\n" "Last-Translator: Slobodan Simic <simicsl@verat.net>\n" -"Language-Team: Serbian <tde-i18n-sr@kde.org>\n" +"Language-Team: Serbian <kde-i18n-sr@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" |