diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 20:02:20 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 20:59:52 +0200 |
| commit | 78cc506bbab7c8fc2f8b4f6cb183b4ab157b762b (patch) | |
| tree | 073fd8dfc96771e4fc8f8bff5b97fccbf9f7f91c /kamera | |
| parent | 580e97ebe258cc3c6745aa49fbc6a423de32c9ba (diff) | |
| download | tdegraphics-78cc506bbab7c8fc2f8b4f6cb183b4ab157b762b.tar.gz tdegraphics-78cc506bbab7c8fc2f8b4f6cb183b4ab157b762b.zip | |
Additional k => tde renaming and fixes
Diffstat (limited to 'kamera')
| -rw-r--r-- | kamera/kcontrol/Makefile.am | 2 | ||||
| -rw-r--r-- | kamera/kcontrol/kameradevice.cpp | 2 | ||||
| -rw-r--r-- | kamera/tdeioslave/Makefile.am | 2 | ||||
| -rw-r--r-- | kamera/tdeioslave/kamera.cpp | 10 |
4 files changed, 8 insertions, 8 deletions
diff --git a/kamera/kcontrol/Makefile.am b/kamera/kcontrol/Makefile.am index 9fd30f46..792c0986 100644 --- a/kamera/kcontrol/Makefile.am +++ b/kamera/kcontrol/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_kamera.la kcm_kamera_la_SOURCES = kamera.cpp kameradevice.cpp kameraconfigdialog.cpp kcm_kamera_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kcm_kamera_la_LIBADD = $(LIB_KIO) $(GPHOTO2_LIBS) +kcm_kamera_la_LIBADD = $(LIB_TDEIO) $(GPHOTO2_LIBS) INCLUDES= $(all_includes) $(GPHOTO2_INCS) kcm_kamera_la_METASOURCES = AUTO diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp index 75db64a8..ef1b0a6f 100644 --- a/kamera/kcontrol/kameradevice.cpp +++ b/kamera/kcontrol/kameradevice.cpp @@ -187,7 +187,7 @@ bool KCamera::configure() bool KCamera::test() { - // TODO: Make testing non-blocking (maybe via KIO?) + // TODO: Make testing non-blocking (maybe via TDEIO?) // Currently, a failed serial test times out at about 30 sec. return camera() != 0; } diff --git a/kamera/tdeioslave/Makefile.am b/kamera/tdeioslave/Makefile.am index ffc4c855..16f9f97c 100644 --- a/kamera/tdeioslave/Makefile.am +++ b/kamera/tdeioslave/Makefile.am @@ -8,7 +8,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes) $(GPHOTO2_INCS) kde_module_LTLIBRARIES = tdeio_kamera.la tdeio_kamera_la_SOURCES = kamera.cpp -tdeio_kamera_la_LIBADD = $(LIB_KIO) -lgphoto2 +tdeio_kamera_la_LIBADD = $(LIB_TDEIO) -lgphoto2 tdeio_kamera_la_LDFLAGS = $(all_libraries) $(GPHOTO2_LIBS) -module $(KDE_PLUGIN) noinst_HEADERS = kamera.h diff --git a/kamera/tdeioslave/kamera.cpp b/kamera/tdeioslave/kamera.cpp index 88228418..96d65e9a 100644 --- a/kamera/tdeioslave/kamera.cpp +++ b/kamera/tdeioslave/kamera.cpp @@ -212,7 +212,7 @@ static TQString fix_foldername(TQString ofolder) { return folder; } -// The KIO slave "get" function (starts a download from the camera) +// The TDEIO slave "get" function (starts a download from the camera) // The actual returning of the data is done in the frontend callback functions. void KameraProtocol::get(const KURL &url) { @@ -368,7 +368,7 @@ void KameraProtocol::get(const KURL &url) m_file = NULL; } -// The KIO slave "stat" function. +// The TDEIO slave "stat" function. void KameraProtocol::stat(const KURL &url) { kdDebug(7123) << "stat(\"" << url.path() << "\")" << endl; @@ -495,7 +495,7 @@ void KameraProtocol::statRegular(const KURL &url) finished(); } -// The KIO slave "del" function. +// The TDEIO slave "del" function. void KameraProtocol::del(const KURL &url, bool isFile) { kdDebug(7123) << "KameraProtocol::del(" << url.path() << ")" << endl; @@ -523,7 +523,7 @@ void KameraProtocol::del(const KURL &url, bool isFile) } } -// The KIO slave "listDir" function. +// The TDEIO slave "listDir" function. void KameraProtocol::listDir(const KURL &url) { kdDebug(7123) << "KameraProtocol::listDir(" << url.path() << ")" << endl; @@ -975,7 +975,7 @@ void frontendProgressUpdate( KameraProtocol *object = (KameraProtocol*)data; // This code will get the last chunk of data retrieved from the - // camera and pass it to KIO, to allow progressive display + // camera and pass it to TDEIO, to allow progressive display // of the downloaded photo. const char *fileData = NULL; |