TQt4 port kdegraphics

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 66 insertions, 62 deletions

diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp
index 97338181..50d7fc12 100644
--- a/kamera/kcontrol/kamera.cpp
+++ b/kamera/kcontrol/kamera.cpp
@@ -48,8 +48,8 @@ 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)
+KKameraConfig::KKameraConfig(TQWidget *tqparent, const char *name, const TQStringList &)
+	: KCModule(KKameraConfigFactory::instance(), tqparent, name)
 {
 	m_devicePopup = new KPopupMenu(this);
 	m_actions = new KActionCollection(this);
@@ -96,7 +96,7 @@ void KKameraConfig::displayGPSuccessDialogue(void)
 	// set the kcontrol module buttons
 	setButtons(Help | Apply | Cancel | Ok);
 
-	// create a layout with two vertical boxes
+	// create a tqlayout with two vertical boxes
 	TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, 0);
 	topLayout->setAutoAdd(true);
 	
@@ -113,29 +113,29 @@ void KKameraConfig::displayGPSuccessDialogue(void)
 	connect(m_deviceSel, TQT_SIGNAL(selectionChanged(TQIconViewItem *)),
 		TQT_SLOT(slot_deviceSelected(TQIconViewItem *)));
 
-	m_deviceSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+	m_deviceSel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
 	
 	// create actions
 	KAction *act;
 	
