From 65eca7929c22f0f0bc64135c02d85d1243df376c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:12:51 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kamera/kcontrol/kamera.cpp | 20 ++++++++++---------- kamera/kcontrol/kamera.h | 12 ++++++------ kamera/kcontrol/kameradevice.cpp | 2 +- kamera/kcontrol/kameradevice.h | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) (limited to 'kamera/kcontrol') diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp index f7481526..58d47734 100644 --- a/kamera/kcontrol/kamera.cpp +++ b/kamera/kcontrol/kamera.cpp @@ -51,8 +51,8 @@ KKameraConfig *KKameraConfig::m_instance = NULL; KKameraConfig::KKameraConfig(TQWidget *parent, const char *name, const TQStringList &) : TDECModule(KKameraConfigFactory::instance(), parent, name) { - m_devicePopup = new KPopupMenu(this); - m_actions = new KActionCollection(this); + m_devicePopup = new TDEPopupMenu(this); + m_actions = new TDEActionCollection(this); m_config = new KSimpleConfig(KProtocolInfo::config("camera")); m_context = gp_context_new(); @@ -100,7 +100,7 @@ void KKameraConfig::displayGPSuccessDialogue(void) TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, 0); topLayout->setAutoAdd(true); - m_toolbar = new KToolBar(this, "ToolBar"); + m_toolbar = new TDEToolBar(this, "ToolBar"); m_toolbar->setMovingEnabled(false); // create list of devices @@ -116,26 +116,26 @@ void KKameraConfig::displayGPSuccessDialogue(void) m_deviceSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); // create actions - KAction *act; + TDEAction *act; - act = new KAction(i18n("Add"), "camera", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_addCamera()), m_actions, "camera_add"); + act = new TDEAction(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, TQT_TQOBJECT(this), TQT_SLOT(slot_testCamera()), m_actions, "camera_test"); + act = new TDEAction(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, TQT_TQOBJECT(this), TQT_SLOT(slot_removeCamera()), m_actions, "camera_remove"); + act = new TDEAction(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, TQT_TQOBJECT(this), TQT_SLOT(slot_configureCamera()), m_actions, "camera_configure"); + act = new TDEAction(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.

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, TQT_TQOBJECT(this), TQT_SLOT(slot_cameraSummary()), m_actions, "camera_summary"); + act = new TDEAction(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.

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, TQT_TQOBJECT(this), TQT_SLOT(slot_cancelOperation()), m_actions, "camera_cancel"); + act = new TDEAction(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); diff --git a/kamera/kcontrol/kamera.h b/kamera/kcontrol/kamera.h index 66dd054e..38e46c10 100644 --- a/kamera/kcontrol/kamera.h +++ b/kamera/kcontrol/kamera.h @@ -40,9 +40,9 @@ class KCamera; class KameraDeviceSelectDialog; class KSimpleConfig; class KIconView; -class KActionCollection; -class KToolBar; -class KPopupMenu; +class TDEActionCollection; +class TDEToolBar; +class TDEPopupMenu; class KKameraConfig : public TDECModule { @@ -101,10 +101,10 @@ private: // widgets for the cameras listview KIconView *m_deviceSel; - KActionCollection *m_actions; + TDEActionCollection *m_actions; TQPushButton *m_addCamera, *m_removeCamera, *m_testCamera, *m_configureCamera; - KToolBar *m_toolbar; - KPopupMenu *m_devicePopup; + TDEToolBar *m_toolbar; + TDEPopupMenu *m_devicePopup; // true if libgphoto2 was initialised successfully in // the constructor diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp index 572e819a..8a76b37f 100644 --- a/kamera/kcontrol/kameradevice.cpp +++ b/kamera/kcontrol/kameradevice.cpp @@ -288,7 +288,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de TQHBoxLayout *topLayout = new TQHBoxLayout(page, 0, KDialog::spacingHint()); // the models list - m_modelSel = new KListView(page); + m_modelSel = new TDEListView(page); topLayout->addWidget( m_modelSel ); m_modelSel->addColumn(i18n("Supported Cameras")); m_modelSel->setColumnWidthMode(0, TQListView::Maximum); diff --git a/kamera/kcontrol/kameradevice.h b/kamera/kcontrol/kameradevice.h index 5ee6fea8..9db8b4c5 100644 --- a/kamera/kcontrol/kameradevice.h +++ b/kamera/kcontrol/kameradevice.h @@ -29,7 +29,7 @@ class TDEConfig; class TQString; -class KListView; +class TDEListView; class TQWidgetStack; class TQVButtonGroup; class TQVGroupBox; @@ -105,7 +105,7 @@ protected: void setPortType(int type); // port settings widgets - KListView *m_modelSel; + TDEListView *m_modelSel; TQLineEdit *m_nameEdit; TQWidgetStack *m_settingsStack; TQVButtonGroup *m_portSelectGroup; -- cgit v1.2.1