From 3c5631f74d1c75204f950140331e10f739082ee9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:33:36 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kamera/kcontrol/kamera.cpp | 2 +- kamera/kcontrol/kamera.h | 4 ++-- kamera/kcontrol/kameradevice.cpp | 4 ++-- kamera/kcontrol/kameradevice.h | 8 +++---- kamera/kioslave/kamera.cpp | 46 ++++++++++++++++++++-------------------- kamera/kioslave/kamera.h | 8 +++---- 6 files changed, 36 insertions(+), 36 deletions(-) (limited to 'kamera') diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp index 5bca35b6..f7481526 100644 --- a/kamera/kcontrol/kamera.cpp +++ b/kamera/kcontrol/kamera.cpp @@ -49,7 +49,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kamera, KKameraConfigFactory( "kcmkamera" ) ) KKameraConfig *KKameraConfig::m_instance = NULL; KKameraConfig::KKameraConfig(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(KKameraConfigFactory::instance(), parent, name) + : TDECModule(KKameraConfigFactory::instance(), parent, name) { m_devicePopup = new KPopupMenu(this); m_actions = new KActionCollection(this); diff --git a/kamera/kcontrol/kamera.h b/kamera/kcontrol/kamera.h index 4bf3d759..6b1996f9 100644 --- a/kamera/kcontrol/kamera.h +++ b/kamera/kcontrol/kamera.h @@ -44,7 +44,7 @@ class KActionCollection; class KToolBar; class KPopupMenu; -class KKameraConfig : public KCModule +class KKameraConfig : public TDECModule { Q_OBJECT @@ -54,7 +54,7 @@ public: KKameraConfig(TQWidget *parent, const char *name, const TQStringList &); virtual ~KKameraConfig(); - // KCModule interface methods + // TDECModule interface methods void load(); void load(bool useDefaults); void save(); diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp index 9492934b..20d090fa 100644 --- a/kamera/kcontrol/kameradevice.cpp +++ b/kamera/kcontrol/kameradevice.cpp @@ -190,7 +190,7 @@ bool KCamera::test() return camera() != 0; } -void KCamera::load(KConfig *config) +void KCamera::load(TDEConfig *config) { config->setGroup(m_name); if (m_model.isNull()) @@ -200,7 +200,7 @@ void KCamera::load(KConfig *config) invalidateCamera(); } -void KCamera::save(KConfig *config) +void KCamera::save(TDEConfig *config) { config->setGroup(m_name); config->writeEntry("Model", m_model); diff --git a/kamera/kcontrol/kameradevice.h b/kamera/kcontrol/kameradevice.h index 8046ac88..5ee6fea8 100644 --- a/kamera/kcontrol/kameradevice.h +++ b/kamera/kcontrol/kameradevice.h @@ -27,7 +27,7 @@ #include #include -class KConfig; +class TDEConfig; class TQString; class KListView; class TQWidgetStack; @@ -46,8 +46,8 @@ public: ~KCamera(); void invalidateCamera(); bool configure(); - void load(KConfig *m_config); - void save(KConfig *m_config); + void load(TDEConfig *m_config); + void save(TDEConfig *m_config); bool test(); TQStringList supportedPorts(); @@ -78,7 +78,7 @@ protected: // int frontend_prompt(Camera *camera, CameraWidget *widgets); Camera *m_camera; -// KConfig *m_config; +// TDEConfig *m_config; TQString m_name; // the camera's real name TQString m_model; TQString m_path; diff --git a/kamera/kioslave/kamera.cpp b/kamera/kioslave/kamera.cpp index fe786228..9806a132 100644 --- a/kamera/kioslave/kamera.cpp +++ b/kamera/kioslave/kamera.cpp @@ -49,7 +49,7 @@ #define tocstr(x) ((x).local8Bit()) -using namespace KIO; +using namespace TDEIO; extern "C" { @@ -213,12 +213,12 @@ void KameraProtocol::get(const KURL &url) CameraFileType fileType; int gpr; if (url.host().isEmpty()) { - error(KIO::ERR_DOES_NOT_EXIST, url.path()); + error(TDEIO::ERR_DOES_NOT_EXIST, url.path()); return; } if(!openCamera()) { - error(KIO::ERR_DOES_NOT_EXIST, url.path()); + error(TDEIO::ERR_DOES_NOT_EXIST, url.path()); return; } @@ -229,7 +229,7 @@ void KameraProtocol::get(const KURL &url) CameraText xx; \ gpr = gp_camera_get_##xx(m_camera, &xx, m_context); \ if (gpr != GP_OK) { \ - error(KIO::ERR_DOES_NOT_EXIST, url.path()); \ + error(TDEIO::ERR_DOES_NOT_EXIST, url.path()); \ return; \ } \ TQByteArray chunkDataBuffer; \ @@ -260,9 +260,9 @@ void KameraProtocol::get(const KURL &url) // fprintf(stderr,"Folder %s / File %s not found, gpr is %d\n",folder.latin1(), url.fileName().latin1(), gpr); gp_file_unref(m_file); if ((gpr == GP_ERROR_FILE_NOT_FOUND) || (gpr == GP_ERROR_DIRECTORY_NOT_FOUND)) - error(KIO::ERR_DOES_NOT_EXIST, url.path()); + error(TDEIO::ERR_DOES_NOT_EXIST, url.path()); else - error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr)); + error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr)); return; } @@ -301,12 +301,12 @@ void KameraProtocol::get(const KURL &url) case GP_ERROR_DIRECTORY_NOT_FOUND: gp_file_unref(m_file); m_file = NULL; - error(KIO::ERR_DOES_NOT_EXIST, url.fileName()); + error(TDEIO::ERR_DOES_NOT_EXIST, url.fileName()); return ; default: gp_file_unref(m_file); m_file = NULL; - error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr)); + error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr)); return; } // emit the mimetype @@ -326,7 +326,7 @@ void KameraProtocol::get(const KURL &url) kdDebug(7123) << "get():: get_data_and_size failed." << endl; gp_file_free(m_file); m_file = NULL; - error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr)); + error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr)); return; } // make sure we're not sending zero-sized chunks (=EOF) @@ -419,7 +419,7 @@ void KameraProtocol::statRegular(const KURL &url) kdDebug(7123) << "statRegular(\"" << url.path() << "\")" << endl; if (openCamera() == false) { - error(KIO::ERR_DOES_NOT_EXIST, url.path()); + error(TDEIO::ERR_DOES_NOT_EXIST, url.path()); return; } @@ -433,9 +433,9 @@ void KameraProtocol::statRegular(const KURL &url) gpr = gp_camera_folder_list_folders(m_camera, tocstr(fix_foldername(url.directory(false))), dirList, m_context); if (gpr != GP_OK) { if ((gpr == GP_ERROR_FILE_NOT_FOUND) || (gpr == GP_ERROR_DIRECTORY_NOT_FOUND)) - error(KIO::ERR_DOES_NOT_EXIST, url.path()); + error(TDEIO::ERR_DOES_NOT_EXIST, url.path()); else - error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr)); + error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr)); gp_list_free(dirList); return; } @@ -445,7 +445,7 @@ void KameraProtocol::statRegular(const KURL &url) CameraText xx; \ gpr = gp_camera_get_about(m_camera, &xx, m_context); \ if (gpr != GP_OK) { \ - error(KIO::ERR_DOES_NOT_EXIST, url.fileName()); \ + error(TDEIO::ERR_DOES_NOT_EXIST, url.fileName()); \ return; \ } \ translateTextToUDS(entry,#xx".txt",xx.text); \ @@ -477,9 +477,9 @@ void KameraProtocol::statRegular(const KURL &url) gpr = gp_camera_file_get_info(m_camera, tocstr(fix_foldername(url.directory(false))), tocstr(url.fileName()), &info, m_context); if (gpr != GP_OK) { if ((gpr == GP_ERROR_FILE_NOT_FOUND) || (gpr == GP_ERROR_DIRECTORY_NOT_FOUND)) - error(KIO::ERR_DOES_NOT_EXIST, url.path()); + error(TDEIO::ERR_DOES_NOT_EXIST, url.path()); else - error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr)); + error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr)); return; } translateFileToUDS(entry, info, url.fileName()); @@ -493,11 +493,11 @@ void KameraProtocol::del(const KURL &url, bool isFile) kdDebug(7123) << "KameraProtocol::del(" << url.path() << ")" << endl; if(!openCamera()) { - error(KIO::ERR_CANNOT_DELETE, url.fileName()); + error(TDEIO::ERR_CANNOT_DELETE, url.fileName()); return; } if (!cameraSupportsDel()) { - error(KIO::ERR_CANNOT_DELETE, url.fileName()); + error(TDEIO::ERR_CANNOT_DELETE, url.fileName()); return; } if(isFile){ @@ -508,7 +508,7 @@ void KameraProtocol::del(const KURL &url, bool isFile) ret = gp_camera_file_delete(m_camera, tocstr(fix_foldername(url.directory(false))), tocstr(url.fileName()), m_context); if(ret != GP_OK) { - error(KIO::ERR_CANNOT_DELETE, url.fileName()); + error(TDEIO::ERR_CANNOT_DELETE, url.fileName()); } else { finished(); } @@ -665,7 +665,7 @@ void KameraProtocol::listDir(const KURL &url) } if (!openCamera()) { - error(KIO::ERR_COULD_NOT_READ,url.path()); + error(TDEIO::ERR_COULD_NOT_READ,url.path()); return; } @@ -693,7 +693,7 @@ void KameraProtocol::listDir(const KURL &url) gp_list_free(dirList); gp_list_free(fileList); gp_list_free(specialList); - error(KIO::ERR_COULD_NOT_READ, gp_result_as_string(gpr)); + error(TDEIO::ERR_COULD_NOT_READ, gp_result_as_string(gpr)); return; } @@ -787,7 +787,7 @@ void KameraProtocol::setHost(const TQString& host, int port, const TQString& use if (idx < 0) { gp_port_info_list_free(port_info_list); kdDebug(7123) << "Unable to get port info for path: " << host << endl; - error(KIO::ERR_UNKNOWN, gp_result_as_string(idx)); + error(TDEIO::ERR_UNKNOWN, gp_result_as_string(idx)); return; } gp_port_info_list_get_info(port_info_list, idx, &port_info); @@ -796,7 +796,7 @@ void KameraProtocol::setHost(const TQString& host, int port, const TQString& use // create a new camera object gpr = gp_camera_new(&m_camera); if(gpr != GP_OK) { - error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr)); + error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr)); return; } @@ -816,7 +816,7 @@ void KameraProtocol::setHost(const TQString& host, int port, const TQString& use TQString errstr; if (!openCamera(errstr)) { kdDebug(7123) << "Unable to init camera: " << gp_result_as_string(gpr) << endl; - error(KIO::ERR_SERVICE_NOT_AVAILABLE, errstr); + error(TDEIO::ERR_SERVICE_NOT_AVAILABLE, errstr); gp_camera_exit(m_camera, m_context); return; } diff --git a/kamera/kioslave/kamera.h b/kamera/kioslave/kamera.h index 97c298f6..f569f4ac 100644 --- a/kamera/kioslave/kamera.h +++ b/kamera/kioslave/kamera.h @@ -29,7 +29,7 @@ class KSimpleConfig; -class KameraProtocol : public KIO::SlaveBase +class KameraProtocol : public TDEIO::SlaveBase { public: KameraProtocol(const TQCString &pool, const TQCString &app); @@ -63,9 +63,9 @@ private: void statRoot(void); void statRegular(const KURL &url); - void translateTextToUDS(KIO::UDSEntry &udsEntry, const TQString &info, const char *txt); - void translateFileToUDS(KIO::UDSEntry &udsEntry, const CameraFileInfo &info, TQString name); - void translateDirectoryToUDS(KIO::UDSEntry &udsEntry, const TQString &dirname); + void translateTextToUDS(TDEIO::UDSEntry &udsEntry, const TQString &info, const char *txt); + void translateFileToUDS(TDEIO::UDSEntry &udsEntry, const CameraFileInfo &info, TQString name); + void translateDirectoryToUDS(TDEIO::UDSEntry &udsEntry, const TQString &dirname); bool cameraSupportsPreview(void); bool cameraSupportsDel(void); bool cameraSupportsPut(void); -- cgit v1.2.3