summaryrefslogtreecommitdiffstats
path: root/kamera
diff options
context:
space:
mode:
Diffstat (limited to 'kamera')
-rw-r--r--kamera/kcontrol/kamera.cpp40
-rw-r--r--kamera/kcontrol/kamera.h6
-rw-r--r--kamera/kcontrol/kameraconfigdialog.cpp6
-rw-r--r--kamera/kcontrol/kameraconfigdialog.h2
-rw-r--r--kamera/kcontrol/kameradevice.cpp18
-rw-r--r--kamera/kcontrol/kameradevice.h4
-rw-r--r--kamera/tdeioslave/kamera.cpp10
-rw-r--r--kamera/tdeioslave/kamera.h4
8 files changed, 45 insertions, 45 deletions
diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp
index 1fa2639c..f3c89149 100644
--- a/kamera/kcontrol/kamera.cpp
+++ b/kamera/kcontrol/kamera.cpp
@@ -24,7 +24,7 @@
#include <tqlayout.h>
#include <kgenericfactory.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <tdeaction.h>
#include <kiconloader.h>
#include <tdemessagebox.h>
@@ -53,7 +53,7 @@ KKameraConfig::KKameraConfig(TQWidget *parent, const char *name, const TQStringL
{
m_devicePopup = new TDEPopupMenu(this);
m_actions = new TDEActionCollection(this);
- m_config = new KSimpleConfig(KProtocolInfo::config("camera"));
+ m_config = new TDESimpleConfig(KProtocolInfo::config("camera"));
m_context = gp_context_new();
if (m_context) {
@@ -106,36 +106,36 @@ void KKameraConfig::displayGPSuccessDialogue(void)
// create list of devices
m_deviceSel = new TDEIconView(this);
- connect(m_deviceSel, TQT_SIGNAL(rightButtonClicked(TQIconViewItem *, const TQPoint &)),
- TQT_SLOT(slot_deviceMenu(TQIconViewItem *, const TQPoint &)));
- connect(m_deviceSel, TQT_SIGNAL(doubleClicked(TQIconViewItem *)),
- TQT_SLOT(slot_configureCamera()));
- connect(m_deviceSel, TQT_SIGNAL(selectionChanged(TQIconViewItem *)),
- TQT_SLOT(slot_deviceSelected(TQIconViewItem *)));
+ connect(m_deviceSel, TQ_SIGNAL(rightButtonClicked(TQIconViewItem *, const TQPoint &)),
+ TQ_SLOT(slot_deviceMenu(TQIconViewItem *, const TQPoint &)));
+ connect(m_deviceSel, TQ_SIGNAL(doubleClicked(TQIconViewItem *)),
+ TQ_SLOT(slot_configureCamera()));
+ connect(m_deviceSel, TQ_SIGNAL(selectionChanged(TQIconViewItem *)),
+ TQ_SLOT(slot_deviceSelected(TQIconViewItem *)));
m_deviceSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
// create actions
TDEAction *act;
- act = new TDEAction(i18n("Add"), "camera-photo", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_addCamera()), m_actions, "camera_add");
+ act = new TDEAction(i18n("Add"), "camera-photo", 0, this, TQ_SLOT(slot_addCamera()), m_actions, "camera_add");
act->setWhatsThis(i18n("Click this button to add a new camera."));
act->plug(m_toolbar);
m_toolbar->insertLineSeparator();
- act = new TDEAction(i18n("Test"), "button_ok", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_testCamera()), m_actions, "camera_test");
+ act = new TDEAction(i18n("Test"), "button_ok", 0, this, TQ_SLOT(slot_testCamera()), m_actions, "camera_test");
act->setWhatsThis(i18n("Click this button to remove the selected camera from the list."));
act->plug(m_toolbar);
- act = new TDEAction(i18n("Remove"), "edittrash", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_removeCamera()), m_actions, "camera_remove");
+ act = new TDEAction(i18n("Remove"), "edittrash", 0, this, TQ_SLOT(slot_removeCamera()), m_actions, "camera_remove");
act->setWhatsThis(i18n("Click this button to remove the selected camera from the list."));
act->plug(m_toolbar);
- act = new TDEAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_configureCamera()), m_actions, "camera_configure");
+ act = new TDEAction(i18n("Configure..."), "configure", 0, this, TQ_SLOT(slot_configureCamera()), m_actions, "camera_configure");
act->setWhatsThis(i18n("Click this button to change the configuration of the selected camera.<br><br>The availability of this feature and the contents of the Configuration dialog depend on the camera model."));
act->plug(m_toolbar);
- act = new TDEAction(i18n("Information"), "hwinfo", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cameraSummary()), m_actions, "camera_summary");
+ act = new TDEAction(i18n("Information"), "hwinfo", 0, this, TQ_SLOT(slot_cameraSummary()), m_actions, "camera_summary");
act->setWhatsThis(i18n("Click this button to view a summary of the current status of the selected camera.<br><br>The availability of this feature and the contents of the Configuration dialog depend on the camera model."));
act->plug(m_toolbar);
m_toolbar->insertLineSeparator();
- act = new TDEAction(i18n("Cancel"), "process-stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cancelOperation()), m_actions, "camera_cancel");
+ act = new TDEAction(i18n("Cancel"), "process-stop", 0, this, TQ_SLOT(slot_cancelOperation()), m_actions, "camera_cancel");
act->setWhatsThis(i18n("Click this button to cancel the current camera operation."));
act->setEnabled(false);
act->plug(m_toolbar);
@@ -188,8 +188,8 @@ void KKameraConfig::load(bool useDefaults )
continue;
kcamera = new KCamera(*it,m_config->readEntry("Path"));
- connect(kcamera, TQT_SIGNAL(error(const TQString &)), TQT_SLOT(slot_error(const TQString &)));
- connect(kcamera, TQT_SIGNAL(error(const TQString &, const TQString &)), TQT_SLOT(slot_error(const TQString &, const TQString &)));
+ connect(kcamera, TQ_SIGNAL(error(const TQString &)), TQ_SLOT(slot_error(const TQString &)));
+ connect(kcamera, TQ_SIGNAL(error(const TQString &, const TQString &)), TQ_SLOT(slot_error(const TQString &, const TQString &)));
kcamera->load(m_config);
m_devices[*it] = kcamera;
}
@@ -227,8 +227,8 @@ void KKameraConfig::load(bool useDefaults )
/* kdDebug() << "Adding USB camera: " << portit.data() << " at " << portit.key() << endl; */
kcamera = new KCamera(portit.data(),portit.key());
- connect(kcamera, TQT_SIGNAL(error(const TQString &)), TQT_SLOT(slot_error(const TQString &)));
- connect(kcamera, TQT_SIGNAL(error(const TQString &, const TQString &)), TQT_SLOT(slot_error(const TQString &, const TQString &)));
+ connect(kcamera, TQ_SIGNAL(error(const TQString &)), TQ_SLOT(slot_error(const TQString &)));
+ connect(kcamera, TQ_SIGNAL(error(const TQString &, const TQString &)), TQ_SLOT(slot_error(const TQString &, const TQString &)));
m_devices[portit.data()] = kcamera;
}
populateDeviceListView();
@@ -285,8 +285,8 @@ TQString KKameraConfig::suggestName(const TQString &name)
void KKameraConfig::slot_addCamera()
{
KCamera *m_device = new KCamera(TQString(),TQString());
- connect(m_device, TQT_SIGNAL(error(const TQString &)), TQT_SLOT(slot_error(const TQString &)));
- connect(m_device, TQT_SIGNAL(error(const TQString &, const TQString &)), TQT_SLOT(slot_error(const TQString &, const TQString &)));
+ connect(m_device, TQ_SIGNAL(error(const TQString &)), TQ_SLOT(slot_error(const TQString &)));
+ connect(m_device, TQ_SIGNAL(error(const TQString &, const TQString &)), TQ_SLOT(slot_error(const TQString &, const TQString &)));
KameraDeviceSelectDialog dialog(this, m_device);
if (dialog.exec() == TQDialog::Accepted) {
dialog.save();
diff --git a/kamera/kcontrol/kamera.h b/kamera/kcontrol/kamera.h
index 1c4ef7a0..ce3b88d4 100644
--- a/kamera/kcontrol/kamera.h
+++ b/kamera/kcontrol/kamera.h
@@ -38,7 +38,7 @@ class TQIconViewItem;
class KCamera;
class KameraDeviceSelectDialog;
-class KSimpleConfig;
+class TDESimpleConfig;
class TDEIconView;
class TDEActionCollection;
class TDEToolBar;
@@ -46,7 +46,7 @@ class TDEPopupMenu;
class KKameraConfig : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
friend class KameraDeviceSelectDialog;
@@ -92,7 +92,7 @@ private:
private:
typedef TQMap<TQString, KCamera *> CameraDevicesMap;
- KSimpleConfig *m_config;
+ TDESimpleConfig *m_config;
CameraDevicesMap m_devices;
bool m_cancelPending;
diff --git a/kamera/kcontrol/kameraconfigdialog.cpp b/kamera/kcontrol/kameraconfigdialog.cpp
index 9806ff65..67d4aa5b 100644
--- a/kamera/kcontrol/kameraconfigdialog.cpp
+++ b/kamera/kcontrol/kameraconfigdialog.cpp
@@ -104,7 +104,7 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
{
gp_widget_get_value(widget, &widget_value_string);
- TQGrid *grid = new TQGrid(2,Qt::Horizontal, parent);
+ TQGrid *grid = new TQGrid(2,TQt::Horizontal, parent);
grid->setSpacing(spacingHint());
new TQLabel(TQString::fromLocal8Bit( widget_label )+":", grid);
TQLineEdit *lineEdit = new TQLineEdit(widget_value_string, grid);
@@ -129,7 +129,7 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
( int )widget_high,
( int )widget_increment,
( int )widget_value_float,
- Qt::Horizontal,
+ TQt::Horizontal,
groupBox );
m_wmap.insert(widget, slider);
@@ -183,7 +183,7 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
{
gp_widget_get_value(widget, &widget_value_string);
- TQComboBox *comboBox = new TQComboBox(FALSE, parent);
+ TQComboBox *comboBox = new TQComboBox(false, parent);
comboBox->clear();
for(int i = 0; i < gp_widget_count_choices(widget); ++i) {
const char *widget_choice;
diff --git a/kamera/kcontrol/kameraconfigdialog.h b/kamera/kcontrol/kameraconfigdialog.h
index 4e4b641d..fe7d4aa7 100644
--- a/kamera/kcontrol/kameraconfigdialog.h
+++ b/kamera/kcontrol/kameraconfigdialog.h
@@ -33,7 +33,7 @@ extern "C" {
class KameraConfigDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KameraConfigDialog(Camera *camera, CameraWidget *widget,
diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp
index ef1b0a6f..f1a4c295 100644
--- a/kamera/kcontrol/kameradevice.cpp
+++ b/kamera/kcontrol/kameradevice.cpp
@@ -276,10 +276,10 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
: KDialogBase(parent, "kkameradeviceselect", true, i18n("Select Camera Device"), Ok | Cancel, Ok, true)
{
m_device = device;
- connect(m_device, TQT_SIGNAL(error(const TQString &)),
- TQT_SLOT(slot_error(const TQString &)));
- connect(m_device, TQT_SIGNAL(error(const TQString &, const TQString &)),
- TQT_SLOT(slot_error(const TQString &, const TQString &)));
+ connect(m_device, TQ_SIGNAL(error(const TQString &)),
+ TQ_SLOT(slot_error(const TQString &)));
+ connect(m_device, TQ_SIGNAL(error(const TQString &, const TQString &)),
+ TQ_SLOT(slot_error(const TQString &, const TQString &)));
TQWidget *page = new TQWidget( this );
setMainWidget(page);
@@ -292,8 +292,8 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
topLayout->addWidget( m_modelSel );
m_modelSel->addColumn(i18n("Supported Cameras"));
m_modelSel->setColumnWidthMode(0, TQListView::Maximum);
- connect(m_modelSel, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
- TQT_SLOT(slot_setModel(TQListViewItem *)));
+ connect(m_modelSel, TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+ TQ_SLOT(slot_setModel(TQListViewItem *)));
// make sure listview only as wide as it needs to be
m_modelSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,
TQSizePolicy::Preferred));
@@ -315,8 +315,8 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
TQWhatsThis::add(m_USBRB, i18n("If this option is checked, the camera would have to be connected to one of the USB slots in your computer or USB hub."));
// Create port settings widget stack
m_settingsStack = new TQWidgetStack(m_portSettingsGroup);
- connect(m_portSelectGroup, TQT_SIGNAL(clicked(int)),
- m_settingsStack, TQT_SLOT(raiseWidget(int)));
+ connect(m_portSelectGroup, TQ_SIGNAL(clicked(int)),
+ m_settingsStack, TQ_SLOT(raiseWidget(int)));
// none tab
m_settingsStack->addWidget(new TQLabel(i18n("No port type selected."),
@@ -326,7 +326,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
TQGrid *grid = new TQGrid(2, m_settingsStack);
grid->setSpacing(KDialog::spacingHint());
new TQLabel(i18n("Port:"), grid);
- m_serialPortCombo = new TQComboBox(TRUE, grid);
+ m_serialPortCombo = new TQComboBox(true, grid);
TQWhatsThis::add(m_serialPortCombo, i18n("Here you should choose the serial port you connect the camera to."));
m_settingsStack->addWidget(grid, INDEX_SERIAL);
diff --git a/kamera/kcontrol/kameradevice.h b/kamera/kcontrol/kameradevice.h
index 9db8b4c5..699524c1 100644
--- a/kamera/kcontrol/kameradevice.h
+++ b/kamera/kcontrol/kameradevice.h
@@ -39,7 +39,7 @@ class TQRadioButton;
class KCamera : public TQObject {
friend class KameraDeviceSelectDialog;
- Q_OBJECT
+ TQ_OBJECT
public:
KCamera(const TQString &name, const TQString &path);
@@ -88,7 +88,7 @@ protected:
class KameraDeviceSelectDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KameraDeviceSelectDialog(TQWidget *parent, KCamera *device);
diff --git a/kamera/tdeioslave/kamera.cpp b/kamera/tdeioslave/kamera.cpp
index 96d65e9a..8810bcc5 100644
--- a/kamera/tdeioslave/kamera.cpp
+++ b/kamera/tdeioslave/kamera.cpp
@@ -33,10 +33,10 @@
#include <tqtextstream.h>
#include <kdebug.h>
-#include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdeinstance.h>
+#include <tdestandarddirs.h>
#include <tdeconfig.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <tdelocale.h>
#include <kprotocolinfo.h>
#include <tdeio/slaveconfig.h>
@@ -53,7 +53,7 @@ using namespace TDEIO;
extern "C"
{
- KDE_EXPORT int kdemain(int argc, char **argv);
+ TDE_EXPORT int kdemain(int argc, char **argv);
#ifdef HAVE_GPHOTO2_5
static void frontendCameraStatus(GPContext *context, const char *status, void *data);
@@ -95,7 +95,7 @@ m_camera(NULL)
// (will init m_camera, since the m_camera's configuration is empty)
m_camera = 0;
m_file = NULL;
- m_config = new KSimpleConfig(KProtocolInfo::config("camera"));
+ m_config = new TDESimpleConfig(KProtocolInfo::config("camera"));
m_context = gp_context_new();
actiondone = true;
cameraopen = false;
diff --git a/kamera/tdeioslave/kamera.h b/kamera/tdeioslave/kamera.h
index 1e015d0f..48d38165 100644
--- a/kamera/tdeioslave/kamera.h
+++ b/kamera/tdeioslave/kamera.h
@@ -27,7 +27,7 @@
#include <tdeio/slavebase.h>
#include <gphoto2.h>
-class KSimpleConfig;
+class TDESimpleConfig;
class KameraProtocol : public TDEIO::SlaveBase
{
@@ -49,7 +49,7 @@ public:
private:
Camera *m_camera;
CameraAbilities m_abilities;
- KSimpleConfig *m_config;
+ TDESimpleConfig *m_config;
GPContext *m_context;
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-31 07:02:09 +0000