diff --git a/src/common/gui/dialog.cpp b/src/common/gui/dialog.cpp index 9b24656..554f364 100644 --- a/src/common/gui/dialog.cpp +++ b/src/common/gui/dialog.cpp @@ -73,7 +73,7 @@ TreeListDialog::TreeListDialog(TQWidget *parent, const char *name, bool modal, TQValueList widths; widths += 80; widths += 500; - Splitter *splitter = new Splitter(widths,Qt::Horizontal, mainWidget(), name); + Splitter *splitter = new Splitter(widths,TQt::Horizontal, mainWidget(), name); top->addWidget(splitter); _listView = new TDEListView(splitter); connect(_listView, TQT_SIGNAL(currentChanged(TQListViewItem *)), TQT_SLOT(currentChanged(TQListViewItem *))); diff --git a/src/common/gui/misc_gui.cpp b/src/common/gui/misc_gui.cpp index 5c7edf0..0121585 100644 --- a/src/common/gui/misc_gui.cpp +++ b/src/common/gui/misc_gui.cpp @@ -158,7 +158,7 @@ int PopupButton::appendItem(const TQString &label, const TQPixmap &icon, int id) } //----------------------------------------------------------------------------- -Splitter::Splitter(const TQValueList &defaultSizes, Qt::Orientation o, TQWidget *parent, const char *name) +Splitter::Splitter(const TQValueList &defaultSizes, TQt::Orientation o, TQWidget *parent, const char *name) : TQSplitter(o, parent, name), _defaultSizes(defaultSizes) { Q_ASSERT(name); diff --git a/src/common/gui/misc_gui.h b/src/common/gui/misc_gui.h index 0980fa6..388489f 100644 --- a/src/common/gui/misc_gui.h +++ b/src/common/gui/misc_gui.h @@ -90,7 +90,7 @@ class Splitter : public TQSplitter TQ_OBJECT public: - Splitter(const TQValueList &defaultSizes, Qt::Orientation orientation, + Splitter(const TQValueList &defaultSizes, TQt::Orientation orientation, TQWidget *parent, const char *name); virtual ~Splitter(); diff --git a/src/devices/gui/memory_editor.cpp b/src/devices/gui/memory_editor.cpp index c5d06f3..308bcbf 100644 --- a/src/devices/gui/memory_editor.cpp +++ b/src/devices/gui/memory_editor.cpp @@ -57,7 +57,7 @@ void Device::MemoryRangeEditor::init() vbox->addWidget(frame); vbox->addStretch(1); TQHBoxLayout *fbox = new TQHBoxLayout(frame, 5, 5); - TQGrid *grid = new TQGrid(3+_nbCols, Qt::Horizontal, frame, "memory_range_editor_grid"); + TQGrid *grid = new TQGrid(3+_nbCols, TQt::Horizontal, frame, "memory_range_editor_grid"); fbox->addWidget(grid); grid->setSpacing(0); grid->setMargin(3); @@ -89,7 +89,7 @@ void Device::MemoryRangeEditor::init() // scrollbar if there are more lines to display than visible _scrollbar = new TQScrollBar(0, TQMAX(_nbLines, totalNbLines)-_nbLines, 1, _nbLines, 0, - Qt::Vertical, frame, "memory_range_editor_scrollbar"); + TQt::Vertical, frame, "memory_range_editor_scrollbar"); connect(_scrollbar, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setIndex(int))) ; if ( totalNbLines<=_nbLines ) _scrollbar->hide(); fbox->addWidget(_scrollbar); diff --git a/src/libgui/device_gui.cpp b/src/libgui/device_gui.cpp index 8b2f5f4..2c60c90 100644 --- a/src/libgui/device_gui.cpp +++ b/src/libgui/device_gui.cpp @@ -162,7 +162,7 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren TQValueList widths; widths += 80; widths += 500; - Splitter *splitter = new Splitter(widths,Qt::Horizontal, mainWidget(), "device_shooser_splitter"); + Splitter *splitter = new Splitter(widths,TQt::Horizontal, mainWidget(), "device_shooser_splitter"); top->addWidget(splitter, 1); _listView = new TDEListView(splitter); connect(_listView, TQT_SIGNAL(currentChanged(TQListViewItem *)), diff --git a/src/libgui/project_manager.cpp b/src/libgui/project_manager.cpp index 18cc33c..68bf72c 100644 --- a/src/libgui/project_manager.cpp +++ b/src/libgui/project_manager.cpp @@ -413,7 +413,7 @@ void ProjectManager::View::removeFile(const PURL::Url &url) void ProjectManager::View::clicked(int button, TQListViewItem *item, const TQPoint &, int) { if ( item==0 ) return; - if ( button!=Qt::LeftButton ) return; + if ( button!=TQt::LeftButton ) return; const Device::Data *data = Main::deviceData(); Rtti rtti = Rtti(item->rtti()); if ( data==0 && rtti!=DeviceRtti && rtti!=RootRtti ) { diff --git a/src/libgui/watch_view.cpp b/src/libgui/watch_view.cpp index 7fd5e8d..b76587a 100644 --- a/src/libgui/watch_view.cpp +++ b/src/libgui/watch_view.cpp @@ -66,7 +66,7 @@ void Register::RegisterListView::updateView() void Register::RegisterListView::itemClicked(int button, TQListViewItem *item, const TQPoint &, int) { - if ( item==0 || button!=Qt::LeftButton ) return; + if ( item==0 || button!=TQt::LeftButton ) return; if ( item==firstChild() ) Main::editorManager().openEditor(EditorManager::RegisterEditor); int id = _root->id(item); if ( id==-1 || _ids[id].type()==Invalid ) return; @@ -152,7 +152,7 @@ TQString Register::WatchedListView::tooltip(const TQListViewItem &item, int col) void Register::WatchedListView::itemClicked(int button, TQListViewItem *item, const TQPoint &, int col) { - if ( item==0 || button!=Qt::LeftButton ) return; + if ( item==0 || button!=TQt::LeftButton ) return; else if ( item->rtti()==RegisterRtti ) { if ( col==2 && Main::programmerState()==Programmer::Halted ) static_cast(item)->startRename(); else item->setOpen(!item->isOpen()); @@ -202,7 +202,7 @@ Register::WatchView::WatchView(TQWidget *parent) TQVBoxLayout *top = new TQVBoxLayout(this); TQValueList sizes; sizes.append(50); - Splitter *splitter = new Splitter(sizes, Qt::Vertical, this, "watch_window_splitter"); + Splitter *splitter = new Splitter(sizes, TQt::Vertical, this, "watch_window_splitter"); top->addWidget(splitter); _registerListView = new RegisterListView(splitter); diff --git a/src/progs/direct/gui/direct_config_widget.cpp b/src/progs/direct/gui/direct_config_widget.cpp index b5f651c..fe46145 100644 --- a/src/progs/direct/gui/direct_config_widget.cpp +++ b/src/progs/direct/gui/direct_config_widget.cpp @@ -31,7 +31,7 @@ Direct::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *parent, : ::Hardware::HConfigWidget(base, parent, edit) { // pins assignment - TQGroupBox *groupb = new TQGroupBox(1,Qt::Horizontal, i18n("Pin assignment"), this); + TQGroupBox *groupb = new TQGroupBox(1,TQt::Horizontal, i18n("Pin assignment"), this); _mainVBox->addWidget(groupb); TQWidget *w = new TQWidget(groupb); TQGridLayout *grid = new TQGridLayout(w, 1, 1, 0, 10); @@ -68,7 +68,7 @@ Direct::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *parent, TQLabel *label = new TQLabel(i18n("Clock delay"), this); TQToolTip::add(label, i18n(DELAY_LABEL)); hbox->addWidget(label); - _delay = new KIntNumInput(0,Qt::Horizontal, this); + _delay = new KIntNumInput(0,TQt::Horizontal, this); _delay->setRange(0, 50, 5); _delay->setEnabled(edit); TQToolTip::add(_delay, i18n(DELAY_LABEL));