summaryrefslogtreecommitdiffstats
path: root/digikam/utilities/cameragui/gpcamera.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'digikam/utilities/cameragui/gpcamera.cpp')
-rw-r--r--digikam/utilities/cameragui/gpcamera.cpp60
1 files changed, 30 insertions, 30 deletions
diff --git a/digikam/utilities/cameragui/gpcamera.cpp b/digikam/utilities/cameragui/gpcamera.cpp
index 9c6be9b..28b7f3e 100644
--- a/digikam/utilities/cameragui/gpcamera.cpp
+++ b/digikam/utilities/cameragui/gpcamera.cpp
@@ -80,19 +80,19 @@ public:
CameraAbilities cameraAbilities;
};
-class GPtqStatus
+class GPStatus
{
public:
- GPtqStatus()
+ GPStatus()
{
context = gp_context_new();
cancel = false;
gp_context_set_cancel_func(context, cancel_func, 0);
}
- ~GPtqStatus()
+ ~GPStatus()
{
gp_context_unref(context);
cancel = false;
@@ -108,7 +108,7 @@ public:
}
};
-bool GPtqStatus::cancel = false;
+bool GPStatus::cancel = false;
GPCamera::GPCamera(const TQString& title, const TQString& model, const TQString& port, const TQString& path)
: DKCamera(title, model, port, path)
@@ -202,7 +202,7 @@ bool GPCamera::doConnect()
m_status = 0;
}
- m_status = new GPtqStatus();
+ m_status = new GPStatus();
gp_abilities_list_new(&abilList);
gp_abilities_list_load(abilList, m_status->context);
@@ -271,7 +271,7 @@ bool GPCamera::doConnect()
// -- Now try to initialize the camera -----------------
- m_status = new GPtqStatus();
+ m_status = new GPStatus();
// Try and initialize the camera to see if its connected
errorCode = gp_camera_init(d->camera, m_status->context);
@@ -331,7 +331,7 @@ bool GPCamera::getSubFolders(const TQString& folder, TQStringList& subFolderList
delete m_status;
m_status = 0;
}
- m_status = new GPtqStatus();
+ m_status = new GPStatus();
errorCode = gp_camera_folder_list_folders(d->camera, TQFile::encodeName(folder), clist, m_status->context);
if (errorCode != GP_OK)
@@ -378,7 +378,7 @@ bool GPCamera::getItemsList(const TQString& folder, TQStringList& itemsList)
delete m_status;
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
gp_list_new(&clist);
@@ -429,7 +429,7 @@ bool GPCamera::getItemsInfoList(const TQString& folder, GPItemInfoList& items, b
delete m_status;
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
gp_list_new(&clist);
@@ -538,7 +538,7 @@ bool GPCamera::getThumbnail(const TQString& folder, const TQString& itemName, TQ
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_file_get(d->camera, TQFile::encodeName(folder),
TQFile::encodeName(itemName),
@@ -588,7 +588,7 @@ bool GPCamera::getExif(const TQString& folder, const TQString& itemName,
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_file_get(d->camera, TQFile::encodeName(folder),
TQFile::encodeName(itemName),
@@ -638,7 +638,7 @@ bool GPCamera::downloadItem(const TQString& folder, const TQString& itemName,
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_file_get(d->camera, TQFile::encodeName(folder),
TQFile::encodeName(itemName),
@@ -679,7 +679,7 @@ bool GPCamera::setLockItem(const TQString& folder, const TQString& itemName, boo
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
CameraFileInfo info;
errorCode = gp_camera_file_get_info(d->camera, TQFile::encodeName(folder),
@@ -737,7 +737,7 @@ bool GPCamera::deleteItem(const TQString& folder, const TQString& itemName)
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_file_delete(d->camera, TQFile::encodeName(folder),
TQFile::encodeName(itemName),
@@ -786,7 +786,7 @@ bool GPCamera::deleteAllItems(const TQString& folder)
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_folder_delete_all(d->camera, TQFile::encodeName(folder),
m_status->context);
@@ -843,7 +843,7 @@ bool GPCamera::uploadItem(const TQString& folder, const TQString& itemName, cons
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_folder_put_file(d->camera,
TQFile::encodeName(folder),
@@ -941,7 +941,7 @@ bool GPCamera::cameraSummary(TQString& summary)
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_get_summary(d->camera, &sum, m_status->context);
if (errorCode != GP_OK)
@@ -962,15 +962,15 @@ bool GPCamera::cameraSummary(TQString& summary)
"Upload items: %7\n"
"Create directories: %8\n"
"Delete directories: %9\n\n")
- .tqarg(title())
- .tqarg(model())
- .tqarg(port())
- .tqarg(path())
- .tqarg(thumbnailSupport() ? i18n("yes") : i18n("no"))
- .tqarg(deleteSupport() ? i18n("yes") : i18n("no"))
- .tqarg(uploadSupport() ? i18n("yes") : i18n("no"))
- .tqarg(mkDirSupport() ? i18n("yes") : i18n("no"))
- .tqarg(delDirSupport() ? i18n("yes") : i18n("no"));
+ .arg(title())
+ .arg(model())
+ .arg(port())
+ .arg(path())
+ .arg(thumbnailSupport() ? i18n("yes") : i18n("no"))
+ .arg(deleteSupport() ? i18n("yes") : i18n("no"))
+ .arg(uploadSupport() ? i18n("yes") : i18n("no"))
+ .arg(mkDirSupport() ? i18n("yes") : i18n("no"))
+ .arg(delDirSupport() ? i18n("yes") : i18n("no"));
summary.append(TQString(sum.text));
@@ -990,7 +990,7 @@ bool GPCamera::cameraManual(TQString& manual)
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_get_manual(d->camera, &man, m_status->context);
if (errorCode != GP_OK)
@@ -1020,7 +1020,7 @@ bool GPCamera::cameraAbout(TQString& about)
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_get_about(d->camera, &abt, m_status->context);
if (errorCode != GP_OK)
@@ -1193,8 +1193,8 @@ int GPCamera::autoDetect(TQString& model, TQString& port)
if (camModel_ && camPort_)
{
- model = TQString::tqfromLatin1(camModel_);
- port = TQString::tqfromLatin1(camPort_);
+ model = TQString::fromLatin1(camModel_);
+ port = TQString::fromLatin1(camPort_);
gp_list_free(camList);
return 0;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-12 19:11:19 +0000