From e7366c97c998679efa80cf61c88e64a11a3d3c33 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kamera/kcontrol/kamera.cpp | 4 ++-- kamera/kcontrol/kamera.h | 2 +- kamera/kcontrol/kameraconfigdialog.cpp | 28 ++++++++++++++-------------- kamera/kcontrol/kameraconfigdialog.h | 4 ++-- kamera/kcontrol/kameradevice.cpp | 4 ++-- kamera/kcontrol/kameradevice.h | 2 +- kamera/kioslave/kamera.cpp | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) (limited to 'kamera') diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp index 5ca35e81..fe4739de 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 *tqparent, const char *name, const TQStringList &) - : KCModule(KKameraConfigFactory::instance(), tqparent, name) +KKameraConfig::KKameraConfig(TQWidget *parent, const char *name, const TQStringList &) + : KCModule(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 537522f6..ca7cd8a9 100644 --- a/kamera/kcontrol/kamera.h +++ b/kamera/kcontrol/kamera.h @@ -51,7 +51,7 @@ class KKameraConfig : public KCModule friend class KameraDeviceSelectDialog; public: - KKameraConfig(TQWidget *tqparent, const char *name, const TQStringList &); + KKameraConfig(TQWidget *parent, const char *name, const TQStringList &); virtual ~KKameraConfig(); // KCModule interface methods diff --git a/kamera/kcontrol/kameraconfigdialog.cpp b/kamera/kcontrol/kameraconfigdialog.cpp index 914e17ab..17a2c249 100644 --- a/kamera/kcontrol/kameraconfigdialog.cpp +++ b/kamera/kcontrol/kameraconfigdialog.cpp @@ -42,9 +42,9 @@ KameraConfigDialog::KameraConfigDialog(Camera */*camera*/, CameraWidget *widget, - TQWidget *tqparent, + TQWidget *parent, const char *name) : -KDialogBase(tqparent, name, true, TQString(), Ok|Cancel, Ok ), +KDialogBase(parent, 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 *tqparent, CameraWidget *widget) +void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget) { - TQWidget *newParent = tqparent; + TQWidget *newParent = parent; CameraWidgetType widget_type; const char *widget_name; @@ -74,7 +74,7 @@ void KameraConfigDialog::appendWidget(TQWidget *tqparent, CameraWidget *widget) TQString whats_this = TQString::fromLocal8Bit(widget_info); // gphoto2 doesn't seem to have any standard for i18n - // Add this widget to tqparent + // Add this widget to parent switch(widget_type) { case GP_WIDGET_WINDOW: { @@ -85,7 +85,7 @@ void KameraConfigDialog::appendWidget(TQWidget *tqparent, CameraWidget *widget) case GP_WIDGET_SECTION: { if (!m_tabWidget) - m_tabWidget = new TQTabWidget(tqparent); + m_tabWidget = new TQTabWidget(parent); 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 *tqparent, CameraWidget *widget) { gp_widget_get_value(widget, &widget_value_string); - TQGrid *grid = new TQGrid(2,Qt::Horizontal, tqparent); + TQGrid *grid = new TQGrid(2,Qt::Horizontal, parent); grid->setSpacing(spacingHint()); new TQLabel(TQString::fromLocal8Bit( widget_label )+":", grid); TQLineEdit *lineEdit = new TQLineEdit(widget_value_string, grid); @@ -123,7 +123,7 @@ void KameraConfigDialog::appendWidget(TQWidget *tqparent, 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, tqparent); + TQGroupBox *groupBox = new TQVGroupBox(widget_label, parent); TQSlider *slider = new TQSlider( ( int )widget_low, ( int )widget_high, @@ -142,7 +142,7 @@ void KameraConfigDialog::appendWidget(TQWidget *tqparent, CameraWidget *widget) { gp_widget_get_value(widget, &widget_value_int); - TQCheckBox *checkBox = new TQCheckBox(widget_label, tqparent); + TQCheckBox *checkBox = new TQCheckBox(widget_label, parent); checkBox->setChecked(widget_value_int); m_wmap.insert(widget, checkBox); @@ -160,9 +160,9 @@ void KameraConfigDialog::appendWidget(TQWidget *tqparent, CameraWidget *widget) // for less than 5 options, align them horizontally TQButtonGroup *buttonGroup; if (count > 4) - buttonGroup = new TQVButtonGroup(widget_label, tqparent); + buttonGroup = new TQVButtonGroup(widget_label, parent); else - buttonGroup = new TQHButtonGroup(widget_label, tqparent); + buttonGroup = new TQHButtonGroup(widget_label, parent); for(int i = 0; i < count; ++i) { const char *widget_choice; @@ -183,7 +183,7 @@ void KameraConfigDialog::appendWidget(TQWidget *tqparent, CameraWidget *widget) { gp_widget_get_value(widget, &widget_value_string); - TQComboBox *comboBox = new TQComboBox(FALSE, tqparent); + TQComboBox *comboBox = new TQComboBox(FALSE, parent); 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 *tqparent, 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)"), tqparent); + new TQLabel(i18n("Button (not supported by KControl)"), parent); break; } case GP_WIDGET_DATE: { // TODO - new TQLabel(i18n("Date (not supported by KControl)"), tqparent); + new TQLabel(i18n("Date (not supported by KControl)"), parent); break; } diff --git a/kamera/kcontrol/kameraconfigdialog.h b/kamera/kcontrol/kameraconfigdialog.h index d02a6ed1..65b3bada 100644 --- a/kamera/kcontrol/kameraconfigdialog.h +++ b/kamera/kcontrol/kameraconfigdialog.h @@ -37,13 +37,13 @@ class KameraConfigDialog : public KDialogBase TQ_OBJECT public: KameraConfigDialog(Camera *camera, CameraWidget *widget, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); private slots: void slotOk(); private: - void appendWidget(TQWidget *tqparent, CameraWidget *widget); + void appendWidget(TQWidget *parent, CameraWidget *widget); void updateWidgetValue(CameraWidget *widget); TQMap m_wmap; diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp index a38ed0b7..9ce6deae 100644 --- a/kamera/kcontrol/kameradevice.cpp +++ b/kamera/kcontrol/kameradevice.cpp @@ -270,8 +270,8 @@ CameraAbilities KCamera::abilities() // ---------- KameraSelectCamera ------------ -KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *tqparent, KCamera *device) - : KDialogBase(tqparent, "kkameradeviceselect", true, i18n("Select Camera Device"), Ok | Cancel, Ok, true) +KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *device) + : KDialogBase(parent, "kkameradeviceselect", true, i18n("Select Camera Device"), Ok | Cancel, Ok, true) { m_device = device; connect(m_device, TQT_SIGNAL(error(const TQString &)), diff --git a/kamera/kcontrol/kameradevice.h b/kamera/kcontrol/kameradevice.h index 698622df..49acdc34 100644 --- a/kamera/kcontrol/kameradevice.h +++ b/kamera/kcontrol/kameradevice.h @@ -91,7 +91,7 @@ class KameraDeviceSelectDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KameraDeviceSelectDialog(TQWidget *tqparent, KCamera *device); + KameraDeviceSelectDialog(TQWidget *parent, KCamera *device); void save(); void load(); protected slots: diff --git a/kamera/kioslave/kamera.cpp b/kamera/kioslave/kamera.cpp index 4ef47238..7e8c9387 100644 --- a/kamera/kioslave/kamera.cpp +++ b/kamera/kioslave/kamera.cpp @@ -890,7 +890,7 @@ void KameraProtocol::translateFileToUDS(UDSEntry &udsEntry, const CameraFileInfo atom.m_long = 0; atom.m_long |= (info.file.permissions & GP_FILE_PERM_READ) ? (S_IRUSR | S_IRGRP | S_IROTH) : 0; // we cannot represent individual FP_FILE_PERM_DELETE permission in the Unix access scheme - // since the tqparent directory's write permission defines that + // since the parent directory's write permission defines that udsEntry.append(atom); } else { // basic permissions, in case the camera doesn't provide permissions info -- cgit v1.2.3