summaryrefslogtreecommitdiffstats
path: root/digikam/digikam
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-03 19:56:24 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-09-03 19:56:24 +0200
commit0a163587847e64aac460bc9f8e0d02f36194bbb9 (patch)
treea8afddc2267b89984d2ccce66075eb1d72f5845e /digikam/digikam
parentef4e813baa5811808cf717ade61cc2802b1c8726 (diff)
downloaddigikam-0a163587847e64aac460bc9f8e0d02f36194bbb9.tar.gz
digikam-0a163587847e64aac460bc9f8e0d02f36194bbb9.zip
Additional k => tde renaming and fixes
Diffstat (limited to 'digikam/digikam')
-rw-r--r--digikam/digikam/Makefile.am12
-rw-r--r--digikam/digikam/imageinfo.h2
-rw-r--r--digikam/digikam/searchwidgets.h6
-rw-r--r--digikam/digikam/timelineview.cpp6
4 files changed, 13 insertions, 13 deletions
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&