-	act = new KAction(i18n("Add"), "camera", 0, this, TQT_SLOT(slot_addCamera()), m_actions, "camera_add");
+	act = new KAction(i18n("Add"), "camera", 0, TQT_TQOBJECT(this), TQT_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 KAction(i18n("Test"), "camera_test", 0, this, TQT_SLOT(slot_testCamera()), m_actions, "camera_test");
+	act = new KAction(i18n("Test"), "camera_test", 0, TQT_TQOBJECT(this), TQT_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 KAction(i18n("Remove"), "edittrash", 0, this, TQT_SLOT(slot_removeCamera()), m_actions, "camera_remove");
+	act = new KAction(i18n("Remove"), "edittrash", 0, TQT_TQOBJECT(this), TQT_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 KAction(i18n("Configure..."), "configure", 0, this, TQT_SLOT(slot_configureCamera()), m_actions, "camera_configure");
+	act = new KAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_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 KAction(i18n("Information"), "hwinfo", 0, this, TQT_SLOT(slot_cameraSummary()), m_actions, "camera_summary");
+	act = new KAction(i18n("Information"), "hwinfo", 0, TQT_TQOBJECT(this), TQT_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 KAction(i18n("Cancel"), "stop", 0, this, TQT_SLOT(slot_cancelOperation()), m_actions, "camera_cancel");
+	act = new KAction(i18n("Cancel"), "stop", 0, TQT_TQOBJECT(this), TQT_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);
@@ -184,7 +184,7 @@ void KKameraConfig::load(bool useDefaults )
 	for (it = groupList.begin(); it != groupList.end(); it++) {
 		if (*it != "<default>")	{
 			m_config->setGroup(*it);
-			if (m_config->readEntry("Path").contains("usb:"))
+			if (m_config->readEntry("Path").tqcontains("usb:"))
 				continue;
 
 			kcamera = new KCamera(*it,m_config->readEntry("Path"));
@@ -218,7 +218,7 @@ void KKameraConfig::load(bool useDefaults )
 		if (!strcmp(value,"usb:"))
 			names[model] = value;
 	}
-	if (ports.contains("usb:") && names[ports["usb:"]]!="usb:")
+	if (ports.tqcontains("usb:") && names[ports["usb:"]]!="usb:")
 		ports.remove("usb:");
 
 	TQMap<TQString,TQString>::iterator portit;
@@ -256,7 +256,7 @@ void KKameraConfig::afterCameraOperation(void)
 
 	// if we're regaining control after a Cancel...
 	if (m_cancelPending) {
-		qApp->restoreOverrideCursor();
+		tqApp->restoreOverrideCursor();
 		m_cancelPending = false;
 	}
 	
@@ -268,23 +268,23 @@ void KKameraConfig::afterCameraOperation(void)
 TQString KKameraConfig::suggestName(const TQString &name)
 {
 	TQString new_name = name;
-	new_name.replace("/", ""); // we cannot have a slash in a URI's host
+	new_name.tqreplace("/", ""); // we cannot have a slash in a URI's host
 
-	if (!m_devices.contains(new_name)) return new_name;
+	if (!m_devices.tqcontains(new_name)) return new_name;
 	
 	// try new names with a number appended until we find a free one
 	int i = 1;
 	while (i++ < 0xffff) {
 		new_name = name + " (" + TQString::number(i) + ")";
-		if (!m_devices.contains(new_name)) return new_name;
+		if (!m_devices.tqcontains(new_name)) return new_name;
 	}
 
-	return TQString::null;
+	return TQString();
 }
 
 void KKameraConfig::slot_addCamera()
 {
-	KCamera *m_device = new KCamera(TQString::null,TQString::null);
+	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 &)));
 	KameraDeviceSelectDialog dialog(this, m_device);
@@ -302,7 +302,7 @@ void KKameraConfig::slot_addCamera()
 void KKameraConfig::slot_removeCamera()
 {
 	TQString name = m_deviceSel->currentItem()->text();
-	if (m_devices.contains(name)) {
+	if (m_devices.tqcontains(name)) {
 		KCamera *m_device = m_devices[name];
 		m_devices.remove(name);
 		delete m_device;
@@ -317,7 +317,7 @@ void KKameraConfig::slot_testCamera()
 	beforeCameraOperation();
 
 	TQString name = m_deviceSel->currentItem()->text();
-	if (m_devices.contains(name)) {
+	if (m_devices.tqcontains(name)) {
 		KCamera *m_device = m_devices[name];
 		if (m_device->test())
 			KMessageBox::information(this, i18n("Camera test was successful."));
@@ -329,7 +329,7 @@ void KKameraConfig::slot_testCamera()
 void KKameraConfig::slot_configureCamera()
 {
 	TQString name = m_deviceSel->currentItem()->text();
-	if (m_devices.contains(name)) {
+	if (m_devices.tqcontains(name)) {
 		KCamera *m_device = m_devices[name];
 		m_device->configure();
 	}
@@ -339,7 +339,7 @@ void KKameraConfig::slot_cameraSummary()
 {
 	TQString summary;
 	TQString name = m_deviceSel->currentItem()->text();
-	if (m_devices.contains(name)) {
+	if (m_devices.tqcontains(name)) {
 		KCamera *m_device = m_devices[name];
 		summary = m_device->summary();
 		if (!summary.isNull()) {
@@ -354,7 +354,7 @@ void KKameraConfig::slot_cancelOperation()
 	// Prevent the user from keeping clicking Cancel
 	m_actions->action("camera_cancel")->setEnabled(false);
 	// and indicate that the click on Cancel did have some effect
-	qApp->setOverrideCursor(Qt::WaitCursor);
+	tqApp->setOverrideCursor(TQt::WaitCursor);
 }
 
 void KKameraConfig::slot_deviceMenu(TQIconViewItem *item, const TQPoint &point)
@@ -381,7 +381,7 @@ void KKameraConfig::cbGPIdle(GPContext * /*context*/, void * /*data*/)
 {
 	/*KKameraConfig *self( reinterpret_cast<KKameraConfig*>(data) );*/
 
-	qApp->processEvents();
+	tqApp->processEvents();
 }
 
 GPContextFeedback KKameraConfig::cbGPCancel(GPContext * /*context*/, void *data)
@@ -390,7 +390,7 @@ GPContextFeedback KKameraConfig::cbGPCancel(GPContext * /*context*/, void *data)
 
 	// Since in practice no camera driver supports idle callbacks yet,
 	// we'll use the cancel callback as opportunity to process events
-	qApp->processEvents();
+	tqApp->processEvents();
 
 	// If a cancel request is pending, ask gphoto to cancel
 	if (self->m_cancelPending)
diff --git a/kamera/kcontrol/kamera.h b/kamera/kcontrol/kamera.h
index 6e66d642..537522f6 100644
--- a/kamera/kcontrol/kamera.h
+++ b/kamera/kcontrol/kamera.h
@@ -47,10 +47,11 @@ class KPopupMenu;
 class KKameraConfig : public KCModule
 {
 	Q_OBJECT
+  TQ_OBJECT
 	friend class KameraDeviceSelectDialog;
 
 public:
-	KKameraConfig(TQWidget *parent, const char *name, const TQStringList &);
+	KKameraConfig(TQWidget *tqparent, const char *name, const TQStringList &);
 	virtual ~KKameraConfig();
 
 	// KCModule interface methods
diff --git a/kamera/kcontrol/kameraconfigdialog.cpp b/kamera/kcontrol/kameraconfigdialog.cpp
index 124ea991..914e17ab 100644
--- a/kamera/kcontrol/kameraconfigdialog.cpp
+++ b/kamera/kcontrol/kameraconfigdialog.cpp
@@ -42,9 +42,9 @@
 
 KameraConfigDialog::KameraConfigDialog(Camera */*camera*/,
 					CameraWidget *widget,
-					TQWidget *parent,
+					TQWidget *tqparent,
 					const char *name) :
-KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok ),
+KDialogBase(tqparent, name, true, TQString(), Ok|Cancel, Ok ),
 m_widgetRoot(widget)
 {
     TQFrame *main = makeMainWidget();
@@ -56,9 +56,9 @@ m_widgetRoot(widget)
 	appendWidget(main, widget);
 }
 
-void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
+void KameraConfigDialog::appendWidget(TQWidget *tqparent, CameraWidget *widget)
 {
-	TQWidget *newParent = parent;
+	TQWidget *newParent = tqparent;
 	
 	CameraWidgetType widget_type;
 	const char *widget_name;
@@ -74,7 +74,7 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
 	
 	TQString whats_this = TQString::fromLocal8Bit(widget_info);	// gphoto2 doesn't seem to have any standard for i18n
 
-	// Add this widget to parent
+	// Add this widget to tqparent
 	switch(widget_type) {
 	case GP_WIDGET_WINDOW:
 		{
@@ -85,7 +85,7 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
 	case GP_WIDGET_SECTION:
 		{
 			if (!m_tabWidget)
-				m_tabWidget = new TQTabWidget(parent);
+				m_tabWidget = new TQTabWidget(tqparent);
 			TQWidget *tab = new TQWidget(m_tabWidget);
 			// widgets are to be aligned vertically in the tab
 			TQVBoxLayout *tabLayout = new TQVBoxLayout(tab, marginHint(),
@@ -104,7 +104,7 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
 		{
 			gp_widget_get_value(widget, &widget_value_string);
 
-			TQGrid *grid = new TQGrid(2, Horizontal, parent);
+			TQGrid *grid = new TQGrid(2,Qt::Horizontal, tqparent);
 			grid->setSpacing(spacingHint());
 			new TQLabel(TQString::fromLocal8Bit( widget_label )+":", grid);
 			TQLineEdit *lineEdit = new TQLineEdit(widget_value_string, grid);
@@ -123,13 +123,13 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
 			gp_widget_get_range(widget, &widget_low, &widget_high, &widget_increment);
 			gp_widget_get_value(widget, &widget_value_float);
 	
-			TQGroupBox *groupBox = new TQVGroupBox(widget_label, parent);
+			TQGroupBox *groupBox = new TQVGroupBox(widget_label, tqparent);
 			TQSlider *slider = new TQSlider(
 				( int )widget_low,
 				( int )widget_high,
 				( int )widget_increment,
 				( int )widget_value_float,
-				TQSlider::Horizontal,
+				Qt::Horizontal,
 				groupBox );
 			m_wmap.insert(widget, slider);
 		
@@ -142,7 +142,7 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
 		{
 			gp_widget_get_value(widget, &widget_value_int);
 		
-			TQCheckBox *checkBox = new TQCheckBox(widget_label, parent);
+			TQCheckBox *checkBox = new TQCheckBox(widget_label, tqparent);
 			checkBox->setChecked(widget_value_int);
 			m_wmap.insert(widget, checkBox);
 
@@ -160,9 +160,9 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
 			// for less than 5 options, align them horizontally
 			TQButtonGroup *buttonGroup;
 			if (count > 4)
-				buttonGroup = new TQVButtonGroup(widget_label, parent);
+				buttonGroup = new TQVButtonGroup(widget_label, tqparent);
 			else
-				buttonGroup = new TQHButtonGroup(widget_label, parent);
+				buttonGroup = new TQHButtonGroup(widget_label, tqparent);
 			
 			for(int i = 0; i < count; ++i) {
 				const char *widget_choice;
@@ -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, tqparent);
 			comboBox->clear();
 			for(int i = 0; i < gp_widget_count_choices(widget); ++i) {
 				const char *widget_choice;
@@ -206,14 +206,14 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
 			// I can't see a way of implementing this. Since there is
 			// no way of telling which button sent you a signal, we
 			// can't map to the appropriate widget->callback
-			new TQLabel(i18n("Button (not supported by KControl)"), parent);
+			new TQLabel(i18n("Button (not supported by KControl)"), tqparent);
 	
 			break;
 		}
 	case GP_WIDGET_DATE:
 		{
 			// TODO
-			new TQLabel(i18n("Date (not supported by KControl)"), parent);
+			new TQLabel(i18n("Date (not supported by KControl)"), tqparent);
 
 			break;
 		}
@@ -221,14 +221,14 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
 		return;
 	}
 
-	// Append all this widgets children
+	// Append all this widgets tqchildren
 	for(int i = 0; i < gp_widget_count_children(widget); ++i) {
 		CameraWidget *widget_child;
 		gp_widget_get_child(widget, i, &widget_child);
 		appendWidget(newParent, widget_child);
 	}
 	
-	// Things that must be done after all children were added
+	// Things that must be done after all tqchildren were added
 /*
 	switch (widget_type) {
 	case GP_WIDGET_SECTION:
@@ -309,7 +309,7 @@ void KameraConfigDialog::updateWidgetValue(CameraWidget *widget)
 
 void KameraConfigDialog::slotOk()
 {
-	// Copy Qt widget values into CameraWidget hierarchy
+	// Copy TQt widget values into CameraWidget hierarchy
 	updateWidgetValue(m_widgetRoot);
 
 	// 'ok' dialog
diff --git a/kamera/kcontrol/kameraconfigdialog.h b/kamera/kcontrol/kameraconfigdialog.h
index 575f4aad..d02a6ed1 100644
--- a/kamera/kcontrol/kameraconfigdialog.h
+++ b/kamera/kcontrol/kameraconfigdialog.h
@@ -34,15 +34,16 @@ extern "C" {
 class KameraConfigDialog : public KDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KameraConfigDialog(Camera *camera, CameraWidget *widget,
-			   TQWidget *parent = 0, const char *name = 0);
+			   TQWidget *tqparent = 0, const char *name = 0);
 
 private slots:
 	void slotOk();
 
 private:
-	void appendWidget(TQWidget *parent, CameraWidget *widget);
+	void appendWidget(TQWidget *tqparent, CameraWidget *widget);
 	void updateWidgetValue(CameraWidget *widget);
 	
 	TQMap<CameraWidget *, TQWidget *> m_wmap;
diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp
index 9492934b..2e8e45e2 100644
--- a/kamera/kcontrol/kameradevice.cpp
+++ b/kamera/kcontrol/kameradevice.cpp
@@ -86,7 +86,7 @@ bool KCamera::initInformation()
 	int index = gp_abilities_list_lookup_model(m_abilitylist, m_model.local8Bit().data());
 	if(index < 0) {
 		emit error(i18n("Description of abilities for camera %1 is not available."
-					" Configuration options may be incorrect.").arg(m_model));
+					" Configuration options may be incorrect.").tqarg(m_model));
 		return false;
 	}
         gp_abilities_list_get_abilities(m_abilitylist, index, &m_abilities);
@@ -197,7 +197,7 @@ void KCamera::load(KConfig *config)
 		m_model = config->readEntry("Model");
 	if (m_path.isNull())
 		m_path = config->readEntry("Path");
-	invalidateCamera();
+	tqinvalidateCamera();
 }
 
 void KCamera::save(KConfig *config)
@@ -209,7 +209,7 @@ void KCamera::save(KConfig *config)
 
 TQString KCamera::portName()
 {
-	TQString port = m_path.left(m_path.find(":")).lower();
+	TQString port = m_path.left(m_path.tqfind(":")).lower();
 	if (port == "serial") return i18n("Serial");
 	if (port == "usb") return i18n("USB");
 	return i18n("Unknown port");
@@ -223,17 +223,17 @@ void KCamera::setName(const TQString &name)
 void KCamera::setModel(const TQString &model)
 {
 	m_model = model;
-	invalidateCamera();
+	tqinvalidateCamera();
 	initInformation();
 }
 
 void KCamera::setPath(const TQString &path)
 {
 	m_path = path;
-	invalidateCamera();
+	tqinvalidateCamera();
 }
 
-void KCamera::invalidateCamera()
+void KCamera::tqinvalidateCamera()
 {
 	if (m_camera) {
 		gp_camera_free(m_camera);
@@ -270,8 +270,8 @@ CameraAbilities KCamera::abilities()
 
 // ---------- KameraSelectCamera ------------
 
-KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *device)
-	: KDialogBase(parent, "kkameradeviceselect", true, i18n("Select Camera Device"), Ok | Cancel, Ok, true)
+KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *tqparent, KCamera *device)
+	: KDialogBase(tqparent, "kkameradeviceselect", true, i18n("Select Camera Device"), Ok | Cancel, Ok, true)
 {
 	m_device = device;
 	connect(m_device, TQT_SIGNAL(error(const TQString &)),
@@ -282,7 +282,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
 	TQWidget *page = new TQWidget( this );
 	setMainWidget(page);
 
-	// a layout with vertical boxes
+	// a tqlayout with vertical boxes
 	TQHBoxLayout *topLayout = new TQHBoxLayout(page, 0, KDialog::spacingHint());
 
 	// the models list
@@ -293,7 +293,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
 	connect(m_modelSel, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
         TQT_SLOT(slot_setModel(TQListViewItem *)));
 	// make sure listview only as wide as it needs to be
-	m_modelSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,
+	m_modelSel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,
 		TQSizePolicy::Preferred));
 
 	TQVBoxLayout *rightLayout = new TQVBoxLayout(0L, 0, KDialog::spacingHint());
@@ -347,7 +347,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
 	for (int i = 0; i < gphoto_ports; i++) {
 		if (gp_port_info_list_get_info(list, i, &info) >= 0) {
 			if (strncmp(info.path, "serial:", 7) == 0)
-				m_serialPortCombo->insertItem(TQString::fromLatin1(info.path).mid(7));
+				m_serialPortCombo->insertItem(TQString::tqfromLatin1(info.path).mid(7));
 		}
 	}
 	gp_port_info_list_free(list);
@@ -403,7 +403,7 @@ void KameraDeviceSelectDialog::save()
 void KameraDeviceSelectDialog::load()
 {
 	TQString path = m_device->path();
-	TQString port = path.left(path.find(":")).lower();
+	TQString port = path.left(path.tqfind(":")).lower();
 
 	if (port == "serial") setPortType(INDEX_SERIAL);
 	if (port == "usb") setPortType(INDEX_USB);
@@ -432,7 +432,7 @@ void KameraDeviceSelectDialog::slot_setModel(TQListViewItem *item)
 	int index = gp_abilities_list_lookup_model(m_device->m_abilitylist, model.local8Bit().data());
 	if(index < 0) {
 		slot_error(i18n("Description of abilities for camera %1 is not available."
-				" Configuration options may be incorrect.").arg(model));
+				" Configuration options may be incorrect.").tqarg(model));
 	}
 	int result = gp_abilities_list_get_abilities(m_device->m_abilitylist, index, &abilities);
 	if (result == GP_OK) {
@@ -452,7 +452,7 @@ void KameraDeviceSelectDialog::slot_setModel(TQListViewItem *item)
 			setPortType(INDEX_USB);
 	} else {
 		slot_error(i18n("Description of abilities for camera %1 is not available."
-			     " Configuration options may be incorrect.").arg(model));
+			     " Configuration options may be incorrect.").tqarg(model));
 	}
 }
 
diff --git a/kamera/kcontrol/kameradevice.h b/kamera/kcontrol/kameradevice.h
index 34594f4e..4b8205b7 100644
--- a/kamera/kcontrol/kameradevice.h
+++ b/kamera/kcontrol/kameradevice.h
@@ -40,10 +40,11 @@ class TQRadioButton;
 class KCamera : public TQObject {
 	friend class KameraDeviceSelectDialog;
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KCamera(const TQString &name, const TQString &path);
 	~KCamera();
-	void invalidateCamera();
+	void tqinvalidateCamera();
 	bool configure();
 	void load(KConfig *m_config);
 	void save(KConfig *m_config);
@@ -88,8 +89,9 @@ protected:
 class KameraDeviceSelectDialog : public KDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KameraDeviceSelectDialog(TQWidget *parent, KCamera *device);
+	KameraDeviceSelectDialog(TQWidget *tqparent, KCamera *device);
 	void save();
 	void load();
 protected slots: