diff options
| author | Michele Calgaro <[email protected]> | 2023-12-29 16:42:37 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2023-12-29 16:48:53 +0900 |
| commit | c679361a50aee162491e7195f2bcfdbbf341dde5 (patch) | |
| tree | c8ff90ba1810054b7e53a79649b0e33a0937e74f | |
| parent | a8207be921513da0ccccf41e36e056736c2b8457 (diff) | |
| download | piklab-c679361a50aee162491e7195f2bcfdbbf341dde5.tar.gz piklab-c679361a50aee162491e7195f2bcfdbbf341dde5.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <[email protected]>
52 files changed, 339 insertions, 339 deletions
diff --git a/src/common/common/storage.cpp b/src/common/common/storage.cpp index 447a8a0..601ff2a 100644 --- a/src/common/common/storage.cpp +++ b/src/common/common/storage.cpp @@ -15,7 +15,7 @@ void GenericStorage::delayedChanged() { if (_dirty) return; _dirty = true; - TQTimer::singleShot(0, this, TQT_SLOT(changedSlot())); + TQTimer::singleShot(0, this, TQ_SLOT(changedSlot())); } void GenericStorage::changedSlot() @@ -27,7 +27,7 @@ void GenericStorage::changedSlot() //---------------------------------------------------------------------------- void GenericViewProxy::addStorage(GenericStorage &storage) { - connect(&storage, TQT_SIGNAL(changed()), TQT_SLOT(changed())); + connect(&storage, TQ_SIGNAL(changed()), TQ_SLOT(changed())); } void GenericViewProxy::changed() diff --git a/src/common/common/synchronous.cpp b/src/common/common/synchronous.cpp index dbf782f..e480a0d 100644 --- a/src/common/common/synchronous.cpp +++ b/src/common/common/synchronous.cpp @@ -13,7 +13,7 @@ Synchronous::Synchronous(uint timeout) { - connect(&_timer, TQT_SIGNAL(timeout()), TQT_SLOT(done())); + connect(&_timer, TQ_SIGNAL(timeout()), TQ_SLOT(done())); if (timeout) _timer.start(timeout, true); } diff --git a/src/common/global/process.cpp b/src/common/global/process.cpp index 9dc4761..bc6102d 100644 --- a/src/common/global/process.cpp +++ b/src/common/global/process.cpp @@ -22,8 +22,8 @@ Process::State Process::runSynchronously(Base &process, RunActions actions, uint timeout) { Synchronous sync(timeout); - TQObject::connect(&process, TQT_SIGNAL(done(int)), &sync, TQT_SLOT(done())); - TQObject::connect(&process, TQT_SIGNAL(requestSynchronousStop()), &sync, TQT_SLOT(done())); + TQObject::connect(&process, TQ_SIGNAL(done(int)), &sync, TQ_SLOT(done())); + TQObject::connect(&process, TQ_SIGNAL(requestSynchronousStop()), &sync, TQ_SLOT(done())); if ( (actions & Start) && !process.start(0) ) return process.state(); Q_ASSERT( process.isRunning() ); if ( !sync.enterLoop() ) process.timeoutSlot(); @@ -35,11 +35,11 @@ Process::Base::Base(TQObject *parent, const char *name) : TQObject(parent, name), _state(Stopped) { _process = new TDEProcess(this); - connect(_process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(exited())); - connect(_process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(receivedStdout(TDEProcess*, char *, int))); - connect(_process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(receivedStderr(TDEProcess*, char *, int))); + connect(_process, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(exited())); + connect(_process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(receivedStdout(TDEProcess*, char *, int))); + connect(_process, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(receivedStderr(TDEProcess*, char *, int))); _timer = new TQTimer(this); - connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeoutSlot())); + connect(_timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeoutSlot())); } Process::Base::~Base() diff --git a/src/common/global/purl.cpp b/src/common/global/purl.cpp index c47fa7b..7b29f56 100644 --- a/src/common/global/purl.cpp +++ b/src/common/global/purl.cpp @@ -28,8 +28,8 @@ PURL::Http::Http(const TQString &hostname) : TQHttp(hostname) { - connect(this, TQT_SIGNAL(responseHeaderReceived(const TQHttpResponseHeader &)), - TQT_SLOT(responseHeaderReceivedSlot(const TQHttpResponseHeader &))); + connect(this, TQ_SIGNAL(responseHeaderReceived(const TQHttpResponseHeader &)), + TQ_SLOT(responseHeaderReceivedSlot(const TQHttpResponseHeader &))); } //----------------------------------------------------------------------------- @@ -254,7 +254,7 @@ bool PURL::Base::httpUrlExists(bool *ok) const if (ok) *ok = false; Http http(_url.host()); Synchronous sync(500); - TQObject::connect(&http, TQT_SIGNAL(done(bool)), &sync, TQT_SLOT(done())); + TQObject::connect(&http, TQ_SIGNAL(done(bool)), &sync, TQ_SLOT(done())); TQFileInfo info(_url.fileName(false)); http.head(_url.path()); if ( !sync.enterLoop() ) return false; // timeout diff --git a/src/common/gui/dialog.cpp b/src/common/gui/dialog.cpp index 554f364..b865edf 100644 --- a/src/common/gui/dialog.cpp +++ b/src/common/gui/dialog.cpp @@ -28,7 +28,7 @@ Dialog::Dialog(TQWidget *parent, const char *name, bool modal, TQWidget *main = new TQWidget(this); setMainWidget(main); - TQTimer::singleShot(0, this, TQT_SLOT(updateSize())); + TQTimer::singleShot(0, this, TQ_SLOT(updateSize())); } Dialog::Dialog(DialogType type, const TQString &caption, int buttonMask, ButtonCode defaultButton, @@ -38,7 +38,7 @@ Dialog::Dialog(DialogType type, const TQString &caption, int buttonMask, ButtonC { PBusyCursor::start(); Q_ASSERT(name); - TQTimer::singleShot(0, this, TQT_SLOT(updateSize())); + TQTimer::singleShot(0, this, TQ_SLOT(updateSize())); } Dialog::~Dialog() @@ -76,7 +76,7 @@ TreeListDialog::TreeListDialog(TQWidget *parent, const char *name, bool modal, 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 *))); + connect(_listView, TQ_SIGNAL(currentChanged(TQListViewItem *)), TQ_SLOT(currentChanged(TQListViewItem *))); _listView->setAllColumnsShowFocus(true); _listView->setRootIsDecorated(true); _listView->setSorting(0); @@ -91,7 +91,7 @@ TreeListDialog::TreeListDialog(TQWidget *parent, const char *name, bool modal, _label = new TQLabel(_frame); _titleBox->addWidget(_label); _stack = new TQWidgetStack(_frame); - connect(_stack, TQT_SIGNAL(aboutToShow(TQWidget *)), TQT_SIGNAL(aboutToShowPage(TQWidget *))); + connect(_stack, TQ_SIGNAL(aboutToShow(TQWidget *)), TQ_SIGNAL(aboutToShowPage(TQWidget *))); vbox->addWidget(_stack); vbox->addStretch(1); } @@ -111,7 +111,7 @@ TQWidget *TreeListDialog::addPage(const TQStringList &labels) } if ( item==0 ) { page = new TQWidget(_stack); - connect(page, TQT_SIGNAL(destroyed(TQObject *)), TQT_SLOT(pageDestroyed(TQObject *))); + connect(page, TQ_SIGNAL(destroyed(TQObject *)), TQ_SLOT(pageDestroyed(TQObject *))); _stack->addWidget(page); item = new Item(labels[0], page, labels[0], _listView); item->setOpen(true); @@ -130,7 +130,7 @@ TQWidget *TreeListDialog::addPage(const TQStringList &labels) } if ( item==0 ) { page = new TQWidget(_stack); - connect(page, TQT_SIGNAL(destroyed(TQObject *)), TQT_SLOT(pageDestroyed(TQObject *))); + connect(page, TQ_SIGNAL(destroyed(TQObject *)), TQ_SLOT(pageDestroyed(TQObject *))); _stack->addWidget(page); item = new Item(labels[i], page, labels[i], parent); item->setOpen(true); diff --git a/src/common/gui/editlistbox.cpp b/src/common/gui/editlistbox.cpp index c583a1a..41b41bd 100644 --- a/src/common/gui/editlistbox.cpp +++ b/src/common/gui/editlistbox.cpp @@ -64,7 +64,7 @@ void EditListBox::init(uint nbColumns, TQWidget *view) TDEIconLoader loader; TQIconSet iconset = loader.loadIcon("locationbar_erase", TDEIcon::Toolbar); KPushButton *button = new KPushButton(iconset, TQString(), this); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(clearEdit())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(clearEdit())); hbox->addWidget(button); } view->reparent( this, TQPoint(0,0) ); @@ -87,11 +87,11 @@ void EditListBox::init(uint nbColumns, TQWidget *view) setButtons(_buttons); if (m_lineEdit) { - connect(m_lineEdit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(typedSomething(const TQString&))); + connect(m_lineEdit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(typedSomething(const TQString&))); m_lineEdit->setTrapReturnKey(true); - connect(m_lineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addItem())); + connect(m_lineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(addItem())); } - connect(_listView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(selectionChanged())); + connect(_listView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(selectionChanged())); // maybe supplied lineedit has some text already typedSomething(m_lineEdit ? m_lineEdit->text() : TQString()); @@ -111,7 +111,7 @@ void EditListBox::setButtons(Buttons buttons) #endif _addButton->setEnabled(false); _addButton->show(); - connect(_addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addItem())); + connect(_addButton, TQ_SIGNAL(clicked()), TQ_SLOT(addItem())); _buttonsLayout->addWidget(_addButton); } @@ -121,7 +121,7 @@ void EditListBox::setButtons(Buttons buttons) _removeButton = new KPushButton(KGuiItem(i18n("Remove"), "clear"), this); _removeButton->setEnabled(false); _removeButton->show(); - connect(_removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem())); + connect(_removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeItem())); _buttonsLayout->addWidget(_removeButton); } @@ -130,7 +130,7 @@ void EditListBox::setButtons(Buttons buttons) if ( buttons & RemoveAll ) { _removeAllButton = new KPushButton(KGuiItem(i18n("Remove All"), "delete"), this); _removeAllButton->show(); - connect(_removeAllButton, TQT_SIGNAL(clicked()), TQT_SLOT(clear())); + connect(_removeAllButton, TQ_SIGNAL(clicked()), TQ_SLOT(clear())); _buttonsLayout->addWidget(_removeAllButton); } @@ -142,12 +142,12 @@ void EditListBox::setButtons(Buttons buttons) _moveUpButton = new KPushButton(KGuiItem(i18n("Move &Up"), "go-up"), this); _moveUpButton->setEnabled(false); _moveUpButton->show(); - connect(_moveUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemUp())); + connect(_moveUpButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemUp())); _buttonsLayout->addWidget(_moveUpButton); _moveDownButton = new KPushButton(KGuiItem(i18n("Move &Down"), "go-down"), this); _moveDownButton->setEnabled(false); _moveDownButton->show(); - connect(_moveDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemDown())); + connect(_moveDownButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemDown())); _buttonsLayout->addWidget(_moveDownButton); } @@ -156,7 +156,7 @@ void EditListBox::setButtons(Buttons buttons) if ( buttons & Reset ) { _resetButton = new KPushButton(KStdGuiItem::reset(), this); _resetButton->show(); - connect(_resetButton, TQT_SIGNAL(clicked()), TQT_SIGNAL(reset())); + connect(_resetButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(reset())); _buttonsLayout->addWidget(_resetButton); } } diff --git a/src/common/gui/hexword_gui.cpp b/src/common/gui/hexword_gui.cpp index 01a5f8d..97cc25c 100644 --- a/src/common/gui/hexword_gui.cpp +++ b/src/common/gui/hexword_gui.cpp @@ -33,7 +33,7 @@ GenericHexWordEditor::GenericHexWordEditor(uint nbChars, bool hasBlankValue, TQW { setFocusPolicy(TQWidget::ClickFocus); setValidator(new HexValueValidator(nbChars, this)); - connect(this, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotTextChanged())); + connect(this, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotTextChanged())); setFrame(false); } @@ -81,7 +81,7 @@ bool GenericHexWordEditor::event(TQEvent *e) changeValue(); break; case TQEvent::FocusIn: - TQTimer::singleShot(0, this, TQT_SLOT(selectAll())); // ugly but it works + TQTimer::singleShot(0, this, TQ_SLOT(selectAll())); // ugly but it works break; case TQEvent::KeyPress: switch ( static_cast<TQKeyEvent*>(e)->key() ) { diff --git a/src/common/gui/misc_gui.cpp b/src/common/gui/misc_gui.cpp index 0121585..06e0d6b 100644 --- a/src/common/gui/misc_gui.cpp +++ b/src/common/gui/misc_gui.cpp @@ -126,7 +126,7 @@ void PopupButton::init() _separator = false; setFlat(true); TQPopupMenu *popup = new TQPopupMenu(this); - connect(popup, TQT_SIGNAL(activated(int)), TQT_SIGNAL(activated(int))); + connect(popup, TQ_SIGNAL(activated(int)), TQ_SIGNAL(activated(int))); setPopup(popup); } @@ -163,7 +163,7 @@ Splitter::Splitter(const TQValueList<int> &defaultSizes, TQt::Orientation o, TQW { Q_ASSERT(name); setOpaqueResize(true); - TQTimer::singleShot(0, this, TQT_SLOT(updateSizes())); + TQTimer::singleShot(0, this, TQ_SLOT(updateSizes())); } Splitter::~Splitter() @@ -211,15 +211,15 @@ void TabWidget::wheelEvent(TQWheelEvent *e) void TabWidget::setTabBar(TabBar *tabbar) { KTabWidget::setTabBar(tabbar); - connect(tabBar(), TQT_SIGNAL(contextMenu( int, const TQPoint & )), TQT_SLOT(contextMenu( int, const TQPoint & ))); - connect(tabBar(), TQT_SIGNAL(mouseDoubleClick( int )), TQT_SLOT(mouseDoubleClick( int ))); - connect(tabBar(), TQT_SIGNAL(mouseMiddleClick( int )), TQT_SLOT(mouseMiddleClick( int ))); - connect(tabBar(), TQT_SIGNAL(initiateDrag( int )), TQT_SLOT(initiateDrag( int ))); - connect(tabBar(), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & ))); - connect(tabBar(), TQT_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQT_SLOT(receivedDropEvent( int, TQDropEvent * ))); - connect(tabBar(), TQT_SIGNAL(moveTab( int, int )), TQT_SLOT(moveTab( int, int ))); - connect(tabBar(), TQT_SIGNAL(closeRequest( int )), TQT_SLOT(closeRequest( int ))); - connect(tabBar(), TQT_SIGNAL(wheelDelta( int )), TQT_SLOT(wheelDelta( int ))); + connect(tabBar(), TQ_SIGNAL(contextMenu( int, const TQPoint & )), TQ_SLOT(contextMenu( int, const TQPoint & ))); + connect(tabBar(), TQ_SIGNAL(mouseDoubleClick( int )), TQ_SLOT(mouseDoubleClick( int ))); + connect(tabBar(), TQ_SIGNAL(mouseMiddleClick( int )), TQ_SLOT(mouseMiddleClick( int ))); + connect(tabBar(), TQ_SIGNAL(initiateDrag( int )), TQ_SLOT(initiateDrag( int ))); + connect(tabBar(), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & ))); + connect(tabBar(), TQ_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQ_SLOT(receivedDropEvent( int, TQDropEvent * ))); + connect(tabBar(), TQ_SIGNAL(moveTab( int, int )), TQ_SLOT(moveTab( int, int ))); + connect(tabBar(), TQ_SIGNAL(closeRequest( int )), TQ_SLOT(closeRequest( int ))); + connect(tabBar(), TQ_SIGNAL(wheelDelta( int )), TQ_SLOT(wheelDelta( int ))); } //----------------------------------------------------------------------------- diff --git a/src/common/gui/number_gui.cpp b/src/common/gui/number_gui.cpp index cb58d4c..8e036c3 100644 --- a/src/common/gui/number_gui.cpp +++ b/src/common/gui/number_gui.cpp @@ -39,13 +39,13 @@ uint maxLabelWidth(NumberBase base, uint nbChars, const TQFont &font) NumberLineEdit::NumberLineEdit(TQWidget *parent, const char *name) : KLineEdit(parent, name) { - connect(this, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChangedSlot())); + connect(this, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChangedSlot())); } NumberLineEdit::NumberLineEdit(const TQString &text, TQWidget *parent, const char *name) : KLineEdit(text, parent, name) { - connect(this, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChangedSlot())); + connect(this, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChangedSlot())); } TQValidator::State validateNumber(const TQString &input) diff --git a/src/common/gui/purl_gui.cpp b/src/common/gui/purl_gui.cpp index fb7aacc..e936a99 100644 --- a/src/common/gui/purl_gui.cpp +++ b/src/common/gui/purl_gui.cpp @@ -77,7 +77,7 @@ PURL::Label::Label(const TQString &url, const TQString &text, TQWidget *parent, const char *name) : KURLLabel(url, text, parent, name) { - connect(this, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(urlClickedSlot())); + connect(this, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(urlClickedSlot())); } void PURL::Label::urlClickedSlot() @@ -103,12 +103,12 @@ void PURL::BaseWidget::init() TQHBoxLayout *top = new TQHBoxLayout(this, 0, 10); _edit = new KLineEdit(this); - connect(_edit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(changed())); + connect(_edit, TQ_SIGNAL(textChanged(const TQString &)), TQ_SIGNAL(changed())); top->addWidget(_edit); TDEIconLoader loader; TQIconSet iconset = loader.loadIcon("document-open", TDEIcon::Toolbar); TQPushButton *button = new KPushButton(iconset, TQString(), this); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(buttonClicked())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(buttonClicked())); top->addWidget(button); } @@ -138,7 +138,7 @@ void PURL::DirectoriesWidget::init(const TQString &defaultDir) { DirectoryWidget *edit = new DirectoryWidget(defaultDir); _editListBox = new EditListBox(1, edit, edit->lineEdit(), this, "directories_editlistbox"); - connect(_editListBox, TQT_SIGNAL(changed()), TQT_SIGNAL(changed())); + connect(_editListBox, TQ_SIGNAL(changed()), TQ_SIGNAL(changed())); } //---------------------------------------------------------------------------- diff --git a/src/common/nokde/nokde_kprocess.cpp b/src/common/nokde/nokde_kprocess.cpp index ee3e35b..a8489f1 100644 --- a/src/common/nokde/nokde_kprocess.cpp +++ b/src/common/nokde/nokde_kprocess.cpp @@ -15,9 +15,9 @@ TDEProcess::TDEProcess(TQObject *parent, const char *name) : TQObject(parent, name) { _process = new Q3Process(this); - connect(_process, TQT_SIGNAL(processExited()), TQT_SLOT(processExitedSlot())); - connect(_process, TQT_SIGNAL(readyReadStdout()), TQT_SLOT(readyReadStdoutSlot())); - connect(_process, TQT_SIGNAL(readyReadStderr()), TQT_SLOT(readyReadStderrSlot())); + connect(_process, TQ_SIGNAL(processExited()), TQ_SLOT(processExitedSlot())); + connect(_process, TQ_SIGNAL(readyReadStdout()), TQ_SLOT(readyReadStdoutSlot())); + connect(_process, TQ_SIGNAL(readyReadStderr()), TQ_SLOT(readyReadStderrSlot())); } bool TDEProcess::start() diff --git a/src/devices/gui/memory_editor.cpp b/src/devices/gui/memory_editor.cpp index db53341..de5da8e 100644 --- a/src/devices/gui/memory_editor.cpp +++ b/src/devices/gui/memory_editor.cpp @@ -75,22 +75,22 @@ void Device::MemoryRangeEditor::init() for (uint i = 0; i<_nbCols; ++i) { HexWordEditor *h = createHexWordEditor(grid); _editors.append(h); - connect(h, TQT_SIGNAL(modified()), TQT_SIGNAL(modified())); - connect(h, TQT_SIGNAL(moveNext()), TQT_SLOT(moveNext())); - connect(h, TQT_SIGNAL(movePrev()), TQT_SLOT(movePrev())); - connect(h, TQT_SIGNAL(moveFirst()), TQT_SLOT(moveFirst())); - connect(h, TQT_SIGNAL(moveLast()), TQT_SLOT(moveLast())); - connect(h, TQT_SIGNAL(moveUp()), TQT_SLOT(moveUp())); - connect(h, TQT_SIGNAL(moveDown()), TQT_SLOT(moveDown())); - connect(h, TQT_SIGNAL(moveNextPage()), TQT_SLOT(moveNextPage())); - connect(h, TQT_SIGNAL(movePrevPage()), TQT_SLOT(movePrevPage())); + connect(h, TQ_SIGNAL(modified()), TQ_SIGNAL(modified())); + connect(h, TQ_SIGNAL(moveNext()), TQ_SLOT(moveNext())); + connect(h, TQ_SIGNAL(movePrev()), TQ_SLOT(movePrev())); + connect(h, TQ_SIGNAL(moveFirst()), TQ_SLOT(moveFirst())); + connect(h, TQ_SIGNAL(moveLast()), TQ_SLOT(moveLast())); + connect(h, TQ_SIGNAL(moveUp()), TQ_SLOT(moveUp())); + connect(h, TQ_SIGNAL(moveDown()), TQ_SLOT(moveDown())); + connect(h, TQ_SIGNAL(moveNextPage()), TQ_SLOT(moveNextPage())); + connect(h, TQ_SIGNAL(movePrevPage()), TQ_SLOT(movePrevPage())); } } // scrollbar if there are more lines to display than visible _scrollbar = new TQScrollBar(0, TQMAX(_nbLines, totalNbLines)-_nbLines, 1, _nbLines, 0, TQt::Vertical, frame, "memory_range_editor_scrollbar"); - connect(_scrollbar, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setIndex(int))) ; + connect(_scrollbar, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(setIndex(int))) ; if ( totalNbLines<=_nbLines ) _scrollbar->hide(); fbox->addWidget(_scrollbar); fbox->addStretch(1); @@ -254,7 +254,7 @@ Device::MemoryEditorGroup::MemoryEditorGroup(Device::Memory *memory, TQWidget *p void Device::MemoryEditorGroup::addEditor(MemoryEditor *editor) { - connect(editor, TQT_SIGNAL(modified()), TQT_SIGNAL(modified())); + connect(editor, TQ_SIGNAL(modified()), TQ_SIGNAL(modified())); _editors.append(editor); } @@ -300,7 +300,7 @@ void Device::MemoryTypeEditor::init(bool first) for (uint i=0; i<Nb_Actions; i++) { if ( hasAction(Action(i)) ) { _actions[i] = new TDEAction(i18n(ACTION_DATA[i].label), ACTION_DATA[i].icon, 0, - this, TQT_SLOT(doAction()), Main::toplevel().actionCollection()); + this, TQ_SLOT(doAction()), Main::toplevel().actionCollection()); addAction(_actions[i]); } if ( ACTION_DATA[i].properties & SeparatorAfter ) _title->appendSeparator(); @@ -312,7 +312,7 @@ void Device::MemoryTypeEditor::init(bool first) hbox->addWidget(_comment); hbox->addStretch(1); - connect(&Main::toplevel(), TQT_SIGNAL(stateChanged()), TQT_SLOT(stateChanged())); + connect(&Main::toplevel(), TQ_SIGNAL(stateChanged()), TQ_SLOT(stateChanged())); } void Device::MemoryTypeEditor::addAction(TDEAction *action) diff --git a/src/devices/gui/register_view.cpp b/src/devices/gui/register_view.cpp index a290508..6e5c268 100644 --- a/src/devices/gui/register_view.cpp +++ b/src/devices/gui/register_view.cpp @@ -167,8 +167,8 @@ void Register::ListViewItem::editDone(int col, const TQWidget *edit) Register::LineEdit::LineEdit(TQWidget *parent, const char *name) : NumberLineEdit(parent, name), _base(NumberBase::Nb_Types) { - connect(this, TQT_SIGNAL(lostFocus()), TQT_SLOT(updateText())); - connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressedSlot())); + connect(this, TQ_SIGNAL(lostFocus()), TQ_SLOT(updateText())); + connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressedSlot())); } void Register::LineEdit::updateText() diff --git a/src/devices/pic/gui/pic_config_word_editor.cpp b/src/devices/pic/gui/pic_config_word_editor.cpp index b40adf5..9413c3a 100644 --- a/src/devices/pic/gui/pic_config_word_editor.cpp +++ b/src/devices/pic/gui/pic_config_word_editor.cpp @@ -110,12 +110,12 @@ Pic::ConfigWordEditor::ConfigWordEditor(Memory &memory, uint ci, bool withWordEd TQHBoxLayout *hbox = new TQHBoxLayout(_top); _mdb = new MemoryRangeEditor(MemoryRangeType::Config, memory, 1, 1, ci, 1, this); _mdb->init(); - connect(_mdb, TQT_SIGNAL(modified()), TQT_SIGNAL(modified())); - connect(_mdb, TQT_SIGNAL(modified()), TQT_SLOT(updateDisplay())); + connect(_mdb, TQ_SIGNAL(modified()), TQ_SIGNAL(modified())); + connect(_mdb, TQ_SIGNAL(modified()), TQ_SLOT(updateDisplay())); hbox->addWidget(_mdb); KPushButton *button = new KPushButton(i18n("Details..."), this); button->setFixedHeight(button->sizeHint().height()); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(showDialog())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(showDialog())); hbox->addWidget(button); hbox->addStretch(1); } else _mdb = 0; @@ -138,7 +138,7 @@ Pic::ConfigWordEditor::ConfigWordEditor(Memory &memory, uint ci, bool withWordEd label += " (" + toHexLabel(cmask.values[i].value, nbChars) + ")"; _combos[k]->appendItem(label, i); } - connect(_combos[k], TQT_SIGNAL(activated(int)), TQT_SLOT(slotModified())); + connect(_combos[k], TQ_SIGNAL(activated(int)), TQ_SLOT(slotModified())); grid->addWidget(_combos[k], k, 2); } } diff --git a/src/devices/pic/gui/pic_memory_editor.cpp b/src/devices/pic/gui/pic_memory_editor.cpp index 0c9e188..8ea8057 100644 --- a/src/devices/pic/gui/pic_memory_editor.cpp +++ b/src/devices/pic/gui/pic_memory_editor.cpp @@ -38,10 +38,10 @@ Pic::MemoryEditorLegend::Data::Data(const TQString &text, TQWidget *parent) { button = new PopupButton(text, parent); TDEActionCollection *ac = 0; - TDEAction *a = new TDEAction(i18n("Go to start"), "go-top", 0, parent, TQT_SLOT(gotoStart()), ac); + TDEAction *a = new TDEAction(i18n("Go to start"), "go-top", 0, parent, TQ_SLOT(gotoStart()), ac); actions.append(a); button->appendAction(a); - a = new TDEAction(i18n("Go to end"), "go-bottom", 0, parent, TQT_SLOT(gotoEnd()), ac); + a = new TDEAction(i18n("Go to end"), "go-bottom", 0, parent, TQ_SLOT(gotoEnd()), ac); actions.append(a); button->appendAction(a); label = new TQLabel(parent); @@ -193,8 +193,8 @@ void Pic::MemoryRangeEditor::addLegend(TQVBoxLayout *vbox) { if ( type()==MemoryRangeType::Code || type()==MemoryRangeType::Eeprom ) { _legend = new MemoryEditorLegend(type(), memory(), this); - connect(_legend, TQT_SIGNAL(setStartWord(int)), TQT_SLOT(setStartWord(int))); - connect(_legend, TQT_SIGNAL(setEndWord(int)), TQT_SLOT(setEndWord(int))); + connect(_legend, TQ_SIGNAL(setStartWord(int)), TQ_SLOT(setStartWord(int))); + connect(_legend, TQ_SIGNAL(setEndWord(int)), TQ_SLOT(setEndWord(int))); vbox->addWidget(_legend); } } @@ -317,7 +317,7 @@ void Pic::MemoryUserIdEditor::init(bool first) { MemoryTypeRangeEditor::init(first); _setToChecksum = new TDEToggleAction(i18n("Set to unprotected checksum"), 0, 0, - this, TQT_SLOT(toggleSetToChecksum()), Main::toplevel().actionCollection()); + this, TQ_SLOT(toggleSetToChecksum()), Main::toplevel().actionCollection()); addAction(_setToChecksum); if ( readConfigEntry(BaseGlobalConfig::UserIdSetToChecksum).toBool() && memory().isClear(MemoryRangeType::UserId) ) { _setToChecksum->activate(); diff --git a/src/devices/pic/gui/pic_register_view.cpp b/src/devices/pic/gui/pic_register_view.cpp index 8848d85..7c2a422 100644 --- a/src/devices/pic/gui/pic_register_view.cpp +++ b/src/devices/pic/gui/pic_register_view.cpp @@ -54,7 +54,7 @@ Pic::BankWidget::BankWidget(uint i, TQWidget *parent) _bankCombo->insertItem((k%2)==0 ? i18n("Bank %1 (low)").arg(k/2) : i18n("Bank %1 (high)").arg(k/2)); } if ( _bindex==3 ) _bankCombo->setCurrentItem(1); - connect(_bankCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(bankChanged())); + connect(_bankCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(bankChanged())); top->addMultiCellWidget(_bankCombo, row,row, 0,6, AlignHCenter); } } else { @@ -83,10 +83,10 @@ Pic::BankWidget::BankWidget(uint i, TQWidget *parent) _registers[k].button->appendItem(i18n("Read"), readIcon, ReadId); _registers[k].button->appendItem(i18n("Edit"), editIcon, EditId); _registers[k].button->appendItem(i18n("Watch"), WatchId); - connect(_registers[k].button, TQT_SIGNAL(activated(int)), TQT_SLOT(buttonActivated(int))); + connect(_registers[k].button, TQ_SIGNAL(activated(int)), TQ_SLOT(buttonActivated(int))); top->addWidget(_registers[k].button, row, 2); _registers[k].edit = new Register::LineEdit(this); - connect(_registers[k].edit, TQT_SIGNAL(modified()), TQT_SLOT(write())); + connect(_registers[k].edit, TQ_SIGNAL(modified()), TQ_SLOT(write())); _registers[k].edit->setFont(f); top->addWidget(_registers[k].edit, row, 6); } else { @@ -260,10 +260,10 @@ Pic::RegisterView::RegisterView(TQWidget *parent) hbox->addWidget(w); TQGridLayout *grid = new TQGridLayout(w, 1, 1, 0, 10); _readAllButton = new TQPushButton(i18n("Read All"), w); - connect(_readAllButton, TQT_SIGNAL(clicked()), Debugger::manager, TQT_SLOT(readAllRegisters())); + connect(_readAllButton, TQ_SIGNAL(clicked()), Debugger::manager, TQ_SLOT(readAllRegisters())); grid->addWidget(_readAllButton, 0, 0); _clearAllButton = new TQPushButton(i18n("Clear all watching"), w); - connect(_clearAllButton, TQT_SIGNAL(clicked()), TQT_SLOT(stopWatchAllRegisters())); + connect(_clearAllButton, TQ_SIGNAL(clicked()), TQ_SLOT(stopWatchAllRegisters())); grid->addWidget(_clearAllButton, 0, 1); grid->setColStretch(2, 1); } diff --git a/src/libgui/breakpoint_view.cpp b/src/libgui/breakpoint_view.cpp index a8454ea..6b78301 100644 --- a/src/libgui/breakpoint_view.cpp +++ b/src/libgui/breakpoint_view.cpp @@ -40,9 +40,9 @@ Breakpoint::View::View(TQWidget *parent) { TQVBoxLayout *top = new TQVBoxLayout(this); _listview = new ListView(this); - connect(_listview, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(itemClicked(TQListViewItem *))); - connect(_listview, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), - TQT_SLOT(contextMenu(TQListViewItem *, const TQPoint &, int))); + connect(_listview, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(itemClicked(TQListViewItem *))); + connect(_listview, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + TQ_SLOT(contextMenu(TQListViewItem *, const TQPoint &, int))); _listview->setAllColumnsShowFocus(true); _listview->addColumn(i18n("Status")); _listview->addColumn(i18n("Location")); diff --git a/src/libgui/config_gen.cpp b/src/libgui/config_gen.cpp index d58be6e..4517879 100644 --- a/src/libgui/config_gen.cpp +++ b/src/libgui/config_gen.cpp @@ -32,7 +32,7 @@ GeneratorDialog::GeneratorDialog(const TQString &title, TQWidget *parent, const TQLabel *label = new TQLabel(i18n("Device:"), mainWidget()); hbox->addWidget(label); _deviceChooser = new DeviceChooser::Button(false, mainWidget()); - connect(_deviceChooser, TQT_SIGNAL(changed()), TQT_SLOT(reset())); + connect(_deviceChooser, TQ_SIGNAL(changed()), TQ_SLOT(reset())); hbox->addWidget(_deviceChooser); hbox->addSpacing(20); @@ -42,7 +42,7 @@ GeneratorDialog::GeneratorDialog(const TQString &title, TQWidget *parent, const Tool::Lister::ConstIterator it; for (it=Tool::lister().begin(); it!=Tool::lister().end(); ++it) _configType->appendItem(it.key(), it.data()->label()); - connect(_configType->widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(typeChanged())); + connect(_configType->widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(typeChanged())); hbox->addWidget(_configType->widget()); label = new TQLabel(i18n("Tool Type:"), mainWidget()); @@ -50,7 +50,7 @@ GeneratorDialog::GeneratorDialog(const TQString &title, TQWidget *parent, const _toolType = new KeyComboBox<PURL::ToolType>(mainWidget()); FOR_EACH(PURL::ToolType, type) _toolType->appendItem(type, type.label()); _toolType->fixMinimumWidth(); - connect(_toolType->widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(compute())); + connect(_toolType->widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(compute())); hbox->addWidget(_toolType->widget()); hbox->addStretch(1); @@ -159,7 +159,7 @@ void ConfigGenerator::reset() _configEditor = Device::groupui(*data).createConfigEditor(*_memory, mainWidget()); if (_configEditor) { _configEditor->show(); - connect(_configEditor, TQT_SIGNAL(modified()), TQT_SLOT(compute())); + connect(_configEditor, TQ_SIGNAL(modified()), TQ_SLOT(compute())); _configEditor->updateDisplay(); _hbox->addWidget(_configEditor); } diff --git a/src/libgui/device_editor.cpp b/src/libgui/device_editor.cpp index c48ffb2..4b8df1d 100644 --- a/src/libgui/device_editor.cpp +++ b/src/libgui/device_editor.cpp @@ -50,7 +50,7 @@ void DeviceEditor::init() _top->addWidget(_labelWarning); _vbox = new TQVBoxLayout(_top); - connect(&Main::toplevel(), TQT_SIGNAL(stateChanged()), TQT_SLOT(updateDevice())); + connect(&Main::toplevel(), TQ_SIGNAL(stateChanged()), TQ_SLOT(updateDevice())); } void DeviceEditor::setDevice(bool force) diff --git a/src/libgui/device_gui.cpp b/src/libgui/device_gui.cpp index 2c60c90..1eb90dc 100644 --- a/src/libgui/device_gui.cpp +++ b/src/libgui/device_gui.cpp @@ -94,10 +94,10 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren TQHBoxLayout *hbox = new TQHBoxLayout(top, 10); TQVBoxLayout *vbox = new TQVBoxLayout(hbox); _listTypeCombo = new EnumComboBox<ListType>("list_type", mainWidget()); - connect(_listTypeCombo->combo(), TQT_SIGNAL(activated(int)), TQT_SLOT(updateList())); + connect(_listTypeCombo->combo(), TQ_SIGNAL(activated(int)), TQ_SLOT(updateList())); vbox->addWidget(_listTypeCombo->combo()); TQPushButton *button = new KPushButton(KGuiItem(i18n("Reset Filters"), "reload"), mainWidget()); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(resetFilters())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(resetFilters())); vbox->addWidget(button); vbox->addStretch(1); @@ -122,7 +122,7 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren Config config; const Programmer::Group *pgroup = config.programmerGroup(); if (pgroup) _programmerCombo->setCurrentItem(pgroup->name()); - connect(_programmerCombo->widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(updateList())); + connect(_programmerCombo->widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(updateList())); shbox->addWidget(_programmerCombo->widget()); // tool filter @@ -135,12 +135,12 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren } const Tool::Group *tgroup = config.toolGroup(); if (tgroup) _toolCombo->setCurrentItem(tgroup->name()); - connect(_toolCombo->widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(updateList())); + connect(_toolCombo->widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(updateList())); shbox->addWidget(_toolCombo->widget()); // memory filter _memoryCombo = new EnumComboBox<Device::MemoryTechnology>(i18n("<Memory Type>"), "memory_technology", frame); - connect(_memoryCombo->combo(), TQT_SIGNAL(activated(int)), TQT_SLOT(updateList())); + connect(_memoryCombo->combo(), TQ_SIGNAL(activated(int)), TQ_SLOT(updateList())); shbox->addWidget(_memoryCombo->combo()); shbox->addStretch(1); @@ -148,12 +148,12 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren // status filter _statusCombo = new EnumComboBox<Device::Status>(i18n("<Status>"), "status", frame); - connect(_statusCombo->combo(), TQT_SIGNAL(activated(int)), TQT_SLOT(updateList())); + connect(_statusCombo->combo(), TQ_SIGNAL(activated(int)), TQ_SLOT(updateList())); shbox->addWidget(_statusCombo->combo()); // features filter _featureCombo = new EnumComboBox<Pic::Feature>(i18n("<Feature>"), "feature", frame); - connect(_featureCombo->combo(), TQT_SIGNAL(activated(int)), TQT_SLOT(updateList())); + connect(_featureCombo->combo(), TQ_SIGNAL(activated(int)), TQ_SLOT(updateList())); shbox->addWidget(_featureCombo->combo()); shbox->addStretch(1); @@ -165,10 +165,10 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren 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 *)), - TQT_SLOT(currentChanged(TQListViewItem *))); - connect(_listView, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), - TQT_SLOT(listDoubleClicked(TQListViewItem *))); + connect(_listView, TQ_SIGNAL(currentChanged(TQListViewItem *)), + TQ_SLOT(currentChanged(TQListViewItem *))); + connect(_listView, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), + TQ_SLOT(listDoubleClicked(TQListViewItem *))); _listView->setAllColumnsShowFocus(true); _listView->setRootIsDecorated(true); _listView->setSorting(-1); @@ -177,8 +177,8 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren // device view _deviceView = new View(splitter); - connect(_deviceView, TQT_SIGNAL(deviceChanged(const TQString &)), - TQT_SLOT(deviceChange(const TQString &))); + connect(_deviceView, TQ_SIGNAL(deviceChanged(const TQString &)), + TQ_SLOT(deviceChange(const TQString &))); updateList(device); } @@ -343,12 +343,12 @@ DeviceChooser::Button::Button(bool withAuto, TQWidget *parent) { TQHBoxLayout *hbox = new TQHBoxLayout(this, 0, 10); _combo = new ComboBox(withAuto, this); - connect(_combo, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); + connect(_combo, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); hbox->addWidget(_combo); TDEIconLoader loader; TQIconSet iconset = loader.loadIcon("document-open", TDEIcon::Toolbar); KPushButton *button = new KPushButton(iconset, TQString(), this); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(chooseDevice())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(chooseDevice())); hbox->addWidget(button); } @@ -399,8 +399,8 @@ DeviceChooser::View::View(TQWidget *parent) _info = new Browser(this); _info->setMimeSourceFactory(&_msf); insertTab(_info, i18n("Information")); - connect(_info, TQT_SIGNAL(deviceChanged(const TQString &)), - TQT_SIGNAL(deviceChanged(const TQString &))); + connect(_info, TQ_SIGNAL(deviceChanged(const TQString &)), + TQ_SIGNAL(deviceChanged(const TQString &))); // Memory Map _memory = new Browser(this); @@ -457,7 +457,7 @@ DeviceChooser::Editor::Editor(const TQString &title, const TQString &tag, TQWidg TQWidget *DeviceChooser::Editor::createView(const Device::Data *, TQWidget *parent) { DeviceChooser::View *view = new DeviceChooser::View(parent); - connect(view, TQT_SIGNAL(deviceChanged(const TQString &)), TQT_SIGNAL(deviceChanged(const TQString &))); + connect(view, TQ_SIGNAL(deviceChanged(const TQString &)), TQ_SIGNAL(deviceChanged(const TQString &))); view->setDevice(_device, true); return view; } diff --git a/src/libgui/editor_manager.cpp b/src/libgui/editor_manager.cpp index d6747f3..3e17daf 100644 --- a/src/libgui/editor_manager.cpp +++ b/src/libgui/editor_manager.cpp @@ -96,7 +96,7 @@ EditorManager::EditorManager(TQWidget *parent) : TabWidget(parent, "editor_manager"), _current(0) { setTabBar(new EditorTabBar(this)); - connect(this, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SLOT(showEditor(TQWidget *))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SLOT(showEditor(TQWidget *))); setHoverCloseButton(readConfigEntry(BaseGlobalConfig::ShowTabCloseButton).toBool()); setHoverCloseButtonDelayed(false); } @@ -127,10 +127,10 @@ void EditorManager::connectEditor(Editor *editor) disconnectEditor(currentEditor()); if ( editor==0 ) return; editor->addGui(); - connect(editor, TQT_SIGNAL(modified()), TQT_SLOT(modifiedSlot())); - connect(editor, TQT_SIGNAL(guiChanged()), TQT_SIGNAL(guiChanged())); - connect(editor, TQT_SIGNAL(dropEventPass(TQDropEvent *)), TQT_SLOT(slotDropEvent(TQDropEvent *))); - connect(editor, TQT_SIGNAL(statusTextChanged(const TQString &)), TQT_SIGNAL(statusChanged(const TQString &))); + connect(editor, TQ_SIGNAL(modified()), TQ_SLOT(modifiedSlot())); + connect(editor, TQ_SIGNAL(guiChanged()), TQ_SIGNAL(guiChanged())); + connect(editor, TQ_SIGNAL(dropEventPass(TQDropEvent *)), TQ_SLOT(slotDropEvent(TQDropEvent *))); + connect(editor, TQ_SIGNAL(statusTextChanged(const TQString &)), TQ_SIGNAL(statusChanged(const TQString &))); } void EditorManager::modifiedSlot() diff --git a/src/libgui/gui_debug_manager.cpp b/src/libgui/gui_debug_manager.cpp index 4b607ab..0aa3e64 100644 --- a/src/libgui/gui_debug_manager.cpp +++ b/src/libgui/gui_debug_manager.cpp @@ -26,7 +26,7 @@ bool Debugger::GuiManager::addEditor(Editor &editor) { if ( _editors.find(&editor)!=_editors.end() ) return false; - connect(&editor, TQT_SIGNAL(destroyed()), TQT_SLOT(editorDestroyed())); + connect(&editor, TQ_SIGNAL(destroyed()), TQ_SLOT(editorDestroyed())); _editors.append(&editor); return true; } diff --git a/src/libgui/hex_editor.cpp b/src/libgui/hex_editor.cpp index a0f11fb..2245f51 100644 --- a/src/libgui/hex_editor.cpp +++ b/src/libgui/hex_editor.cpp @@ -34,9 +34,9 @@ HexEditorPart::HexEditorPart(HexEditor *editor) { setXMLFile("hexeditorpartui.rc"); - (void)KStdAction::save(editor, TQT_SLOT(save()), actionCollection()); - (void)KStdAction::saveAs(editor, TQT_SLOT(saveAs()), actionCollection()); - (void)new TDEToggleAction(i18n("Read Only Mode"), 0, 0, editor, TQT_SLOT(toggleReadOnly()), actionCollection(), "tools_toggle_write_lock"); + (void)KStdAction::save(editor, TQ_SLOT(save()), actionCollection()); + (void)KStdAction::saveAs(editor, TQ_SLOT(saveAs()), actionCollection()); + (void)new TDEToggleAction(i18n("Read Only Mode"), 0, 0, editor, TQ_SLOT(toggleReadOnly()), actionCollection(), "tools_toggle_write_lock"); } void HexEditorPart::setReadWrite(bool rw) @@ -85,9 +85,9 @@ TQWidget *HexEditor::createView(const Device::Data *data, TQWidget *parent) } if ( data==0 ) return new TQWidget(parent); Device::HexView *hv = Device::groupui(*data).createHexView(*this, parent); - connect(hv, TQT_SIGNAL(modified()), TQT_SLOT(slotModified())); + connect(hv, TQ_SIGNAL(modified()), TQ_SLOT(slotModified())); _dirty = true; - TQTimer::singleShot(0, this, TQT_SLOT(simpleLoad())); + TQTimer::singleShot(0, this, TQ_SLOT(simpleLoad())); return hv; } diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp index 02e2fc4..ea30824 100644 --- a/src/libgui/likeback.cpp +++ b/src/libgui/likeback.cpp @@ -66,21 +66,21 @@ LikeBack::LikeBack(Button buttons) m_likeButton->setIconSet(likeIconSet); m_likeButton->setTextLabel(i18n("I Like...")); m_likeButton->setAutoRaise(true); - connect( m_likeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(iLike()) ); + connect( m_likeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(iLike()) ); layout->add(m_likeButton); TQToolButton *m_dislikeButton = new TQToolButton(this, "idonotlike"); m_dislikeButton->setIconSet(dislikeIconSet); m_dislikeButton->setTextLabel(i18n("I Do not Like...")); m_dislikeButton->setAutoRaise(true); - connect( m_dislikeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(iDoNotLike()) ); + connect( m_dislikeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(iDoNotLike()) ); layout->add(m_dislikeButton); TQToolButton *m_bugButton = new TQToolButton(this, "ifoundabug"); m_bugButton->setIconSet(bugIconSet); m_bugButton->setTextLabel(i18n("I Found a Bug...")); m_bugButton->setAutoRaise(true); - connect( m_bugButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(iFoundABug()) ); + connect( m_bugButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(iFoundABug()) ); layout->add(m_bugButton); m_configureButton = new TQToolButton(this, "configure"); @@ -88,17 +88,17 @@ LikeBack::LikeBack(Button buttons) m_configureButton->setIconSet(helpIconSet); m_configureButton->setTextLabel(i18n("Configure...")); m_configureButton->setAutoRaise(true); - connect( m_likeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configure()) ); + connect( m_likeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(configure()) ); layout->add(m_configureButton); TQPopupMenu *configureMenu = new TQPopupMenu(this); - configureMenu->insertItem(helpIconSet, i18n("What's &This?"), this , TQT_SLOT(showWhatsThisMessage()) ); + configureMenu->insertItem(helpIconSet, i18n("What's &This?"), this , TQ_SLOT(showWhatsThisMessage()) ); TQIconSet changeEmailIconSet = kapp->iconLoader()->loadIconSet("mail_generic", TDEIcon::Small); - configureMenu->insertItem(changeEmailIconSet, i18n("&Configure Email Address..."), this , TQT_SLOT(askEMail()) ); + configureMenu->insertItem(changeEmailIconSet, i18n("&Configure Email Address..."), this , TQ_SLOT(askEMail()) ); // TQIconSet dontHelpIconSet = kapp->iconLoader()->loadIconSet("process-stop", TDEIcon::Small); -// configureMenu->insertItem( dontHelpIconSet, i18n("&Do not Help Anymore"), this , TQT_SLOT(doNotHelpAnymore()) ); +// configureMenu->insertItem( dontHelpIconSet, i18n("&Do not Help Anymore"), this , TQ_SLOT(doNotHelpAnymore()) ); m_configureButton->setPopup(configureMenu); - connect( m_configureButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(openConfigurePopup()) ); + connect( m_configureButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(openConfigurePopup()) ); if (!emailAddressAlreadyProvided()) //beginFetchingEmail(); // Begin before showing the message, so we have time! @@ -112,7 +112,7 @@ LikeBack::LikeBack(Button buttons) resize(sizeHint()); - connect( &m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(autoMove()) ); + connect( &m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(autoMove()) ); m_timer.start(10); s_instance = this; @@ -453,7 +453,7 @@ void LikeBack::init(bool isDevelopmentVersion, Button buttons) return; m_process = new TDEProcess(); *m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount"); - connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(endFetchingEmailFrom()) ); + connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(endFetchingEmailFrom()) ); if (!m_process->start()) { kdDebug() << "Couldn't start tdecmshell.." << endl; delete m_process; @@ -582,8 +582,8 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQS m_sendButton = new TQPushButton(sendIconSet, i18n("Send"), coloredWidget); m_sendButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding); m_sendButton->setEnabled(false); - connect( m_sendButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(send()) ); - connect( m_comment, TQT_SIGNAL(textChanged()), this, TQT_SLOT(commentChanged()) ); + connect( m_sendButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(send()) ); + connect( m_comment, TQ_SIGNAL(textChanged()), this, TQ_SLOT(commentChanged()) ); commentLayout->addWidget(m_comment); commentLayout->addWidget(m_sendButton); coloredWidgetLayout->addLayout(commentLayout); @@ -635,7 +635,7 @@ void LikeBackDialog::send() // std::cout << "http://" << LikeBack::hostName() << ":" << LikeBack::hostPort() << LikeBack::remotePath() << std::endl; // std::cout << data << std::endl; - connect( http, TQT_SIGNAL(requestFinished(int, bool)), this, TQT_SLOT(requestFinished(int, bool)) ); + connect( http, TQ_SIGNAL(requestFinished(int, bool)), this, TQ_SLOT(requestFinished(int, bool)) ); // http->post(LikeBack::remotePath(), data.utf8()); TQHttpRequestHeader header("POST", LikeBack::remotePath()); diff --git a/src/libgui/log_view.cpp b/src/libgui/log_view.cpp index 3c3d75c..6365f51 100644 --- a/src/libgui/log_view.cpp +++ b/src/libgui/log_view.cpp @@ -77,18 +77,18 @@ TQPopupMenu *Log::Widget::createPopupMenu(const TQPoint &pos) _popup = TQTextEdit::createPopupMenu(pos); TDEIconLoader loader; TQIconSet iset = loader.loadIconSet("document-save", TDEIcon::Small, 0); - _popup->insertItem(iset, "Save As...", this, TQT_SLOT(saveAs())); + _popup->insertItem(iset, "Save As...", this, TQ_SLOT(saveAs())); iset = loader.loadIconSet("window-close", TDEIcon::Small, 0); - _popup->insertItem(iset, "Clear", this, TQT_SLOT(clear())); + _popup->insertItem(iset, "Clear", this, TQ_SLOT(clear())); _popup->insertSeparator(); FOR_EACH(DebugLevel, level) { _id[level.type()] = _popup->insertItem(level.label()); _popup->setItemChecked(_id[level.type()], _debugLevel==level); } _popup->insertSeparator(); - int id = _popup->insertItem(i18n("Output in console"), this, TQT_SLOT(toggleConsoleOutput())); + int id = _popup->insertItem(i18n("Output in console"), this, TQ_SLOT(toggleConsoleOutput())); _popup->setItemChecked(id, GlobalConfig::logOutputType()==GuiConsole); - connect(_popup, TQT_SIGNAL(activated(int)), TQT_SLOT(toggleVisible(int))); + connect(_popup, TQ_SIGNAL(activated(int)), TQ_SLOT(toggleVisible(int))); return _popup; } diff --git a/src/libgui/new_dialogs.cpp b/src/libgui/new_dialogs.cpp index 2ffc16f..919ad51 100644 --- a/src/libgui/new_dialogs.cpp +++ b/src/libgui/new_dialogs.cpp @@ -26,18 +26,18 @@ NewDialog::NewDialog(const TQString &caption, TQWidget *parent) _fLabel = new TQLabel(mainWidget()); _top->addWidget(_fLabel, 0, 0); _filename = new TQLineEdit(mainWidget()); - connect(_filename, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(changed())); + connect(_filename, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(changed())); _top->addMultiCellWidget(_filename, 0,0, 1,3); TQLabel *label= new TQLabel(i18n("Location:"), mainWidget()); _top->addWidget(label, 1, 0); _dir = new TQLineEdit(mainWidget()); - connect(_dir, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(changed())); + connect(_dir, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(changed())); _top->addMultiCellWidget(_dir, 1,1, 1,2); TDEIconLoader loader; TQIconSet iconset = loader.loadIcon("document-open", TDEIcon::Toolbar); KPushButton *button = new KPushButton(iconset, TQString(), mainWidget()); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(browse())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(browse())); _top->addWidget(button, 1, 3); _filename->setFocus(); diff --git a/src/libgui/project_manager.cpp b/src/libgui/project_manager.cpp index fd10d0d..8fa9586 100644 --- a/src/libgui/project_manager.cpp +++ b/src/libgui/project_manager.cpp @@ -38,13 +38,13 @@ ProjectManager::View::View(TQWidget *parent) : ListView(parent, "project_manager"), _project(0), _modified(false) { - connect(this, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), - TQT_SLOT(clicked(int, TQListViewItem *, const TQPoint &, int))); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), - TQT_SLOT(contextMenu(TQListViewItem *, const TQPoint &, int))); - connect(this, TQT_SIGNAL(itemRenamed(TQListViewItem *, int, const TQString &)), - TQT_SLOT(renamed(TQListViewItem *, int, const TQString &))); - connect(this, TQT_SIGNAL(moved()), TQT_SLOT(filesReordered())); + connect(this, TQ_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), + TQ_SLOT(clicked(int, TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + TQ_SLOT(contextMenu(TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL(itemRenamed(TQListViewItem *, int, const TQString &)), + TQ_SLOT(renamed(TQListViewItem *, int, const TQString &))); + connect(this, TQ_SIGNAL(moved()), TQ_SLOT(filesReordered())); header()->hide(); setSorting(-1); @@ -54,7 +54,7 @@ ProjectManager::View::View(TQWidget *parent) setAcceptDrops(true); setDragEnabled(true); setDropVisualizer(true); - TQTimer::singleShot(0, this, TQT_SLOT(init()));; + TQTimer::singleShot(0, this, TQ_SLOT(init()));; } ProjectManager::View::~View() @@ -178,8 +178,8 @@ void ProjectManager::View::contextMenu(TQListViewItem *item, const TQPoint &p, i RootItem *ri = static_cast<RootItem *>(item); if ( _project==0 ) { if ( ri->url().isEmpty() ) { - pop.insertItem("piklab_createproject", i18n("New Project..."), &Main::toplevel(), TQT_SLOT(newProject())); - pop.insertItem("piklab_openproject", i18n("Open Project..."), &Main::toplevel(), TQT_SLOT(openProject())); + pop.insertItem("piklab_createproject", i18n("New Project..."), &Main::toplevel(), TQ_SLOT(newProject())); + pop.insertItem("piklab_openproject", i18n("Open Project..."), &Main::toplevel(), TQ_SLOT(openProject())); pop.exec(p); } else { pop.insertTitle(i18n("Standalone File")); @@ -188,16 +188,16 @@ void ProjectManager::View::contextMenu(TQListViewItem *item, const TQPoint &p, i } } else { pop.insertTitle(i18n("Project")); - pop.insertItem("configure", i18n("Options..."), &Main::toplevel(), TQT_SLOT(configureProject())); - pop.insertItem("edit-find", i18n("Find Files..."), &Main::toplevel(), TQT_SLOT(runKfind())); + pop.insertItem("configure", i18n("Options..."), &Main::toplevel(), TQ_SLOT(configureProject())); + pop.insertItem("edit-find", i18n("Find Files..."), &Main::toplevel(), TQ_SLOT(runKfind())); pop.insertSeparator(); - pop.insertItem("piklab_compile", i18n("Build Project"), &Main::toplevel(), TQT_SLOT(buildProject())); - pop.insertItem("trashcan_empty", i18n("Clean Project"), &Main::toplevel(), TQT_SLOT(cleanBuild())); + pop.insertItem("piklab_compile", i18n("Build Project"), &Main::toplevel(), TQ_SLOT(buildProject())); + pop.insertItem("trashcan_empty", i18n("Clean Project"), &Main::toplevel(), TQ_SLOT(cleanBuild())); pop.insertSeparator(); - pop.insertItem("document-new", i18n("New Source File..."), &Main::toplevel(), TQT_SLOT(newSourceFile())); - pop.insertItem("piklab_addfile", i18n("Add Source Files..."), this, TQT_SLOT(insertSourceFiles())); - pop.insertItem("piklab_addfile", i18n("Add Object Files..."), this, TQT_SLOT(insertObjectFiles())); - if ( Main::currentEditor() ) pop.insertItem("piklab_addcurrentfile", i18n("Add Current File"), this, TQT_SLOT(insertCurrentFile())); + pop.insertItem("document-new", i18n("New Source File..."), &Main::toplevel(), TQ_SLOT(newSourceFile())); + pop.insertItem("piklab_addfile", i18n("Add Source Files..."), this, TQ_SLOT(insertSourceFiles())); + pop.insertItem("piklab_addfile", i18n("Add Object Files..."), this, TQ_SLOT(insertObjectFiles())); + if ( Main::currentEditor() ) pop.insertItem("piklab_addcurrentfile", i18n("Add Current File"), this, TQ_SLOT(insertCurrentFile())); pop.exec(p); } } else if ( item->rtti()==FileRtti ) { @@ -211,15 +211,15 @@ void ProjectManager::View::contextMenu(TQListViewItem *item, const TQPoint &p, i if ( _project==0 ) return; if ( group==LinkerObjectGroup ) { pop.insertTitle(i18n("Objects")); - pop.insertItem("piklab_addfile", i18n("Add Object Files..."), this, TQT_SLOT(insertObjectFiles())); + pop.insertItem("piklab_addfile", i18n("Add Object Files..."), this, TQ_SLOT(insertObjectFiles())); pop.exec(p); } else if ( group==SourceGroup || group==HeaderGroup ) { pop.insertTitle(i18n("Sources")); - pop.insertItem("document-new", i18n("New File..."), &Main::toplevel(), TQT_SLOT(newSourceFile())); - pop.insertItem("piklab_addfile", i18n("Add Source Files..."), this, TQT_SLOT(insertSourceFiles())); + pop.insertItem("document-new", i18n("New File..."), &Main::toplevel(), TQ_SLOT(newSourceFile())); + pop.insertItem("piklab_addfile", i18n("Add Source Files..."), this, TQ_SLOT(insertSourceFiles())); pop.exec(p); } else if ( group==DeviceGroup ) { - pop.insertItem("document-new", i18n("Select Device..."), &Main::toplevel(), TQT_SLOT(showDeviceInfo())); + pop.insertItem("document-new", i18n("Select Device..."), &Main::toplevel(), TQ_SLOT(showDeviceInfo())); pop.exec(p); } } diff --git a/src/libgui/project_manager_ui.cpp b/src/libgui/project_manager_ui.cpp index f0c6178..173b550 100644 --- a/src/libgui/project_manager_ui.cpp +++ b/src/libgui/project_manager_ui.cpp @@ -136,7 +136,7 @@ TQWidget *ProjectManager::DeviceItem::editWidgetFactory(int) const TQComboBox *combo = new DeviceChooser::ComboBox(Main::project()==0, 0); TQString device = Main::device(); if ( device!=Device::AUTO_DATA.name ) combo->setCurrentText(device); - TQObject::connect(combo, TQT_SIGNAL(activated(int)), listView(), TQT_SLOT(finishRenaming())); + TQObject::connect(combo, TQ_SIGNAL(activated(int)), listView(), TQ_SLOT(finishRenaming())); return combo; } diff --git a/src/libgui/project_wizard.cpp b/src/libgui/project_wizard.cpp index 3fd8732..b0d0c51 100644 --- a/src/libgui/project_wizard.cpp +++ b/src/libgui/project_wizard.cpp @@ -81,7 +81,7 @@ FileListBox::FileListBox(TQWidget *parent) _listView->header()->resizeSection(0, fm.width(i18n("Copy")) + 2*spacing); // hack _listView->setColumnText(1, i18n("Filename")); _listView->setAllColumnsShowFocus(true); - connect(_listView, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)), TQT_SLOT(clicked(TQListViewItem *, const TQPoint &, int))); + connect(_listView, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)), TQ_SLOT(clicked(TQListViewItem *, const TQPoint &, int))); } void FileListBox::addItem() @@ -150,7 +150,7 @@ ProjectWizard::ProjectWizard(TQWidget *parent) _templateButton = new TQRadioButton(i18n("Create template source file."), _bgroup); _addButton = new TQRadioButton(i18n("Add existing files."), _bgroup); (void)new TQRadioButton(i18n("Do not add files now."), _bgroup); - connect(_bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(buttonClicked(int))); + connect(_bgroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(buttonClicked(int))); grid->addWidget(_bgroup, 0, 0); // third page diff --git a/src/libgui/text_editor.cpp b/src/libgui/text_editor.cpp index bad8ee0..41f4396 100644 --- a/src/libgui/text_editor.cpp +++ b/src/libgui/text_editor.cpp @@ -56,14 +56,14 @@ TextEditor::TextEditor(bool withDebugger, TQWidget *parent, const char *name) _split->setFrameStyle(TQFrame::TabWidgetPanel | TQFrame::Sunken); top->addWidget(_split); - connect(_document, TQT_SIGNAL(hlChanged()), TQT_SLOT(highlightChanged())); + connect(_document, TQ_SIGNAL(hlChanged()), TQ_SLOT(highlightChanged())); setAcceptDrops(true); addView(); for (uint i=0; i<Breakpoint::Nb_MarkTypes; i++) _document->setPixmap(KTextEditor::MarkInterface::MarkTypes(MARK_TYPE_DATA[i].type), pixmap(Breakpoint::MarkType(i))); - if (withDebugger) TQTimer::singleShot(0, this, TQT_SLOT(addToDebugManager())); + if (withDebugger) TQTimer::singleShot(0, this, TQ_SLOT(addToDebugManager())); } bool TextEditor::open(const PURL::Url &url) @@ -93,10 +93,10 @@ void TextEditor::addView() KTextEditor::View *v = _document->createView(_split); if ( _view==0 ) _view = static_cast<Kate::View *>(v); Q_ASSERT(v); - connect(v, TQT_SIGNAL(gotFocus(Kate::View *)), TQT_SLOT(gotFocus(Kate::View *))); - connect(v, TQT_SIGNAL(cursorPositionChanged()), TQT_SLOT(statusChanged())); - connect(v, TQT_SIGNAL(dropEventPass(TQDropEvent *)), TQT_SIGNAL(dropEventPass(TQDropEvent *))); - connect(v, TQT_SIGNAL(newStatus()), TQT_SLOT(statusChanged())); + connect(v, TQ_SIGNAL(gotFocus(Kate::View *)), TQ_SLOT(gotFocus(Kate::View *))); + connect(v, TQ_SIGNAL(cursorPositionChanged()), TQ_SLOT(statusChanged())); + connect(v, TQ_SIGNAL(dropEventPass(TQDropEvent *)), TQ_SIGNAL(dropEventPass(TQDropEvent *))); + connect(v, TQ_SIGNAL(newStatus()), TQ_SLOT(statusChanged())); v->show(); v->setFocus(); v->child(0, "KateViewInternal")->installEventFilter(this); diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp index 9244d20..9febe6e 100644 --- a/src/libgui/toplevel.cpp +++ b/src/libgui/toplevel.cpp @@ -78,7 +78,7 @@ KDockWidget *MainWindow::createDock(const TQString &name, const TQPixmap &icon, ddata.position = position; ddata.dock = dock; ddata.action = new ViewMenuAction(dock); - connect(ddata.action, TQT_SIGNAL(activated(TQWidget *)), TQT_SLOT(toggleToolView(TQWidget *))); + connect(ddata.action, TQ_SIGNAL(activated(TQWidget *)), TQ_SLOT(toggleToolView(TQWidget *))); _docks += ddata; initDockPosition(ddata); return dock; @@ -100,13 +100,13 @@ MainWindow::MainWindow() _editorStatus = new TQLabel(statusBar()); statusBar()->addWidget(_editorStatus, 0, true); _programmerStatus = new ProgrammerStatusWidget(statusBar()); - connect(_programmerStatus, TQT_SIGNAL(configure()), TQT_SLOT(configureProgrammer())); - connect(_programmerStatus, TQT_SIGNAL(selected(const Programmer::Group &)), TQT_SLOT(selectProgrammer(const Programmer::Group &))); + connect(_programmerStatus, TQ_SIGNAL(configure()), TQ_SLOT(configureProgrammer())); + connect(_programmerStatus, TQ_SIGNAL(selected(const Programmer::Group &)), TQ_SLOT(selectProgrammer(const Programmer::Group &))); statusBar()->addWidget(_programmerStatus->widget(), 0, true); _toolStatus = new ToolStatusWidget(statusBar()); - connect(_toolStatus, TQT_SIGNAL(configureToolchain()), TQT_SLOT(configureToolchains())); - connect(_toolStatus, TQT_SIGNAL(configure()), TQT_SLOT(configureProject())); - connect(_toolStatus, TQT_SIGNAL(selected(const Tool::Group &)), TQT_SLOT(selectTool(const Tool::Group &))); + connect(_toolStatus, TQ_SIGNAL(configureToolchain()), TQ_SLOT(configureToolchains())); + connect(_toolStatus, TQ_SIGNAL(configure()), TQ_SLOT(configureProject())); + connect(_toolStatus, TQ_SIGNAL(selected(const Tool::Group &)), TQ_SLOT(selectTool(const Tool::Group &))); statusBar()->addWidget(_toolStatus->widget(), 0, true); // interface @@ -120,7 +120,7 @@ MainWindow::MainWindow() KDockWidget *dock = createDock("project_manager_dock_widget", PURL::icon(PURL::Project), i18n("Project Manager"), DockPosition(KDockWidget::DockLeft, 20)); Main::_projectManager = new ProjectManager::View(dock); - connect(Main::_projectManager, TQT_SIGNAL(guiChanged()), TQT_SLOT(updateGUI())); + connect(Main::_projectManager, TQ_SIGNAL(guiChanged()), TQ_SLOT(updateGUI())); dock->setWidget(Main::_projectManager); dock = createDock("watch_view_dock_widget", loader.loadIcon("viewmag", TDEIcon::Small), @@ -130,9 +130,9 @@ MainWindow::MainWindow() Main::_editorManager = new EditorManager(_mainDock); _mainDock->setWidget(Main::_editorManager); - connect(Main::_editorManager, TQT_SIGNAL(guiChanged()), TQT_SLOT(updateGUI())); - connect(Main::_editorManager, TQT_SIGNAL(modified(const PURL::Url &)), Main::_projectManager, TQT_SLOT(modified(const PURL::Url &))); - connect(Main::_editorManager, TQT_SIGNAL(statusChanged(const TQString &)), _editorStatus, TQT_SLOT(setText(const TQString &))); + connect(Main::_editorManager, TQ_SIGNAL(guiChanged()), TQ_SLOT(updateGUI())); + connect(Main::_editorManager, TQ_SIGNAL(modified(const PURL::Url &)), Main::_projectManager, TQ_SLOT(modified(const PURL::Url &))); + connect(Main::_editorManager, TQ_SIGNAL(statusChanged(const TQString &)), _editorStatus, TQ_SLOT(setText(const TQString &))); dock = createDock("compile_log_dock_widget", loader.loadIcon("piklab_compile", TDEIcon::Small), i18n("Compile Log"), DockPosition(KDockWidget::DockBottom, 80)); @@ -160,63 +160,63 @@ MainWindow::MainWindow() // managers Programmer::manager = new Programmer::GuiManager(this); Programmer::manager->setView(_programLog); - connect(Programmer::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actionStatus, TQT_SLOT(setText(const TQString &))); - connect(Programmer::manager, TQT_SIGNAL(showProgress(bool)), TQT_SLOT(showProgress(bool))); - connect(Programmer::manager, TQT_SIGNAL(setTotalProgress(uint)), TQT_SLOT(setTotalProgress(uint))); - connect(Programmer::manager, TQT_SIGNAL(setProgress(uint)), TQT_SLOT(setProgress(uint))); + connect(Programmer::manager, TQ_SIGNAL(actionMessage(const TQString &)), _actionStatus, TQ_SLOT(setText(const TQString &))); + connect(Programmer::manager, TQ_SIGNAL(showProgress(bool)), TQ_SLOT(showProgress(bool))); + connect(Programmer::manager, TQ_SIGNAL(setTotalProgress(uint)), TQ_SLOT(setTotalProgress(uint))); + connect(Programmer::manager, TQ_SIGNAL(setProgress(uint)), TQ_SLOT(setProgress(uint))); Debugger::manager = new Debugger::GuiManager; - connect(Debugger::manager, TQT_SIGNAL(targetStateChanged()), TQT_SLOT(updateGUI())); - connect(Debugger::manager, TQT_SIGNAL(statusChanged(const TQString &)), _debugStatus, TQT_SLOT(setText(const TQString &))); - connect(Debugger::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actionStatus, TQT_SLOT(setText(const TQString &))); + connect(Debugger::manager, TQ_SIGNAL(targetStateChanged()), TQ_SLOT(updateGUI())); + connect(Debugger::manager, TQ_SIGNAL(statusChanged(const TQString &)), _debugStatus, TQ_SLOT(setText(const TQString &))); + connect(Debugger::manager, TQ_SIGNAL(actionMessage(const TQString &)), _actionStatus, TQ_SLOT(setText(const TQString &))); Main::_compileManager = new Compile::Manager(this); Main::_compileManager->setView(Main::_compileLog); - connect(Main::_compileManager, TQT_SIGNAL(success()), TQT_SLOT(compileSuccess())); - connect(Main::_compileManager, TQT_SIGNAL(failure()), TQT_SLOT(compileFailure())); - connect(Main::_compileManager, TQT_SIGNAL(updateFile(const Compile::FileData &)), - TQT_SLOT(updateFile(const Compile::FileData &))); + connect(Main::_compileManager, TQ_SIGNAL(success()), TQ_SLOT(compileSuccess())); + connect(Main::_compileManager, TQ_SIGNAL(failure()), TQ_SLOT(compileFailure())); + connect(Main::_compileManager, TQ_SIGNAL(updateFile(const Compile::FileData &)), + TQ_SLOT(updateFile(const Compile::FileData &))); // actions // file actions - TDEAction *a = KStdAction::openNew(this, TQT_SLOT(newSourceFile()), actionCollection()); + TDEAction *a = KStdAction::openNew(this, TQ_SLOT(newSourceFile()), actionCollection()); a->setText(i18n("&New Source File...")); - (void)new TDEAction(i18n("New hex File..."), "document-new", 0, this, TQT_SLOT(newHexFile()), + (void)new TDEAction(i18n("New hex File..."), "document-new", 0, this, TQ_SLOT(newHexFile()), actionCollection(), "file_new_hex"); - KStdAction::open(this, TQT_SLOT(openFile()), actionCollection()); - TDERecentFilesAction *recent = KStdAction::openRecent(this, TQT_SLOT(openRecentFile(const KURL &)), actionCollection()); + KStdAction::open(this, TQ_SLOT(openFile()), actionCollection()); + TDERecentFilesAction *recent = KStdAction::openRecent(this, TQ_SLOT(openRecentFile(const KURL &)), actionCollection()); recent->setMaxItems(20); recent->loadEntries(kapp->config(), "recent-files"); - (void)new TDEAction(i18n("Save All"), 0, 0, Main::_editorManager, TQT_SLOT(saveAllFiles()), + (void)new TDEAction(i18n("Save All"), 0, 0, Main::_editorManager, TQ_SLOT(saveAllFiles()), actionCollection(), "file_save_all"); - KStdAction::close(Main::_editorManager, TQT_SLOT(closeCurrentEditor()), actionCollection()); - (void)new TDEAction(i18n("C&lose All"), 0, 0, Main::_editorManager, TQT_SLOT(closeAllEditors()), + KStdAction::close(Main::_editorManager, TQ_SLOT(closeCurrentEditor()), actionCollection()); + (void)new TDEAction(i18n("C&lose All"), 0, 0, Main::_editorManager, TQ_SLOT(closeAllEditors()), actionCollection(), "file_close_all"); - (void)new TDEAction(i18n("Close All Others"), 0, 0, Main::_editorManager, TQT_SLOT(closeAllOtherEditors()), + (void)new TDEAction(i18n("Close All Others"), 0, 0, Main::_editorManager, TQ_SLOT(closeAllOtherEditors()), actionCollection(), "file_closeother"); - KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); // edit actions // view actions (void)new TDEAction(i18n("Back"), "back", TQt::ALT + TQt::Key_Left, - Main::_editorManager, TQT_SLOT(goBack()), actionCollection(), "history_back"); + Main::_editorManager, TQ_SLOT(goBack()), actionCollection(), "history_back"); (void)new TDEAction(i18n("Forward"), "forward", TQt::ALT + TQt::Key_Right, - Main::_editorManager, TQT_SLOT(goForward()), actionCollection(), "history_forward"); + Main::_editorManager, TQ_SLOT(goForward()), actionCollection(), "history_forward"); (void)new TDEAction(i18n("Switch to..."), 0, TQt::CTRL + TQt::Key_Slash, - Main::_editorManager, TQT_SLOT(switchToEditor()), actionCollection(), "file_switchto"); + Main::_editorManager, TQ_SLOT(switchToEditor()), actionCollection(), "file_switchto"); (void)new TDEAction(i18n("Switch Header/Implementation"), 0, TQt::SHIFT + TQt::Key_F12, - Main::_editorManager, TQT_SLOT(switchHeaderImplementation()), actionCollection(), "view_switch_source"); + Main::_editorManager, TQ_SLOT(switchHeaderImplementation()), actionCollection(), "view_switch_source"); (void)new TDEAction(TQString(), 0, 0, - Debugger::manager, TQT_SLOT(toggleBreakpoint()), actionCollection(), "toggle_breakpoint"); + Debugger::manager, TQ_SLOT(toggleBreakpoint()), actionCollection(), "toggle_breakpoint"); (void)new TDEAction(TQString(), 0, 0, - Debugger::manager, TQT_SLOT(toggleEnableBreakpoint()), actionCollection(), "enable_breakpoint"); + Debugger::manager, TQ_SLOT(toggleEnableBreakpoint()), actionCollection(), "enable_breakpoint"); (void)new TDEAction(i18n("Show disassembly location"), 0, 0, - Debugger::manager, TQT_SLOT(showDisassemblyLocation()), actionCollection(), "show_disassembly_location"); + Debugger::manager, TQ_SLOT(showDisassemblyLocation()), actionCollection(), "show_disassembly_location"); TDEActionMenu *toolViewsMenu = new TDEActionMenu( i18n("Tool Views"), 0, "view_tool_views"); - connect(toolViewsMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(updateToolViewsActions())); + connect(toolViewsMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(updateToolViewsActions())); actionCollection()->insert(toolViewsMenu); - a = new TDEAction(i18n("&Reset Layout"), 0, 0, this, TQT_SLOT(resetDockLayout()), actionCollection(), "view_reset_layout"); + a = new TDEAction(i18n("&Reset Layout"), 0, 0, this, TQ_SLOT(resetDockLayout()), actionCollection(), "view_reset_layout"); toolViewsMenu->insert(a); toolViewsMenu->popupMenu()->insertSeparator(); TQValueList<DockData>::iterator it; @@ -224,106 +224,106 @@ MainWindow::MainWindow() // project actions (void)new TDEAction(i18n("New Project..."), "piklab_createproject", 0, - this, TQT_SLOT(newProject()), actionCollection(), "project_new"); + this, TQ_SLOT(newProject()), actionCollection(), "project_new"); (void)new TDEAction(i18n("Open Project..."), "piklab_openproject", 0, - this, TQT_SLOT(openProject()), actionCollection(), "project_open"); + this, TQ_SLOT(openProject()), actionCollection(), "project_open"); recent = new TDERecentFilesAction(i18n("Open Recent Project"), 0, - this, TQT_SLOT(openRecentProject(const KURL &)), actionCollection(), "project_open_recent"); + this, TQ_SLOT(openRecentProject(const KURL &)), actionCollection(), "project_open_recent"); recent->setMaxItems(20); recent->loadEntries(kapp->config(), "recent-projects"); (void)new TDEAction(i18n("Project Options..."), "configure", 0, - this, TQT_SLOT(configureProject()), actionCollection(), "project_options"); + this, TQ_SLOT(configureProject()), actionCollection(), "project_options"); (void)new TDEAction(i18n("Close Project"), "window-close", 0, - this, TQT_SLOT(closeProject()), actionCollection(), "project_close"); + this, TQ_SLOT(closeProject()), actionCollection(), "project_close"); (void)new TDEAction(i18n("Add Source File..."), "piklab_addfile", 0, - Main::_projectManager, TQT_SLOT(insertSourceFiles()), actionCollection(), "project_add_source_file"); + Main::_projectManager, TQ_SLOT(insertSourceFiles()), actionCollection(), "project_add_source_file"); (void)new TDEAction(i18n("Add Object File..."), "piklab_addfile", 0, - Main::_projectManager, TQT_SLOT(insertObjectFiles()), actionCollection(), "project_add_object_file"); + Main::_projectManager, TQ_SLOT(insertObjectFiles()), actionCollection(), "project_add_object_file"); (void)new TDEAction(i18n("Add Current File"), "piklab_addcurrentfile", 0, - Main::_projectManager, TQT_SLOT(insertCurrentFile()), actionCollection(), "project_add_current_file"); + Main::_projectManager, TQ_SLOT(insertCurrentFile()), actionCollection(), "project_add_current_file"); // build actions (void)new TDEAction(i18n("&Build Project"), "piklab_compile", TQt::Key_F8, - this, TQT_SLOT(buildProject()), actionCollection(), "build_build_project"); + this, TQ_SLOT(buildProject()), actionCollection(), "build_build_project"); (void)new TDEAction(i18n("&Compile File"), 0, TQt::SHIFT + TQt::Key_F8, - this, TQT_SLOT(compileFile()), actionCollection(), "build_compile_file"); + this, TQ_SLOT(compileFile()), actionCollection(), "build_compile_file"); (void)new TDEAction(i18n("Clean"), "trashcan_empty", 0, - this, TQT_SLOT(cleanBuild()), actionCollection(), "build_clean"); + this, TQ_SLOT(cleanBuild()), actionCollection(), "build_clean"); (void)new TDEAction(i18n("Stop"), "process-stop", 0, - this, TQT_SLOT(stopBuild()), actionCollection(), "build_stop"); + this, TQ_SLOT(stopBuild()), actionCollection(), "build_stop"); // programmer actions (void)new TDEAction(i18n("&Connect"), "connect_creating", 0, - Programmer::manager, TQT_SLOT(connectDevice()), actionCollection(), "prog_connect"); + Programmer::manager, TQ_SLOT(connectDevice()), actionCollection(), "prog_connect"); (void)new TDEToggleAction(i18n("Device Power"), "piklab_power", 0, - Programmer::manager, TQT_SLOT(toggleDevicePower()), actionCollection(), "prog_power"); + Programmer::manager, TQ_SLOT(toggleDevicePower()), actionCollection(), "prog_power"); (void)new TDEAction(i18n("&Disconnect"), "connect_no", 0, - Programmer::manager, TQT_SLOT(disconnectDevice()), actionCollection(), "prog_disconnect"); + Programmer::manager, TQ_SLOT(disconnectDevice()), actionCollection(), "prog_disconnect"); (void)new TDEAction(i18n("&Program"), "piklab_burnchip", TQt::SHIFT + TQt::Key_F5, - this, TQT_SLOT(program()), actionCollection(), "prog_program"); + this, TQ_SLOT(program()), actionCollection(), "prog_program"); (void)new TDEAction(i18n("&Verify"), "piklab_verifychip", TQt::SHIFT + TQt::Key_F6, - this, TQT_SLOT(verify()), actionCollection(), "prog_verify"); + this, TQ_SLOT(verify()), actionCollection(), "prog_verify"); (void)new TDEAction(i18n("&Read"), "piklab_readchip", TQt::SHIFT + TQt::Key_F7, - this, TQT_SLOT(read()), actionCollection(), "prog_read"); + this, TQ_SLOT(read()), actionCollection(), "prog_read"); (void)new TDEAction(i18n("&Erase"), "piklab_erasechip", 0, - this, TQT_SLOT(erase()), actionCollection(), "prog_erase"); + this, TQ_SLOT(erase()), actionCollection(), "prog_erase"); (void)new TDEAction(i18n("&Blank Check"), "piklab_blankcheck", 0, - this, TQT_SLOT(blankCheck()), actionCollection(), "prog_blank_check"); + this, TQ_SLOT(blankCheck()), actionCollection(), "prog_blank_check"); (void)new TDEAction(i18n("&Run"), "launch", TQt::SHIFT + TQt::Key_F9, - Programmer::manager, TQT_SLOT(run()), actionCollection(), "prog_run"); + Programmer::manager, TQ_SLOT(run()), actionCollection(), "prog_run"); (void)new TDEAction(i18n("&Stop"), "piklab_stop", 0, - Programmer::manager, TQT_SLOT(halt()), actionCollection(), "prog_stop"); + Programmer::manager, TQ_SLOT(halt()), actionCollection(), "prog_stop"); (void)new TDEAction(i18n("R&estart"), "piklab_restart", 0, - Programmer::manager, TQT_SLOT(restart()), actionCollection(), "prog_restart"); + Programmer::manager, TQ_SLOT(restart()), actionCollection(), "prog_restart"); (void)new TDEAction(i18n("&Advanced..."), 0, 0, - Programmer::manager , TQT_SLOT(showAdvancedDialog()), actionCollection(), "prog_advanced"); + Programmer::manager , TQ_SLOT(showAdvancedDialog()), actionCollection(), "prog_advanced"); (void)new TDEAction(i18n("Settings..."), "configure", 0, - this, TQT_SLOT(showProgrammerSettings()), actionCollection(), "prog_settings"); + this, TQ_SLOT(showProgrammerSettings()), actionCollection(), "prog_settings"); // debugger actions (void)new TDEAction(i18n("&Start"), "launch", TQt::SHIFT + TQt::Key_F9, - Programmer::manager, TQT_SLOT(restart()), actionCollection(), "debug_start"); + Programmer::manager, TQ_SLOT(restart()), actionCollection(), "debug_start"); (void)new TDEAction(i18n("&Run"), "piklab_run", TQt::SHIFT + TQt::Key_F9, - Programmer::manager, TQT_SLOT(run()), actionCollection(), "debug_run"); + Programmer::manager, TQ_SLOT(run()), actionCollection(), "debug_run"); (void)new TDEAction(i18n("&Step"), "piklab_debug_step", 0, - Programmer::manager, TQT_SLOT(step()), actionCollection(), "debug_next"); + Programmer::manager, TQ_SLOT(step()), actionCollection(), "debug_next"); //(void)new TDEAction(i18n("Step &In"), "piklab_debug_stepin", - // 0, this, TQT_SLOT(debugStepIn()), actionCollection(), "debug_step_in"); + // 0, this, TQ_SLOT(debugStepIn()), actionCollection(), "debug_step_in"); //(void)new TDEAction(i18n("Step &Out"), "piklab_debug_stepout", - // 0, this, TQT_SLOT(debugStepOut()), actionCollection(), "debug_step_out"); + // 0, this, TQ_SLOT(debugStepOut()), actionCollection(), "debug_step_out"); (void)new TDEAction(i18n("&Break<Translators: it is the verb>", "&Halt"), "piklab_debughalt", 0, - Programmer::manager, TQT_SLOT(halt()), actionCollection(), "debug_halt"); + Programmer::manager, TQ_SLOT(halt()), actionCollection(), "debug_halt"); (void)new TDEAction(i18n("&Disconnect/Stop"), "piklab_stop", 0, - Programmer::manager, TQT_SLOT(disconnectDevice()), actionCollection(), "debug_stop"); + Programmer::manager, TQ_SLOT(disconnectDevice()), actionCollection(), "debug_stop"); (void)new TDEAction(i18n("R&eset"), "piklab_restart", 0, - Programmer::manager, TQT_SLOT(restart()), actionCollection(), "debug_reset"); + Programmer::manager, TQ_SLOT(restart()), actionCollection(), "debug_reset"); (void)new TDEAction(i18n("Show Program Counter"), "piklab_program_counter", 0, - Debugger::manager, TQT_SLOT(showPC()), actionCollection(), "debug_show_pc"); + Debugger::manager, TQ_SLOT(showPC()), actionCollection(), "debug_show_pc"); (void)new TDEAction(i18n("Clear All Breakpoints"), "remove", 0, - Debugger::manager, TQT_SLOT(clearBreakpoints()), actionCollection(), "debug_clear_breakpoints"); + Debugger::manager, TQ_SLOT(clearBreakpoints()), actionCollection(), "debug_clear_breakpoints"); (void)new TDEAction(i18n("Settings..."), "configure", 0, - this, TQT_SLOT(showDebuggerSettings()), actionCollection(), "debug_settings"); + this, TQ_SLOT(showDebuggerSettings()), actionCollection(), "debug_settings"); // tools (void)new TDEAction(i18n("&Pikloops..."), 0, 0, - this, TQT_SLOT(runPikloops()), actionCollection(), "tools_pikloops"); + this, TQ_SLOT(runPikloops()), actionCollection(), "tools_pikloops"); (void)new TDEAction(i18n("&Find Files..."), "edit-find", 0, - this, TQT_SLOT(runKfind()), actionCollection(), "tools_kfind"); + this, TQ_SLOT(runKfind()), actionCollection(), "tools_kfind"); (void)new TDEAction(i18n("&Device Information..."), "application-vnd.tde.info", 0, - this, TQT_SLOT(showDeviceInfo()), actionCollection(), "tools_device_information"); + this, TQ_SLOT(showDeviceInfo()), actionCollection(), "tools_device_information"); (void)new TDEAction(i18n("&Config Generator..."), 0, 0, - this, TQT_SLOT(configGenerator()), actionCollection(), "tools_config_generator"); + this, TQ_SLOT(configGenerator()), actionCollection(), "tools_config_generator"); (void)new TDEAction(i18n("&Template Generator..."), 0, 0, - this, TQT_SLOT(templateGenerator()), actionCollection(), "tools_template_generator"); + this, TQ_SLOT(templateGenerator()), actionCollection(), "tools_template_generator"); // settings actions (void)new TDEAction(i18n("Configure Toolchains..."), 0, 0, - this, TQT_SLOT(configureToolchains()), actionCollection(), "options_configure_toolchains"); - (void)KStdAction::preferences(this, TQT_SLOT(configure()), actionCollection()); + this, TQ_SLOT(configureToolchains()), actionCollection(), "options_configure_toolchains"); + (void)KStdAction::preferences(this, TQ_SLOT(configure()), actionCollection()); // help (void)new TDEAction(i18n("Report Bug..."), "likeback_bug", 0, - LikeBack::instance(), TQT_SLOT(iFoundABug()), actionCollection(), "help_report_bug_piklab"); + LikeBack::instance(), TQ_SLOT(iFoundABug()), actionCollection(), "help_report_bug_piklab"); setupGUI(); readDockConfig(); @@ -332,25 +332,25 @@ MainWindow::MainWindow() menuBar()->insertItem(new TQLabel(menuBar())); // #### first widget is put left-most... MenuBarButton *button = new MenuBarButton("likeback_like", menuBar()); TQToolTip::add(button, i18n("I like...")); - connect(button, TQT_SIGNAL(clicked()), LikeBack::instance(), TQT_SLOT(iLike())); + connect(button, TQ_SIGNAL(clicked()), LikeBack::instance(), TQ_SLOT(iLike())); menuBar()->insertItem(button); button = new MenuBarButton("likeback_dislike", menuBar()); TQToolTip::add(button, i18n("I do not like...")); - connect(button, TQT_SIGNAL(clicked()), LikeBack::instance(), TQT_SLOT(iDoNotLike())); + connect(button, TQ_SIGNAL(clicked()), LikeBack::instance(), TQ_SLOT(iDoNotLike())); menuBar()->insertItem(button); button = new MenuBarButton("likeback_bug", menuBar()); TQToolTip::add(button, i18n("I found a bug...")); - connect(button, TQT_SIGNAL(clicked()), LikeBack::instance(), TQT_SLOT(iFoundABug())); + connect(button, TQ_SIGNAL(clicked()), LikeBack::instance(), TQ_SLOT(iFoundABug())); menuBar()->insertItem(button); button = new MenuBarButton("configure", menuBar()); TQToolTip::add(button, i18n("Configure email...")); - connect(button, TQT_SIGNAL(clicked()), LikeBack::instance(), TQT_SLOT(askEMail())); + connect(button, TQ_SIGNAL(clicked()), LikeBack::instance(), TQ_SLOT(askEMail())); menuBar()->insertItem(button); button = new MenuBarButton("help", menuBar()); - connect(button, TQT_SIGNAL(clicked()), LikeBack::instance(), TQT_SLOT(showWhatsThisMessage())); + connect(button, TQ_SIGNAL(clicked()), LikeBack::instance(), TQ_SLOT(showWhatsThisMessage())); menuBar()->insertItem(button); - TQTimer::singleShot(0, this, TQT_SLOT(initialLoading())); + TQTimer::singleShot(0, this, TQ_SLOT(initialLoading())); } MainWindow::~MainWindow() @@ -404,7 +404,7 @@ void MainWindow::configureToolbar() { saveMainWindowSettings(TDEGlobal::config(), "MainWindow"); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(applyToolbarSettings())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(applyToolbarSettings())); dlg.exec(); } @@ -710,7 +710,7 @@ void MainWindow::runKfind() PURL::Url url = Main::projectManager().projectUrl(); if ( !url.isEmpty() ) path = url.path(); _kfindProcess->setup("kfind", path, false); - connect(_kfindProcess, TQT_SIGNAL(done(int)), TQT_SLOT(kfindDone())); + connect(_kfindProcess, TQ_SIGNAL(done(int)), TQ_SLOT(kfindDone())); if ( !_kfindProcess->start(0) ) MessageBox::sorry(i18n("Could not run \"kfind\""), Log::Show); } @@ -726,7 +726,7 @@ void MainWindow::runPikloops() if (_pikloopsProcess) return; _pikloopsProcess = new ::Process::StringOutput; _pikloopsProcess->setup("pikloops", TQStringList(), false); - connect(_pikloopsProcess, TQT_SIGNAL(done(int)), TQT_SLOT(pikloopsDone())); + connect(_pikloopsProcess, TQ_SIGNAL(done(int)), TQ_SLOT(pikloopsDone())); if ( !_pikloopsProcess->start(0) ) MessageBox::detailedSorry(i18n("Could not run \"pikloops\""), i18n("The Pikloops utility (%1) is not installed in your system.").arg("http://pikloops.sourceforge.net"), Log::Show); } diff --git a/src/libgui/toplevel_ui.cpp b/src/libgui/toplevel_ui.cpp index 41f993c..c0d24a4 100644 --- a/src/libgui/toplevel_ui.cpp +++ b/src/libgui/toplevel_ui.cpp @@ -18,8 +18,8 @@ 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())); + connect(widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(activatedSlot(int))); + widget()->appendAction(i18n("Configure..."), "configure", this, TQ_SIGNAL(configure())); widget()->appendSeparator(); Programmer::Lister::ConstIterator it; for (it=Programmer::lister().begin(); it!=Programmer::lister().end(); ++it) @@ -35,9 +35,9 @@ void ProgrammerStatusWidget::activatedSlot(int id) 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())); - widget()->appendAction(i18n("Configure Compilation..."), "configure", this, TQT_SIGNAL(configure())); + connect(widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(activatedSlot(int))); + widget()->appendAction(i18n("Configure Toolchain..."), "configure", this, TQ_SIGNAL(configureToolchain())); + widget()->appendAction(i18n("Configure Compilation..."), "configure", this, TQ_SIGNAL(configure())); widget()->appendSeparator(); Tool::Lister::ConstIterator it; for (it=Tool::lister().begin(); it!=Tool::lister().end(); ++it) diff --git a/src/libgui/watch_view.cpp b/src/libgui/watch_view.cpp index b76587a..7f838e8 100644 --- a/src/libgui/watch_view.cpp +++ b/src/libgui/watch_view.cpp @@ -29,10 +29,10 @@ Register::BaseListView::BaseListView(TQWidget *parent) setFullWidth(true); setRootIsDecorated(false); setAllColumnsShowFocus(true); - connect(this, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), - TQT_SLOT(itemClicked(int, TQListViewItem *, const TQPoint &, int))); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), - TQT_SLOT(contextMenu(TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), + TQ_SLOT(itemClicked(int, TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + TQ_SLOT(contextMenu(TQListViewItem *, const TQPoint &, int))); } //----------------------------------------------------------------------------- @@ -113,7 +113,7 @@ void Register::WatchedListView::init(const Device::Data *data) _formatPopup = appendFormatMenu(_popup, _ids.count()); TDEIconLoader loader; TQPixmap icon = loader.loadIcon("cancel", TDEIcon::Small); - _popup->insertItem(icon, i18n("Clear"), Debugger::manager, TQT_SLOT(stopWatchAll())); + _popup->insertItem(icon, i18n("Clear"), Debugger::manager, TQ_SLOT(stopWatchAll())); } void Register::WatchedListView::updateView() diff --git a/src/piklab-prog/cli_interactive.cpp b/src/piklab-prog/cli_interactive.cpp index 40adb2c..ecf486a 100644 --- a/src/piklab-prog/cli_interactive.cpp +++ b/src/piklab-prog/cli_interactive.cpp @@ -84,7 +84,7 @@ CLI::Interactive::Interactive(TQObject *parent) #else _stdin.open(IO_ReadOnly, stdin); #endif - TQTimer::singleShot(0, this, TQT_SLOT(displayPrompt())); + TQTimer::singleShot(0, this, TQ_SLOT(displayPrompt())); } void CLI::Interactive::redisplayPrompt() @@ -231,7 +231,7 @@ void CLI::Interactive::lineRead() tqApp->exit(OK); return; } - TQTimer::singleShot(0, this, TQT_SLOT(displayPrompt())); + TQTimer::singleShot(0, this, TQ_SLOT(displayPrompt())); } CLI::ExitCode CLI::Interactive::registerList() diff --git a/src/progs/direct/gui/direct_config_widget.cpp b/src/progs/direct/gui/direct_config_widget.cpp index fe46145..203cfc9 100644 --- a/src/progs/direct/gui/direct_config_widget.cpp +++ b/src/progs/direct/gui/direct_config_widget.cpp @@ -42,7 +42,7 @@ Direct::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *parent, grid->addWidget(label, i, 0); _combos[i] = new TQComboBox(w); _combos[i]->setEnabled(edit); - connect(_combos[i], TQT_SIGNAL(activated(int)), TQT_SLOT(slotPinChanged())); + connect(_combos[i], TQ_SIGNAL(activated(int)), TQ_SLOT(slotPinChanged())); TQToolTip::add(_combos[i], PIN_DATA[i].comment); grid->addWidget(_combos[i], i, 1); _invcbs[i] = new TQCheckBox(i18n("Inverted"), w); @@ -52,7 +52,7 @@ Direct::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *parent, if (edit) { _testcbs[i] = new TQCheckBox(i18n("on"), w); TQToolTip::add(_testcbs[i], PIN_DATA[i].testComment); - connect(_testcbs[i], TQT_SIGNAL(clicked()), TQT_SLOT(slotTestPin())); + connect(_testcbs[i], TQ_SIGNAL(clicked()), TQ_SLOT(slotTestPin())); grid->addWidget(_testcbs[i], i, 3); _testLabels[i] = new TQLabel(w); TQToolTip::add(_testcbs[i], PIN_DATA[i].testComment); @@ -77,7 +77,7 @@ Direct::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *parent, if (edit) { _sendBitsButton = new TQPushButton(i18n("Send 0xA55A"), this); _sendBitsButton->setToggleButton(true); - connect(_sendBitsButton, TQT_SIGNAL(clicked()), TQT_SLOT(sendBits())); + connect(_sendBitsButton, TQ_SIGNAL(clicked()), TQ_SLOT(sendBits())); TQToolTip::add(_sendBitsButton, i18n("Continuously send 0xA55A on \"Data out\" pin.")); _editVBox->addWidget(_sendBitsButton); _editVBox->addStretch(1); @@ -85,11 +85,11 @@ Direct::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *parent, // timer for sending bits _timerSendBits = new TQTimer(this); - connect(_timerSendBits, TQT_SIGNAL(timeout()), TQT_SLOT(slotSendBits())); + connect(_timerSendBits, TQ_SIGNAL(timeout()), TQ_SLOT(slotSendBits())); // timer for automatically polling DataOut pin _timerPollDataOut = new TQTimer(this); - connect(_timerPollDataOut, TQT_SIGNAL(timeout()), TQT_SLOT(updateDataIn())); + connect(_timerPollDataOut, TQ_SIGNAL(timeout()), TQ_SLOT(updateDataIn())); } void Direct::HConfigWidget::sendBits() diff --git a/src/progs/gpsim/base/gpsim.cpp b/src/progs/gpsim/base/gpsim.cpp index 6803686..71cf2a2 100644 --- a/src/progs/gpsim/base/gpsim.cpp +++ b/src/progs/gpsim/base/gpsim.cpp @@ -16,7 +16,7 @@ GPSim::Process::Process(Log::Base *base) : ::Process::LineOutput(0, "gpsim_process"), Log::Base(base), _ready(false) { - connect(this, TQT_SIGNAL(stdoutDataReceived()), TQT_SLOT(stdoutDataReceivedSlot())); + connect(this, TQ_SIGNAL(stdoutDataReceived()), TQ_SLOT(stdoutDataReceivedSlot())); } void GPSim::Process::stdoutDataReceivedSlot() diff --git a/src/progs/gpsim/gui/gpsim_group_ui.cpp b/src/progs/gpsim/gui/gpsim_group_ui.cpp index aa404c3..69dd558 100644 --- a/src/progs/gpsim/gui/gpsim_group_ui.cpp +++ b/src/progs/gpsim/gui/gpsim_group_ui.cpp @@ -23,7 +23,7 @@ GPSim::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *pa _status = new TQLabel(this); addWidget(_status, row,row, 1,1); - TQTimer::singleShot(0, this, TQT_SLOT(updateStatus())); + TQTimer::singleShot(0, this, TQ_SLOT(updateStatus())); } void GPSim::ConfigWidget::updateStatus() diff --git a/src/progs/gui/hardware_config_widget.cpp b/src/progs/gui/hardware_config_widget.cpp index 82b0bab..12ab6e2 100644 --- a/src/progs/gui/hardware_config_widget.cpp +++ b/src/progs/gui/hardware_config_widget.cpp @@ -100,7 +100,7 @@ Hardware::ConfigWidget::ConfigWidget(::Programmer::Base *base, Config *config, T // programmer combo uint row = numRows(); _configCombo = new TQComboBox(this); - connect(_configCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(configChanged(int))); + connect(_configCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(configChanged(int))); addWidget(_configCombo, row,row, 0,0); row++; @@ -119,10 +119,10 @@ Hardware::ConfigWidget::ConfigWidget(::Programmer::Base *base, Config *config, T // buttons TQVBoxLayout *vbox = new TQVBoxLayout(hbox); _editButton = new KPushButton(this); - connect(_editButton, TQT_SIGNAL(clicked()), TQT_SLOT(editClicked())); + connect(_editButton, TQ_SIGNAL(clicked()), TQ_SLOT(editClicked())); vbox->addWidget(_editButton); _deleteButton = new KPushButton(i18n("Delete"), this); - connect(_deleteButton, TQT_SIGNAL(clicked()), TQT_SLOT(deleteClicked())); + connect(_deleteButton, TQ_SIGNAL(clicked()), TQ_SLOT(deleteClicked())); vbox->addWidget(_deleteButton); vbox->addStretch(1); } diff --git a/src/progs/gui/port_selector.cpp b/src/progs/gui/port_selector.cpp index 27ecb12..9c06de1 100644 --- a/src/progs/gui/port_selector.cpp +++ b/src/progs/gui/port_selector.cpp @@ -28,7 +28,7 @@ PortSelector::PortSelector(TQWidget *parent) _top->setRowStretch(1, 1); _bgroup = new TQButtonGroup; - connect(_bgroup, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(changed())); + connect(_bgroup, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(changed())); } void PortSelector::setGroup(const Programmer::Group &group) @@ -95,8 +95,8 @@ void PortSelector::addPortType(const Port::Description &pd) for (uint i=0; i<list.count(); i++) _combos[pd.type.type()]->insertItem(list[i]); if ( !pd.device.isEmpty() && !list.contains(pd.device) ) _combos[pd.type.type()]->insertItem(pd.device); _combos[pd.type.type()]->setCurrentText(pd.device); - connect(_combos[pd.type.type()], TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(_combos[pd.type.type()], TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged())); + connect(_combos[pd.type.type()], TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(_combos[pd.type.type()], TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChanged())); _grid->addWidget(_combos[pd.type.type()], 3*(_bgroup->count()-1), 1); } } @@ -140,5 +140,5 @@ void PortSelector::textChanged() if (_pending) return; _status[type().type()]->hide(); _pending = true; - TQTimer::singleShot(1000, this, TQT_SIGNAL(changed())); + TQTimer::singleShot(1000, this, TQ_SIGNAL(changed())); } diff --git a/src/progs/gui/prog_config_center.cpp b/src/progs/gui/prog_config_center.cpp index bd876c2..75723a5 100644 --- a/src/progs/gui/prog_config_center.cpp +++ b/src/progs/gui/prog_config_center.cpp @@ -40,7 +40,7 @@ Programmer::SelectConfigWidget::SelectConfigWidget() TQLabel *label = new TQLabel(i18n("Programmer in use:"), this); addWidget(label, row,row, 0,0); _combo = new KeyComboBox<TQString>(this); - connect(_combo->widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(programmerChanged())); + connect(_combo->widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(programmerChanged())); addWidget(_combo->widget(), row,row, 1,1); row++; @@ -53,7 +53,7 @@ Programmer::SelectConfigWidget::SelectConfigWidget() _portSelectorContainer = new Container; _portSelectorContainer->setMargin(10); _portSelector = new PortSelector(_portSelectorContainer); - connect(_portSelector, TQT_SIGNAL(changed()), TQT_SLOT(portChanged())); + connect(_portSelector, TQ_SIGNAL(changed()), TQ_SLOT(portChanged())); _portSelectorContainer->addWidget(_portSelector, 0,0, 0,0); // specific programmer config @@ -73,7 +73,7 @@ Programmer::SelectConfigWidget::SelectConfigWidget() // init _combo->setCurrentItem(GlobalConfig::programmerGroup().name()); _stack->setCurrentItem(GlobalConfig::programmerGroup().name()); - TQTimer::singleShot(0, this, TQT_SLOT(programmerChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(programmerChanged())); } void Programmer::SelectConfigWidget::portChanged() @@ -118,5 +118,5 @@ void Programmer::SelectConfigWidget::programmerChanged() } else if (hasTab) _tabWidget->removePage(_portSelectorContainer); _portSelector->setGroup(group); _stack->setCurrentItem(key); - if (isHardware) TQTimer::singleShot(0, this, TQT_SLOT(portChanged())); + if (isHardware) TQTimer::singleShot(0, this, TQ_SLOT(portChanged())); } diff --git a/src/progs/gui/prog_group_ui.cpp b/src/progs/gui/prog_group_ui.cpp index 80f8ac3..c1a6566 100644 --- a/src/progs/gui/prog_group_ui.cpp +++ b/src/progs/gui/prog_group_ui.cpp @@ -31,9 +31,9 @@ Programmer::StandaloneMemoryCalibrationEditor::StandaloneMemoryCalibrationEditor void Programmer::StandaloneMemoryCalibrationEditor::init(bool first) { Pic::MemoryCalibrationEditor::init(first); - TDEAction *action = new TDEAction(i18n("Read"), "reload", 0, this, TQT_SIGNAL(updateCalibration()), Main::toplevel().actionCollection()); + TDEAction *action = new TDEAction(i18n("Read"), "reload", 0, this, TQ_SIGNAL(updateCalibration()), Main::toplevel().actionCollection()); addAction(action); - action = new TDEAction(i18n("Regenerating..."), 0, 0, this, TQT_SIGNAL(regenerate()), Main::toplevel().actionCollection()); + action = new TDEAction(i18n("Regenerating..."), 0, 0, this, TQ_SIGNAL(regenerate()), Main::toplevel().actionCollection()); addAction(action); } @@ -61,10 +61,10 @@ Programmer::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *parent, const c Properties properties = _base.group().properties(); uint row = _programmerContainer->numRows(); if ( properties & HasFirmware ) { - _firmwareContainer = new ButtonContainer(i18n("Firmware"), this, TQT_SLOT(updateFirmware()), _programmerContainer); + _firmwareContainer = new ButtonContainer(i18n("Firmware"), this, TQ_SLOT(updateFirmware()), _programmerContainer); _programmerContainer->addWidget(_firmwareContainer, row,row, 0,1); if ( _base.group().properties() & CanUploadFirmware ) - _firmwareContainer->button().appendAction(i18n("Uploading..."), "piklab_burnchip", this, TQT_SLOT(uploadFirmware())); + _firmwareContainer->button().appendAction(i18n("Uploading..."), "piklab_burnchip", this, TQ_SLOT(uploadFirmware())); TQLabel *label = new TQLabel(i18n("Version:"), _firmwareContainer); _firmwareContainer->addWidget(label, 1,1, 0,0); _firmwareLabel = new TQLabel(_firmwareContainer); @@ -76,13 +76,13 @@ Programmer::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *parent, const c } if ( _base.group().canReadVoltages() ) { - _voltagesContainer = new ButtonContainer(i18n("Voltages"), this, TQT_SLOT(updateVoltages()), _programmerContainer); + _voltagesContainer = new ButtonContainer(i18n("Voltages"), this, TQ_SLOT(updateVoltages()), _programmerContainer); _programmerContainer->addWidget(_voltagesContainer, row,row, 0,1); row++; } else _voltagesContainer = 0; if ( properties & HasSelfTest ) { - _selfTestContainer = new ButtonContainer(i18n("Self-test"), this, TQT_SLOT(updateSelfTest()), _programmerContainer); + _selfTestContainer = new ButtonContainer(i18n("Self-test"), this, TQ_SLOT(updateSelfTest()), _programmerContainer); _programmerContainer->addWidget(_selfTestContainer, row,row, 0,1); row++; } else _selfTestContainer = 0; @@ -102,8 +102,8 @@ Programmer::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *parent, const c else { const ::Programmer::PicBase &pbase = static_cast<const ::Programmer::PicBase &>(_base); _calEditor = new StandaloneMemoryCalibrationEditor(pbase.deviceMemory(), _calibrationContainer); - connect(_calEditor, TQT_SIGNAL(updateCalibration()), TQT_SLOT(updateCalibration())); - connect(_calEditor, TQT_SIGNAL(regenerate()), TQT_SLOT(regenerateCalibration())); + connect(_calEditor, TQ_SIGNAL(updateCalibration()), TQ_SLOT(updateCalibration())); + connect(_calEditor, TQ_SIGNAL(regenerate()), TQ_SLOT(regenerateCalibration())); _calEditor->init(true); _calEditor->setReadOnly(true); _calibrationContainer->addWidget(_calEditor, 0,0, 0,0); diff --git a/src/progs/icd2/gui/icd2_group_ui.cpp b/src/progs/icd2/gui/icd2_group_ui.cpp index 82987b4..fd794b0 100644 --- a/src/progs/icd2/gui/icd2_group_ui.cpp +++ b/src/progs/icd2/gui/icd2_group_ui.cpp @@ -26,7 +26,7 @@ Icd2::AdvancedDialog::AdvancedDialog(ProgrammerBase &base, TQWidget *parent) row = _programmerContainer->numRows(); if ( base.group().properties() & ::Programmer::Debugger ) { - ButtonContainer *container = new ::Programmer::ButtonContainer(i18n("Debug Executive"), this, TQT_SLOT(updateDebugExecutive()), _programmerContainer); + ButtonContainer *container = new ::Programmer::ButtonContainer(i18n("Debug Executive"), this, TQ_SLOT(updateDebugExecutive()), _programmerContainer); _programmerContainer->addWidget(container, row,row, 0,1); label = new TQLabel(i18n("Version:"), container); container->addWidget(label, 1,1, 0,0); diff --git a/src/progs/manager/debug_manager.cpp b/src/progs/manager/debug_manager.cpp index 0ae4e9f..4e00866 100644 --- a/src/progs/manager/debug_manager.cpp +++ b/src/progs/manager/debug_manager.cpp @@ -26,8 +26,8 @@ Debugger::Manager::Manager() : TQObject(Programmer::manager, "debug_manager"), Log::Base(Programmer::manager), GenericView(Breakpoint::list()), _coff(0), _data(0) { - connect(&_runTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotRunTimeout())); - connect(&_stepTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doStep())); + connect(&_runTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotRunTimeout())); + connect(&_stepTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doStep())); } Debugger::Manager::~Manager() diff --git a/src/progs/manager/prog_manager.cpp b/src/progs/manager/prog_manager.cpp index dac29ee..8df43c5 100644 --- a/src/progs/manager/prog_manager.cpp +++ b/src/progs/manager/prog_manager.cpp @@ -39,11 +39,11 @@ void Programmer::Manager::createProgrammer(const Device::Data *data, const Hardw delete _programmer; _programmer = group().createProgrammer(isTargetSelfPowered(), data, hd); _programmer->Log::Base::setParent(this); - connect(_programmer, TQT_SIGNAL(actionMessage(const TQString &)), TQT_SIGNAL(actionMessage(const TQString &))); - connect(&_programmer->progressMonitor(), TQT_SIGNAL(setLabel(const TQString &)), TQT_SIGNAL(actionMessage(const TQString &))); - connect(&_programmer->progressMonitor(), TQT_SIGNAL(setTotalProgress(uint)), TQT_SIGNAL(setTotalProgress(uint))); - connect(&_programmer->progressMonitor(), TQT_SIGNAL(setProgress(uint)), TQT_SIGNAL(setProgress(uint))); - connect(&_programmer->progressMonitor(), TQT_SIGNAL(showProgress(bool)), TQT_SIGNAL(showProgress(bool))); + connect(_programmer, TQ_SIGNAL(actionMessage(const TQString &)), TQ_SIGNAL(actionMessage(const TQString &))); + connect(&_programmer->progressMonitor(), TQ_SIGNAL(setLabel(const TQString &)), TQ_SIGNAL(actionMessage(const TQString &))); + connect(&_programmer->progressMonitor(), TQ_SIGNAL(setTotalProgress(uint)), TQ_SIGNAL(setTotalProgress(uint))); + connect(&_programmer->progressMonitor(), TQ_SIGNAL(setProgress(uint)), TQ_SIGNAL(setProgress(uint))); + connect(&_programmer->progressMonitor(), TQ_SIGNAL(showProgress(bool)), TQ_SIGNAL(showProgress(bool))); } bool Programmer::Manager::initProgramming(bool debugging) diff --git a/src/tools/c18/gui/c18_ui.cpp b/src/tools/c18/gui/c18_ui.cpp index 5d0c167..4b38611 100644 --- a/src/tools/c18/gui/c18_ui.cpp +++ b/src/tools/c18/gui/c18_ui.cpp @@ -23,7 +23,7 @@ void C18::ConfigWidget::initEntries() TQLabel *label = new TQLabel(i18n("Warning level:"), container()); container()->addWidget(label, row,row, 0,0); _warningLevel = new TQComboBox(container()); - connect(_warningLevel, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); + connect(_warningLevel, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); for (uint i=0; i<Config::Nb_WarningLevels; i++) _warningLevel->insertItem(i18n(Config::WARNING_LEVEL_LABELS[i])); container()->addWidget(_warningLevel, row,row, 1,1); diff --git a/src/tools/gputils/gui/gputils_ui.cpp b/src/tools/gputils/gui/gputils_ui.cpp index bab898e..2a912f7 100644 --- a/src/tools/gputils/gui/gputils_ui.cpp +++ b/src/tools/gputils/gui/gputils_ui.cpp @@ -24,7 +24,7 @@ void GPUtils::ConfigWidget::initEntries() TQLabel *label = new TQLabel(i18n("Warning level:"), container()); container()->addWidget(label, row,row, 0,0); _gpasmWarning = new TQComboBox(container()); - connect(_gpasmWarning, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); + connect(_gpasmWarning, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); for (uint i=0; i<GPUtils::Config::Nb_WarningLevels; i++) _gpasmWarning->insertItem(i18n(GPUtils::Config::WARNING_LEVEL_LABELS[i])); _gpasmWarning->insertItem(i18n("as in LIST directive")); diff --git a/src/tools/gui/tool_config_widget.cpp b/src/tools/gui/tool_config_widget.cpp index b964431..d121bf3 100644 --- a/src/tools/gui/tool_config_widget.cpp +++ b/src/tools/gui/tool_config_widget.cpp @@ -38,7 +38,7 @@ ToolConfigWidget::ToolConfigWidget(Project *project) _argumentsType = new KComboBox(container); for (uint i=0; i<Nb_ArgumentsTypes; i++) _argumentsType->insertItem(i18n(ARGUMENTS_TYPE_LABELS[i]), i); - connect(_argumentsType, TQT_SIGNAL(activated(int)), TQT_SLOT(updateArguments())); + connect(_argumentsType, TQ_SIGNAL(activated(int)), TQ_SLOT(updateArguments())); container->addWidget(_argumentsType, 0,0, 1,1); label = new TQLabel(i18n("Arguments:"), container); container->addWidget(label, 1,1, 0,0); @@ -46,19 +46,19 @@ ToolConfigWidget::ToolConfigWidget(Project *project) _arguments->setReadOnly(true); container->addWidget(_arguments, 1,1, 1,2); KPushButton *button = new KPushButton(KGuiItem(TQString(), "help"), container); - connect(button, TQT_SIGNAL(clicked()), TQT_SIGNAL(displayHelp())); + connect(button, TQ_SIGNAL(clicked()), TQ_SIGNAL(displayHelp())); container->addWidget(button, 1,1, 3,3); _argumentsEditor = new EditListBox(1, container, "arguments_editor", EditListBox::DuplicatesAllowed, EditListBox::Add | EditListBox::Remove | EditListBox::UpDown | EditListBox::RemoveAll | EditListBox::Reset); - connect(_argumentsEditor, TQT_SIGNAL(changed()), TQT_SLOT(updateArguments())); - connect(_argumentsEditor, TQT_SIGNAL(reset()), TQT_SLOT(resetCustomArguments())); + connect(_argumentsEditor, TQ_SIGNAL(changed()), TQ_SLOT(updateArguments())); + connect(_argumentsEditor, TQ_SIGNAL(reset()), TQ_SLOT(resetCustomArguments())); container->addWidget(_argumentsEditor, 2,2, 0,3); _container = new Container(container); _container->setColStretch(2, 1); container->addWidget(_container, 3,3, 0,3); - connect(this, TQT_SIGNAL(changed()), TQT_SLOT(updateArguments())); + connect(this, TQ_SIGNAL(changed()), TQ_SLOT(updateArguments())); } void ToolConfigWidget::init(Tool::Category category, const Tool::Group &group) @@ -87,7 +87,7 @@ PURL::DirectoriesWidget *ToolConfigWidget::createDirectoriesEntry(const TQString { uint row = container()->numRows(); PURL::DirectoriesWidget *sdw = new PURL::DirectoriesWidget(text, _project ? _project->directory().path() : TQString(), container()); - connect(sdw, TQT_SIGNAL(changed()), TQT_SIGNAL(changed())); + connect(sdw, TQ_SIGNAL(changed()), TQ_SIGNAL(changed())); container()->addWidget(sdw, row,row, 0,2); return sdw; } @@ -98,7 +98,7 @@ void ToolConfigWidget::createCustomOptionsEntry() TQLabel *label = new TQLabel(i18n("Custom options:"), container()); container()->addWidget(label, row,row, 0,0); _customOptions = new TQLineEdit(container()); - connect(_customOptions, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(changed())); + connect(_customOptions, TQ_SIGNAL(textChanged(const TQString &)), TQ_SIGNAL(changed())); container()->addWidget(_customOptions, row,row, 1,2); } @@ -108,7 +108,7 @@ void ToolConfigWidget::createCustomLibrariesEntry() TQLabel *label = new TQLabel(i18n("Custom libraries:"), container()); container()->addWidget(label, row,row, 0,0); _customLibraries = new TQLineEdit(container()); - connect(_customLibraries, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(changed())); + connect(_customLibraries, TQ_SIGNAL(textChanged(const TQString &)), TQ_SIGNAL(changed())); TQToolTip::add(_customLibraries, i18n("<qt>This values will be placed after the linked objects.</qt>")) ; container()->addWidget(_customLibraries, row,row, 1,2); } @@ -119,7 +119,7 @@ void ToolConfigWidget::createHexFormatEntry() TQLabel *label = new TQLabel(i18n("Hex file format:"), container()); container()->addWidget(label, row,row, 0,0); _hexFormat = new TQComboBox(container()); - connect(_hexFormat, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); + connect(_hexFormat, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); for (uint i=0; i<HexBuffer::Nb_Formats; i++) _hexFormat->insertItem(HexBuffer::FORMATS[i]); _hexFormat->insertItem(i18n("as in LIST directive")); diff --git a/src/tools/gui/toolchain_config_center.cpp b/src/tools/gui/toolchain_config_center.cpp index 6948c3a..3685997 100644 --- a/src/tools/gui/toolchain_config_center.cpp +++ b/src/tools/gui/toolchain_config_center.cpp @@ -28,7 +28,7 @@ ToolchainsConfigCenter::ToolchainsConfigCenter(const Tool::Group &sgroup, TQWidg _titleBox->addStretch(1); _infoButton = new KPushButton(KGuiItem(TQString(), "viewmag"), _frame); - connect(_infoButton, TQT_SIGNAL(clicked()), TQT_SLOT(showInformationDialog())); + connect(_infoButton, TQ_SIGNAL(clicked()), TQ_SLOT(showInformationDialog())); _titleBox->addWidget(_infoButton); TQWidget *current = 0; @@ -52,7 +52,7 @@ ToolchainsConfigCenter::ToolchainsConfigCenter(const Tool::Group &sgroup, TQWidg } showPage(current); aboutToShowPageSlot(current); - connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget *)), TQT_SLOT(aboutToShowPageSlot(TQWidget *))); + connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget *)), TQ_SLOT(aboutToShowPageSlot(TQWidget *))); } void ToolchainsConfigCenter::aboutToShowPageSlot(TQWidget *page) @@ -60,7 +60,7 @@ void ToolchainsConfigCenter::aboutToShowPageSlot(TQWidget *page) if ( !_pages.contains(page) ) _infoButton->hide(); else { _infoButton->show(); - TQTimer::singleShot(0, _pages[page], TQT_SLOT(detect())); + TQTimer::singleShot(0, _pages[page], TQ_SLOT(detect())); } } diff --git a/src/tools/gui/toolchain_config_widget.cpp b/src/tools/gui/toolchain_config_widget.cpp index 291952f..27302fd 100644 --- a/src/tools/gui/toolchain_config_widget.cpp +++ b/src/tools/gui/toolchain_config_widget.cpp @@ -44,7 +44,7 @@ void ToolchainConfigWidget::init() TQLabel *label = new TQLabel(Compile::DirectoryType(Compile::DirectoryType::Executable).label() + ":", container); container->addWidget(label, row,row, 0,0); _dirs[Compile::DirectoryType::Executable] = new PURL::DirectoryWidget(container); - connect(_dirs[Compile::DirectoryType::Executable], TQT_SIGNAL(changed()), TQT_SLOT(forceDetect())); + connect(_dirs[Compile::DirectoryType::Executable], TQ_SIGNAL(changed()), TQ_SLOT(forceDetect())); container->addWidget(_dirs[Compile::DirectoryType::Executable], row,row, 1,3); row++; @@ -52,7 +52,7 @@ void ToolchainConfigWidget::init() container->addWidget(label, row,row, 0,0); _execType = new TQComboBox(container); FOR_EACH(Tool::ExecutableType, type) _execType->insertItem(type.label()); - connect(_execType, TQT_SIGNAL(activated(int)), TQT_SLOT(forceDetect())); + connect(_execType, TQ_SIGNAL(activated(int)), TQ_SLOT(forceDetect())); container->addWidget(_execType, row,row, 1,2); row++; @@ -65,7 +65,7 @@ void ToolchainConfigWidget::init() _outputType = new KeyComboBox<Tool::OutputExecutableType>(container); FOR_EACH(Tool::OutputExecutableType, type) if ( _group.hasOutputExecutableType(type) ) _outputType->appendItem(type, type.label()); - connect(_outputType->widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(forceDetect())); + connect(_outputType->widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(forceDetect())); container->addWidget(_outputType->widget(), row,row, 1,1); row++; } @@ -80,7 +80,7 @@ void ToolchainConfigWidget::init() _data[k].label = new TQLabel(container); container->addWidget(_data[k].label, row,row, 1,1); _data[k].button = new KPushButton(KGuiItem(TQString(), "viewmag"), container); - connect(_data[k].button, TQT_SIGNAL(clicked()), TQT_SLOT(showDetails())); + connect(_data[k].button, TQ_SIGNAL(clicked()), TQ_SLOT(showDetails())); container->addWidget(_data[k].button, row,row, 2,2); row++; } @@ -90,7 +90,7 @@ void ToolchainConfigWidget::init() _devicesLabel = new TQLabel(container); container->addWidget(_devicesLabel, row,row, 1,1); KPushButton *button = new KPushButton(KGuiItem(TQString(), "viewmag"), container); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(showDeviceDetails())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(showDeviceDetails())); container->addWidget(button, row,row, 2,2); row++; @@ -226,8 +226,8 @@ void ToolchainConfigWidget::detect() _data[k].checkLines.clear(); _data[k].process = checkExecutableProcess(k); _data[k].command = _data[k].process->prettyCommand(); - connect(_data[k].process, TQT_SIGNAL(done(int)), TQT_SLOT(checkExecutableDone())); - connect(_data[k].process, TQT_SIGNAL(timeout()), TQT_SLOT(checkExecutableDone())); + connect(_data[k].process, TQ_SIGNAL(done(int)), TQ_SLOT(checkExecutableDone())); + connect(_data[k].process, TQ_SIGNAL(timeout()), TQ_SLOT(checkExecutableDone())); TQString exec = baseExecutable(k); if ( !_data[k].process->start(10000) ) _data[k].label->setText(i18n("\"%1\" not found").arg(exec)); else _data[k].label->setText(i18n("Detecting \"%1\"...").arg(exec)); @@ -241,8 +241,8 @@ void ToolchainConfigWidget::detect() delete _devicesData[i].process; _devicesData[i].process = checkDevicesProcess(i); _devicesData[i].command = _devicesData[i].process->prettyCommand(); - connect(_devicesData[i].process, TQT_SIGNAL(done(int)), TQT_SLOT(checkDevicesDone())); - connect(_devicesData[i].process, TQT_SIGNAL(timeout()), TQT_SLOT(checkDevicesDone())); + connect(_devicesData[i].process, TQ_SIGNAL(done(int)), TQ_SLOT(checkDevicesDone())); + connect(_devicesData[i].process, TQ_SIGNAL(timeout()), TQ_SLOT(checkDevicesDone())); _devicesData[i].done = false; _devicesData[i].checkLines.clear(); if ( !_devicesData[i].process->start(10000) ) _devicesLabel->setText(i18n("Failed")); diff --git a/src/tools/list/compile_manager.cpp b/src/tools/list/compile_manager.cpp index 28f7aa6..edf999c 100644 --- a/src/tools/list/compile_manager.cpp +++ b/src/tools/list/compile_manager.cpp @@ -39,7 +39,7 @@ bool Compile::Manager::setupFile(Operations op, const TodoItem &item) _todo.append(item); _action = Compiling; _wholeProject = false; - TQTimer::singleShot(0, this, TQT_SLOT(start())); + TQTimer::singleShot(0, this, TQ_SLOT(start())); return true; } @@ -74,7 +74,7 @@ bool Compile::Manager::setupProject(Operations op, LinkType type) } _action = Compiling; _wholeProject = true; - TQTimer::singleShot(0, this, TQT_SLOT(start())); + TQTimer::singleShot(0, this, TQ_SLOT(start())); return true; } @@ -216,7 +216,7 @@ void Compile::Manager::start() } if ( _operations & Clean ) { _base->files(0).onlyExistingFiles().cleanGenerated(); - TQTimer::singleShot(0, this, TQT_SLOT(start())); + TQTimer::singleShot(0, this, TQ_SLOT(start())); return; } if ( !_base->start() ) { @@ -249,7 +249,7 @@ void Compile::Manager::processDone() FileData::List list = _base->files(0).onlyExistingFiles(); FileData::List::iterator it; for (it=list.begin(); it!=list.end(); ++it) emit updateFile(*it); - TQTimer::singleShot(0, this, TQT_SLOT(start())); + TQTimer::singleShot(0, this, TQ_SLOT(start())); } } diff --git a/src/tools/list/compile_process.cpp b/src/tools/list/compile_process.cpp index b19bc54..aff7c7c 100644 --- a/src/tools/list/compile_process.cpp +++ b/src/tools/list/compile_process.cpp @@ -70,7 +70,7 @@ void Compile::FileData::List::cleanGenerated() const Compile::LogWidget::LogWidget(TQWidget *parent) : Log::Widget(parent, "compile_log") { - connect(this, TQT_SIGNAL(clicked(int, int)), TQT_SLOT(lineClicked(int))); + connect(this, TQ_SIGNAL(clicked(int, int)), TQ_SLOT(lineClicked(int))); } void Compile::LogWidget::clear() @@ -124,10 +124,10 @@ bool Compile::BaseProcess::start() _stderr = TQString(); delete _process; _process = new ::Process::LineSignal; - connect(_process, TQT_SIGNAL(done(int)), TQT_SLOT(done(int))); - connect(_process, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); - connect(_process, TQT_SIGNAL(logStdoutLine(const TQString &)), TQT_SLOT(logStdoutLine(const TQString &))); - connect(_process, TQT_SIGNAL(logStderrLine(const TQString &)), TQT_SLOT(logStderrLine(const TQString &))); + connect(_process, TQ_SIGNAL(done(int)), TQ_SLOT(done(int))); + connect(_process, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); + connect(_process, TQ_SIGNAL(logStdoutLine(const TQString &)), TQ_SLOT(logStdoutLine(const TQString &))); + connect(_process, TQ_SIGNAL(logStderrLine(const TQString &)), TQ_SLOT(logStderrLine(const TQString &))); _process->setWorkingDirectory(directory().path()); setupProcess(); _manager->log(Log::LineType::Command, _process->arguments().join(" ")); diff --git a/src/tools/list/tools_config_widget.cpp b/src/tools/list/tools_config_widget.cpp index 1ced475..a6b853a 100644 --- a/src/tools/list/tools_config_widget.cpp +++ b/src/tools/list/tools_config_widget.cpp @@ -47,7 +47,7 @@ ToolsConfigWidget::ToolsConfigWidget(Project *project, TQWidget *parent) Tool::Lister::ConstIterator it; for (it=Tool::lister().begin(); it!=Tool::lister().end(); ++it) _tool->appendItem(it.key(), it.data()->label()); - connect(_tool->widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(toolChanged())); + connect(_tool->widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(toolChanged())); addWidget(_tool->widget(), row,row, 1,1); label = new TQLabel(i18n("Output type:"), this); addWidget(label, row,row, 2,2); @@ -71,7 +71,7 @@ ToolsConfigWidget::ToolsConfigWidget(Project *project, TQWidget *parent) ToolConfigWidget *cw = static_cast<const Tool::GroupUI *>(it.data()->gui())->createConfigWidget(category, project); Q_ASSERT(cw); _stacks[category]->appendItem(it.key(), cw); - connect(cw, TQT_SIGNAL(displayHelp()), TQT_SLOT(displayHelp())); + connect(cw, TQ_SIGNAL(displayHelp()), TQ_SLOT(displayHelp())); } } _customWidget = new TQWidget(_mainStack); |