From 931991843ab3b6b0b0157dd433c226f7fc2ebc1b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 14 Jan 2024 14:38:52 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- kommander/editor/actiondnd.cpp | 10 +- kommander/editor/actioneditorimpl.cpp | 16 ++-- kommander/editor/actionlistview.cpp | 4 +- kommander/editor/assistproc.cpp | 6 +- kommander/editor/assoctexteditorimpl.cpp | 16 ++-- kommander/editor/choosewidgetimpl.cpp | 4 +- kommander/editor/command.cpp | 12 +-- kommander/editor/connectioneditorimpl.cpp | 20 ++-- kommander/editor/filechooser.cpp | 8 +- kommander/editor/formfile.cpp | 10 +- kommander/editor/formwindow.cpp | 26 +++--- kommander/editor/functionsimpl.cpp | 10 +- kommander/editor/hierarchyview.cpp | 20 ++-- kommander/editor/iconvieweditorimpl.cpp | 2 +- kommander/editor/layout.cpp | 4 +- kommander/editor/listboxeditorimpl.cpp | 2 +- kommander/editor/listvieweditorimpl.cpp | 2 +- kommander/editor/mainwindow.cpp | 46 +++++----- kommander/editor/mainwindowactions.cpp | 122 ++++++++++++------------- kommander/editor/messagelog.cpp | 12 +-- kommander/editor/multilineeditorimpl.cpp | 2 +- kommander/editor/newformimpl.cpp | 2 +- kommander/editor/paletteeditoradvancedimpl.cpp | 2 +- kommander/editor/paletteeditorimpl.cpp | 2 +- kommander/editor/pixmapchooser.cpp | 2 +- kommander/editor/propertyeditor.cpp | 98 ++++++++++---------- kommander/editor/qcompletionedit.cpp | 4 +- kommander/editor/styledbutton.cpp | 2 +- kommander/editor/tableeditorimpl.cpp | 2 +- kommander/editor/timestamp.cpp | 2 +- kommander/editor/widgetfactory.cpp | 4 +- kommander/editor/wizardeditorimpl.cpp | 2 +- kommander/editor/workspace.cpp | 42 ++++----- kommander/executor/main.cpp | 2 +- kommander/part/kommander_part.cpp | 2 +- kommander/pluginmanager/mainwindow.cpp | 2 +- kommander/widget/functionlib.cpp | 8 +- kommander/widget/invokeclass.cpp | 4 +- kommander/widget/kmdrmainwindow.cpp | 2 +- kommander/widget/myprocess.cpp | 6 +- kommander/widgets/closebutton.cpp | 10 +- kommander/widgets/combobox.cpp | 2 +- kommander/widgets/execbutton.cpp | 4 +- kommander/widgets/fileselector.cpp | 2 +- kommander/widgets/konsole.cpp | 4 +- kommander/widgets/lineedit.cpp | 4 +- kommander/widgets/popupmenu.cpp | 2 +- kommander/widgets/richtexteditor.cpp | 14 +-- kommander/widgets/subdialog.cpp | 4 +- kommander/widgets/textedit.cpp | 2 +- kommander/widgets/timer.cpp | 4 +- kommander/widgets/wizard.cpp | 2 +- 52 files changed, 299 insertions(+), 299 deletions(-) (limited to 'kommander') diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp index 13bdaa4c..bc3b2a21 100644 --- a/kommander/editor/actiondnd.cpp +++ b/kommander/editor/actiondnd.cpp @@ -76,8 +76,8 @@ QDesignerToolBarSeparator::QDesignerToolBarSeparator(TQt::Orientation o , TQTool const char* name ) : TQWidget( parent, name ) { - connect( parent, TQT_SIGNAL(orientationChanged(TQt::Orientation)), - this, TQT_SLOT(setOrientation(TQt::Orientation)) ); + connect( parent, TQ_SIGNAL(orientationChanged(TQt::Orientation)), + this, TQ_SLOT(setOrientation(TQt::Orientation)) ); setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); @@ -201,7 +201,7 @@ void QDesignerToolBar::findFormWindow() void QDesignerToolBar::addAction( TQAction *a ) { actionList.append( a ); - connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) ); + connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( actionRemoved() ) ); if ( a->inherits( "TQActionGroup" ) ) { ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); @@ -998,7 +998,7 @@ void QDesignerPopupMenu::mousePressEvent( TQMouseEvent *e ) popupMenu->close(); } e->accept(); - TQTimer::singleShot( 0, this, TQT_SLOT(createPopupMenu()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(createPopupMenu()) ); return; } mousePressed = true; @@ -1217,7 +1217,7 @@ TQPoint QDesignerPopupMenu::calcIndicatorPos( const TQPoint &pos ) void QDesignerPopupMenu::addAction( TQAction *a ) { actionList.append( a ); - connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) ); + connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( actionRemoved() ) ); } void QDesignerPopupMenu::actionRemoved() diff --git a/kommander/editor/actioneditorimpl.cpp b/kommander/editor/actioneditorimpl.cpp index 8e54da57..3b5df0e8 100644 --- a/kommander/editor/actioneditorimpl.cpp +++ b/kommander/editor/actioneditorimpl.cpp @@ -44,17 +44,17 @@ ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl ) buttonConnect->setEnabled( false ); TQPopupMenu *popup = new TQPopupMenu( this ); - popup->insertItem( i18n("New &Action" ), this, TQT_SLOT( newAction() ) ); - popup->insertItem( i18n("New Action &Group" ), this, TQT_SLOT( newActionGroup() ) ); - popup->insertItem( i18n("New &Dropdown Action Group" ), this, TQT_SLOT( newDropDownActionGroup() ) ); + popup->insertItem( i18n("New &Action" ), this, TQ_SLOT( newAction() ) ); + popup->insertItem( i18n("New Action &Group" ), this, TQ_SLOT( newActionGroup() ) ); + popup->insertItem( i18n("New &Dropdown Action Group" ), this, TQ_SLOT( newDropDownActionGroup() ) ); buttonNewAction->setPopup( popup ); buttonNewAction->setPopupDelay( 0 ); - connect( listActions, TQT_SIGNAL( insertAction() ), this, TQT_SLOT( newAction() ) ); - connect( listActions, TQT_SIGNAL( insertActionGroup() ), this, TQT_SLOT( newActionGroup() ) ); - connect( listActions, TQT_SIGNAL( insertDropDownActionGroup() ), this, TQT_SLOT( newDropDownActionGroup() ) ); - connect( listActions, TQT_SIGNAL( deleteAction() ), this, TQT_SLOT( deleteAction() ) ); - connect( listActions, TQT_SIGNAL( connectAction() ), this, TQT_SLOT( connectionsClicked() ) ); + connect( listActions, TQ_SIGNAL( insertAction() ), this, TQ_SLOT( newAction() ) ); + connect( listActions, TQ_SIGNAL( insertActionGroup() ), this, TQ_SLOT( newActionGroup() ) ); + connect( listActions, TQ_SIGNAL( insertDropDownActionGroup() ), this, TQ_SLOT( newDropDownActionGroup() ) ); + connect( listActions, TQ_SIGNAL( deleteAction() ), this, TQ_SLOT( deleteAction() ) ); + connect( listActions, TQ_SIGNAL( connectAction() ), this, TQ_SLOT( connectionsClicked() ) ); } void ActionEditor::closeEvent( TQCloseEvent *e ) diff --git a/kommander/editor/actionlistview.cpp b/kommander/editor/actionlistview.cpp index 78b883b0..ab7517f7 100644 --- a/kommander/editor/actionlistview.cpp +++ b/kommander/editor/actionlistview.cpp @@ -30,8 +30,8 @@ ActionListView::ActionListView( TQWidget *parent, const char *name ) header()->setStretchEnabled( true ); setRootIsDecorated( true ); setSorting( -1 ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); } ActionItem::ActionItem( TQListView *lv, TQAction *ac ) diff --git a/kommander/editor/assistproc.cpp b/kommander/editor/assistproc.cpp index 8fbf61f3..580b2b2d 100644 --- a/kommander/editor/assistproc.cpp +++ b/kommander/editor/assistproc.cpp @@ -23,14 +23,14 @@ AssistProc::AssistProc( TQObject *parent, const char *name, const TQString &path : TQProcess( parent, name ) { assistantPath = path; - connect( this, TQT_SIGNAL(readyReadStdout()), this, TQT_SLOT(processOutput()) ); - connect( this, TQT_SIGNAL(readyReadStderr()), this, TQT_SLOT(processErrOutput()) ); + connect( this, TQ_SIGNAL(readyReadStdout()), this, TQ_SLOT(processOutput()) ); + connect( this, TQ_SIGNAL(readyReadStderr()), this, TQ_SLOT(processErrOutput()) ); } AssistProc::~AssistProc() { tryTerminate(); - TQTimer::singleShot( 5000, this, TQT_SLOT(kill())); // If busy, kill in 5 sec... + TQTimer::singleShot( 5000, this, TQ_SLOT(kill())); // If busy, kill in 5 sec... } bool AssistProc::run( const TQString &path ) diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp index f42acc2b..93e33b17 100644 --- a/kommander/editor/assoctexteditorimpl.cpp +++ b/kommander/editor/assoctexteditorimpl.cpp @@ -138,7 +138,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form, readOnlyAction = view->actionCollection()->action("tools_toggle_write_lock"); popup->insertSeparator(); highlightPopup = new TDEPopupMenu(popup); - connect(highlightPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(slotHighlightingChanged(int))); + connect(highlightPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(slotHighlightingChanged(int))); popup->insertItem(i18n("&Highlighting"), highlightPopup); @@ -151,13 +151,13 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form, readOnlyAction->activate(); setWidget(a_widget); - connect(doc, TQT_SIGNAL(textChanged()), TQT_SLOT(textEditChanged())); - connect(widgetsComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(widgetChanged(int))); - connect(stateComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(stateChanged(int))); - connect(filePushButton, TQT_SIGNAL(clicked()), TQT_SLOT(insertFile())); - connect(functionButton, TQT_SIGNAL(clicked()), TQT_SLOT(insertFunction())); - connect(widgetComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(insertWidgetName(int))); - connect(treeWidgetButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectWidget())); + connect(doc, TQ_SIGNAL(textChanged()), TQ_SLOT(textEditChanged())); + connect(widgetsComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(widgetChanged(int))); + connect(stateComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(stateChanged(int))); + connect(filePushButton, TQ_SIGNAL(clicked()), TQ_SLOT(insertFile())); + connect(functionButton, TQ_SIGNAL(clicked()), TQ_SLOT(insertFunction())); + connect(widgetComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(insertWidgetName(int))); + connect(treeWidgetButton, TQ_SIGNAL(clicked()), TQ_SLOT(selectWidget())); view->setFocus(); } diff --git a/kommander/editor/choosewidgetimpl.cpp b/kommander/editor/choosewidgetimpl.cpp index 62f545a0..f399b8b5 100644 --- a/kommander/editor/choosewidgetimpl.cpp +++ b/kommander/editor/choosewidgetimpl.cpp @@ -32,8 +32,8 @@ ChooseWidget::ChooseWidget(TQWidget* a_parent, const char* a_name, bool a_modal) : ChooseWidgetBase(a_parent, a_name, a_modal) { - connect( nameEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textChanged(const TQString&)) ); - connect( widgetView, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(selectedItem(TQListViewItem*))); + connect( nameEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textChanged(const TQString&)) ); + connect( widgetView, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(selectedItem(TQListViewItem*))); widgetView->setFullWidth(true); widgetView->addColumn(i18n("Widgets")); widgetView->setRootIsDecorated(true); diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp index 6612e49f..8d15c885 100644 --- a/kommander/editor/command.cpp +++ b/kommander/editor/command.cpp @@ -1611,7 +1611,7 @@ void AddActionToToolBarCommand::execute() else toolBar->insertAction( index, action ); toolBar->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } else { TQObjectList clo = action->childrenListObject(); if (!clo.isEmpty()) { @@ -1635,7 +1635,7 @@ void AddActionToToolBarCommand::execute() } } toolBar->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } } @@ -1649,7 +1649,7 @@ void AddActionToToolBarCommand::unexecute() toolBar->removeAction( action ); action->removeFrom( toolBar ); - TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::disconnect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( toolBar ); } else { @@ -1701,13 +1701,13 @@ void AddActionToPopupCommand::execute() } } popup->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), popup, TQ_SLOT( actionRemoved() ) ); } else { if ( !action->inherits( "QDesignerAction" ) || ( (QDesignerAction*)action )->supportsMenu() ) { action->addTo( popup ); popup->insertAction( index, action ); popup->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), popup, TQ_SLOT( actionRemoved() ) ); } } } @@ -1716,7 +1716,7 @@ void AddActionToPopupCommand::unexecute() { action->removeFrom( popup ); popup->removeAction( action ); - TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) ); + TQObject::disconnect( action, TQ_SIGNAL( destroyed() ), popup, TQ_SLOT( actionRemoved() ) ); if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( popup ); } else { diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp index 05c1dc4c..e9ae6738 100644 --- a/kommander/editor/connectioneditorimpl.cpp +++ b/kommander/editor/connectioneditorimpl.cpp @@ -128,16 +128,16 @@ ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* r updateDisconnectButton(); // Connections - connect(comboSender, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(senderChanged(const TQString&))); - connect(comboReceiver, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(receiverChanged(const TQString&))); - connect(signalBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateConnectButton())); - connect(slotBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateConnectButton())); - connect(connectButton, TQT_SIGNAL(clicked()), TQT_SLOT(connectClicked())); - connect(disconnectButton, TQT_SIGNAL(clicked()), TQT_SLOT(disconnectClicked())); - connect(okButton, TQT_SIGNAL(clicked()), TQT_SLOT(okClicked())); - connect(cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(cancelClicked())); - connect(signalBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(connectClicked())); - connect(slotBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(connectClicked())); + connect(comboSender, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(senderChanged(const TQString&))); + connect(comboReceiver, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(receiverChanged(const TQString&))); + connect(signalBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateConnectButton())); + connect(slotBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateConnectButton())); + connect(connectButton, TQ_SIGNAL(clicked()), TQ_SLOT(connectClicked())); + connect(disconnectButton, TQ_SIGNAL(clicked()), TQ_SLOT(disconnectClicked())); + connect(okButton, TQ_SIGNAL(clicked()), TQ_SLOT(okClicked())); + connect(cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(cancelClicked())); + connect(signalBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), TQ_SLOT(connectClicked())); + connect(slotBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), TQ_SLOT(connectClicked())); } ConnectionEditor::~ConnectionEditor() diff --git a/kommander/editor/filechooser.cpp b/kommander/editor/filechooser.cpp index ac0aad5a..347eacf5 100644 --- a/kommander/editor/filechooser.cpp +++ b/kommander/editor/filechooser.cpp @@ -13,15 +13,15 @@ FileChooser::FileChooser( TQWidget *parent, const char *name ) lineEdit = new TQLineEdit( this, "filechooser_lineedit" ); layout->addWidget( lineEdit ); - connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( fileNameChanged( const TQString & ) ) ); + connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( fileNameChanged( const TQString & ) ) ); button = new TQPushButton( "...", this, "filechooser_button" ); button->setFixedWidth( button->fontMetrics().width( " ... " ) ); layout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( chooseFile() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( chooseFile() ) ); setFocusProxy( lineEdit ); } diff --git a/kommander/editor/formfile.cpp b/kommander/editor/formfile.cpp index c82e961d..874918d3 100644 --- a/kommander/editor/formfile.cpp +++ b/kommander/editor/formfile.cpp @@ -45,15 +45,15 @@ FormFile::FormFile(const TQString &fn, bool temp) : filename(fn), fileNameTemp(temp), fw(0) { - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } void FormFile::init() { - connect(this, TQT_SIGNAL(addedFormFile(FormFile *)), MainWindow::self->workspace(), - TQT_SLOT(formFileAdded(FormFile*))); - connect(this, TQT_SIGNAL(removedFormFile(FormFile *)), MainWindow::self->workspace(), - TQT_SLOT(formFileRemoved(FormFile*))); + connect(this, TQ_SIGNAL(addedFormFile(FormFile *)), MainWindow::self->workspace(), + TQ_SLOT(formFileAdded(FormFile*))); + connect(this, TQ_SIGNAL(removedFormFile(FormFile *)), MainWindow::self->workspace(), + TQ_SLOT(formFileRemoved(FormFile*))); emit addedFormFile(this); } diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp index c511fc55..81489695 100644 --- a/kommander/editor/formwindow.cpp +++ b/kommander/editor/formwindow.cpp @@ -143,26 +143,26 @@ void FormWindow::init() setFocusPolicy(TQWidget::ClickFocus); sizePreviewLabel = 0; checkSelectionsTimer = new TQTimer(this, "checkSelectionsTimer"); - connect(checkSelectionsTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(invalidCheckedSelections())); + connect(checkSelectionsTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(invalidCheckedSelections())); updatePropertiesTimer = new TQTimer(this); - connect(updatePropertiesTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(updatePropertiesTimerDone())); + connect(updatePropertiesTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updatePropertiesTimerDone())); showPropertiesTimer = new TQTimer(this); - connect(showPropertiesTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(showPropertiesTimerDone())); + connect(showPropertiesTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(showPropertiesTimerDone())); selectionChangedTimer = new TQTimer(this); - connect(selectionChangedTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(selectionChangedTimerDone())); + connect(selectionChangedTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(selectionChangedTimerDone())); insertParent = 0; - connect(&commands, TQT_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)), - this, TQT_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &))); + connect(&commands, TQ_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)), + this, TQ_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &))); propShowBlocked = false; setIcon(PixmapChooser::loadPixmap("form.xpm", PixmapChooser::Mini)); - connect(&commands, TQT_SIGNAL(modificationChanged(bool)), - this, TQT_SLOT(modificationChanged(bool))); + connect(&commands, TQ_SIGNAL(modificationChanged(bool)), + this, TQ_SLOT(modificationChanged(bool))); buffer = 0; TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQFrame"), this); @@ -2604,6 +2604,6 @@ void FormWindow::setFormFile(FormFile *f) { ff = f; if (ff) - connect(this, TQT_SIGNAL(modificationChanged(bool, const TQString&)), ff, TQT_SLOT(formWindowChangedSomehow())); + connect(this, TQ_SIGNAL(modificationChanged(bool, const TQString&)), ff, TQ_SLOT(formWindowChangedSomehow())); } #include "formwindow.moc" diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp index c1c3f41d..88521a97 100644 --- a/kommander/editor/functionsimpl.cpp +++ b/kommander/editor/functionsimpl.cpp @@ -49,11 +49,11 @@ FunctionsDialog::FunctionsDialog(TQWidget* a_parent, const TQDict& a_w copyButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("1downarrow", TDEIcon::Toolbar)); groupComboBox->insertStringList(SpecialInformation::groups()); - connect(groupComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(groupChanged(int))); - connect(widgetComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(groupChanged(int))); - connect(functionListBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(functionChanged(int))); - connect(copyButton, TQT_SIGNAL(clicked()), TQT_SLOT(copyText())); - connect(clearButton, TQT_SIGNAL(clicked()), insertedText, TQT_SLOT(clear())); + connect(groupComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(groupChanged(int))); + connect(widgetComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(groupChanged(int))); + connect(functionListBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(functionChanged(int))); + connect(copyButton, TQ_SIGNAL(clicked()), TQ_SLOT(copyText())); + connect(clearButton, TQ_SIGNAL(clicked()), insertedText, TQ_SLOT(clear())); // build widget name list for (TQDictIterator It(m_widgetList); It.current(); ++It) diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp index 75b001b5..b6113d37 100644 --- a/kommander/editor/hierarchyview.cpp +++ b/kommander/editor/hierarchyview.cpp @@ -193,18 +193,18 @@ HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) ); (void)*selectedBack; // hack setPalette( p ); - disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( changeSortColumn( int ) ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); if ( doConnects ) { - connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), - this, TQT_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), + this, TQ_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); } deselect = true; setColumnWidthMode( 1, Manual ); @@ -502,8 +502,8 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) } else { if ( !tabWidgetMenu ) tabWidgetMenu = - formWindow->mainWindow()->setupTabWidgetHierarchyMenu( this, TQT_SLOT( addTabPage() ), - TQT_SLOT( removeTabPage() ) ); + formWindow->mainWindow()->setupTabWidgetHierarchyMenu( this, TQ_SLOT( addTabPage() ), + TQ_SLOT( removeTabPage() ) ); tabWidgetMenu->popup( p ); } } diff --git a/kommander/editor/iconvieweditorimpl.cpp b/kommander/editor/iconvieweditorimpl.cpp index 2fe8eed4..97c7514a 100644 --- a/kommander/editor/iconvieweditorimpl.cpp +++ b/kommander/editor/iconvieweditorimpl.cpp @@ -34,7 +34,7 @@ IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : IconViewEditorBase( parent, 0, true ), formwindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); iconview = (TQIconView*)editWidget; itemText->setText( "" ); diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp index 05354a84..84e4dabb 100644 --- a/kommander/editor/layout.cpp +++ b/kommander/editor/layout.cpp @@ -134,8 +134,8 @@ void Layout::setup() // widgets to get informed if one gets deleted to be able to // handle that and do not crash in this case for ( w = widgets.first(); w; w = widgets.next() ) { - connect( w, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( widgetDestroyed() ) ); + connect( w, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( widgetDestroyed() ) ); startPoint = TQPoint( TQMIN( startPoint.x(), w->x() ), TQMIN( startPoint.y(), w->y() ) ); geometries.insert( w, TQRect( w->pos(), w->size() ) ); diff --git a/kommander/editor/listboxeditorimpl.cpp b/kommander/editor/listboxeditorimpl.cpp index 047bc4f8..32c94d95 100644 --- a/kommander/editor/listboxeditorimpl.cpp +++ b/kommander/editor/listboxeditorimpl.cpp @@ -35,7 +35,7 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : ListBoxEditorBase( parent, 0, true ), formwindow( fw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); listbox = (TQListBox*)editWidget; itemText->setText( "" ); diff --git a/kommander/editor/listvieweditorimpl.cpp b/kommander/editor/listvieweditorimpl.cpp index 83422997..8021d242 100644 --- a/kommander/editor/listvieweditorimpl.cpp +++ b/kommander/editor/listvieweditorimpl.cpp @@ -40,7 +40,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ) : ListViewEditorBase( parent, 0, true ), listview( lv ), formwindow( fw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); itemText->setEnabled( false ); itemChoosePixmap->setEnabled( false ); itemDeletePixmap->setEnabled( false ); diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index f9dbac46..fd5059ec 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -129,7 +129,7 @@ MainWindow::MainWindow(bool asClient) docPath(TQTDOCDIR), client(asClient), databaseAutoEdit(false), previewing(false) { m_partManager = new KParts::PartManager(this); - //connect(m_partManager, TQT_SIGNAL(activePartChanged(KParts::Part * )), this, TQT_SLOT(slotActivePartChanged(KParts::Part * ))); + //connect(m_partManager, TQ_SIGNAL(activePartChanged(KParts::Part * )), this, TQ_SLOT(slotActivePartChanged(KParts::Part * ))); init_colors(); inDebugMode = true; //debugging kommander @@ -177,7 +177,7 @@ MainWindow::MainWindow(bool asClient) as -= TQSize(30, 30); resize(TQSize(1200, 1000).boundedTo(as)); - connect(kapp->clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged())); + connect(kapp->clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clipboardChanged())); clipboardChanged(); layoutChilds = false; layoutSelected = false; @@ -204,7 +204,7 @@ MainWindow::MainWindow(bool asClient) SpecialInformation::registerSpecials(); backupTimer = new TQTimer(this); - connect(backupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCreateBackups())); + connect(backupTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCreateBackups())); backupTimer->start(1000*60*5); //fire it every five minutes //createGUI(0); @@ -235,8 +235,8 @@ void MainWindow::setupMDI() PixmapChooser::NoSize)); qworkspace->setPaletteBackgroundColor(TQColor(238, 238, 238)); qworkspace->setScrollBarsEnabled(true); - connect(qworkspace, TQT_SIGNAL(windowActivated(TQWidget *)), - this, TQT_SLOT(activeWindowChanged(TQWidget *))); + connect(qworkspace, TQ_SIGNAL(windowActivated(TQWidget *)), + this, TQ_SLOT(activeWindowChanged(TQWidget *))); lastActiveFormWindow = 0; qworkspace->setAcceptDrops(true); } @@ -294,7 +294,7 @@ void MainWindow::setupWorkspace() QCompletionEdit *edit = new QCompletionEdit(vbox); TQToolTip::add(edit, i18n("Start typing the buffer you want to switch to here (ALT+B)")); TQAccel *a = new TQAccel(this); - a->connectItem(a->insertItem(ALT + Key_B), edit, TQT_SLOT(setFocus())); + a->connectItem(a->insertItem(ALT + Key_B), edit, TQ_SLOT(setFocus())); wspace = new Workspace(vbox, this); wspace->setBufferEdit(edit); dw->setWidget(vbox); @@ -460,11 +460,11 @@ void MainWindow::runForm() TDEProcess* process = new TDEProcess; process->setUseShell(true); (*process) << "kmdr-executor" << TQString("\"%1\"").arg(form->formFile()->fileName()); - connect(process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), messageLog, - TQT_SLOT(receivedStdout(TDEProcess*, char*, int))); - connect(process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), messageLog, - TQT_SLOT(receivedStderr(TDEProcess*, char*, int))); - connect(process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(closeRunningForm(TDEProcess*))); + connect(process, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), messageLog, + TQ_SLOT(receivedStdout(TDEProcess*, char*, int))); + connect(process, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), messageLog, + TQ_SLOT(receivedStderr(TDEProcess*, char*, int))); + connect(process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(closeRunningForm(TDEProcess*))); messageLog->clear(MessageLog::All); previewing = process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } @@ -613,7 +613,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) } lastPressWidget = (TQWidget*)o; if (passiveInteractor) - TQTimer::singleShot(0, formWindow(), TQT_SLOT(visibilityChanged())); + TQTimer::singleShot(0, formWindow(), TQ_SLOT(visibilityChanged())); if (currentTool() == CONNECT_TOOL) return true; return !passiveInteractor; @@ -629,7 +629,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) ((FormWindow*)w)->handleMouseRelease((TQMouseEvent*)e, ((FormWindow*)w)->designerWidget(o)); if (passiveInteractor) { selectionChanged(); - TQTimer::singleShot(0, formWindow(), TQT_SLOT(visibilityChanged())); + TQTimer::singleShot(0, formWindow(), TQ_SLOT(visibilityChanged())); } return !passiveInteractor; case TQEvent::MouseMove: @@ -803,16 +803,16 @@ void MainWindow::insertFormWindow(FormWindow *fw) "

You can have several forms open, and all open forms are listed " "in the Form List.")); - connect(fw, TQT_SIGNAL(showProperties(TQObject *)), - this, TQT_SLOT(showProperties(TQObject *))); - connect(fw, TQT_SIGNAL(updateProperties(TQObject *)), - this, TQT_SLOT(updateProperties(TQObject *))); - connect(this, TQT_SIGNAL(currentToolChanged()), - fw, TQT_SLOT(currentToolChanged())); - connect(fw, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(selectionChanged())); - connect(fw, TQT_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)), - this, TQT_SLOT(updateUndoRedo(bool, bool, const TQString &, const TQString &))); + connect(fw, TQ_SIGNAL(showProperties(TQObject *)), + this, TQ_SLOT(showProperties(TQObject *))); + connect(fw, TQ_SIGNAL(updateProperties(TQObject *)), + this, TQ_SLOT(updateProperties(TQObject *))); + connect(this, TQ_SIGNAL(currentToolChanged()), + fw, TQ_SLOT(currentToolChanged())); + connect(fw, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(selectionChanged())); + connect(fw, TQ_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)), + this, TQ_SLOT(updateUndoRedo(bool, bool, const TQString &, const TQString &))); fw->show(); fw->currentToolChanged(); diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp index fff01afd..d10c0c2f 100644 --- a/kommander/editor/mainwindowactions.cpp +++ b/kommander/editor/mainwindowactions.cpp @@ -92,77 +92,77 @@ int forms = 0; void MainWindow::setupEditActions() { - actionEditUndo = KStdAction::undo(this, TQT_SLOT(editUndo()), actionCollection()); + actionEditUndo = KStdAction::undo(this, TQ_SLOT(editUndo()), actionCollection()); actionEditUndo->setText(i18n("&Undo: Not Available")); actionEditUndo->setToolTip(i18n("Undoes the last action")); actionEditUndo->setWhatsThis(whatsThisFrom("Edit|Undo")); actionEditUndo->setEnabled(false); - actionEditRedo = KStdAction::redo(this, TQT_SLOT(editRedo()), actionCollection()); + actionEditRedo = KStdAction::redo(this, TQ_SLOT(editRedo()), actionCollection()); actionEditRedo->setText(i18n("&Redo: Not Available")); actionEditRedo->setToolTip(i18n("Redoes the last undone operation")); actionEditRedo->setWhatsThis(whatsThisFrom("Edit|Redo")); actionEditRedo->setEnabled(false); - actionEditCut = KStdAction::cut(this, TQT_SLOT(editCut()), actionCollection()); + actionEditCut = KStdAction::cut(this, TQ_SLOT(editCut()), actionCollection()); actionEditCut->setToolTip(i18n("Cuts the selected widgets and puts them on the clipboard")); actionEditCut->setWhatsThis(whatsThisFrom("Edit|Cut")); actionEditCut->setEnabled(false); - actionEditCopy = KStdAction::copy(this, TQT_SLOT(editCopy()), actionCollection()); + actionEditCopy = KStdAction::copy(this, TQ_SLOT(editCopy()), actionCollection()); actionEditCopy->setToolTip(i18n("Copies the selected widgets to the clipboard")); actionEditCopy->setWhatsThis(whatsThisFrom("Edit|Copy")); actionEditCopy->setEnabled(false); - actionEditPaste = KStdAction::paste(this, TQT_SLOT(editPaste()), actionCollection()); + actionEditPaste = KStdAction::paste(this, TQ_SLOT(editPaste()), actionCollection()); actionEditPaste->setToolTip(i18n("Pastes the clipboard's contents")); actionEditPaste->setWhatsThis(whatsThisFrom("Edit|Paste")); actionEditPaste->setEnabled(false); - actionEditDelete = new TDEAction(i18n("Delete"), Key_Delete, this, TQT_SLOT(editDelete()), + actionEditDelete = new TDEAction(i18n("Delete"), Key_Delete, this, TQ_SLOT(editDelete()), actionCollection(), "edit_delete"); actionEditDelete->setToolTip(i18n("Deletes the selected widgets")); actionEditDelete->setWhatsThis(whatsThisFrom("Edit|Delete")); actionEditDelete->setEnabled(false); - actionEditSelectAll = KStdAction::selectAll(this, TQT_SLOT(editSelectAll()), actionCollection()); + actionEditSelectAll = KStdAction::selectAll(this, TQ_SLOT(editSelectAll()), actionCollection()); actionEditSelectAll->setToolTip(i18n("Selects all widgets")); actionEditSelectAll->setWhatsThis(whatsThisFrom("Edit|Select All")); actionEditRaise = new TDEAction(i18n("Bring to Front"), createIconSet("editraise.xpm"), - TDEShortcut::null(), this, TQT_SLOT(editRaise()), actionCollection(), "edit_raise"); + TDEShortcut::null(), this, TQ_SLOT(editRaise()), actionCollection(), "edit_raise"); actionEditRaise->setToolTip(i18n("Raises the selected widgets")); actionEditRaise->setEnabled(false); actionEditLower = new TDEAction(i18n("Send to Back"), createIconSet("editlower.xpm"), - TDEShortcut::null(), this, TQT_SLOT(editLower()), actionCollection(), "edit_lower"); + TDEShortcut::null(), this, TQ_SLOT(editLower()), actionCollection(), "edit_lower"); actionEditLower->setToolTip(i18n("Lowers the selected widgets")); actionEditLower->setWhatsThis(i18n("Lowers the selected widgets")); actionEditLower->setEnabled(false); - actionEditFindGlobal = new TDEAction(i18n("Find in Form..."), CTRL + ALT + Key_F, this, TQT_SLOT(editFindGlobal()), actionCollection(), "edit_find_global"); + actionEditFindGlobal = new TDEAction(i18n("Find in Form..."), CTRL + ALT + Key_F, this, TQ_SLOT(editFindGlobal()), actionCollection(), "edit_find_global"); actionEditFindGlobal->setToolTip(i18n("Search for a text in the whole form.")); actionEditFindGlobal->setWhatsThis(whatsThisFrom("Edit|Find in Form")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditFindGlobal, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditFindGlobal, TQ_SLOT(setEnabled(bool))); - actionEditAccels = new TDEAction(i18n("Check Accelerators"), ALT + Key_R, this, TQT_SLOT(editAccels()), + actionEditAccels = new TDEAction(i18n("Check Accelerators"), ALT + Key_R, this, TQ_SLOT(editAccels()), actionCollection(), "edit_check_accel"); actionEditAccels->setToolTip(i18n("Checks if the accelerators used in the form are unique")); actionEditAccels->setWhatsThis(whatsThisFrom("Edit|Check Accelerator")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditAccels, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditAccels, TQ_SLOT(setEnabled(bool))); actionEditConnections = new TDEAction(i18n("Connections"), createIconSet("connecttool.xpm"), - TDEShortcut::null(), this, TQT_SLOT(editConnections()), actionCollection(), + TDEShortcut::null(), this, TQ_SLOT(editConnections()), actionCollection(), "edit_connections"); actionEditConnections->setToolTip(i18n("Opens a dialog for editing connections")); actionEditConnections->setWhatsThis(whatsThisFrom("Edit|Connections")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditConnections, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditConnections, TQ_SLOT(setEnabled(bool))); actionEditFormSettings = new TDEAction(i18n("Form Settings..."), TDEShortcut::null(), - this, TQT_SLOT(editFormSettings()), actionCollection(), "edit_form"); + this, TQ_SLOT(editFormSettings()), actionCollection(), "edit_form"); actionEditFormSettings->setToolTip(i18n("Opens a dialog to change the form's settings")); actionEditFormSettings->setWhatsThis(whatsThisFrom("Edit|Form Settings")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditFormSettings, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditFormSettings, TQ_SLOT(setEnabled(bool))); TDEToolBar *tb = new TDEToolBar(this, "Edit"); tb->setFullSize(false); @@ -198,50 +198,50 @@ void MainWindow::setupEditActions() void MainWindow::setupLayoutActions() { actionEditAdjustSize = new TDEAction(i18n("Adjust Size"), createIconSet("adjustsize.xpm"), - CTRL + Key_J, this, TQT_SLOT(editAdjustSize()), actionCollection(), "edit_adjust_size"); + CTRL + Key_J, this, TQ_SLOT(editAdjustSize()), actionCollection(), "edit_adjust_size"); actionEditAdjustSize->setToolTip(i18n("Adjusts the size of the selected widget")); actionEditAdjustSize->setWhatsThis(whatsThisFrom("Layout|Adjust Size")); actionEditAdjustSize->setEnabled(false); actionEditHLayout = new TDEAction(i18n("Lay Out Horizontally"), createIconSet("edithlayout.xpm"), - CTRL + Key_H, this, TQT_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h"); + CTRL + Key_H, this, TQ_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h"); actionEditHLayout->setToolTip(i18n("Lays out the selected widgets horizontally")); actionEditHLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out Horizontally")); actionEditHLayout->setEnabled(false); actionEditVLayout = new TDEAction(i18n("Lay Out Vertically"), createIconSet("editvlayout.xpm"), - CTRL + Key_L, this, TQT_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v"); + CTRL + Key_L, this, TQ_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v"); actionEditVLayout->setToolTip(i18n("Lays out the selected widgets vertically")); actionEditVLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out Vertically")); actionEditVLayout->setEnabled(false); actionEditGridLayout = new TDEAction(i18n("Lay Out in a Grid"), createIconSet("editgrid.xpm"), - CTRL + Key_G, this, TQT_SLOT(editLayoutGrid()), actionCollection(), "edit_layout_grid"); + CTRL + Key_G, this, TQ_SLOT(editLayoutGrid()), actionCollection(), "edit_layout_grid"); actionEditGridLayout->setToolTip(i18n("Lays out the selected widgets in a grid")); actionEditGridLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out in a Grid")); actionEditGridLayout->setEnabled(false); actionEditSplitHorizontal = new TDEAction(i18n("Lay Out Horizontally in Splitter"), createIconSet("editvlayoutsplit.xpm"), - TDEShortcut::null(), this, TQT_SLOT(editLayoutHorizontalSplit()), actionCollection(), + TDEShortcut::null(), this, TQ_SLOT(editLayoutHorizontalSplit()), actionCollection(), "edit_split_h"); actionEditSplitHorizontal->setToolTip(i18n("Lays out the selected widgets horizontally in a splitter")); actionEditSplitHorizontal->setWhatsThis(whatsThisFrom("Layout|Lay Out Horizontally in Splitter")); actionEditSplitHorizontal->setEnabled(false); actionEditSplitVertical = new TDEAction(i18n("Lay Out Vertically in Splitter"), createIconSet("edithlayoutsplit.xpm"), - TDEShortcut::null(), this, TQT_SLOT(editLayoutVerticalSplit()), actionCollection(), + TDEShortcut::null(), this, TQ_SLOT(editLayoutVerticalSplit()), actionCollection(), "edit_split_v"); actionEditSplitVertical->setToolTip(i18n("Lays out the selected widgets vertically in a splitter")); actionEditSplitVertical->setWhatsThis(whatsThisFrom("Layout|Lay Out Vertically (in Splitter)")); actionEditSplitVertical->setEnabled(false); actionEditBreakLayout = new TDEAction(i18n("Break Layout"), createIconSet("editbreaklayout.xpm"), - CTRL + Key_B, this, TQT_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout"); + CTRL + Key_B, this, TQ_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout"); actionEditBreakLayout->setToolTip(i18n("Breaks the selected layout")); actionEditBreakLayout->setWhatsThis(whatsThisFrom("Layout|Break Layout")); int id = WidgetDatabase::idFromClassName("Spacer"); - TDEToggleAction *a = new TDEToggleAction(i18n("Spacer"), createIconSet("spacer.xpm"), TDEShortcut::null(), this, TQT_SLOT(toolSelected()), + TDEToggleAction *a = new TDEToggleAction(i18n("Spacer"), createIconSet("spacer.xpm"), TDEShortcut::null(), this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(id).latin1()); a->setExclusiveGroup("tool"); a->setText(i18n("Add ") + WidgetDatabase::className(id)); @@ -280,21 +280,21 @@ void MainWindow::setupLayoutActions() void MainWindow::setupToolActions() { actionPointerTool = new TDEToggleAction(i18n("Pointer"), "arrow", Key_F2, - this, TQT_SLOT(toolSelected()), actionCollection(), + this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(POINTER_TOOL).latin1()); actionPointerTool->setToolTip(i18n("Selects the pointer tool")); actionPointerTool->setWhatsThis(whatsThisFrom("Tools|Pointer")); actionPointerTool->setExclusiveGroup("tool"); actionConnectTool = new TDEToggleAction(i18n("Connect Signal/Slots"), createIconSet("connecttool.xpm"), - Key_F3, this, TQT_SLOT(toolSelected()), actionCollection(), + Key_F3, this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(CONNECT_TOOL).latin1()); actionConnectTool->setToolTip(i18n("Selects the connection tool")); actionConnectTool->setWhatsThis(whatsThisFrom("Tools|Connect Signals and Slots")); actionConnectTool->setExclusiveGroup("tool"); actionOrderTool = new TDEToggleAction(i18n("Tab Order"), createIconSet("ordertool.xpm"), - Key_F4, this, TQT_SLOT(toolSelected()), actionCollection(), + Key_F4, this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(ORDER_TOOL).latin1()); actionOrderTool->setToolTip(i18n("Selects the tab order tool")); actionOrderTool->setWhatsThis(whatsThisFrom("Tools|Tab Order")); @@ -344,7 +344,7 @@ void MainWindow::setupToolActions() if (WidgetDatabase::group(i) != grp) continue; // only widgets, i.e. not forms and temp stuff TDEToggleAction *a = new TDEToggleAction(WidgetDatabase::className(i), TDEShortcut::null(), - this, TQT_SLOT(toolSelected()), actionCollection(), TQString::number(i).latin1()); + this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(i).latin1()); a->setExclusiveGroup("tool"); TQString atext = WidgetDatabase::className(i); if (atext[0] == 'Q') @@ -390,7 +390,7 @@ void MainWindow::setupToolActions() continue; TQString name = fi->baseName(); name = name.replace("_", " "); - editMenu->insertItem(name, this, TQT_SLOT(editExternalTool(int)), 0, m_editorTools.count()); + editMenu->insertItem(name, this, TQ_SLOT(editExternalTool(int)), 0, m_editorTools.count()); m_editorTools.append(fi->filePath()); } } @@ -410,54 +410,54 @@ void MainWindow::setupFileActions() fileMenu = new TQPopupMenu(this, "File"); menuBar()->insertItem(i18n("&File"), fileMenu); - TDEAction *a = KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + TDEAction *a = KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); a->setToolTip(i18n("Creates a new dialog")); a->setWhatsThis(whatsThisFrom("File|New")); a->plug(fileTb); a->plug(fileMenu); - a = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + a = KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); a->setToolTip(i18n("Opens an existing dialog")); a->setWhatsThis(whatsThisFrom("File|Open")); a->plug(fileTb); a->plug(fileMenu); - actionRecent = KStdAction::openRecent(this, TQT_SLOT(fileOpenRecent(const KURL&)), actionCollection()); + actionRecent = KStdAction::openRecent(this, TQ_SLOT(fileOpenRecent(const KURL&)), actionCollection()); actionRecent->setToolTip(i18n("Opens recently open file")); actionRecent->plug(fileMenu); fileMenu->insertSeparator(); - a = KStdAction::close(this, TQT_SLOT(fileClose()), actionCollection()); + a = KStdAction::close(this, TQ_SLOT(fileClose()), actionCollection()); a->setToolTip(i18n("Closes the current dialog")); a->setWhatsThis(whatsThisFrom("File|Close")); - connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileMenu); fileMenu->insertSeparator(); - a = KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); + a = KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); a->setToolTip(i18n("Saves the current dialog")); a->setWhatsThis(whatsThisFrom("File|Save")); - connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileTb); a->plug(fileMenu); - a = KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); + a = KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); a->setToolTip(i18n("Saves the current dialog with a new filename")); a->setWhatsThis(whatsThisFrom("File|Save As")); - connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileMenu); - a = new TDEAction(i18n("Save All"), "save_all", TDEShortcut::null(), this, TQT_SLOT(fileSaveAll()), + a = new TDEAction(i18n("Save All"), "save_all", TDEShortcut::null(), this, TQ_SLOT(fileSaveAll()), actionCollection(), "file_close_all"); a->setToolTip(i18n("Saves all open dialogs")); a->setWhatsThis(whatsThisFrom("File|Save All")); - connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileMenu); fileMenu->insertSeparator(); - a = KStdAction::quit(kapp, TQT_SLOT(closeAllWindows()), actionCollection()); + a = KStdAction::quit(kapp, TQ_SLOT(closeAllWindows()), actionCollection()); a->setToolTip(i18n("Quits the application and prompts to save any changed dialogs")); a->setWhatsThis(whatsThisFrom("File|Exit")); a->plug(fileMenu); @@ -470,10 +470,10 @@ void MainWindow::setupRunActions() menuBar()->insertItem(i18n("&Run"), menu); TDEAction* a = new TDEAction(i18n("Run Dialog"), "system-run", CTRL + Key_R, - this, TQT_SLOT(runForm()), actionCollection(), "run"); + this, TQ_SLOT(runForm()), actionCollection(), "run"); a->setToolTip(i18n("Executes dialog")); a->setWhatsThis(whatsThisFrom("Run|Run dialog")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileTb); a->plug(menu); } @@ -485,39 +485,39 @@ void MainWindow::setupWindowActions() { windowActionsSetup = true; - TDEAction* actionWindowTile = new TDEAction(i18n("Tile"), TDEShortcut::null(), qworkspace, TQT_SLOT(tile()), + TDEAction* actionWindowTile = new TDEAction(i18n("Tile"), TDEShortcut::null(), qworkspace, TQ_SLOT(tile()), actionCollection(), "window_tile"); actionWindowTile->setToolTip(i18n("Tiles the windows so that they are all visible")); actionWindowTile->setWhatsThis(whatsThisFrom("Window|Tile")); - TDEAction* actionWindowCascade = new TDEAction(i18n("Cascade"), TDEShortcut::null(), qworkspace, TQT_SLOT(cascade()), + TDEAction* actionWindowCascade = new TDEAction(i18n("Cascade"), TDEShortcut::null(), qworkspace, TQ_SLOT(cascade()), actionCollection(), "window_cascade"); actionWindowCascade->setToolTip(i18n("Cascades the windows so that all their title bars are visible")); actionWindowCascade->setWhatsThis(whatsThisFrom("Window|Cascade")); - TDEAction* actionWindowClose = new TDEAction(i18n("Cascade"), TDEShortcut::null(), qworkspace, TQT_SLOT(closeActiveWindow()), + TDEAction* actionWindowClose = new TDEAction(i18n("Cascade"), TDEShortcut::null(), qworkspace, TQ_SLOT(closeActiveWindow()), actionCollection(), "window_close"); actionWindowClose->setToolTip(i18n("Closes the active window")); actionWindowClose->setWhatsThis(whatsThisFrom("Window|Close")); TDEAction* actionWindowCloseAll = new TDEAction(i18n("Close All"), TDEShortcut::null(), qworkspace, - TQT_SLOT(closeAllWindows()), actionCollection(), "window_close_all"); + TQ_SLOT(closeAllWindows()), actionCollection(), "window_close_all"); actionWindowCloseAll->setToolTip(i18n("Closes all form windows")); actionWindowCloseAll->setWhatsThis(whatsThisFrom("Window|Close All")); TDEAction* actionWindowNext = new TDEAction(i18n("Next"), Key_F6, qworkspace, - TQT_SLOT(activateNextWindow()), actionCollection(), "window_next"); + TQ_SLOT(activateNextWindow()), actionCollection(), "window_next"); actionWindowNext->setToolTip(i18n("Activates the next window")); actionWindowNext->setWhatsThis(whatsThisFrom("Window|Next")); TDEAction* actionWindowPrevious = new TDEAction(i18n("Previous"), CTRL + SHIFT + Key_F6, qworkspace, - TQT_SLOT(activatePreviousWindow()), actionCollection(), "window_prev"); + TQ_SLOT(activatePreviousWindow()), actionCollection(), "window_prev"); actionWindowPrevious->setToolTip(i18n("Activates the previous window")); actionWindowPrevious->setWhatsThis(whatsThisFrom("Window|Previous")); windowMenu = new TDEPopupMenu(this, "Window"); menuBar()->insertItem(i18n("&Window"), windowMenu); - connect(windowMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(setupWindowActions())); + connect(windowMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(setupWindowActions())); actionWindowClose->plug(windowMenu); actionWindowCloseAll->plug(windowMenu); @@ -554,7 +554,7 @@ void MainWindow::setupWindowActions() else itemText += w->caption(); - int id = windowMenu->insertItem(itemText, this, TQT_SLOT(windowsMenuActivated(int))); + int id = windowMenu->insertItem(itemText, this, TQ_SLOT(windowsMenuActivated(int))); windowMenu->setItemParameter(id, i); windowMenu->setItemChecked(id, qworkspace->activeWindow() == windows.at(i)); } @@ -564,21 +564,21 @@ void MainWindow::setupWindowActions() void MainWindow::setupSettingsActions() { TDEPopupMenu *settings = new TDEPopupMenu(this, "Settings"); - TDEAction* a = KStdAction::keyBindings(this, TQT_SLOT(editShortcuts()), actionCollection()); + TDEAction* a = KStdAction::keyBindings(this, TQ_SLOT(editShortcuts()), actionCollection()); a->setToolTip(i18n("Opens a dialog to change shortcuts")); a->plug(settings); - a = new TDEAction(i18n("Configure &Plugins..."), TDEShortcut::null(), this, TQT_SLOT(editPlugins()), + a = new TDEAction(i18n("Configure &Plugins..."), TDEShortcut::null(), this, TQ_SLOT(editPlugins()), actionCollection(), "configure_plugins"); a->setToolTip(i18n("Opens a dialog to configure plugins")); a->plug(settings); - a = new TDEAction(i18n("&Configure Editor..."), TDEShortcut::null(), this, TQT_SLOT(configureEditor()), + a = new TDEAction(i18n("&Configure Editor..."), TDEShortcut::null(), this, TQ_SLOT(configureEditor()), actionCollection(), "configure_editor"); a->setToolTip(i18n("Configure various aspects of this editor.")); a->plug(settings); - a = KStdAction::preferences(this, TQT_SLOT(editPreferences()), actionCollection()); + a = KStdAction::preferences(this, TQ_SLOT(editPreferences()), actionCollection()); a->setToolTip(i18n("Opens a dialog to change preferences")); a->setWhatsThis(whatsThisFrom("Edit|Preferences")); a->plug(settings); @@ -780,7 +780,7 @@ void MainWindow::fileCreateTemplate() } dia.editName->setText(i18n("NewTemplate")); - connect(dia.buttonCreate, TQT_SIGNAL(clicked()), this, TQT_SLOT(createNewTemplate())); + connect(dia.buttonCreate, TQ_SIGNAL(clicked()), this, TQ_SLOT(createNewTemplate())); dia.exec(); } @@ -1090,7 +1090,7 @@ void MainWindow::editPreferences() statusBar()->message(i18n("Edit preferences...")); Preferences *dia = new Preferences(this, 0, true); prefDia = dia; - connect(dia->helpButton, TQT_SIGNAL(clicked()), MainWindow::self, TQT_SLOT(showDialogHelp())); + connect(dia->helpButton, TQ_SIGNAL(clicked()), MainWindow::self, TQ_SLOT(showDialogHelp())); dia->buttonColor->setEditor(StyledButton::ColorEditor); dia->buttonPixmap->setEditor(StyledButton::PixmapEditor); dia->checkBoxShowGrid->setChecked(sGrid); @@ -1111,7 +1111,7 @@ void MainWindow::editPreferences() dia->checkBoxSplash->setChecked(splashScreen); dia->editDocPath->setText(docPath); dia->checkAutoEdit->setChecked(!databaseAutoEdit); - connect(dia->buttonDocPath, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseDocPath())); + connect(dia->buttonDocPath, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseDocPath())); if (dia->exec() == TQDialog::Accepted) { @@ -1165,8 +1165,8 @@ void MainWindow::editExternalTool(int id) { TDEProcess* process = new TDEProcess; (*process) << "kmdr-executor" << m_editorTools[id]; - connect(process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(editToolExited(TDEProcess*))); - connect(process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQT_SLOT(editToolOutput(TDEProcess*, char*, int))); + connect(process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(editToolExited(TDEProcess*))); + connect(process, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQ_SLOT(editToolOutput(TDEProcess*, char*, int))); m_toolOutput = '\0'; process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp index e6d13a21..cf8bdd25 100644 --- a/kommander/editor/messagelog.cpp +++ b/kommander/editor/messagelog.cpp @@ -31,19 +31,19 @@ MessageLog::MessageLog(TQWidget* parent, const char* name) : TQTabWidget(parent, name) { m_popupMenu = new TDEPopupMenu(this); - m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("Copy Current &Line"), this, TQT_SLOT(copyLine())); - m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("&Copy Content"), this, TQT_SLOT(copyContent())); - m_popupMenu->insertItem(SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQT_SLOT(saveToFile())); + m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("Copy Current &Line"), this, TQ_SLOT(copyLine())); + m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("&Copy Content"), this, TQ_SLOT(copyContent())); + m_popupMenu->insertItem(SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQ_SLOT(saveToFile())); m_popupMenu->insertSeparator(); - m_popupMenu->insertItem(SmallIconSet("edit-clear"), i18n("Clear"), this, TQT_SLOT(clearContent())); + m_popupMenu->insertItem(SmallIconSet("edit-clear"), i18n("Clear"), this, TQ_SLOT(clearContent())); for (int i = 0; i < m_listCount; i++) { m_lists[i] = new TDEListBox(this); addTab(m_lists[i], m_listNames[i]); m_seenEOL[i] = false; - connect(m_lists[i], TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), - this, TQT_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); + connect(m_lists[i], TQ_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), + this, TQ_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); } } diff --git a/kommander/editor/multilineeditorimpl.cpp b/kommander/editor/multilineeditorimpl.cpp index 2dab19a1..158f5d9e 100644 --- a/kommander/editor/multilineeditorimpl.cpp +++ b/kommander/editor/multilineeditorimpl.cpp @@ -31,7 +31,7 @@ MultiLineEditor::MultiLineEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : MultiLineEditorBase( parent, 0, true ), formwindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); mlined = (TQMultiLineEdit*)editWidget; // #### complete list of properties here preview->setAlignment( mlined->alignment() ); diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp index 51d80432..17e37001 100644 --- a/kommander/editor/newformimpl.cpp +++ b/kommander/editor/newformimpl.cpp @@ -138,7 +138,7 @@ void CustomFormItem::insert() NewForm::NewForm(TQWidget *parent, const TQString &templatePath) : NewFormBase(parent, 0, true) { - connect(helpButton, TQT_SIGNAL(clicked()), MainWindow::self, TQT_SLOT(showDialogHelp())); + connect(helpButton, TQ_SIGNAL(clicked()), MainWindow::self, TQ_SLOT(showDialogHelp())); TQIconViewItem *cur = 0; FormItem *fi = new FormItem(templateView, i18n("Dialog")); diff --git a/kommander/editor/paletteeditoradvancedimpl.cpp b/kommander/editor/paletteeditoradvancedimpl.cpp index e7880b19..eb93c28d 100644 --- a/kommander/editor/paletteeditoradvancedimpl.cpp +++ b/kommander/editor/paletteeditoradvancedimpl.cpp @@ -63,7 +63,7 @@ PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorAdvancedBase( parent, name, modal, f ), formWindow( fw ), selectedPalette(0) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); buttonPixmap->setEditor( StyledButton::PixmapEditor ); diff --git a/kommander/editor/paletteeditorimpl.cpp b/kommander/editor/paletteeditorimpl.cpp index bf68fe16..dd12de19 100644 --- a/kommander/editor/paletteeditorimpl.cpp +++ b/kommander/editor/paletteeditorimpl.cpp @@ -33,7 +33,7 @@ PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorBase( parent, name, modal, f ), formWindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); editPalette = TQApplication::palette(); setPreviewPalette( editPalette ); diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp index c3440c3f..71fe357c 100644 --- a/kommander/editor/pixmapchooser.cpp +++ b/kommander/editor/pixmapchooser.cpp @@ -985,7 +985,7 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T #endif else { PixmapFunction dia( parent, 0, true ); - TQObject::connect( dia.helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + TQObject::connect( dia.helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" ); dia.editArguments->setText( MetaDataBase::pixmapArgument( fw, old.serialNumber() ) ); dia.editArguments->setFocus(); diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp index 7f7d30d6..4b0c58e4 100644 --- a/kommander/editor/propertyeditor.cpp +++ b/kommander/editor/propertyeditor.cpp @@ -401,8 +401,8 @@ void PropertyItem::createResetButton() hbox->layout()->setAlignment( TQt::AlignRight ); listview->addChild( hbox ); hbox->hide(); - TQObject::connect( resetButton, TQT_SIGNAL( clicked() ), - listview, TQT_SLOT( resetProperty() ) ); + TQObject::connect( resetButton, TQ_SIGNAL( clicked() ), + listview, TQ_SLOT( resetProperty() ) ); TQToolTip::add( resetButton, i18n("Reset the property to its default value" ) ); TQWhatsThis::add( resetButton, i18n("Click this button to reset the property to its default value" ) ); updateResetButtonState(); @@ -594,18 +594,18 @@ TQLineEdit *PropertyTextItem::lined() } else { button = new TQPushButton( i18n("..."), box ); button->setFixedWidth( 20 ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getText() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getText() ) ); lin->setFrame( false ); } - connect( lin, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( setValue() ) ); - connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); if ( PropertyItem::name() == "name" || PropertyItem::name() == "itemName" ) - connect( lin, TQT_SIGNAL( returnPressed() ), + connect( lin, TQ_SIGNAL( returnPressed() ), listview->propertyEditor()->formWindow()->commandHistory(), - TQT_SLOT( checkCompressedCommand() ) ); + TQ_SLOT( checkCompressedCommand() ) ); lin->installEventFilter( listview ); return lin; } @@ -764,10 +764,10 @@ TQLineEdit *PropertyDoubleItem::lined() lin = new TQLineEdit( listview->viewport() ); lin->setValidator( new TQDoubleValidator( lin, "double_validator" ) ); - connect( lin, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( setValue() ) ); - connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); lin->installEventFilter( listview ); return lin; } @@ -846,8 +846,8 @@ TQDateEdit *PropertyDateItem::lined() for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; - connect( lin, TQT_SIGNAL( valueChanged( const TQDate & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDate & ) ), + this, TQ_SLOT( setValue() ) ); return lin; } @@ -917,8 +917,8 @@ TQTimeEdit *PropertyTimeItem::lined() if ( lin ) return lin; lin = new TQTimeEdit( listview->viewport() ); - connect( lin, TQT_SIGNAL( valueChanged( const TQTime & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQTime & ) ), + this, TQ_SLOT( setValue() ) ); TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); @@ -992,8 +992,8 @@ TQDateTimeEdit *PropertyDateTimeItem::lined() if ( lin ) return lin; lin = new TQDateTimeEdit( listview->viewport() ); - connect( lin, TQT_SIGNAL( valueChanged( const TQDateTime & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDateTime & ) ), + this, TQ_SLOT( setValue() ) ); TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); @@ -1070,8 +1070,8 @@ TQComboBox *PropertyBoolItem::combo() comb->hide(); comb->insertItem( i18n("False" ) ); comb->insertItem( i18n("True" ) ); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -1167,8 +1167,8 @@ TQSpinBox *PropertyIntItem::spinBox() if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; - connect( spinBx, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( spinBx, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( setValue() ) ); return spinBx; } @@ -1252,8 +1252,8 @@ TQComboBox *PropertyListItem::combo() return comb; comb = new TQComboBox( editable, listview->viewport() ); comb->hide(); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); if ( editable ) { TQObjectList *ol = comb->queryList( "TQLineEdit" ); @@ -1548,8 +1548,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr box->setLineWidth( 2 ); pixPrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getPixmap() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPixmap() ) ); } PropertyPixmapItem::~PropertyPixmapItem() { @@ -1637,8 +1637,8 @@ PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, Prop pal.setDisabled( cg ); colorPrev->setPalette( pal ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getColor() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getColor() ) ); } void PropertyColorItem::createChildren() @@ -1758,8 +1758,8 @@ PropertyFontItem::PropertyFontItem( PropertyList *l, PropertyItem *after, Proper box->installEventFilter( listview ); lined->installEventFilter( listview ); button->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getFont() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getFont() ) ); } void PropertyFontItem::createChildren() @@ -2156,8 +2156,8 @@ PropertyPaletteItem::PropertyPaletteItem( PropertyList *l, PropertyItem *after, box->setLineWidth( 2 ); palettePrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getPalette() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPalette() ) ); } PropertyPaletteItem::~PropertyPaletteItem() { @@ -2305,8 +2305,8 @@ TQComboBox *PropertyCursorItem::combo() cur.setMask( cur ); comb->insertItem( cur, i18n("Forbidden"), TQObject::ForbiddenCursor ); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -2397,16 +2397,16 @@ PropertyList::PropertyList( PropertyEditor *e ) viewport()->installEventFilter( this ); addColumn( i18n("Property" ) ); addColumn( i18n("Value" ) ); - connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), - this, TQT_SLOT( updateEditorSize() ) ); - disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( changeSortColumn( int ) ) ); - connect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( toggleSort() ) ); - connect( this, TQT_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( toggleOpen( TQListViewItem * ) ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + this, TQ_SLOT( updateEditorSize() ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); + connect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( toggleSort() ) ); + connect( this, TQ_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( toggleOpen( TQListViewItem * ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); @@ -2941,7 +2941,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) return true; } } else if ( e->type() == TQEvent::FocusOut && o->inherits( "TQLineEdit" ) && editor->formWindow() ) { - TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQT_SLOT( checkCompressedCommand() ) ); + TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQ_SLOT( checkCompressedCommand() ) ); } else if ( o == viewport() ) { TQMouseEvent *me; PropertyListItem* i; @@ -3280,8 +3280,8 @@ EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ) header()->hide(); removeColumn( 1 ); setRootIsDecorated( true ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), - this, TQT_SLOT( renamed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), + this, TQ_SLOT( renamed( TQListViewItem * ) ) ); } void EventList::setup() diff --git a/kommander/editor/qcompletionedit.cpp b/kommander/editor/qcompletionedit.cpp index 66c9663f..76c3e00a 100644 --- a/kommander/editor/qcompletionedit.cpp +++ b/kommander/editor/qcompletionedit.cpp @@ -19,8 +19,8 @@ QCompletionEdit::QCompletionEdit( TQWidget *parent, const char *name ) listbox->setHScrollBarMode( TQScrollView::AlwaysOn ); listbox->setVScrollBarMode( TQScrollView::AlwaysOn ); listbox->setCornerWidget( new TQSizeGrip( listbox, "completion sizegrip" ) ); - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( textDidChange( const TQString & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( textDidChange( const TQString & ) ) ); popup->setFocusProxy( listbox ); installEventFilter( this ); } diff --git a/kommander/editor/styledbutton.cpp b/kommander/editor/styledbutton.cpp index 4b96ee49..c35ce642 100644 --- a/kommander/editor/styledbutton.cpp +++ b/kommander/editor/styledbutton.cpp @@ -38,7 +38,7 @@ StyledButton::StyledButton(TQWidget* parent, const char* name) setMinimumSize( minimumSizeHint() ); setAcceptDrops( true ); - connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(onEditor())); + connect( this, TQ_SIGNAL(clicked()), TQ_SLOT(onEditor())); setEditor( ColorEditor ); } diff --git a/kommander/editor/tableeditorimpl.cpp b/kommander/editor/tableeditorimpl.cpp index 282fd49e..137934d9 100644 --- a/kommander/editor/tableeditorimpl.cpp +++ b/kommander/editor/tableeditorimpl.cpp @@ -28,7 +28,7 @@ TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *f #endif formWindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); #ifndef TQT_NO_TABLE labelColumnPixmap->setText( "" ); labelRowPixmap->setText( "" ); diff --git a/kommander/editor/timestamp.cpp b/kommander/editor/timestamp.cpp index 850e7eb2..7782fff3 100644 --- a/kommander/editor/timestamp.cpp +++ b/kommander/editor/timestamp.cpp @@ -28,7 +28,7 @@ TimeStamp::TimeStamp( TQObject *parent, const TQString &f ) : TQObject( parent ), filename( f ), autoCheck( false ) { timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoCheckTimeStamp() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoCheckTimeStamp() ) ); update(); } diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp index 4b07bb37..f4b7eaac 100644 --- a/kommander/editor/widgetfactory.cpp +++ b/kommander/editor/widgetfactory.cpp @@ -1016,7 +1016,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare QDesignerWidget *dw = new QDesignerWidget((FormWindow *) parent, wiz, "page"); MetaDataBase::addEntry(dw); wiz->addPage(dw, i18n("Page")); - TQTimer::singleShot(0, wiz, TQT_SLOT(next())); + TQTimer::singleShot(0, wiz, TQ_SLOT(next())); } return wiz; } else if (className == "Spacer") @@ -1159,7 +1159,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare MetaDataBase::addEntry(dw); wiz->addPage(dw, i18n("Page 1")); wiz->addPage(dw, i18n("Page 2")); - TQTimer::singleShot(0, wiz, TQT_SLOT(next())); + TQTimer::singleShot(0, wiz, TQ_SLOT(next())); } return wiz; } diff --git a/kommander/editor/wizardeditorimpl.cpp b/kommander/editor/wizardeditorimpl.cpp index 3dbdec9b..f362a360 100644 --- a/kommander/editor/wizardeditorimpl.cpp +++ b/kommander/editor/wizardeditorimpl.cpp @@ -34,7 +34,7 @@ WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw ) : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); fillListBox(); } diff --git a/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp index 5ca2da26..59ed882c 100644 --- a/kommander/editor/workspace.cpp +++ b/kommander/editor/workspace.cpp @@ -136,7 +136,7 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) t = type; if ( type == FormFileType ) { setPixmap( 0, *formPixmap ); - TQObject::connect( ff, TQT_SIGNAL( somethingChanged(FormFile*) ), listView(), TQT_SLOT( update(FormFile*) ) ); + TQObject::connect( ff, TQ_SIGNAL( somethingChanged(FormFile*) ), listView(), TQ_SLOT( update(FormFile*) ) ); #ifndef KOMMANDER if ( formFile->supportsCodeFile() ) (void) new WorkspaceItem( this, formFile, FormSourceType ); @@ -154,7 +154,7 @@ WorkspaceItem::WorkspaceItem( TQListView *parent, FormFile* ff, Type type ) t = type; if ( type == FormFileType ) { setPixmap( 0, *formPixmap ); - TQObject::connect( ff, TQT_SIGNAL( somethingChanged(FormFile*) ), listView(), TQT_SLOT( update(FormFile*) ) ); + TQObject::connect( ff, TQ_SIGNAL( somethingChanged(FormFile*) ), listView(), TQ_SLOT( update(FormFile*) ) ); #ifndef KOMMANDER if ( formFile->supportsCodeFile() ) (void) new WorkspaceItem( this, formFile, FormSourceType ); @@ -355,12 +355,12 @@ Workspace::Workspace( TQWidget *parent, MainWindow *mw ) setPalette( p ); addColumn( i18n("Files" ) ); setAllColumnsShowFocus( true ); - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( itemDoubleClicked( TQListViewItem * ) ) ), - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( itemDoubleClicked( TQListViewItem * ) ) ), + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); viewport()->setAcceptDrops( true ); @@ -395,19 +395,19 @@ void Workspace::setCurrentProject( Project *pro ) if ( project == pro ) return; if ( project ) { - disconnect( project, TQT_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQT_SLOT( sourceFileAdded(SourceFile*) ) ); - disconnect( project, TQT_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQT_SLOT( sourceFileRemoved(SourceFile*) ) ); - disconnect( project, TQT_SIGNAL( formFileAdded(FormFile*) ), this, TQT_SLOT( formFileAdded(FormFile*) ) ); - disconnect( project, TQT_SIGNAL( formFileRemoved(FormFile*) ), this, TQT_SLOT( formFileRemoved(FormFile*) ) ); - disconnect( project, TQT_SIGNAL( projectModified() ), this, TQT_SLOT( update() ) ); + disconnect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); } project = pro; - connect( project, TQT_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQT_SLOT( sourceFileAdded(SourceFile*) ) ); - connect( project, TQT_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQT_SLOT( sourceFileRemoved(SourceFile*) ) ); - connect( project, TQT_SIGNAL( formFileAdded(FormFile*) ), this, TQT_SLOT( formFileAdded(FormFile*) ) ); - connect( project, TQT_SIGNAL( formFileRemoved(FormFile*) ), this, TQT_SLOT( formFileRemoved(FormFile*) ) ); - connect( project, TQT_SIGNAL( destroyed(TQObject*) ), this, TQT_SLOT( projectDestroyed(TQObject*) ) ); - connect( project, TQT_SIGNAL( projectModified() ), this, TQT_SLOT( update() ) ); + connect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + connect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + connect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + connect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + connect( project, TQ_SIGNAL( destroyed(TQObject*) ), this, TQ_SLOT( projectDestroyed(TQObject*) ) ); + connect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); clear(); if ( bufferEdit ) @@ -728,8 +728,8 @@ bool Workspace::eventFilter( TQObject *o, TQEvent * e ) void Workspace::setBufferEdit( QCompletionEdit *edit ) { bufferEdit = edit; - connect( bufferEdit, TQT_SIGNAL( chosen( const TQString & ) ), - this, TQT_SLOT( bufferChosen( const TQString & ) ) ); + connect( bufferEdit, TQ_SIGNAL( chosen( const TQString & ) ), + this, TQ_SLOT( bufferChosen( const TQString & ) ) ); bufferEdit->installEventFilter( this ); } diff --git a/kommander/executor/main.cpp b/kommander/executor/main.cpp index ecd9bfac..f27ab90f 100644 --- a/kommander/executor/main.cpp +++ b/kommander/executor/main.cpp @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) TDELocale::setMainCatalogue("kommander"); TDEApplication app; - TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit())); + TQObject::connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit())); if (!args->count()) { KMessageBox::sorry(0, i18n("Error: no dialog given. Use --stdin option to read dialog from standard input.\n")); diff --git a/kommander/part/kommander_part.cpp b/kommander/part/kommander_part.cpp index 1d4fb709..66649ab3 100644 --- a/kommander/part/kommander_part.cpp +++ b/kommander/part/kommander_part.cpp @@ -66,7 +66,7 @@ bool KommanderPart::openFile() delete m_instance; m_instance = new Instance(0L); m_instance->build(m_url); - TQTimer::singleShot(0, this, TQT_SLOT(slotRun())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRun())); emit setStatusBarText( m_url.prettyURL() ); return true; diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp index dd196043..2f34f712 100644 --- a/kommander/pluginmanager/mainwindow.cpp +++ b/kommander/pluginmanager/mainwindow.cpp @@ -35,7 +35,7 @@ MainWindow::MainWindow( TQWidget* parent, const char *name, WFlags f ) toolBar->insertButton("document-open", Add, true, i18n("Add") ); toolBar->insertButton("no", Remove, true, i18n("Remove") ); toolBar->insertButton("reload", Refresh, true, i18n("Refresh") ); - connect( toolBar, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(toolButton(int)) ); + connect( toolBar, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(toolButton(int)) ); m_list = new TDEListBox( this ); setCentralWidget(m_list); diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp index bf08888a..47db3bd0 100644 --- a/kommander/widget/functionlib.cpp +++ b/kommander/widget/functionlib.cpp @@ -429,9 +429,9 @@ static ParseNode f_widgetExists(Parser* p, const ParameterList& params) static ParseNode f_connect(Parser* p, const ParameterList& params) { TQString sender = params[0].toString(); - TQString signal = TQString::number(TQSIGNAL_CODE) + params[1].toString(); + TQString signal = TQString::number(TQ_SIGNAL_CODE) + params[1].toString(); TQString receiver = params[2].toString(); - TQString slot = TQString::number(TQSLOT_CODE) + params[3].toString(); + TQString slot = TQString::number(TQ_SLOT_CODE) + params[3].toString(); KommanderWidget *senderW = p->currentWidget()->widgetByName(sender); if (!senderW) return ParseNode::error("unknown widget"); @@ -445,9 +445,9 @@ static ParseNode f_connect(Parser* p, const ParameterList& params) static ParseNode f_disconnect(Parser* p, const ParameterList& params) { TQString sender = params[0].toString(); - TQString signal = TQString::number(TQSIGNAL_CODE) + params[1].toString(); + TQString signal = TQString::number(TQ_SIGNAL_CODE) + params[1].toString(); TQString receiver = params[2].toString(); - TQString slot = TQString::number(TQSLOT_CODE) + params[3].toString(); + TQString slot = TQString::number(TQ_SLOT_CODE) + params[3].toString(); KommanderWidget *senderW = p->currentWidget()->widgetByName(sender); if (!senderW) return ParseNode::error("unknown widget"); diff --git a/kommander/widget/invokeclass.cpp b/kommander/widget/invokeclass.cpp index ec360d69..033ea770 100644 --- a/kommander/widget/invokeclass.cpp +++ b/kommander/widget/invokeclass.cpp @@ -24,8 +24,8 @@ void InvokeClass::invokeSlot(TQObject *object, const TQString& slot, TQStringLis { TQString invokeName = slot; invokeName = invokeName.mid(invokeName.find('(')); - invokeName.prepend(TQString::number(TQSIGNAL_CODE) + "invoke"); - TQString slotName = TQString::number(TQSLOT_CODE) + slot; + invokeName.prepend(TQString::number(TQ_SIGNAL_CODE) + "invoke"); + TQString slotName = TQString::number(TQ_SLOT_CODE) + slot; connect(this, invokeName.ascii(), object, slotName.ascii()); if (args.count() == 0) diff --git a/kommander/widget/kmdrmainwindow.cpp b/kommander/widget/kmdrmainwindow.cpp index 845cc905..c44ea4a6 100644 --- a/kommander/widget/kmdrmainwindow.cpp +++ b/kommander/widget/kmdrmainwindow.cpp @@ -21,7 +21,7 @@ KmdrMainWindow::KmdrMainWindow(TQWidget *parent, const char *name, WFlags f) : TDEMainWindow(parent, name, f) { - TQTimer::singleShot(10, this, TQT_SIGNAL(initialize())); + TQTimer::singleShot(10, this, TQ_SIGNAL(initialize())); } diff --git a/kommander/widget/myprocess.cpp b/kommander/widget/myprocess.cpp index 5b56ec8d..943589c7 100644 --- a/kommander/widget/myprocess.cpp +++ b/kommander/widget/myprocess.cpp @@ -85,9 +85,9 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell) mProcess = new TDEProcess; (*mProcess) << shellName.latin1(); - connect(mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(mProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(mProcess, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); if(!mProcess->start(TDEProcess::NotifyOnExit, TDEProcess::All)) { diff --git a/kommander/widgets/closebutton.cpp b/kommander/widgets/closebutton.cpp index 0b72f3dc..07fb7ed8 100644 --- a/kommander/widgets/closebutton.cpp +++ b/kommander/widgets/closebutton.cpp @@ -39,7 +39,7 @@ CloseButton::CloseButton(TQWidget* a_parent, const char* a_name) setDisplayStates(states); setWriteStdout(true); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(startProcess())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(startProcess())); TQObject *parent = this; while (parent->parent() != 0) @@ -48,7 +48,7 @@ CloseButton::CloseButton(TQWidget* a_parent, const char* a_name) if (parent->inherits("TQDialog")) break; } - connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(reject())); + connect(this, TQ_SIGNAL(clicked()), parent, TQ_SLOT(reject())); } CloseButton::~CloseButton() @@ -105,10 +105,10 @@ void CloseButton::startProcess() KShellProcess *process = new KShellProcess("/bin/sh"); *process << at; - connect(process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(endProcess(TDEProcess *))); - connect(process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(appendOutput(TDEProcess *, + connect(process, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(endProcess(TDEProcess *))); + connect(process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(appendOutput(TDEProcess *, char *, int))); - connect(process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(appendOutput(TDEProcess *, + connect(process, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(appendOutput(TDEProcess *, char *, int))); if (!process->start(TDEProcess::Block, TDEProcess::Stdout)) diff --git a/kommander/widgets/combobox.cpp b/kommander/widgets/combobox.cpp index e347cdbe..1bb99c2b 100644 --- a/kommander/widgets/combobox.cpp +++ b/kommander/widgets/combobox.cpp @@ -44,7 +44,7 @@ ComboBox::ComboBox(TQWidget *a_parent, const char *a_name) setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(emitWidgetTextChanged(int))); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(emitWidgetTextChanged(int))); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(popupList, "popupList(TQString widget)", i18n("Make the ComboBox expose it's list without mousing around."), 1); diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp index 15043c15..9ab99d1f 100644 --- a/kommander/widgets/execbutton.cpp +++ b/kommander/widgets/execbutton.cpp @@ -56,7 +56,7 @@ ExecButton::ExecButton(TQWidget* a_parent, const char* a_name) setDisplayStates(states); setWriteStdout(true); setBlockGUI(Button); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(startProcess())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(startProcess())); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(EB_isOn, "isOn(TQString widget)", i18n("For use only when button is togle type."), 1); @@ -120,7 +120,7 @@ void ExecButton::startProcess() TDEApplication::setOverrideCursor(TQCursor(TQt::WaitCursor)); MyProcess* process = new MyProcess(this); process->setBlocking(m_blockGUI == GUI); - connect(process, TQT_SIGNAL(processExited(MyProcess*)), TQT_SLOT(processExited(MyProcess*))); + connect(process, TQ_SIGNAL(processExited(MyProcess*)), TQ_SLOT(processExited(MyProcess*))); m_output = process->run(at); if (m_blockGUI == GUI) { diff --git a/kommander/widgets/fileselector.cpp b/kommander/widgets/fileselector.cpp index 9be2fd88..f562662c 100644 --- a/kommander/widgets/fileselector.cpp +++ b/kommander/widgets/fileselector.cpp @@ -54,7 +54,7 @@ FileSelector::FileSelector(TQWidget * a_parent, const char *a_name) m_lineEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); m_selectButton->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); - connect(m_selectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(makeSelection())); + connect(m_selectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(makeSelection())); setSelectionType(Open); setSelectionOpenMultiple(false); diff --git a/kommander/widgets/konsole.cpp b/kommander/widgets/konsole.cpp index 48c49f48..dd4a955d 100644 --- a/kommander/widgets/konsole.cpp +++ b/kommander/widgets/konsole.cpp @@ -87,8 +87,8 @@ void Konsole::execute() mSeenEOL = false; mProcess = new MyProcess(this); mProcess->setBlocking(false); - connect(mProcess, TQT_SIGNAL(processExited(MyProcess*)), TQT_SLOT(processExited(MyProcess*))); - connect(mProcess, TQT_SIGNAL(processReceivedStdout(MyProcess*, char*, int)), TQT_SLOT(processReceivedStdout(MyProcess*, char*, int))); + connect(mProcess, TQ_SIGNAL(processExited(MyProcess*)), TQ_SLOT(processExited(MyProcess*))); + connect(mProcess, TQ_SIGNAL(processReceivedStdout(MyProcess*, char*, int)), TQ_SLOT(processReceivedStdout(MyProcess*, char*, int))); setCursor(TQCursor(TQt::WaitCursor)); mProcess->run(at); } diff --git a/kommander/widgets/lineedit.cpp b/kommander/widgets/lineedit.cpp index 08c8b21f..f75526d9 100644 --- a/kommander/widgets/lineedit.cpp +++ b/kommander/widgets/lineedit.cpp @@ -38,8 +38,8 @@ LineEdit::LineEdit(TQWidget *a_parent, const char *a_name) setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(textChanged(const TQString &)), this, - TQT_SIGNAL(widgetTextChanged(const TQString &))); + connect(this, TQ_SIGNAL(textChanged(const TQString &)), this, + TQ_SIGNAL(widgetTextChanged(const TQString &))); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(LE_clearModified, "clearModified(TQString widget)", i18n("Clear widget modified status."), 1); diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp index e4d26ecd..b24e5956 100644 --- a/kommander/widgets/popupmenu.cpp +++ b/kommander/widgets/popupmenu.cpp @@ -55,7 +55,7 @@ PopupMenu::PopupMenu(TQWidget *parent, const char *name) setHidden(true); m_menu = new TDEPopupMenu(this); - connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuItemActivated(int))); + connect(m_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuItemActivated(int))); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(INSERTMENUITEM, "insertMenuItem(TQString widget, TQString text, TQString executeWidget, int index, TQString icon)", i18n("Insert an item into the popup menu. The executeWidget's execute method will be run when this item is selected. Returns the id of the inserted item. Use -1 for index to insert to the end. The icon is optional."), 4, 5); diff --git a/kommander/widgets/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp index 4c62b167..33127372 100644 --- a/kommander/widgets/richtexteditor.cpp +++ b/kommander/widgets/richtexteditor.cpp @@ -84,15 +84,15 @@ RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name) m_buttonTextBold = new TQToolButton(m_formatGroup, "textBold"); m_buttonTextBold->setPixmap(TQPixmap((const char **)bold_xpm)); m_buttonTextBold->setToggleButton(true); - connect(m_buttonTextBold, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textBold(bool))); + connect(m_buttonTextBold, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(textBold(bool))); m_buttonTextItalic = new TQToolButton(m_formatGroup, "textItalic"); m_buttonTextItalic->setPixmap(TQPixmap((const char **)italic_xpm)); m_buttonTextItalic->setToggleButton(true); - connect(m_buttonTextItalic, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textItalic(bool))); + connect(m_buttonTextItalic, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(textItalic(bool))); m_buttonTextUnder = new TQToolButton(m_formatGroup, "textUnder"); m_buttonTextUnder->setPixmap(TQPixmap((const char **)under_xpm)); m_buttonTextUnder->setToggleButton(true); - connect(m_buttonTextUnder, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textUnder(bool))); + connect(m_buttonTextUnder, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(textUnder(bool))); m_buttonTextLeft = new TQToolButton(m_alignGroup, "textLeft"); m_buttonTextLeft->setPixmap(TQPixmap((const char **)left_xpm)); @@ -104,11 +104,11 @@ RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name) m_buttonTextRight->setPixmap(TQPixmap((const char **)right_xpm)); m_buttonTextRight->setToggleButton(true); - connect(m_alignGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(textAlign(int))); - connect(m_textedit, TQT_SIGNAL(currentFontChanged(const TQFont &)), this, TQT_SLOT(fontChanged(const TQFont &))); - connect(m_textedit, TQT_SIGNAL(currentAlignmentChanged(int)), this, TQT_SLOT(alignmentChanged(int))); + connect(m_alignGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(textAlign(int))); + connect(m_textedit, TQ_SIGNAL(currentFontChanged(const TQFont &)), this, TQ_SLOT(fontChanged(const TQFont &))); + connect(m_textedit, TQ_SIGNAL(currentAlignmentChanged(int)), this, TQ_SLOT(alignmentChanged(int))); - connect(m_textedit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setTextChanged())); + connect(m_textedit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setTextChanged())); } diff --git a/kommander/widgets/subdialog.cpp b/kommander/widgets/subdialog.cpp index 292ac541..66c8770b 100644 --- a/kommander/widgets/subdialog.cpp +++ b/kommander/widgets/subdialog.cpp @@ -39,7 +39,7 @@ SubDialog::SubDialog(TQWidget *a_parent, const char *a_name) setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(showDialog())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(showDialog())); } @@ -103,7 +103,7 @@ void SubDialog::showDialog() if(!m_dialog) { kdWarning() << "Creation of sub dialog failed .." << endl; - connect(m_dialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFinished())); + connect(m_dialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotFinished())); m_dialog->exec(); } diff --git a/kommander/widgets/textedit.cpp b/kommander/widgets/textedit.cpp index be607aa4..ad5f06d9 100644 --- a/kommander/widgets/textedit.cpp +++ b/kommander/widgets/textedit.cpp @@ -50,7 +50,7 @@ KommanderWidget(this) setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setTextChanged())); + connect(this, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setTextChanged())); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(TE_setModified, "setModified(TQString widget, bool Modified)", i18n("Set widget modified status."), 1); diff --git a/kommander/widgets/timer.cpp b/kommander/widgets/timer.cpp index c5f1f6ce..ea39706c 100644 --- a/kommander/widgets/timer.cpp +++ b/kommander/widgets/timer.cpp @@ -57,7 +57,7 @@ Timer::Timer(TQWidget *a_parent, const char *a_name) mTimer = new TQTimer(this); setInterval(5000); setSingleShot(false); - connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(SetInterval, "setInterval(TQString widget, int interval)", i18n("Set the timer timeout interval in ms."), 2); @@ -148,7 +148,7 @@ void Timer::timeout() void Timer::execute() { if (mSingleShot) - TQTimer::singleShot(mInterval, this, TQT_SLOT(timeout())); + TQTimer::singleShot(mInterval, this, TQ_SLOT(timeout())); else mTimer->start(mInterval); } diff --git a/kommander/widgets/wizard.cpp b/kommander/widgets/wizard.cpp index fd2c0703..0ae537de 100644 --- a/kommander/widgets/wizard.cpp +++ b/kommander/widgets/wizard.cpp @@ -41,7 +41,7 @@ Wizard::Wizard(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(helpClicked()), TQT_SLOT(runHelp())); + connect(this, TQ_SIGNAL(helpClicked()), TQ_SLOT(runHelp())); } Wizard::~Wizard() -- cgit v1.2.1