diff options
Diffstat (limited to 'src/libgui')
42 files changed, 166 insertions, 166 deletions
diff --git a/src/libgui/breakpoint_view.cpp b/src/libgui/breakpoint_view.cpp index 3a8394f..b3950fa 100644 --- a/src/libgui/breakpoint_view.cpp +++ b/src/libgui/breakpoint_view.cpp @@ -29,13 +29,13 @@ void Breakpoint::updateActions(const Data *data) } //---------------------------------------------------------------------------- -Breakpoint::ListViewItem::ListViewItem(ListView *tqparent, const Data &data) - : KListViewItem(tqparent), _data(data) +Breakpoint::ListViewItem::ListViewItem(ListView *parent, const Data &data) + : KListViewItem(parent), _data(data) {} //---------------------------------------------------------------------------- -Breakpoint::View::View(TQWidget *tqparent) - : TQWidget(tqparent, "breakpoints_view"), GenericView(Breakpoint::list()), +Breakpoint::View::View(TQWidget *parent) + : TQWidget(parent, "breakpoints_view"), GenericView(Breakpoint::list()), _currentData(0) { TQVBoxLayout *top = new TQVBoxLayout(this); diff --git a/src/libgui/breakpoint_view.h b/src/libgui/breakpoint_view.h index 1f3543e..1545afa 100644 --- a/src/libgui/breakpoint_view.h +++ b/src/libgui/breakpoint_view.h @@ -18,7 +18,7 @@ namespace Breakpoint class ListViewItem : public KListViewItem { public: - ListViewItem(ListView *tqparent, const Data &data); + ListViewItem(ListView *parent, const Data &data); const Data &data() const { return _data; } private: @@ -31,7 +31,7 @@ class View : public TQWidget, public GenericView Q_OBJECT TQ_OBJECT public: - View(TQWidget *tqparent); + View(TQWidget *parent); virtual void updateView(); const Data *currentData() const { return _currentData; } diff --git a/src/libgui/config_center.cpp b/src/libgui/config_center.cpp index 237a89d..e91a956 100644 --- a/src/libgui/config_center.cpp +++ b/src/libgui/config_center.cpp @@ -106,8 +106,8 @@ ConfigWidget *ConfigCenter::factory(Type type) return 0; } -ConfigCenter::ConfigCenter(Type showType, TQWidget *tqparent) - : Dialog(IconList, i18n("Configure Piklab"), Ok|Cancel, Cancel, tqparent, "configure_piklab_dialog", true, false) +ConfigCenter::ConfigCenter(Type showType, TQWidget *parent) + : Dialog(IconList, i18n("Configure Piklab"), Ok|Cancel, Cancel, parent, "configure_piklab_dialog", true, false) { for (uint i=0; i<Nb_Types; i++) { _configWidgets[i] = factory(Type(i)); diff --git a/src/libgui/config_center.h b/src/libgui/config_center.h index 9f50056..88ed12c 100644 --- a/src/libgui/config_center.h +++ b/src/libgui/config_center.h @@ -72,7 +72,7 @@ Q_OBJECT public: enum Type { General = 0, ProgSelect, ProgOptions, DebugOptions, Standalone, Nb_Types }; - ConfigCenter(Type showType, TQWidget *tqparent); + ConfigCenter(Type showType, TQWidget *parent); public slots: virtual void slotOk(); diff --git a/src/libgui/config_gen.cpp b/src/libgui/config_gen.cpp index 8ef334d..01dc06b 100644 --- a/src/libgui/config_gen.cpp +++ b/src/libgui/config_gen.cpp @@ -23,8 +23,8 @@ #include "tools/list/tool_list.h" //----------------------------------------------------------------------------- -GeneratorDialog::GeneratorDialog(const TQString &title, TQWidget *tqparent, const char *name) - : Dialog(tqparent, name, true, title, Close|User1, Close, false, TQSize(400, 300)) +GeneratorDialog::GeneratorDialog(const TQString &title, TQWidget *parent, const char *name) + : Dialog(parent, name, true, title, Close|User1, Close, false, TQSize(400, 300)) { TQVBoxLayout *top = new TQVBoxLayout(mainWidget(), 10, 10); @@ -141,8 +141,8 @@ void GeneratorDialog::slotUser1() } //----------------------------------------------------------------------------- -ConfigGenerator::ConfigGenerator(TQWidget *tqparent) - : GeneratorDialog(i18n("Config Generator"), tqparent, "config_generator"), _memory(0), _configEditor(0) +ConfigGenerator::ConfigGenerator(TQWidget *parent) + : GeneratorDialog(i18n("Config Generator"), parent, "config_generator"), _memory(0), _configEditor(0) {} ConfigGenerator::~ConfigGenerator() @@ -175,8 +175,8 @@ SourceLine::List ConfigGenerator::generateLines(bool &ok) const } //----------------------------------------------------------------------------- -TemplateGenerator::TemplateGenerator(TQWidget *tqparent) - : GeneratorDialog(i18n("Template Generator"), tqparent, "template_generator") +TemplateGenerator::TemplateGenerator(TQWidget *parent) + : GeneratorDialog(i18n("Template Generator"), parent, "template_generator") {} SourceLine::List TemplateGenerator::generateLines(bool &ok) const diff --git a/src/libgui/config_gen.h b/src/libgui/config_gen.h index 412e75c..b281de0 100644 --- a/src/libgui/config_gen.h +++ b/src/libgui/config_gen.h @@ -28,7 +28,7 @@ class GeneratorDialog : public Dialog Q_OBJECT TQ_OBJECT public: - GeneratorDialog(const TQString &title, TQWidget *tqparent, const char *name); + GeneratorDialog(const TQString &title, TQWidget *parent, const char *name); void set(const Device::Data *data, const Tool::Group &group, PURL::ToolType stype); protected slots: @@ -56,7 +56,7 @@ class ConfigGenerator : public GeneratorDialog Q_OBJECT TQ_OBJECT public: - ConfigGenerator(TQWidget *tqparent); + ConfigGenerator(TQWidget *parent); virtual ~ConfigGenerator(); private slots: @@ -76,7 +76,7 @@ class TemplateGenerator : public GeneratorDialog Q_OBJECT TQ_OBJECT public: - TemplateGenerator(TQWidget *tqparent); + TemplateGenerator(TQWidget *parent); private: virtual SourceLine::List generateLines(bool &ok) const; diff --git a/src/libgui/console.cpp b/src/libgui/console.cpp index f090319..6adf44a 100644 --- a/src/libgui/console.cpp +++ b/src/libgui/console.cpp @@ -16,8 +16,8 @@ #include <kparts/part.h> #include <kde_terminal_interface.h> -ConsoleView::ConsoleView(TQWidget *tqparent) - : TQWidget(tqparent, "console_view"), _initialized(false) +ConsoleView::ConsoleView(TQWidget *parent) + : TQWidget(parent, "console_view"), _initialized(false) {} void ConsoleView::showEvent(TQShowEvent *e) diff --git a/src/libgui/console.h b/src/libgui/console.h index ca86fd1..304c793 100644 --- a/src/libgui/console.h +++ b/src/libgui/console.h @@ -16,7 +16,7 @@ class ConsoleView : public TQWidget Q_OBJECT TQ_OBJECT public: - ConsoleView(TQWidget *tqparent); + ConsoleView(TQWidget *parent); protected: virtual void showEvent(TQShowEvent *e); diff --git a/src/libgui/device_editor.cpp b/src/libgui/device_editor.cpp index d3c2158..9b3b852 100644 --- a/src/libgui/device_editor.cpp +++ b/src/libgui/device_editor.cpp @@ -19,14 +19,14 @@ #include "common/global/pfile.h" #include "main_global.h" -DeviceEditor::DeviceEditor(const TQString &title, const TQString &tag, TQWidget *tqparent, const char *name) - : Editor(title, tag, tqparent, name), _view(0) +DeviceEditor::DeviceEditor(const TQString &title, const TQString &tag, TQWidget *parent, const char *name) + : Editor(title, tag, parent, name), _view(0) { init(); } -DeviceEditor::DeviceEditor(TQWidget *tqparent, const char *name) - : Editor(tqparent, name), _view(0) +DeviceEditor::DeviceEditor(TQWidget *parent, const char *name) + : Editor(parent, name), _view(0) { init(); } diff --git a/src/libgui/device_editor.h b/src/libgui/device_editor.h index adbd2d0..355ddae 100644 --- a/src/libgui/device_editor.h +++ b/src/libgui/device_editor.h @@ -17,8 +17,8 @@ class DeviceEditor : public Editor Q_OBJECT TQ_OBJECT public: - DeviceEditor(const TQString &title, const TQString &tag, TQWidget *tqparent, const char *name); - DeviceEditor(TQWidget *tqparent, const char *name); + DeviceEditor(const TQString &title, const TQString &tag, TQWidget *parent, const char *name); + DeviceEditor(TQWidget *parent, const char *name); virtual PURL::FileType fileType() const { return PURL::Nb_FileTypes; } virtual PURL::Url url() const { return PURL::Url(); } virtual void setDevice(bool force = false); @@ -38,7 +38,7 @@ protected: TQLabel *_labelDevice, *_labelWarning; void init(); - virtual TQWidget *createView(const Device::Data *data, TQWidget *tqparent) = 0; + virtual TQWidget *createView(const Device::Data *data, TQWidget *parent) = 0; static PURL::Url findAsmFile(const PURL::Url &url); private slots: diff --git a/src/libgui/device_gui.cpp b/src/libgui/device_gui.cpp index fae54f6..f5e7a10 100644 --- a/src/libgui/device_gui.cpp +++ b/src/libgui/device_gui.cpp @@ -83,8 +83,8 @@ const DeviceChooser::ListType::Data DeviceChooser::ListType::DATA[Nb_Types] = { { "flat", I18N_NOOP("Flat List") } }; -DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *tqparent) - : ::Dialog(tqparent, "device_chooser_dialog", true, i18n("Select a device"), +DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *parent) + : ::Dialog(parent, "device_chooser_dialog", true, i18n("Select a device"), Ok|Close, Close, false, TQSize(400, 300)), _withAuto(type==ChooseWithAuto) { setButtonOK(KGuiItem(i18n( "&Select"), "button_ok")); @@ -305,8 +305,8 @@ void DeviceChooser::Dialog::updateList(const TQString &device) } //----------------------------------------------------------------------------- -DeviceChooser::ComboBox::ComboBox(bool withAuto, TQWidget *tqparent) - : TQComboBox(tqparent, "device_chooser_combo"), _withAuto(withAuto) +DeviceChooser::ComboBox::ComboBox(bool withAuto, TQWidget *parent) + : TQComboBox(parent, "device_chooser_combo"), _withAuto(withAuto) { if (withAuto) insertItem(i18n(Device::AUTO_DATA.label)); Device::Lister::ConstIterator it; @@ -338,8 +338,8 @@ TQString DeviceChooser::ComboBox::device() const } //----------------------------------------------------------------------------- -DeviceChooser::Button::Button(bool withAuto, TQWidget *tqparent) - : TQWidget(tqparent, "device_chooser_button") +DeviceChooser::Button::Button(bool withAuto, TQWidget *parent) + : TQWidget(parent, "device_chooser_button") { TQHBoxLayout *hbox = new TQHBoxLayout(this, 0, 10); _combo = new ComboBox(withAuto, this); @@ -361,8 +361,8 @@ void DeviceChooser::Button::chooseDevice() } //----------------------------------------------------------------------------- -DeviceChooser::Browser::Browser(TQWidget *tqparent) - : KTextBrowser(tqparent, "device_browser") +DeviceChooser::Browser::Browser(TQWidget *parent) + : KTextBrowser(parent, "device_browser") {} PURL::Url findDocumentUrl(const TQString &prefix, const TQString &baseName) @@ -392,8 +392,8 @@ void DeviceChooser::Browser::setSource(const TQString &name) } //----------------------------------------------------------------------------- -DeviceChooser::View::View(TQWidget *tqparent) - : TabWidget(tqparent, "device_view") +DeviceChooser::View::View(TQWidget *parent) + : TabWidget(parent, "device_view") { // Information _info = new Browser(this); @@ -454,9 +454,9 @@ DeviceChooser::Editor::Editor(const TQString &title, const TQString &tag, TQWidg : DeviceEditor(title, tag, widget, "device_view_editor") {} -TQWidget *DeviceChooser::Editor::createView(const Device::Data *, TQWidget *tqparent) +TQWidget *DeviceChooser::Editor::createView(const Device::Data *, TQWidget *parent) { - DeviceChooser::View *view = new DeviceChooser::View(tqparent); + DeviceChooser::View *view = new DeviceChooser::View(parent); connect(view, TQT_SIGNAL(deviceChanged(const TQString &)), TQT_SIGNAL(deviceChanged(const TQString &))); view->setDevice(_device, true); return view; diff --git a/src/libgui/device_gui.h b/src/libgui/device_gui.h index 53ad04f..de28bbf 100644 --- a/src/libgui/device_gui.h +++ b/src/libgui/device_gui.h @@ -50,15 +50,15 @@ template <typename Enum> class EnumComboBox { public: - EnumComboBox(const TQString &key, TQWidget *tqparent) : _key(key) { - _combo = new TQComboBox(tqparent); + EnumComboBox(const TQString &key, TQWidget *parent) : _key(key) { + _combo = new TQComboBox(parent); for (Enum type; type<Enum::Nb_Types; ++type) _combo->insertItem(type.label()); Config config; Enum type = config.readEnumEntry(key, Enum(Enum::Nb_Types)); if ( type!=Enum::Nb_Types ) _combo->setCurrentItem(type.type()); } - EnumComboBox(const TQString &emptyLabel, const TQString &key, TQWidget *tqparent) : _key(key) { - _combo = new TQComboBox(tqparent); + EnumComboBox(const TQString &emptyLabel, const TQString &key, TQWidget *parent) : _key(key) { + _combo = new TQComboBox(parent); _combo->insertItem(emptyLabel); for (Enum type; type<Enum::Nb_Types; ++type) _combo->insertItem(type.label()); Config config; @@ -88,7 +88,7 @@ class Dialog : public ::Dialog Q_OBJECT TQ_OBJECT public: - Dialog(const TQString &device, Type type, TQWidget *tqparent); + Dialog(const TQString &device, Type type, TQWidget *parent); virtual ~Dialog(); TQString device() const; @@ -121,7 +121,7 @@ class ComboBox : public TQComboBox Q_OBJECT TQ_OBJECT public: - ComboBox(bool withAuto, TQWidget *tqparent); + ComboBox(bool withAuto, TQWidget *parent); void setDevice(const TQString &device, const Device::Data *data = 0); TQString device() const; bool withAuto() const { return _withAuto; } @@ -136,7 +136,7 @@ class Button : public TQWidget Q_OBJECT TQ_OBJECT public: - Button(bool withAuto, TQWidget *tqparent); + Button(bool withAuto, TQWidget *parent); void setDevice(const TQString &device) { _combo->setDevice(device); } TQString device() const { return _combo->device(); } @@ -156,7 +156,7 @@ class Browser : public KTextBrowser Q_OBJECT TQ_OBJECT public: - Browser(TQWidget *tqparent); + Browser(TQWidget *parent); signals: void deviceChanged(const TQString &device); @@ -171,7 +171,7 @@ class View : public TabWidget Q_OBJECT TQ_OBJECT public: - View(TQWidget *tqparent); + View(TQWidget *parent); void clear(); void setText(const TQString &text); void setDevice(const TQString &name, bool cannotChangeDevice); @@ -190,7 +190,7 @@ class Editor : public DeviceEditor Q_OBJECT TQ_OBJECT public: - Editor(const TQString &title, const TQString &tag, TQWidget *tqparent); + Editor(const TQString &title, const TQString &tag, TQWidget *parent); virtual bool isModified() const { return false; } virtual bool isReadOnly() const { return true; } virtual void addGui() {} @@ -201,7 +201,7 @@ signals: void deviceChanged(const TQString &device); private: - virtual TQWidget *createView(const Device::Data *data, TQWidget *tqparent); + virtual TQWidget *createView(const Device::Data *data, TQWidget *parent); virtual void setModifiedInternal(bool) {} virtual void setReadOnlyInternal(bool) {} }; diff --git a/src/libgui/editor.cpp b/src/libgui/editor.cpp index 1bbacb2..2999b1e 100644 --- a/src/libgui/editor.cpp +++ b/src/libgui/editor.cpp @@ -13,12 +13,12 @@ #include "common/gui/purl_gui.h" #include "common/gui/misc_gui.h" -Editor::Editor(const TQString &title, const TQString &tag, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name), _title(title), _tag(tag) +Editor::Editor(const TQString &title, const TQString &tag, TQWidget *parent, const char *name) + : TQWidget(parent, name), _title(title), _tag(tag) {} -Editor::Editor(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +Editor::Editor(TQWidget *parent, const char *name) + : TQWidget(parent, name) {} TQSizePolicy Editor::sizePolicy() const diff --git a/src/libgui/editor.h b/src/libgui/editor.h index 1a4c54d..0c80b07 100644 --- a/src/libgui/editor.h +++ b/src/libgui/editor.h @@ -23,8 +23,8 @@ class Editor : public TQWidget Q_OBJECT TQ_OBJECT public: - Editor(const TQString &title, const TQString &tag, TQWidget *tqparent, const char *name); - Editor(TQWidget *tqparent, const char *name); + Editor(const TQString &title, const TQString &tag, TQWidget *parent, const char *name); + Editor(TQWidget *parent, const char *name); virtual TQSizePolicy sizePolicy() const; virtual PURL::FileType fileType() const = 0; virtual bool isModified() const = 0; diff --git a/src/libgui/editor_manager.cpp b/src/libgui/editor_manager.cpp index a9d6a24..5c9c193 100644 --- a/src/libgui/editor_manager.cpp +++ b/src/libgui/editor_manager.cpp @@ -33,8 +33,8 @@ #include "project.h" //----------------------------------------------------------------------------- -SwitchToDialog::SwitchToDialog(const TQStringList &names, TQWidget *tqparent) - : Dialog(tqparent, "switch_to_dialog", true, i18n("Switch to editor"), Ok | Cancel, Ok, false) +SwitchToDialog::SwitchToDialog(const TQStringList &names, TQWidget *parent) + : Dialog(parent, "switch_to_dialog", true, i18n("Switch to editor"), Ok | Cancel, Ok, false) { TQVBoxLayout *top = new TQVBoxLayout(mainWidget(), 10, 10); _edit = new KLineEdit(mainWidget()); @@ -92,8 +92,8 @@ void EditorHistory::closedLast() //----------------------------------------------------------------------------- const char * const EditorManager::EDITOR_TAGS[Nb_EditorTypes] = { "device", "registers" }; -EditorManager::EditorManager(TQWidget *tqparent) - : TabWidget(tqparent, "editor_manager"), _current(0) +EditorManager::EditorManager(TQWidget *parent) + : TabWidget(parent, "editor_manager"), _current(0) { setTabBar(new EditorTabBar(this)); connect(this, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SLOT(showEditor(TQWidget *))); diff --git a/src/libgui/editor_manager.h b/src/libgui/editor_manager.h index 8c5f626..c20f520 100644 --- a/src/libgui/editor_manager.h +++ b/src/libgui/editor_manager.h @@ -25,7 +25,7 @@ class SwitchToDialog : public Dialog Q_OBJECT TQ_OBJECT public: - SwitchToDialog(const TQStringList &names, TQWidget *tqparent); + SwitchToDialog(const TQStringList &names, TQWidget *parent); TQString name() const { return _edit->text(); } private: @@ -38,7 +38,7 @@ class EditorTabBar : public TabBar Q_OBJECT TQ_OBJECT public: - EditorTabBar(TQWidget *tqparent) : TabBar(tqparent, "editor_tab_bar") {} + EditorTabBar(TQWidget *parent) : TabBar(parent, "editor_tab_bar") {} void setReadOnly(uint index, bool readOnly) { _readOnly[tabAt(index)] = readOnly; } private: @@ -69,7 +69,7 @@ class EditorManager : public TabWidget Q_OBJECT TQ_OBJECT public: - EditorManager(TQWidget *tqparent); + EditorManager(TQWidget *parent); PURL::UrlList files() const; TQValueList<Editor *> &editors() { return _editors; } diff --git a/src/libgui/gui_prog_manager.h b/src/libgui/gui_prog_manager.h index b4e267d..b747da6 100644 --- a/src/libgui/gui_prog_manager.h +++ b/src/libgui/gui_prog_manager.h @@ -19,7 +19,7 @@ class GuiManager : public Manager Q_OBJECT TQ_OBJECT public: - GuiManager(TQObject *tqparent) : Manager(tqparent) {} + GuiManager(TQObject *parent) : Manager(parent) {} virtual void createProgrammer(const Device::Data *data); virtual void setState(State state) { Main::setState(state==Idle ? Main::Idle : Main::Programming); } diff --git a/src/libgui/hex_editor.cpp b/src/libgui/hex_editor.cpp index 197eb83..c8b2727 100644 --- a/src/libgui/hex_editor.cpp +++ b/src/libgui/hex_editor.cpp @@ -46,14 +46,14 @@ void HexEditorPart::setReadWrite(bool rw) } //----------------------------------------------------------------------------- -HexEditor::HexEditor(const TQString &name, TQWidget *tqparent) - : DeviceEditor(name, TQString(), tqparent, "hex_editor") +HexEditor::HexEditor(const TQString &name, TQWidget *parent) + : DeviceEditor(name, TQString(), parent, "hex_editor") { init(); } -HexEditor::HexEditor(TQWidget *tqparent) - : DeviceEditor(tqparent, "hex_editor") +HexEditor::HexEditor(TQWidget *parent) + : DeviceEditor(parent, "hex_editor") { init(); } @@ -76,15 +76,15 @@ void HexEditor::clear() _originalMemory = 0; } -TQWidget *HexEditor::createView(const Device::Data *data, TQWidget *tqparent) +TQWidget *HexEditor::createView(const Device::Data *data, TQWidget *parent) { clear(); if (data) { _originalMemory = data->group().createMemory(*data); _memory = data->group().createMemory(*data); } - if ( data==0 ) return new TQWidget(tqparent); - Device::HexView *hv = Device::groupui(*data).createHexView(*this, tqparent); + if ( data==0 ) return new TQWidget(parent); + Device::HexView *hv = Device::groupui(*data).createHexView(*this, parent); connect(hv, TQT_SIGNAL(modified()), TQT_SLOT(slotModified())); _dirty = true; TQTimer::singleShot(0, this, TQT_SLOT(simpleLoad())); diff --git a/src/libgui/hex_editor.h b/src/libgui/hex_editor.h index 9418a59..50df57c 100644 --- a/src/libgui/hex_editor.h +++ b/src/libgui/hex_editor.h @@ -38,8 +38,8 @@ class HexEditor : public DeviceEditor Q_OBJECT TQ_OBJECT public: - HexEditor(const TQString &name, TQWidget *tqparent); - HexEditor(TQWidget *tqparent); + HexEditor(const TQString &name, TQWidget *parent); + HexEditor(TQWidget *parent); virtual bool isModified() const { return _modified; } virtual bool isReadOnly() const { return !_part->isReadWrite(); } virtual ~HexEditor() { clear(); } @@ -74,7 +74,7 @@ private: virtual void dropEvent(TQDropEvent *e) { emit dropEventPass(e); } bool save(const PURL::Url &url, const TQString &fileErrorString); bool verifyDeviceType(); - virtual TQWidget *createView(const Device::Data *data, TQWidget *tqparent); + virtual TQWidget *createView(const Device::Data *data, TQWidget *parent); virtual void setModifiedInternal(bool modified) { _modified = modified; } virtual void setReadOnlyInternal(bool readOnly); void display(); diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp index 11fa9b9..2073f03 100644 --- a/src/libgui/likeback.cpp +++ b/src/libgui/likeback.cpp @@ -328,7 +328,7 @@ TQString LikeBack::activeWindowPath() if (name == "unnamed") name += TQString(":") + window->className(); windowNames.append(name); - window = dynamic_cast<TQWidget*>(window->tqparent()); + window = dynamic_cast<TQWidget*>(window->parent()); } TQString windowName; diff --git a/src/libgui/log_view.cpp b/src/libgui/log_view.cpp index f0a1830..2442bc3 100644 --- a/src/libgui/log_view.cpp +++ b/src/libgui/log_view.cpp @@ -17,8 +17,8 @@ #include "common/gui/purl_gui.h" #include "common/gui/misc_gui.h" -Log::Widget::Widget(TQWidget *tqparent, const char *name) - : TQTextEdit(tqparent, name) +Log::Widget::Widget(TQWidget *parent, const char *name) + : TQTextEdit(parent, name) { setTextFormat(LogText); setMinimumWidth(300); diff --git a/src/libgui/log_view.h b/src/libgui/log_view.h index 75e2481..5f0fa44 100644 --- a/src/libgui/log_view.h +++ b/src/libgui/log_view.h @@ -21,7 +21,7 @@ class Widget : public TQTextEdit, public View Q_OBJECT TQ_OBJECT public: - Widget(TQWidget *tqparent = 0, const char *name = 0); + Widget(TQWidget *parent = 0, const char *name = 0); virtual void appendToLastLine(const TQString &text); virtual void clear(); virtual void sorry(const TQString &message, const TQString &details); diff --git a/src/libgui/new_dialogs.cpp b/src/libgui/new_dialogs.cpp index f5fbc4a..71b6de7 100644 --- a/src/libgui/new_dialogs.cpp +++ b/src/libgui/new_dialogs.cpp @@ -17,8 +17,8 @@ #include "project.h" //---------------------------------------------------------------------------- -NewDialog::NewDialog(const TQString &caption, TQWidget *tqparent) - : Dialog(tqparent, "new_dialog", true, caption, Ok|Cancel, Ok, false) +NewDialog::NewDialog(const TQString &caption, TQWidget *parent) + : Dialog(parent, "new_dialog", true, caption, Ok|Cancel, Ok, false) { _top = new TQGridLayout(mainWidget(), 0, 0, 10, 10); _top->setColStretch(2, 1); @@ -57,8 +57,8 @@ void NewDialog::browse() } //---------------------------------------------------------------------------- -NewFileDialog::NewFileDialog(Project *project, TQWidget *tqparent) - : NewDialog(i18n("Create New File"), tqparent), _project(project) +NewFileDialog::NewFileDialog(Project *project, TQWidget *parent) + : NewDialog(i18n("Create New File"), parent), _project(project) { _fLabel->setText(i18n("File Name:")); diff --git a/src/libgui/new_dialogs.h b/src/libgui/new_dialogs.h index b3d2846..dd71f67 100644 --- a/src/libgui/new_dialogs.h +++ b/src/libgui/new_dialogs.h @@ -27,7 +27,7 @@ class NewDialog : public Dialog Q_OBJECT TQ_OBJECT public: - NewDialog(const TQString &caption, TQWidget *tqparent); + NewDialog(const TQString &caption, TQWidget *parent); protected: TQGridLayout *_top; @@ -47,7 +47,7 @@ class NewFileDialog : public NewDialog Q_OBJECT TQ_OBJECT public: - NewFileDialog(Project *project, TQWidget *tqparent); + NewFileDialog(Project *project, TQWidget *parent); PURL::Url url() const; bool addToProject() const { return (_project ? _add->isChecked() : false); } diff --git a/src/libgui/object_view.cpp b/src/libgui/object_view.cpp index dd606fc..fa5239d 100644 --- a/src/libgui/object_view.cpp +++ b/src/libgui/object_view.cpp @@ -22,8 +22,8 @@ #include "common/gui/misc_gui.h" //----------------------------------------------------------------------------- -Coff::BaseEditor::BaseEditor(const PURL::Url &source, const Device::Data *data, TQWidget *tqparent) - : SimpleTextEditor(true, tqparent), _source(source), _ok(false), _created(0), _device(data) +Coff::BaseEditor::BaseEditor(const PURL::Url &source, const Device::Data *data, TQWidget *parent) + : SimpleTextEditor(true, parent), _source(source), _ok(false), _created(0), _device(data) { setReadOnly(true); _view->setDynWordWrap(false); @@ -36,12 +36,12 @@ Coff::BaseEditor::~BaseEditor() } //----------------------------------------------------------------------------- -Coff::CoffEditor::CoffEditor(const PURL::Url &source, const Device::Data &data, TQWidget *tqparent) - : BaseEditor(source, &data, tqparent), _provided(0) +Coff::CoffEditor::CoffEditor(const PURL::Url &source, const Device::Data &data, TQWidget *parent) + : BaseEditor(source, &data, parent), _provided(0) {} -Coff::CoffEditor::CoffEditor(const TextObject &object, TQWidget *tqparent) - : BaseEditor(PURL::Url(), object.device(), tqparent), _provided(&object) +Coff::CoffEditor::CoffEditor(const TextObject &object, TQWidget *parent) + : BaseEditor(PURL::Url(), object.device(), parent), _provided(&object) {} bool Coff::CoffEditor::open(const PURL::Url &url) @@ -56,8 +56,8 @@ bool Coff::CoffEditor::open(const PURL::Url &url) } //----------------------------------------------------------------------------- -Coff::ObjectEditor::ObjectEditor(const PURL::Url &source, TQWidget *tqparent) - : BaseEditor(source, 0, tqparent) +Coff::ObjectEditor::ObjectEditor(const PURL::Url &source, TQWidget *parent) + : BaseEditor(source, 0, parent) {} bool Coff::ObjectEditor::open(const PURL::Url &url) @@ -73,8 +73,8 @@ bool Coff::ObjectEditor::open(const PURL::Url &url) } //----------------------------------------------------------------------------- -Coff::LibraryEditor::LibraryEditor(const PURL::Url &source, TQWidget *tqparent) - : BaseEditor(source, 0, tqparent) +Coff::LibraryEditor::LibraryEditor(const PURL::Url &source, TQWidget *parent) + : BaseEditor(source, 0, parent) {} bool Coff::LibraryEditor::open(const PURL::Url &url) @@ -92,16 +92,16 @@ bool Coff::LibraryEditor::open(const PURL::Url &url) } //----------------------------------------------------------------------------- -DisassemblyEditor::DisassemblyEditor(const PURL::Url &source, const Device::Data &data, TQWidget *tqparent) - : SimpleTextEditor(true, tqparent), _source(source), _device(data), _editor(0) +DisassemblyEditor::DisassemblyEditor(const PURL::Url &source, const Device::Data &data, TQWidget *parent) + : SimpleTextEditor(true, parent), _source(source), _device(data), _editor(0) { setReadOnly(true); _view->setDynWordWrap(false); setView(&Main::compileLog()); } -DisassemblyEditor::DisassemblyEditor(const HexEditor &e, const Device::Data &data, TQWidget *tqparent) - : SimpleTextEditor(true, tqparent), _device(data), _editor(&e) +DisassemblyEditor::DisassemblyEditor(const HexEditor &e, const Device::Data &data, TQWidget *parent) + : SimpleTextEditor(true, parent), _device(data), _editor(&e) { setReadOnly(true); _view->setDynWordWrap(false); diff --git a/src/libgui/object_view.h b/src/libgui/object_view.h index 9b7ea65..f65ba59 100644 --- a/src/libgui/object_view.h +++ b/src/libgui/object_view.h @@ -26,7 +26,7 @@ class BaseEditor : public SimpleTextEditor, public Log::Base Q_OBJECT TQ_OBJECT public: - BaseEditor(const PURL::Url &source, const Device::Data *data, TQWidget *tqparent); + BaseEditor(const PURL::Url &source, const Device::Data *data, TQWidget *parent); virtual ~BaseEditor(); virtual PURL::Url url() const { return _url; } @@ -43,8 +43,8 @@ class CoffEditor : public BaseEditor Q_OBJECT TQ_OBJECT public: - CoffEditor(const PURL::Url &source, const Device::Data &data, TQWidget *tqparent); - CoffEditor(const TextObject &object, TQWidget *tqparent); + CoffEditor(const PURL::Url &source, const Device::Data &data, TQWidget *parent); + CoffEditor(const TextObject &object, TQWidget *parent); virtual PURL::FileType fileType() const { return PURL::Coff; } virtual bool open(const PURL::Url &url); @@ -58,7 +58,7 @@ class ObjectEditor : public BaseEditor Q_OBJECT TQ_OBJECT public: - ObjectEditor(const PURL::Url &source, TQWidget *tqparent); + ObjectEditor(const PURL::Url &source, TQWidget *parent); virtual PURL::FileType fileType() const { return PURL::Unknown; } virtual bool open(const PURL::Url &url); @@ -72,7 +72,7 @@ class LibraryEditor : public BaseEditor Q_OBJECT TQ_OBJECT public: - LibraryEditor(const PURL::Url &source, TQWidget *tqparent); + LibraryEditor(const PURL::Url &source, TQWidget *parent); virtual PURL::FileType fileType() const { return PURL::Unknown; } virtual bool open(const PURL::Url &url); @@ -88,8 +88,8 @@ class DisassemblyEditor : public SimpleTextEditor, public Log::Base Q_OBJECT TQ_OBJECT public: - DisassemblyEditor(const PURL::Url &hexUrl, const Device::Data &data, TQWidget *tqparent); - DisassemblyEditor(const HexEditor &e, const Device::Data &data, TQWidget *tqparent); + DisassemblyEditor(const PURL::Url &hexUrl, const Device::Data &data, TQWidget *parent); + DisassemblyEditor(const HexEditor &e, const Device::Data &data, TQWidget *parent); virtual PURL::FileType fileType() const { return PURL::AsmGPAsm; } virtual bool open(const PURL::Url &url); virtual PURL::Url url() const { return _url; } diff --git a/src/libgui/project_editor.cpp b/src/libgui/project_editor.cpp index bfb2d8c..331bb55 100644 --- a/src/libgui/project_editor.cpp +++ b/src/libgui/project_editor.cpp @@ -17,8 +17,8 @@ #include "tools/list/compile_config.h" #include "device_gui.h" -ProjectEditor::ProjectEditor(Project &project, TQWidget *tqparent) - : Dialog(tqparent, "project_options", true, i18n("Project Options"), Ok|Cancel, Ok, false), +ProjectEditor::ProjectEditor(Project &project, TQWidget *parent) + : Dialog(parent, "project_options", true, i18n("Project Options"), Ok|Cancel, Ok, false), _project(project) { TQVBoxLayout *top = new TQVBoxLayout(mainWidget(), 0, 10); diff --git a/src/libgui/project_editor.h b/src/libgui/project_editor.h index 8ae4df6..ce08aca 100644 --- a/src/libgui/project_editor.h +++ b/src/libgui/project_editor.h @@ -32,7 +32,7 @@ class ProjectEditor : public Dialog Q_OBJECT TQ_OBJECT public: - ProjectEditor(Project &project, TQWidget *tqparent); + ProjectEditor(Project &project, TQWidget *parent); private slots: virtual void slotOk(); diff --git a/src/libgui/project_manager.cpp b/src/libgui/project_manager.cpp index 931901e..ce58146 100644 --- a/src/libgui/project_manager.cpp +++ b/src/libgui/project_manager.cpp @@ -35,8 +35,8 @@ #include "device_gui.h" //---------------------------------------------------------------------------- -ProjectManager::View::View(TQWidget *tqparent) - : ListView(tqparent, "project_manager"), _project(0), _modified(false) +ProjectManager::View::View(TQWidget *parent) + : ListView(parent, "project_manager"), _project(0), _modified(false) { connect(TQT_TQOBJECT(this), TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), TQT_SLOT(clicked(int, TQListViewItem *, const TQPoint &, int))); @@ -403,7 +403,7 @@ void ProjectManager::View::removeFile(const PURL::Url &url) if ( _project && !isExternalFile(url) ) _project->removeFile(url); FileItem *item = findFileItem(url); if ( item==0 ) return; - HeaderItem *group = static_cast<HeaderItem *>(item->tqparent()); + HeaderItem *group = static_cast<HeaderItem *>(item->parent()); delete item; if ( group->childCount()==0 ) delete group; _modified = true; @@ -575,7 +575,7 @@ TQDragObject *ProjectManager::View::dragObject() { if ( currentItem()==0 || currentItem()->rtti()!=FileRtti ) return 0; const FileItem *item = static_cast<const FileItem *>(currentItem()); - const HeaderItem *hitem = static_cast<const HeaderItem *>(item->tqparent()); + const HeaderItem *hitem = static_cast<const HeaderItem *>(item->parent()); if ( hitem->group()!=SourceGroup ) return 0; TQStrList uris; uris.append(TQUriDrag::localFileToUri(item->url().filepath())); @@ -587,7 +587,7 @@ bool ProjectManager::View::acceptDrag(TQDropEvent* e) const if ( e->source()!=viewport() ) return false; const TQListViewItem *item = itemAt(e->pos()); if ( item==0 || item->rtti()!=FileRtti ) return false; - const HeaderItem *hitem = static_cast<const HeaderItem *>(item->tqparent()); + const HeaderItem *hitem = static_cast<const HeaderItem *>(item->parent()); return ( hitem->group()==SourceGroup ); } diff --git a/src/libgui/project_manager.h b/src/libgui/project_manager.h index 8c33579..78655b8 100644 --- a/src/libgui/project_manager.h +++ b/src/libgui/project_manager.h @@ -26,7 +26,7 @@ class View : public ListView Q_OBJECT TQ_OBJECT public: - View(TQWidget *tqparent); + View(TQWidget *parent); virtual ~View(); bool editProject(); diff --git a/src/libgui/project_wizard.cpp b/src/libgui/project_wizard.cpp index 72ecefc..78fcd49 100644 --- a/src/libgui/project_wizard.cpp +++ b/src/libgui/project_wizard.cpp @@ -68,8 +68,8 @@ const TQPixmap *FileListItem::pixmap(int column) const } //----------------------------------------------------------------------------- -FileListBox::FileListBox(TQWidget *tqparent) - : EditListBox(2, 0, 0, tqparent, "file_list_box") +FileListBox::FileListBox(TQWidget *parent) + : EditListBox(2, 0, 0, parent, "file_list_box") { _listView->header()->show(); _listView->header()->setClickEnabled(false); @@ -109,8 +109,8 @@ void FileListBox::setToolGroup(const Tool::Group &group) } //----------------------------------------------------------------------------- -ProjectWizard::ProjectWizard(TQWidget *tqparent) - : KWizard(tqparent, "project_wizard"), _project(0) +ProjectWizard::ProjectWizard(TQWidget *parent) + : KWizard(parent, "project_wizard"), _project(0) { // first page _first = new TQWidget(this); diff --git a/src/libgui/project_wizard.h b/src/libgui/project_wizard.h index 4a47e3c..e12ed00 100644 --- a/src/libgui/project_wizard.h +++ b/src/libgui/project_wizard.h @@ -45,7 +45,7 @@ class FileListBox : public EditListBox Q_OBJECT TQ_OBJECT public: - FileListBox(TQWidget *tqparent); + FileListBox(TQWidget *parent); void setDirectory(const PURL::Directory &directory) { _directory = directory; } void setToolGroup(const Tool::Group &group); @@ -66,7 +66,7 @@ class ProjectWizard : public KWizard Q_OBJECT TQ_OBJECT public: - ProjectWizard(TQWidget *tqparent); + ProjectWizard(TQWidget *parent); PURL::Url url() const; Project *project() const { return _project; } diff --git a/src/libgui/register_view.cpp b/src/libgui/register_view.cpp index fe4b4d6..4f2aaff 100644 --- a/src/libgui/register_view.cpp +++ b/src/libgui/register_view.cpp @@ -23,8 +23,8 @@ #include "gui_debug_manager.h" //----------------------------------------------------------------------------- -Register::MainView::MainView(const TQString &title, const TQString &tag, TQWidget *tqparent) - : DeviceEditor(title, tag, tqparent, "register_view"), _debugging(false) +Register::MainView::MainView(const TQString &title, const TQString &tag, TQWidget *parent) + : DeviceEditor(title, tag, parent, "register_view"), _debugging(false) {} void Register::MainView::setDevice(bool force) @@ -34,13 +34,13 @@ void Register::MainView::setDevice(bool force) DeviceEditor::setDevice(force || oldDebugging!=_debugging); } -TQWidget *Register::MainView::createView(const Device::Data *data, TQWidget *tqparent) +TQWidget *Register::MainView::createView(const Device::Data *data, TQWidget *parent) { - if ( data==0 ) return new TQWidget(tqparent); - Register::View *view = Device::groupui(*data).createRegisterView(tqparent); + if ( data==0 ) return new TQWidget(parent); + Register::View *view = Device::groupui(*data).createRegisterView(parent); if (view) view->updateView(); else { - TQWidget *w = new TQWidget(tqparent); + TQWidget *w = new TQWidget(parent); TQVBoxLayout *vbox = new TQVBoxLayout(w, 10, 10); TQLabel *label = new TQLabel(i18n("The selected device has no register."), w); vbox->addWidget(label); diff --git a/src/libgui/register_view.h b/src/libgui/register_view.h index 98868e4..18d9f1b 100644 --- a/src/libgui/register_view.h +++ b/src/libgui/register_view.h @@ -22,7 +22,7 @@ class MainView : public DeviceEditor Q_OBJECT TQ_OBJECT public: - MainView(const TQString &title, const TQString &tag, TQWidget *tqparent = 0); + MainView(const TQString &title, const TQString &tag, TQWidget *parent = 0); virtual bool isModified() const { return false; } virtual bool isReadOnly() const { return true; } virtual void addGui() {} @@ -33,7 +33,7 @@ public: private: bool _debugging; - virtual TQWidget *createView(const Device::Data *, TQWidget *tqparent); + virtual TQWidget *createView(const Device::Data *, TQWidget *parent); virtual void setModifiedInternal(bool) {} virtual void setReadOnlyInternal(bool) {} }; diff --git a/src/libgui/text_editor.cpp b/src/libgui/text_editor.cpp index eb9d16f..e7f0382 100644 --- a/src/libgui/text_editor.cpp +++ b/src/libgui/text_editor.cpp @@ -42,8 +42,8 @@ TQPixmap TextEditor::pixmap(Breakpoint::MarkType type) return SmallIcon(MARK_TYPE_DATA[type].pixmap); } -TextEditor::TextEditor(bool withDebugger, TQWidget *tqparent, const char *name) - : Editor(tqparent, name), _view(0) +TextEditor::TextEditor(bool withDebugger, TQWidget *parent, const char *name) + : Editor(parent, name), _view(0) { KLibFactory *factory = KLibLoader::self()->factory("libkatepart"); if ( factory==0 ) qFatal("Could not find katepart"); @@ -321,12 +321,12 @@ void TextEditor::populateList() #endif //----------------------------------------------------------------------------- -SimpleTextEditor::SimpleTextEditor(bool withDebugger, PURL::FileType type, TQWidget *tqparent, const char *name) - : TextEditor(withDebugger, tqparent, name), _type(type), _file(_sview) +SimpleTextEditor::SimpleTextEditor(bool withDebugger, PURL::FileType type, TQWidget *parent, const char *name) + : TextEditor(withDebugger, parent, name), _type(type), _file(_sview) {} -SimpleTextEditor::SimpleTextEditor(bool withDebugger, TQWidget *tqparent, const char *name) - : TextEditor(withDebugger, tqparent, name), _type(PURL::Nb_FileTypes), _file(_sview) +SimpleTextEditor::SimpleTextEditor(bool withDebugger, TQWidget *parent, const char *name) + : TextEditor(withDebugger, parent, name), _type(PURL::Nb_FileTypes), _file(_sview) {} bool SimpleTextEditor::open(const PURL::Url &url) diff --git a/src/libgui/text_editor.h b/src/libgui/text_editor.h index 5b76734..d5c90c5 100644 --- a/src/libgui/text_editor.h +++ b/src/libgui/text_editor.h @@ -27,7 +27,7 @@ class TextEditor : public Editor Q_OBJECT TQ_OBJECT public: - TextEditor(bool withDebugger, TQWidget *tqparent, const char *name = 0); + TextEditor(bool withDebugger, TQWidget *parent, const char *name = 0); virtual PURL::FileType fileType() const { return url().fileType(); } virtual PURL::Url url() const { return _document->url(); } virtual bool isModified() const; @@ -86,8 +86,8 @@ class SimpleTextEditor : public TextEditor Q_OBJECT TQ_OBJECT public: - SimpleTextEditor(bool withDebugger, PURL::FileType type, TQWidget *tqparent, const char *name = 0); - SimpleTextEditor(bool withDebugger, TQWidget *tqparent, const char *name = 0); + SimpleTextEditor(bool withDebugger, PURL::FileType type, TQWidget *parent, const char *name = 0); + SimpleTextEditor(bool withDebugger, TQWidget *parent, const char *name = 0); void setFileType(PURL::FileType type) { _type = type; } virtual PURL::FileType fileType() const { return _type; } bool setText(const TQString &text); diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp index fa70706..f087a4a 100644 --- a/src/libgui/toplevel.cpp +++ b/src/libgui/toplevel.cpp @@ -688,7 +688,7 @@ void MainWindow::updateToolViewsActions() void MainWindow::initDockPosition(const DockData &ddata) { const DockPosition &pos = ddata.position; - ddata.dock->manualDock(manager()->getDockWidgetFromName(pos.tqparent), pos.pos, pos.space); + ddata.dock->manualDock(manager()->getDockWidgetFromName(pos.parent), pos.pos, pos.space); } void MainWindow::resetDockLayout() diff --git a/src/libgui/toplevel.h b/src/libgui/toplevel.h index ea36c93..f7ef383 100644 --- a/src/libgui/toplevel.h +++ b/src/libgui/toplevel.h @@ -104,9 +104,9 @@ private: class DockPosition { public: DockPosition() {} - DockPosition(const TQString &ptqparent) : tqparent(ptqparent), pos(KDockWidget::DockCenter), space(0) {} - DockPosition(KDockWidget::DockPosition ppos, uint pspace) : tqparent("main_dock_widget"), pos(ppos), space(pspace) {} - TQString tqparent; + DockPosition(const TQString &pparent) : parent(pparent), pos(KDockWidget::DockCenter), space(0) {} + DockPosition(KDockWidget::DockPosition ppos, uint pspace) : parent("main_dock_widget"), pos(ppos), space(pspace) {} + TQString parent; KDockWidget::DockPosition pos; uint space; }; diff --git a/src/libgui/toplevel_ui.cpp b/src/libgui/toplevel_ui.cpp index 2bb50ee..51abeab 100644 --- a/src/libgui/toplevel_ui.cpp +++ b/src/libgui/toplevel_ui.cpp @@ -15,8 +15,8 @@ #include "tools/list/tool_list.h" //---------------------------------------------------------------------------- -ProgrammerStatusWidget::ProgrammerStatusWidget(TQWidget *tqparent) - : TQObject(tqparent), KeyPopupButton<TQString>(tqparent) +ProgrammerStatusWidget::ProgrammerStatusWidget(TQWidget *parent) + : TQObject(parent), KeyPopupButton<TQString>(parent) { connect(widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(activatedSlot(int))); widget()->appendAction(i18n("Configure..."), "configure", this, TQT_SIGNAL(configure())); @@ -32,8 +32,8 @@ void ProgrammerStatusWidget::activatedSlot(int id) } //---------------------------------------------------------------------------- -ToolStatusWidget::ToolStatusWidget(TQWidget *tqparent) - : TQObject(tqparent), KeyPopupButton<TQString>(tqparent) +ToolStatusWidget::ToolStatusWidget(TQWidget *parent) + : TQObject(parent), KeyPopupButton<TQString>(parent) { connect(widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(activatedSlot(int))); widget()->appendAction(i18n("Configure Toolchain..."), "configure", this, TQT_SIGNAL(configureToolchain())); @@ -61,8 +61,8 @@ void ViewMenuAction::slotActivated() } //---------------------------------------------------------------------------- -MenuBarButton::MenuBarButton(const TQString &icon, TQWidget *tqparent) - : TQToolButton(tqparent, "menu_bar_button") +MenuBarButton::MenuBarButton(const TQString &icon, TQWidget *parent) + : TQToolButton(parent, "menu_bar_button") { TQFontMetrics fm(font()); int h = fm.height() + 2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth, this); diff --git a/src/libgui/toplevel_ui.h b/src/libgui/toplevel_ui.h index b4e99b8..651809c 100644 --- a/src/libgui/toplevel_ui.h +++ b/src/libgui/toplevel_ui.h @@ -23,7 +23,7 @@ class ProgrammerStatusWidget : public TQObject, public KeyPopupButton<TQString> Q_OBJECT TQ_OBJECT public: - ProgrammerStatusWidget(TQWidget *tqparent); + ProgrammerStatusWidget(TQWidget *parent); signals: void configure(); @@ -39,7 +39,7 @@ class ToolStatusWidget : public TQObject, public KeyPopupButton<TQString> Q_OBJECT TQ_OBJECT public: - ToolStatusWidget(TQWidget *tqparent); + ToolStatusWidget(TQWidget *parent); signals: void configureToolchain(); @@ -74,7 +74,7 @@ class MenuBarButton : public TQToolButton Q_OBJECT TQ_OBJECT public: - MenuBarButton(const TQString &icon, TQWidget *tqparent); + MenuBarButton(const TQString &icon, TQWidget *parent); virtual TQSize tqsizeHint() const; }; diff --git a/src/libgui/watch_view.cpp b/src/libgui/watch_view.cpp index 4f5ef89..789b64a 100644 --- a/src/libgui/watch_view.cpp +++ b/src/libgui/watch_view.cpp @@ -21,8 +21,8 @@ #include "common/gui/list_container.h" //----------------------------------------------------------------------------- -Register::BaseListView::BaseListView(TQWidget *tqparent) - : ListView(tqparent), _root(0) +Register::BaseListView::BaseListView(TQWidget *parent) + : ListView(parent), _root(0) { header()->hide(); setSorting(-1); @@ -36,8 +36,8 @@ Register::BaseListView::BaseListView(TQWidget *tqparent) } //----------------------------------------------------------------------------- -Register::RegisterListView::RegisterListView(TQWidget *tqparent) - : BaseListView(tqparent) +Register::RegisterListView::RegisterListView(TQWidget *parent) + : BaseListView(parent) { addColumn(TQString()); } @@ -76,8 +76,8 @@ void Register::RegisterListView::itemClicked(int button, TQListViewItem *item, c } //----------------------------------------------------------------------------- -Register::WatchedListView::WatchedListView(TQWidget *tqparent) - : BaseListView(tqparent), _popup(0), _base(NumberBase::Hex) +Register::WatchedListView::WatchedListView(TQWidget *parent) + : BaseListView(parent), _popup(0), _base(NumberBase::Hex) { setSorting(0); addColumn(TQString()); @@ -91,14 +91,14 @@ Register::WatchedListView::WatchedListView(TQWidget *tqparent) _root->setOpen(true); } -KPopupMenu *Register::WatchedListView::appendFormatMenu(KPopupMenu *tqparent, uint offset) +KPopupMenu *Register::WatchedListView::appendFormatMenu(KPopupMenu *parent, uint offset) { KIconLoader loader; TQPixmap icon = loader.loadIcon("fonts", KIcon::Small); KPopupMenu *popup = new KPopupMenu; popup->insertTitle(i18n("Format")); FOR_EACH(NumberBase, base) popup->insertItem(base.label(), offset + base.type()); - tqparent->insertItem(icon, i18n("Format"), popup); + parent->insertItem(icon, i18n("Format"), popup); return popup; } @@ -196,8 +196,8 @@ void Register::WatchedListView::contextMenu(TQListViewItem *item, const TQPoint } //----------------------------------------------------------------------------- -Register::WatchView::WatchView(TQWidget *tqparent) - : TQWidget(tqparent, "watch_view"), GenericView(Register::list()), _data(0) +Register::WatchView::WatchView(TQWidget *parent) + : TQWidget(parent, "watch_view"), GenericView(Register::list()), _data(0) { TQVBoxLayout *top = new TQVBoxLayout(this); TQValueList<int> sizes; diff --git a/src/libgui/watch_view.h b/src/libgui/watch_view.h index f5090d1..0a09426 100644 --- a/src/libgui/watch_view.h +++ b/src/libgui/watch_view.h @@ -24,7 +24,7 @@ class BaseListView : public ListView Q_OBJECT TQ_OBJECT public: - BaseListView(TQWidget *tqparent); + BaseListView(TQWidget *parent); virtual void init(const Device::Data *data) = 0; virtual void updateView() = 0; @@ -43,7 +43,7 @@ class RegisterListView : public BaseListView Q_OBJECT TQ_OBJECT public: - RegisterListView(TQWidget *tqparent); + RegisterListView(TQWidget *parent); virtual void init(const Device::Data *data); virtual void updateView(); @@ -58,7 +58,7 @@ class WatchedListView : public BaseListView Q_OBJECT TQ_OBJECT public: - WatchedListView(TQWidget *tqparent); + WatchedListView(TQWidget *parent); virtual TQString tooltip(const TQListViewItem &item, int col) const; virtual void init(const Device::Data *data); virtual void updateView(); @@ -72,7 +72,7 @@ private: KPopupMenu *_formatPopup; NumberBase _base; - static KPopupMenu *appendFormatMenu(KPopupMenu *tqparent, uint offset); + static KPopupMenu *appendFormatMenu(KPopupMenu *parent, uint offset); }; //----------------------------------------------------------------------------- @@ -81,7 +81,7 @@ class WatchView : public TQWidget, public GenericView Q_OBJECT TQ_OBJECT public: - WatchView(TQWidget *tqparent); + WatchView(TQWidget *parent); void init(bool force); public slots: |