" "Each second match will be colored in red and each other match will be colored blue, simply so you " "can distinguish them from each other.
" @@ -98,54 +98,54 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name) rows->addWidget( verArea2 ); // Connect the buttons - connect( _regExpButtons, TQT_SIGNAL( clicked( int ) ), _scrolledEditorWindow, TQT_SLOT( slotInsertRegExp( int ) ) ); - connect( _regExpButtons, TQT_SIGNAL( doSelect() ), _scrolledEditorWindow, TQT_SLOT( slotDoSelect() ) ); - connect( _userRegExps, TQT_SIGNAL( load( RegExp* ) ), _scrolledEditorWindow, TQT_SLOT( slotInsertRegExp( RegExp* ) ) ); + connect( _regExpButtons, TQ_SIGNAL( clicked( int ) ), _scrolledEditorWindow, TQ_SLOT( slotInsertRegExp( int ) ) ); + connect( _regExpButtons, TQ_SIGNAL( doSelect() ), _scrolledEditorWindow, TQ_SLOT( slotDoSelect() ) ); + connect( _userRegExps, TQ_SIGNAL( load( RegExp* ) ), _scrolledEditorWindow, TQ_SLOT( slotInsertRegExp( RegExp* ) ) ); - connect( _regExpButtons, TQT_SIGNAL( clicked( int ) ), _userRegExps, TQT_SLOT( slotUnSelect() ) ); - connect( _regExpButtons, TQT_SIGNAL( doSelect() ), _userRegExps, TQT_SLOT( slotUnSelect() ) ); - connect( _userRegExps, TQT_SIGNAL( load( RegExp* ) ), _regExpButtons, TQT_SLOT( slotUnSelect() ) ); + connect( _regExpButtons, TQ_SIGNAL( clicked( int ) ), _userRegExps, TQ_SLOT( slotUnSelect() ) ); + connect( _regExpButtons, TQ_SIGNAL( doSelect() ), _userRegExps, TQ_SLOT( slotUnSelect() ) ); + connect( _userRegExps, TQ_SIGNAL( load( RegExp* ) ), _regExpButtons, TQ_SLOT( slotUnSelect() ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( doneEditing() ), _regExpButtons, TQT_SLOT( slotSelectNewAction() ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( doneEditing() ), _userRegExps, TQT_SLOT( slotSelectNewAction() ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( doneEditing() ), _regExpButtons, TQ_SLOT( slotSelectNewAction() ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( doneEditing() ), _userRegExps, TQ_SLOT( slotSelectNewAction() ) ); - connect( _regExpButtons, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotShowEditor() ) ); - connect( _userRegExps, TQT_SIGNAL( load( RegExp* ) ), this, TQT_SLOT( slotShowEditor() ) ); - connect( _regExpButtons, TQT_SIGNAL( doSelect() ), this, TQT_SLOT( slotShowEditor() ) ); + connect( _regExpButtons, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotShowEditor() ) ); + connect( _userRegExps, TQ_SIGNAL( load( RegExp* ) ), this, TQ_SLOT( slotShowEditor() ) ); + connect( _regExpButtons, TQ_SIGNAL( doSelect() ), this, TQ_SLOT( slotShowEditor() ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( savedRegexp() ), _userRegExps, TQT_SLOT( slotPopulateUserRegexps() ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( savedRegexp() ), _userRegExps, TQ_SLOT( slotPopulateUserRegexps() ) ); - connect( _auxButtons, TQT_SIGNAL( undo() ), this, TQT_SLOT( slotUndo() ) ); - connect( _auxButtons, TQT_SIGNAL( redo() ), this, TQT_SLOT( slotRedo() ) ); - connect( _auxButtons, TQT_SIGNAL( cut() ), _scrolledEditorWindow, TQT_SLOT( slotCut() ) ); - connect( _auxButtons, TQT_SIGNAL( copy() ), _scrolledEditorWindow, TQT_SLOT( slotCopy() ) ); - connect( _auxButtons, TQT_SIGNAL( paste() ), _scrolledEditorWindow, TQT_SLOT( slotPaste() ) ); - connect( _auxButtons, TQT_SIGNAL( save() ), _scrolledEditorWindow, TQT_SLOT( slotSave() ) ); - connect( _verifyButtons, TQT_SIGNAL( autoVerify( bool ) ), this, TQT_SLOT( setAutoVerify( bool ) ) ); - connect( _verifyButtons, TQT_SIGNAL( verify() ), this, TQT_SLOT( doVerify() ) ); - connect( _verifyButtons, TQT_SIGNAL( changeSyntax( const TQString& ) ), this, TQT_SLOT( setSyntax( const TQString& ) ) ); + connect( _auxButtons, TQ_SIGNAL( undo() ), this, TQ_SLOT( slotUndo() ) ); + connect( _auxButtons, TQ_SIGNAL( redo() ), this, TQ_SLOT( slotRedo() ) ); + connect( _auxButtons, TQ_SIGNAL( cut() ), _scrolledEditorWindow, TQ_SLOT( slotCut() ) ); + connect( _auxButtons, TQ_SIGNAL( copy() ), _scrolledEditorWindow, TQ_SLOT( slotCopy() ) ); + connect( _auxButtons, TQ_SIGNAL( paste() ), _scrolledEditorWindow, TQ_SLOT( slotPaste() ) ); + connect( _auxButtons, TQ_SIGNAL( save() ), _scrolledEditorWindow, TQ_SLOT( slotSave() ) ); + connect( _verifyButtons, TQ_SIGNAL( autoVerify( bool ) ), this, TQ_SLOT( setAutoVerify( bool ) ) ); + connect( _verifyButtons, TQ_SIGNAL( verify() ), this, TQ_SLOT( doVerify() ) ); + connect( _verifyButtons, TQ_SIGNAL( changeSyntax( const TQString& ) ), this, TQ_SLOT( setSyntax( const TQString& ) ) ); - connect( this, TQT_SIGNAL( canUndo( bool ) ), _auxButtons, TQT_SLOT( slotCanUndo( bool ) ) ); - connect( this, TQT_SIGNAL( canRedo( bool ) ), _auxButtons, TQT_SLOT( slotCanRedo( bool ) ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( anythingSelected( bool ) ), _auxButtons, TQT_SLOT( slotCanCut( bool ) ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( anythingSelected( bool ) ), _auxButtons, TQT_SLOT( slotCanCopy( bool ) ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( anythingOnClipboard( bool ) ), _auxButtons, TQT_SLOT( slotCanPaste( bool ) ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( canSave( bool ) ), _auxButtons, TQT_SLOT( slotCanSave( bool ) ) ); + connect( this, TQ_SIGNAL( canUndo( bool ) ), _auxButtons, TQ_SLOT( slotCanUndo( bool ) ) ); + connect( this, TQ_SIGNAL( canRedo( bool ) ), _auxButtons, TQ_SLOT( slotCanRedo( bool ) ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( anythingSelected( bool ) ), _auxButtons, TQ_SLOT( slotCanCut( bool ) ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( anythingSelected( bool ) ), _auxButtons, TQ_SLOT( slotCanCopy( bool ) ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( anythingOnClipboard( bool ) ), _auxButtons, TQ_SLOT( slotCanPaste( bool ) ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( canSave( bool ) ), _auxButtons, TQ_SLOT( slotCanSave( bool ) ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( verifyRegExp() ), this, TQT_SLOT( maybeVerify() ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( verifyRegExp() ), this, TQ_SLOT( maybeVerify() ) ); - connect( _verifyButtons, TQT_SIGNAL( loadVerifyText( const TQString& ) ), this, TQT_SLOT( setVerifyText( const TQString& ) ) ); + connect( _verifyButtons, TQ_SIGNAL( loadVerifyText( const TQString& ) ), this, TQ_SLOT( setVerifyText( const TQString& ) ) ); - // connect( _verifier, TQT_SIGNAL( countChanged( int ) ), _verifyButtons, TQT_SLOT( setMatchCount( int ) ) ); + // connect( _verifier, TQ_SIGNAL( countChanged( int ) ), _verifyButtons, TQ_SLOT( setMatchCount( int ) ) ); // TQt anchors do not work for
..., thefore scrolling to next/prev match // do not work. Enable this when they work. - // connect( _verifyButtons, TQT_SIGNAL( gotoFirst() ), _verifier, TQT_SLOT( gotoFirst() ) ); - // connect( _verifyButtons, TQT_SIGNAL( gotoPrev() ), _verifier, TQT_SLOT( gotoPrev() ) ); - // connect( _verifyButtons, TQT_SIGNAL( gotoNext() ), _verifier, TQT_SLOT( gotoNext() ) ); - // connect( _verifyButtons, TQT_SIGNAL( gotoLast() ), _verifier, TQT_SLOT( gotoLast() ) ); - // connect( _verifier, TQT_SIGNAL( goForwardPossible( bool ) ), _verifyButtons, TQT_SLOT( enableForwardButtons( bool ) ) ); - // connect( _verifier, TQT_SIGNAL( goBackwardPossible( bool ) ), _verifyButtons, TQT_SLOT( enableBackwardButtons( bool ) ) ); + // connect( _verifyButtons, TQ_SIGNAL( gotoFirst() ), _verifier, TQ_SLOT( gotoFirst() ) ); + // connect( _verifyButtons, TQ_SIGNAL( gotoPrev() ), _verifier, TQ_SLOT( gotoPrev() ) ); + // connect( _verifyButtons, TQ_SIGNAL( gotoNext() ), _verifier, TQ_SLOT( gotoNext() ) ); + // connect( _verifyButtons, TQ_SIGNAL( gotoLast() ), _verifier, TQ_SLOT( gotoLast() ) ); + // connect( _verifier, TQ_SIGNAL( goForwardPossible( bool ) ), _verifyButtons, TQ_SLOT( enableForwardButtons( bool ) ) ); + // connect( _verifier, TQ_SIGNAL( goBackwardPossible( bool ) ), _verifyButtons, TQ_SLOT( enableBackwardButtons( bool ) ) ); _auxButtons->slotCanPaste( false ); _auxButtons->slotCanCut( false ); @@ -183,18 +183,18 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name) _timer = new TQTimer(this); - connect( _scrolledEditorWindow, TQT_SIGNAL( change() ), this, TQT_SLOT( slotUpdateLineEdit() ) ); - connect( _regexpEdit, TQT_SIGNAL(textChanged( const TQString& ) ), this, TQT_SLOT( slotTriggerUpdate() ) ); - connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimeout() ) ); - connect( clearButton, TQT_SIGNAL( clicked() ), _regexpEdit, TQT_SLOT( clear() ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( change() ), this, TQ_SLOT( slotUpdateLineEdit() ) ); + connect( _regexpEdit, TQ_SIGNAL(textChanged( const TQString& ) ), this, TQ_SLOT( slotTriggerUpdate() ) ); + connect( _timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimeout() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), _regexpEdit, TQ_SLOT( clear() ) ); // Push an initial empty element on the stack. _undoStack.push( _scrolledEditorWindow->regExp() ); _redoStack.setAutoDelete( true ); TQAccel* accel = new TQAccel( this ); - accel->connectItem( accel->insertItem( CTRL+Key_Z ), this, TQT_SLOT( slotUndo() ) ); - accel->connectItem( accel->insertItem( CTRL+Key_R ), this, TQT_SLOT( slotRedo() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_Z ), this, TQ_SLOT( slotUndo() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_R ), this, TQ_SLOT( slotRedo() ) ); setSyntax( TQString::fromLatin1( "TQt" ) ); } diff --git a/kregexpeditor/main.cpp b/kregexpeditor/main.cpp index 728bb19..0bc7990 100644 --- a/kregexpeditor/main.cpp +++ b/kregexpeditor/main.cpp @@ -58,11 +58,11 @@ int main( int argc, char* argv[] ) lay2->addStretch(1); lay2->addWidget( quit ); - TQObject::connect( help, TQT_SIGNAL( clicked() ), iface, TQT_SLOT( showHelp() ) ); - TQObject::connect( quit, TQT_SIGNAL( clicked() ), tqApp, TQT_SLOT( quit() ) ); + TQObject::connect( help, TQ_SIGNAL( clicked() ), iface, TQ_SLOT( showHelp() ) ); + TQObject::connect( quit, TQ_SIGNAL( clicked() ), tqApp, TQ_SLOT( quit() ) ); top->show(); - TQObject::connect( tqApp, TQT_SIGNAL( lastWindowClosed() ), tqApp, TQT_SLOT( quit() ) ); + TQObject::connect( tqApp, TQ_SIGNAL( lastWindowClosed() ), tqApp, TQ_SLOT( quit() ) ); myapp.exec(); } diff --git a/kregexpeditor/qt-only/compat.cpp b/kregexpeditor/qt-only/compat.cpp index a7a5d12..2d3315a 100644 --- a/kregexpeditor/qt-only/compat.cpp +++ b/kregexpeditor/qt-only/compat.cpp @@ -50,18 +50,18 @@ void KDialogBase::init( int buttonMask, ButtonCode /*defaultButton*/, const TQSt if ( buttonMask & Help ) { but = new TQPushButton( tr("Help"), this ); buts->addWidget( but ); - connect( but, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( helpClicked() ) ); + connect( but, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( helpClicked() ) ); } buts->addStretch(1); if ( buttonMask & Ok ) { but = new TQPushButton( tr("OK"), this ); buts->addWidget( but ); - connect( but, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOk() ) ); + connect( but, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOk() ) ); } if ( buttonMask & Cancel ) { but = new TQPushButton( tr("Cancel"), this ); buts->addWidget( but ); - connect( but, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( but, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCancel() ) ); } } diff --git a/kregexpeditor/regexpbuttons.cpp b/kregexpeditor/regexpbuttons.cpp index 1974534..d65f302 100644 --- a/kregexpeditor/regexpbuttons.cpp +++ b/kregexpeditor/regexpbuttons.cpp @@ -44,7 +44,7 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) _grp->setExclusive( true ); _mapper = new TQSignalMapper( this, "RegExpButtons::_mapper" ); - connect( _mapper, TQT_SIGNAL( mapped(int) ), this, TQT_SIGNAL( clicked(int) ) ); + connect( _mapper, TQ_SIGNAL( mapped(int) ), this, TQ_SIGNAL( clicked(int) ) ); // The "select" button. _selectBut = new TQToolButton( this); @@ -60,8 +60,8 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) layout->addWidget( _selectBut ); _grp->insert(_selectBut); _selectBut->setToggleButton( true ); - connect( _selectBut, TQT_SIGNAL(clicked()), TQT_SIGNAL(doSelect())); - connect( _selectBut, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetNonKeepMode()) ); + connect( _selectBut, TQ_SIGNAL(clicked()), TQ_SIGNAL(doSelect())); + connect( _selectBut, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSetNonKeepMode()) ); TQToolTip::add( _selectBut, i18n("Selection tool")); TQWhatsThis::add( _selectBut, i18n("
"
@@ -166,9 +166,9 @@ DoubleClickButton* RegExpButtons::insert(RegExpType tp, const char* name, TQStri
_mapper->setMapping( but, tp );
- connect( but, TQT_SIGNAL( clicked() ), _mapper, TQT_SLOT( map() ) );
- connect( but, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSetNonKeepMode() ) );
- connect( but, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( slotSetKeepMode() ) );
+ connect( but, TQ_SIGNAL( clicked() ), _mapper, TQ_SLOT( map() ) );
+ connect( but, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSetNonKeepMode() ) );
+ connect( but, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( slotSetKeepMode() ) );
_grp->insert( but );
but->setToggleButton( true );
diff --git a/kregexpeditor/repeatwidget.cpp b/kregexpeditor/repeatwidget.cpp
index b46cade..9a87eb6 100644
--- a/kregexpeditor/repeatwidget.cpp
+++ b/kregexpeditor/repeatwidget.cpp
@@ -80,8 +80,8 @@ void RepeatWidget::init()
KDialogBase::Ok | KDialogBase::Cancel);
_content = new RepeatRangeWindow( _configWindow );
_configWindow->setMainWidget( _content );
- connect( _configWindow, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotConfigCanceled() ) );
- connect(_configWindow, TQT_SIGNAL(finished()), this, TQT_SLOT(slotConfigWindowClosed()));
+ connect( _configWindow, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotConfigCanceled() ) );
+ connect(_configWindow, TQ_SIGNAL(finished()), this, TQ_SLOT(slotConfigWindowClosed()));
}
@@ -206,15 +206,15 @@ RepeatRangeWindow::RepeatRangeWindow( TQWidget* parent, const char* name )
_rangeTo = new TQSpinBox( 1, 999, 1, box );
(void) new TQLabel( i18n( "time(s)" ), box );
- connect( _rangeFrom, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotUpdateMaxVal( int ) ) );
- connect( _rangeTo, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotUpdateMinVal( int ) ) );
+ connect( _rangeFrom, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotUpdateMaxVal( int ) ) );
+ connect( _rangeTo, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotUpdateMinVal( int ) ) );
// set a default button.
_group->setButton(ANY);
slotItemChange( ANY );
- connect( _group, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotItemChange( int ) ) );
+ connect( _group, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotItemChange( int ) ) );
}
diff --git a/kregexpeditor/scrollededitorwindow.cpp b/kregexpeditor/scrollededitorwindow.cpp
index 07e8bf0..442ac22 100644
--- a/kregexpeditor/scrollededitorwindow.cpp
+++ b/kregexpeditor/scrollededitorwindow.cpp
@@ -30,21 +30,21 @@ RegExpScrolledEditorWindow::RegExpScrolledEditorWindow( TQWidget* parent, const
_scrollView->addChild( _editorWindow );
_scrollView->setResizePolicy( TQScrollView::Manual );
- connect( _editorWindow, TQT_SIGNAL( contentChanged( TQPoint ) ),
- this, TQT_SLOT( slotUpdateContentSize( TQPoint ) ) );
+ connect( _editorWindow, TQ_SIGNAL( contentChanged( TQPoint ) ),
+ this, TQ_SLOT( slotUpdateContentSize( TQPoint ) ) );
- connect( _editorWindow, TQT_SIGNAL( scrolling( TQPoint ) ),
- this, TQT_SLOT( slotScroll( TQPoint ) ) );
+ connect( _editorWindow, TQ_SIGNAL( scrolling( TQPoint ) ),
+ this, TQ_SLOT( slotScroll( TQPoint ) ) );
- connect( _editorWindow, TQT_SIGNAL( doneEditing() ), this, TQT_SIGNAL( doneEditing() ) );
+ connect( _editorWindow, TQ_SIGNAL( doneEditing() ), this, TQ_SIGNAL( doneEditing() ) );
- connect( _editorWindow, TQT_SIGNAL( change() ), this, TQT_SIGNAL( change() ) );
- connect( _editorWindow, TQT_SIGNAL( savedRegexp() ), this, TQT_SIGNAL( savedRegexp() ) );
+ connect( _editorWindow, TQ_SIGNAL( change() ), this, TQ_SIGNAL( change() ) );
+ connect( _editorWindow, TQ_SIGNAL( savedRegexp() ), this, TQ_SIGNAL( savedRegexp() ) );
- connect( _editorWindow, TQT_SIGNAL( anythingSelected(bool) ), this, TQT_SIGNAL( anythingSelected(bool) ) );
- connect( _editorWindow, TQT_SIGNAL( anythingOnClipboard(bool) ), this, TQT_SIGNAL( anythingOnClipboard(bool) ) );
- connect( _editorWindow, TQT_SIGNAL( canSave(bool) ), this, TQT_SIGNAL( canSave(bool) ) );
- connect( _editorWindow, TQT_SIGNAL( verifyRegExp() ), this, TQT_SIGNAL( verifyRegExp() ) );
+ connect( _editorWindow, TQ_SIGNAL( anythingSelected(bool) ), this, TQ_SIGNAL( anythingSelected(bool) ) );
+ connect( _editorWindow, TQ_SIGNAL( anythingOnClipboard(bool) ), this, TQ_SIGNAL( anythingOnClipboard(bool) ) );
+ connect( _editorWindow, TQ_SIGNAL( canSave(bool) ), this, TQ_SIGNAL( canSave(bool) ) );
+ connect( _editorWindow, TQ_SIGNAL( verifyRegExp() ), this, TQ_SIGNAL( verifyRegExp() ) );
}
void RegExpScrolledEditorWindow::slotSetRegExp( RegExp* regexp )
diff --git a/kregexpeditor/selectablelineedit.cpp b/kregexpeditor/selectablelineedit.cpp
index 0e085d5..fc44b91 100644
--- a/kregexpeditor/selectablelineedit.cpp
+++ b/kregexpeditor/selectablelineedit.cpp
@@ -25,8 +25,8 @@
SelectableLineEdit::SelectableLineEdit( RegExpWidget* owner, TQWidget* parent, const char* name)
: TQLineEdit( parent, name ), _owner(owner)
{
- connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), this,
- TQT_SLOT( slotKeyPressed() ) );
+ connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), this,
+ TQ_SLOT( slotKeyPressed() ) );
setAcceptDrops( false );
}
diff --git a/kregexpeditor/textwidget.cpp b/kregexpeditor/textwidget.cpp
index 121dad4..07e2da1 100644
--- a/kregexpeditor/textwidget.cpp
+++ b/kregexpeditor/textwidget.cpp
@@ -47,10 +47,10 @@ void TextWidget::init( const TQString& txt )
_edit->setText( txt );
- connect( _edit, TQT_SIGNAL( parentPleaseUpdate() ), this, TQT_SLOT(slotUpdate()) );
+ connect( _edit, TQ_SIGNAL( parentPleaseUpdate() ), this, TQ_SLOT(slotUpdate()) );
setFocusProxy( _edit );
_edit->installEventFilter( this );
- connect( _edit, TQT_SIGNAL( textChanged( const TQString & ) ), _editorWindow, TQT_SLOT( emitChange() ) );
+ connect( _edit, TQ_SIGNAL( textChanged( const TQString & ) ), _editorWindow, TQ_SLOT( emitChange() ) );
}
diff --git a/kregexpeditor/userdefinedregexps.cpp b/kregexpeditor/userdefinedregexps.cpp
index e6d83aa..35853fc 100644
--- a/kregexpeditor/userdefinedregexps.cpp
+++ b/kregexpeditor/userdefinedregexps.cpp
@@ -54,9 +54,9 @@ UserDefinedRegExps::UserDefinedRegExps( TQWidget *parent, const char *name )
setWidget( top );
slotPopulateUserRegexps();
- connect( _userDefined, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotLoad(TQListViewItem*)) );
- connect( _userDefined, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&, int )),
- this, TQT_SLOT( slotEdit( TQListViewItem*, const TQPoint& ) ) );
+ connect( _userDefined, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotLoad(TQListViewItem*)) );
+ connect( _userDefined, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&, int )),
+ this, TQ_SLOT( slotEdit( TQListViewItem*, const TQPoint& ) ) );
}
void UserDefinedRegExps::slotPopulateUserRegexps()
diff --git a/kregexpeditor/verifybuttons.cpp b/kregexpeditor/verifybuttons.cpp
index 6f5b316..1f62e0a 100644
--- a/kregexpeditor/verifybuttons.cpp
+++ b/kregexpeditor/verifybuttons.cpp
@@ -51,40 +51,40 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name )
TQWhatsThis::add( _verify, i18n("Shows what part of the regular expression is being matched in the verifier window."
"(The window below the graphical editor window)."));
layout->addWidget( _verify );
- connect( _verify, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( verify() ) );
+ connect( _verify, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( verify() ) );
TQToolButton* button = new TQToolButton(this);
button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("document-open")) );
layout->addWidget( button );
- connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadText()));
+ connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(loadText()));
TQToolTip::add( button, i18n("Load text in the verifier window") );
button = new TQToolButton(this);
button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("package_settings")) );
layout->addWidget( button );
- connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(configure()));
+ connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(configure()));
TQToolTip::add( button, i18n("Settings") );
// It is currently not possible to ask for the paragraph being highlighted, thefore scrolling to next/prev match
// do not work. Enable this when they work.
// _first = new TQToolButton( TQString::fromLatin1("<<"), this);
// layout->addWidget( _first );
- // connect(_first, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoFirst()));
+ // connect(_first, TQ_SIGNAL(clicked()), this, TQ_SIGNAL( gotoFirst()));
// _first->setFixedWidth( 25 );
//
// _prev = new TQToolButton(TQString::fromLatin1("<"), this);
// layout->addWidget( _prev );
- // connect(_prev, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoPrev()));
+ // connect(_prev, TQ_SIGNAL(clicked()), this, TQ_SIGNAL( gotoPrev()));
// _prev->setFixedWidth( 20 );
//
// _next = new TQToolButton(TQString::fromLatin1(">"), this);
// layout->addWidget( _next );
- // connect(_next, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoNext()));
+ // connect(_next, TQ_SIGNAL(clicked()), this, TQ_SIGNAL( gotoNext()));
// _next->setFixedWidth( 20 );
//
// _last = new TQToolButton(TQString::fromLatin1(">>"), this);
// layout->addWidget( _last );
- // connect(_last, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoLast()));
+ // connect(_last, TQ_SIGNAL(clicked()), this, TQ_SIGNAL( gotoLast()));
// _last->setFixedWidth( 25 );
// Same as above
@@ -117,8 +117,8 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name )
TQAction* autoVerify = new TQAction( i18n("Verify on the Fly"), 0, this );
autoVerify->setToggleAction( true );
autoVerify->setOn( true );
- connect( autoVerify, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( updateVerifyButton( bool ) ) );
- connect( autoVerify, TQT_SIGNAL( toggled( bool ) ), this, TQT_SIGNAL( autoVerify( bool ) ) );
+ connect( autoVerify, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( updateVerifyButton( bool ) ) );
+ connect( autoVerify, TQ_SIGNAL( toggled( bool ) ), this, TQ_SIGNAL( autoVerify( bool ) ) );
autoVerify->addTo( _configMenu );
autoVerify->setToolTip( i18n( "Toggle on-the-fly verification of regular expression" ) );
autoVerify->setWhatsThis( i18n( "Enabling this option will make the verifier update for each edit. "
@@ -138,7 +138,7 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name )
(*it).second = action;
}
grp->addTo( languages );
- connect( grp, TQT_SIGNAL( selected( TQAction* ) ), this, TQT_SLOT( slotChangeSyntax( TQAction* ) ) );
+ connect( grp, TQ_SIGNAL( selected( TQAction* ) ), this, TQ_SLOT( slotChangeSyntax( TQAction* ) ) );
_configMenu->setItemEnabled( _languageId, false );
// Select the TQt converter by default
diff --git a/ksim/generalprefs.cpp b/ksim/generalprefs.cpp
index b7b9b4d..ee601c2 100644
--- a/ksim/generalprefs.cpp
+++ b/ksim/generalprefs.cpp
@@ -174,21 +174,21 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name)
m_uptimeCombo->insertItem(i18n("%dd %h:%m"));
m_uptimeCombo->insertItem(i18n("Uptime: %h:%m:%s"));
connect(m_uptimeCombo,
- TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)),
- TQT_SLOT(uptimeContextMenu(TQPopupMenu *)));
+ TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)),
+ TQ_SLOT(uptimeContextMenu(TQPopupMenu *)));
m_uptimeAdd = new TQPushButton(this);
m_uptimeAdd->setPixmap(SmallIcon("go-down"));
- connect(m_uptimeAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertUptimeItem()));
+ connect(m_uptimeAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertUptimeItem()));
TQToolTip::add(m_uptimeAdd, i18n("Insert item"));
m_uptimeCheck = new TQCheckBox(this);
m_uptimeCheck->setText(i18n("Show uptime"));
m_uptimeCheck->setChecked(true);
- connect(m_uptimeCheck, TQT_SIGNAL(toggled(bool)),
- m_uptimeCombo, TQT_SLOT(setEnabled(bool)));
- connect(m_uptimeCheck, TQT_SIGNAL(toggled(bool)),
- m_uptimeAdd, TQT_SLOT(setEnabled(bool)));
+ connect(m_uptimeCheck, TQ_SIGNAL(toggled(bool)),
+ m_uptimeCombo, TQ_SLOT(setEnabled(bool)));
+ connect(m_uptimeCheck, TQ_SIGNAL(toggled(bool)),
+ m_uptimeAdd, TQ_SLOT(setEnabled(bool)));
m_mainLayout->addWidget(m_uptimeCheck);
m_subLayout = new TQHBoxLayout;
@@ -273,9 +273,9 @@ void KSim::UptimePrefs::uptimeContextMenu(TQPopupMenu *menu)
{
menu->insertSeparator();
menu->insertItem(m_addIcon, i18n("Insert Item"),
- this, TQT_SLOT(insertUptimeItem()));
+ this, TQ_SLOT(insertUptimeItem()));
menu->insertItem(m_removeIcon, i18n("Remove Item"),
- this, TQT_SLOT(removeUptimeItem()));
+ this, TQ_SLOT(removeUptimeItem()));
}
void KSim::UptimePrefs::insertUptimeItem()
@@ -310,21 +310,21 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name)
//m_memCombo->insertItem(i18n("%tM - %fM free"));
//m_memCombo->insertItem(i18n("%tM - %uM used"));
connect(m_memCombo,
- TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)),
- TQT_SLOT(memoryContextMenu(TQPopupMenu *)));
+ TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)),
+ TQ_SLOT(memoryContextMenu(TQPopupMenu *)));
m_memoryAdd = new TQPushButton(this);
m_memoryAdd->setPixmap(SmallIcon("go-down"));
- connect(m_memoryAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertMemoryItem()));
+ connect(m_memoryAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertMemoryItem()));
TQToolTip::add(m_memoryAdd, i18n("Insert item"));
m_memCheck = new TQCheckBox(this);
m_memCheck->setText(i18n("Show memory and free memory"));
m_memCheck->setChecked(false);
- connect(m_memCheck, TQT_SIGNAL(toggled(bool)),
- m_memCombo, TQT_SLOT(setEnabled(bool)));
- connect(m_memCheck, TQT_SIGNAL(toggled(bool)),
- m_memoryAdd, TQT_SLOT(setEnabled(bool)));
+ connect(m_memCheck, TQ_SIGNAL(toggled(bool)),
+ m_memCombo, TQ_SLOT(setEnabled(bool)));
+ connect(m_memCheck, TQ_SIGNAL(toggled(bool)),
+ m_memoryAdd, TQ_SLOT(setEnabled(bool)));
m_mainLayout->addWidget(m_memCheck);
m_subLayout = new TQHBoxLayout;
@@ -421,9 +421,9 @@ void KSim::MemoryPrefs::memoryContextMenu(TQPopupMenu *menu)
{
menu->insertSeparator();
menu->insertItem(m_addIcon, i18n("Insert Item"),
- this, TQT_SLOT(insertMemoryItem()));
+ this, TQ_SLOT(insertMemoryItem()));
menu->insertItem(m_removeIcon, i18n("Remove Item"),
- this, TQT_SLOT(removeMemoryItem()));
+ this, TQ_SLOT(removeMemoryItem()));
}
void KSim::MemoryPrefs::insertMemoryItem()
@@ -464,20 +464,20 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name)
//m_swapCombo->insertItem(i18n("%tM - %uM used"));
connect(m_swapCombo,
- TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)),
- TQT_SLOT(swapContextMenu(TQPopupMenu *)));
+ TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)),
+ TQ_SLOT(swapContextMenu(TQPopupMenu *)));
m_swapAdd = new TQPushButton(this);
m_swapAdd->setPixmap(SmallIcon("go-down"));
- connect(m_swapAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertSwapItem()));
+ connect(m_swapAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertSwapItem()));
TQToolTip::add(m_swapAdd, i18n("Insert item"));
m_subLayout = new TQHBoxLayout;
m_subLayout->setSpacing(6);
- connect(m_swapCheck, TQT_SIGNAL(toggled(bool)),
- m_swapCombo, TQT_SLOT(setEnabled(bool)));
- connect(m_swapCheck, TQT_SIGNAL(toggled(bool)),
- m_swapAdd, TQT_SLOT(setEnabled(bool)));
+ connect(m_swapCheck, TQ_SIGNAL(toggled(bool)),
+ m_swapCombo, TQ_SLOT(setEnabled(bool)));
+ connect(m_swapCheck, TQ_SIGNAL(toggled(bool)),
+ m_swapAdd, TQ_SLOT(setEnabled(bool)));
m_swapFormat = new TQLabel(this);
m_swapFormat->setText(i18n("Swap format:"));
@@ -553,8 +553,8 @@ void KSim::SwapPrefs::readConfig(KSim::Config *config)
void KSim::SwapPrefs::swapContextMenu(TQPopupMenu *menu)
{
menu->insertSeparator();
- menu->insertItem(m_addIcon, i18n("Insert Item"), this, TQT_SLOT(insertSwapItem()));
- menu->insertItem(m_removeIcon, i18n("Remove Item"), this, TQT_SLOT(removeSwapItem()));
+ menu->insertItem(m_addIcon, i18n("Insert Item"), this, TQ_SLOT(insertSwapItem()));
+ menu->insertItem(m_removeIcon, i18n("Remove Item"), this, TQ_SLOT(removeSwapItem()));
}
void KSim::SwapPrefs::insertSwapItem()
diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp
index 746c810..b5600db 100644
--- a/ksim/ksimpref.cpp
+++ b/ksim/ksimpref.cpp
@@ -91,10 +91,10 @@ KSim::ConfigDialog::ConfigDialog(KSim::Config *config,
i18n("Theme Selector"), BarIcon("folder_image", TDEIcon::SizeSmall));
m_themePage = new KSim::ThemePrefs(theme);
- connect(this, TQT_SIGNAL(applyClicked()), TQT_SLOT(savePrefs()));
- connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(closePrefs()));
- connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(loadPluginConfig()));
- connect(parent, TQT_SIGNAL(reload()), TQT_SLOT(reload()));
+ connect(this, TQ_SIGNAL(applyClicked()), TQ_SLOT(savePrefs()));
+ connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(closePrefs()));
+ connect(this, TQ_SIGNAL(closeClicked()), TQ_SLOT(loadPluginConfig()));
+ connect(parent, TQ_SIGNAL(reload()), TQ_SLOT(reload()));
KSim::PluginList::ConstIterator it;
const KSim::PluginList &pluginList = KSim::PluginLoader::self().pluginList();
@@ -164,8 +164,8 @@ void KSim::ConfigDialog::createPage(const KSim::Plugin &plugin)
plugin.configPage()->readConfig();
// TODO: implement this correctly one day
-// connect (info.configPage(), TQT_SIGNAL(pageChanged()),
-// this, TQT_SLOT(enableButtons()));
+// connect (info.configPage(), TQ_SIGNAL(pageChanged()),
+// this, TQ_SLOT(enableButtons()));
}
void KSim::ConfigDialog::savePrefs()
diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp
index 1f204b7..e6b58e8 100644
--- a/ksim/ksimsysinfo.cpp
+++ b/ksim/ksimsysinfo.cpp
@@ -55,10 +55,10 @@ KSim::Sysinfo::Sysinfo(KSim::Config *config,
//m_procsLabel = 0L;
m_timer = new TQTimer(this);
- connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(clockUptimeUpdate()));
+ connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(clockUptimeUpdate()));
m_sysTimer = new TQTimer(this);
- connect(m_sysTimer, TQT_SIGNAL(timeout()), TQT_SLOT(sysUpdate()));
+ connect(m_sysTimer, TQ_SIGNAL(timeout()), TQ_SLOT(sysUpdate()));
createView();
}
diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp
index 21b4fa6..91fd84c 100644
--- a/ksim/ksimview.cpp
+++ b/ksim/ksimview.cpp
@@ -140,8 +140,8 @@ KSim::MainView::MainView(TDEConfig *config,
m_sizeLayout->addWidget(m_rightFrame);
connect(&KSim::PluginLoader::self(),
- TQT_SIGNAL(pluginLoaded(const KSim::Plugin &)),
- this, TQT_SLOT(addMonitor(const KSim::Plugin &)));
+ TQ_SIGNAL(pluginLoaded(const KSim::Plugin &)),
+ this, TQ_SLOT(addMonitor(const KSim::Plugin &)));
KSim::ThemeLoader::self().themeColours(this);
@@ -150,7 +150,7 @@ KSim::MainView::MainView(TDEConfig *config,
addPlugins();
}
- connect(&m_maskTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMaskMainView()));
+ connect(&m_maskTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotMaskMainView()));
}
KSim::MainView::~MainView()
@@ -371,8 +371,8 @@ void KSim::MainView::addMonitor(const KSim::Plugin &plugin)
// kdDebug(2003) << "m_oldLocation: " << m_oldLocation << endl;
// kdDebug(2003) << "location: " << location << endl;
m_pluginLayout->addWidget(plugin.view());
- connect(plugin.view(), TQT_SIGNAL(runCommand(const TQCString &)),
- TQT_SLOT(runCommand(const TQCString &)));
+ connect(plugin.view(), TQ_SIGNAL(runCommand(const TQCString &)),
+ TQ_SLOT(runCommand(const TQCString &)));
// if (location > m_oldLocation)
// m_oldLocation = location;
@@ -393,8 +393,8 @@ void KSim::MainView::preferences()
{
if (m_prefDialog == 0L) {
m_prefDialog = new KSim::ConfigDialog(m_config, this, "m_prefDialog");
- connect(m_prefDialog, TQT_SIGNAL(reparse(bool, const KSim::ChangedPluginList &)),
- this, TQT_SLOT(reparseConfig(bool, const KSim::ChangedPluginList &)));
+ connect(m_prefDialog, TQ_SIGNAL(reparse(bool, const KSim::ChangedPluginList &)),
+ this, TQ_SLOT(reparseConfig(bool, const KSim::ChangedPluginList &)));
}
m_prefDialog->exec();
diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp
index 99eb9c8..8f07f30 100644
--- a/ksim/library/chart.cpp
+++ b/ksim/library/chart.cpp
@@ -49,8 +49,8 @@ class KSim::Chart::Timer
tqAddPostRoutine(cleanup);
}
- TQObject::connect(m_timer, TQT_SIGNAL(timeout()),
- chart, TQT_SLOT(updateDisplay()));
+ TQObject::connect(m_timer, TQ_SIGNAL(timeout()),
+ chart, TQ_SLOT(updateDisplay()));
}
static void disconnect(KSim::Chart *chart)
@@ -58,8 +58,8 @@ class KSim::Chart::Timer
if (!m_timer)
return;
- TQObject::disconnect(m_timer, TQT_SIGNAL(timeout()),
- chart, TQT_SLOT(updateDisplay()));
+ TQObject::disconnect(m_timer, TQ_SIGNAL(timeout()),
+ chart, TQ_SLOT(updateDisplay()));
}
private:
diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp
index 7ef24b2..150a2ba 100644
--- a/ksim/library/pluginmodule.cpp
+++ b/ksim/library/pluginmodule.cpp
@@ -123,7 +123,7 @@ KSim::PluginView::PluginView(KSim::PluginObject *parent, const char *name)
d->parent = parent;
d->popupMenu = new TQPopupMenu(this);
d->popupMenu->insertItem(i18n("About"), this,
- TQT_SLOT(showAbout()), 0, -1, 0);
+ TQ_SLOT(showAbout()), 0, -1, 0);
if (parent && !parent->configFileName().isEmpty())
d->config = new TDEConfig(parent->configFileName() + "rc");
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp
index 68b2b90..68d720b 100644
--- a/ksim/monitors/cpu/ksimcpu.cpp
+++ b/ksim/monitors/cpu/ksimcpu.cpp
@@ -126,7 +126,7 @@ CpuView::CpuView(KSim::PluginObject *parent, const char *name)
addDisplay();
m_timer = new TQTimer(this);
- connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(updateView()));
+ connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(updateView()));
m_timer->start(CPU_SPEED);
updateView();
}
@@ -372,8 +372,8 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name)
m_listView->addColumn(i18n("Chart Format"));
m_listView->setAllColumnsShowFocus(true);
m_listView->setSelectionMode(TQListView::Single);
- connect( m_listView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
- TQT_SLOT( modify( TQListViewItem * ) ) );
+ connect( m_listView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+ TQ_SLOT( modify( TQListViewItem * ) ) );
mainLayout->addWidget( m_listView );
@@ -386,7 +386,7 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name)
m_modify = new TQPushButton( this );
m_modify->setText( i18n( "Modify..." ) );
- connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) );
+ connect( m_modify, TQ_SIGNAL( clicked() ), TQ_SLOT( modify() ) );
layout->addWidget( m_modify );
mainLayout->addLayout( layout );
diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index d3a3827..fe278b5 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -126,7 +126,7 @@ DiskView::DiskView(KSim::PluginObject *parent, const char *name)
init();
m_timer = new TQTimer(this);
- connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(updateDisplay()));
+ connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(updateDisplay()));
m_timer->start(DISK_SPEED);
updateDisplay();
}
@@ -491,12 +491,12 @@ DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name)
m_add = new TQPushButton(this);
m_add->setText(i18n("Add..."));
- connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(addItem()));
+ connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(addItem()));
layout->addWidget(m_add);
m_remove = new TQPushButton(this);
m_remove->setText(i18n("Remove"));
- connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem()));
+ connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(removeItem()));
layout->addWidget(m_remove);
m_layout->addLayout(layout);
diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp
index 4a63e04..21aebff 100644
--- a/ksim/monitors/filesystem/filesystemwidget.cpp
+++ b/ksim/monitors/filesystem/filesystemwidget.cpp
@@ -200,11 +200,11 @@ void FilesystemWidget::createProcess(const TQString &command, const TQString &po
{
m_process = new TDEProcess();
connect(m_process,
- TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
- TQT_SLOT(receivedStderr(TDEProcess *, char *, int)));
+ TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+ TQ_SLOT(receivedStderr(TDEProcess *, char *, int)));
connect(m_process,
- TQT_SIGNAL(processExited(TDEProcess *)),
- TQT_SLOT(processExited(TDEProcess *)));
+ TQ_SIGNAL(processExited(TDEProcess *)),
+ TQ_SLOT(processExited(TDEProcess *)));
(*m_process) << command << point;
void(m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr));
diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp
index 0a436ed..262ae93 100644
--- a/ksim/monitors/filesystem/ksimfsystem.cpp
+++ b/ksim/monitors/filesystem/ksimfsystem.cpp
@@ -100,7 +100,7 @@ Fsystem::Fsystem(KSim::PluginObject *parent, const char *name)
createFreeInfo();
m_updateTimer = new TQTimer(this);
- connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateFS()));
+ connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateFS()));
m_updateTimer->start(config()->readNumEntry("updateValue", 60) * 1000);
}
diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp
index 21d0c9e..556f15c 100644
--- a/ksim/monitors/i8k/ksimi8k.cpp
+++ b/ksim/monitors/i8k/ksimi8k.cpp
@@ -121,7 +121,7 @@ void I8KView::openStream()
{
m_procStream = new TQTextIStream( m_procFile );
disconnect( m_timer, 0, 0, 0 );
- connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateView() ) );
+ connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateView() ) );
m_timer->start( m_interval*1000 );
kdDebug( 2003 ) << "i8k: Success" << endl;
@@ -130,7 +130,7 @@ void I8KView::openStream()
{
// i8k module is not loaded. Try again after 30 secs.
disconnect( m_timer, 0, 0, 0 );
- connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( openStream() ) );
+ connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( openStream() ) );
m_timer->start( 30*1000 );
kdDebug( 2003 ) << "i8k: Failed...retry after 30 secs" << endl;
}
diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp
index 9514bc5..e920df9 100644
--- a/ksim/monitors/lm_sensors/ksimsensors.cpp
+++ b/ksim/monitors/lm_sensors/ksimsensors.cpp
@@ -77,8 +77,8 @@ SensorsView::SensorsView(KSim::PluginObject *parent, const char *name)
config()->setGroup("Sensors");
(new TQVBoxLayout(this))->setAutoAdd(true);
- connect(SensorBase::self(), TQT_SIGNAL(updateSensors(const SensorList &)),
- this, TQT_SLOT(updateSensors(const SensorList &)));
+ connect(SensorBase::self(), TQ_SIGNAL(updateSensors(const SensorList &)),
+ this, TQ_SLOT(updateSensors(const SensorList &)));
insertSensors();
}
diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp
index c81ad56..0584870 100644
--- a/ksim/monitors/lm_sensors/sensorbase.cpp
+++ b/ksim/monitors/lm_sensors/sensorbase.cpp
@@ -76,7 +76,7 @@ SensorBase::SensorBase() : TQObject()
}
m_updateTimer = new TQTimer(this);
- connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(update()));
+ connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(update()));
}
SensorBase::~SensorBase()
diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp
index 1a1f4a1..e8afb88 100644
--- a/ksim/monitors/lm_sensors/sensorsconfig.cpp
+++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp
@@ -67,18 +67,18 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name)
m_sensorView->setColumnWidth(1, 60);
m_sensorView->setColumnWidth(2, 80);
m_sensorView->setAllColumnsShowFocus(true);
- connect(m_sensorView, TQT_SIGNAL(contextMenu(TDEListView *,
- TQListViewItem *, const TQPoint &)), this, TQT_SLOT(menu(TDEListView *,
+ connect(m_sensorView, TQ_SIGNAL(contextMenu(TDEListView *,
+ TQListViewItem *, const TQPoint &)), this, TQ_SLOT(menu(TDEListView *,
TQListViewItem *, const TQPoint &)));
- connect( m_sensorView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
- TQT_SLOT( modify( TQListViewItem * ) ) );
+ connect( m_sensorView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+ TQ_SLOT( modify( TQListViewItem * ) ) );
m_layout->addMultiCellWidget(m_sensorView, 1, 1, 0, 3);
m_modify = new TQPushButton( this );
m_modify->setText( i18n( "Modify..." ) );
- connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) );
+ connect( m_modify, TQ_SIGNAL( clicked() ), TQ_SLOT( modify() ) );
m_layout->addMultiCellWidget( m_modify, 2, 2, 3, 3 );
m_fahrenBox = new TQCheckBox(i18n("Display Fahrenheit"), this);
diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp
index bf67d46..fdfc977 100644
--- a/ksim/monitors/mail/ksimmail.cpp
+++ b/ksim/monitors/mail/ksimmail.cpp
@@ -93,7 +93,7 @@ MailLabel::MailLabel( TQWidget* parent )
// label->setPixmap( KSim::ThemeLoader::self().current().krellMail() );
configureObject( false );
TQTimer* timer = new TQTimer( this );
- connect( timer, TQT_SIGNAL( timeout() ), TQT_SLOT( animation() ) );
+ connect( timer, TQ_SIGNAL( timeout() ), TQ_SLOT( animation() ) );
timer->start( 100 );
}
diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp
index e72f8ea..2167abe 100644
--- a/ksim/monitors/net/ksimnet.cpp
+++ b/ksim/monitors/net/ksimnet.cpp
@@ -119,11 +119,11 @@ NetView::NetView(KSim::PluginObject *parent, const char *name)
addDisplay();
m_netTimer = new TQTimer(this);
- connect(m_netTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateGraph()));
+ connect(m_netTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateGraph()));
m_netTimer->start(NET_UPDATE);
m_lightTimer = new TQTimer(this);
- connect(m_lightTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateLights()));
+ connect(m_lightTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateLights()));
m_lightTimer->start(LED_UPDATE);
updateGraph();
@@ -444,10 +444,10 @@ TQPopupMenu *NetView::addPopupMenu(const TQString &device, int value)
{
TQPopupMenu *popup = new TQPopupMenu(this);
popup->insertItem(SmallIcon("network"), i18n("Connect"), this,
- TQT_SLOT(runConnectCommand(int)), 0, 1);
+ TQ_SLOT(runConnectCommand(int)), 0, 1);
popup->setItemParameter(1, value);
popup->insertItem(SmallIcon("network"), i18n("Disconnect"), this,
- TQT_SLOT(runDisconnectCommand(int)), 0, 2);
+ TQ_SLOT(runDisconnectCommand(int)), 0, 2);
popup->setItemParameter(2, value);
menu()->insertItem(device, popup, 100 + value);
return popup;
diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp
index eb2c1a3..2cfc1af 100644
--- a/ksim/monitors/net/netconfig.cpp
+++ b/ksim/monitors/net/netconfig.cpp
@@ -49,11 +49,11 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name)
usingBox ->addColumn(i18n("Commands"));
usingBox->setAllColumnsShowFocus(true);
- connect(usingBox, TQT_SIGNAL(contextMenu(TDEListView *,
+ connect(usingBox, TQ_SIGNAL(contextMenu(TDEListView *,
TQListViewItem *, const TQPoint &)),
- TQT_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &)));
- connect(usingBox, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
- TQT_SLOT(modifyItem(TQListViewItem *)));
+ TQ_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &)));
+ connect(usingBox, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+ TQ_SLOT(modifyItem(TQListViewItem *)));
mainLayout->addWidget(usingBox);
layout = new TQHBoxLayout;
@@ -65,17 +65,17 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name)
insertButton = new TQPushButton(this);
insertButton->setText(i18n("Add..."));
- connect(insertButton, TQT_SIGNAL(clicked()), TQT_SLOT(showNetDialog()));
+ connect(insertButton, TQ_SIGNAL(clicked()), TQ_SLOT(showNetDialog()));
layout->addWidget(insertButton);
modifyButton = new TQPushButton(this);
modifyButton->setText(i18n("Modify..."));
- connect(modifyButton, TQT_SIGNAL(clicked()), TQT_SLOT(modifyCurrent()));
+ connect(modifyButton, TQ_SIGNAL(clicked()), TQ_SLOT(modifyCurrent()));
layout->addWidget(modifyButton);
removeButton = new TQPushButton(this);
removeButton->setText(i18n("Remove"));
- connect(removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeCurrent()));
+ connect(removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeCurrent()));
layout->addWidget(removeButton);
mainLayout->addLayout(layout);
diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp
index 12ef26d..39ea761 100644
--- a/ksim/monitors/net/netdialog.cpp
+++ b/ksim/monitors/net/netdialog.cpp
@@ -99,8 +99,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name)
m_showTimer = new TQCheckBox(m_timerBox);
m_showTimer->setText(i18n("Show timer"));
- connect(m_showTimer, TQT_SIGNAL(toggled(bool)),
- m_timerEdit, TQT_SLOT(setEnabled(bool)));
+ connect(m_showTimer, TQ_SIGNAL(toggled(bool)),
+ m_timerEdit, TQ_SLOT(setEnabled(bool)));
m_timerBoxLayout->addWidget(m_showTimer);
m_timerBoxLayout->addWidget(m_timerEdit);
@@ -138,8 +138,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name)
m_connectRequester = new KURLRequester(m_commandTab);
m_connectRequester->setMinimumSize(145, 0);
m_connectRequester->setEnabled(false);
- connect(m_enableCommands, TQT_SIGNAL(toggled(bool)),
- m_connectRequester, TQT_SLOT(setEnabled(bool)));
+ connect(m_enableCommands, TQ_SIGNAL(toggled(bool)),
+ m_connectRequester, TQ_SLOT(setEnabled(bool)));
m_commandLayout->addMultiCellWidget(m_connectRequester, 1, 1, 1, 2);
m_dCommand = new TQLabel(m_commandTab);
@@ -149,8 +149,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name)
m_disconnectRequester = new KURLRequester(m_commandTab);
m_disconnectRequester->setMinimumSize(145, 0);
m_disconnectRequester->setEnabled(false);
- connect(m_enableCommands, TQT_SIGNAL(toggled(bool)),
- m_disconnectRequester, TQT_SLOT(setEnabled(bool)));
+ connect(m_enableCommands, TQ_SIGNAL(toggled(bool)),
+ m_disconnectRequester, TQ_SLOT(setEnabled(bool)));
m_commandLayout->addMultiCellWidget(m_disconnectRequester, 2, 2, 1, 2);
TQSpacerItem *commandSpacer = new TQSpacerItem(20, 20,
@@ -160,7 +160,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name)
setOkButton(KStdGuiItem::ok().text());
setCancelButton(KStdGuiItem::cancel().text());
- connect(this, TQT_SIGNAL(applyButtonPressed()), TQT_SLOT(sendClicked()));
+ connect(this, TQ_SIGNAL(applyButtonPressed()), TQ_SLOT(sendClicked()));
}
NetDialog::~NetDialog()
diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp
index 6e224f8..3aeb2b1 100644
--- a/ksim/monitors/snmp/browsedialog.cpp
+++ b/ksim/monitors/snmp/browsedialog.cpp
@@ -96,10 +96,10 @@ void BrowseDialog::startWalk( const Identifier &startOid )
stopWalker();
m_walker = new Walker( m_host, startOid, this );
- connect( m_walker, TQT_SIGNAL( resultReady( const Walker::Result & ) ),
- this, TQT_SLOT( insertBrowseItem( const Walker::Result & ) ) );
- connect( m_walker, TQT_SIGNAL( finished() ),
- this, TQT_SLOT( nextWalk() ) );
+ connect( m_walker, TQ_SIGNAL( resultReady( const Walker::Result & ) ),
+ this, TQ_SLOT( insertBrowseItem( const Walker::Result & ) ) );
+ connect( m_walker, TQ_SIGNAL( finished() ),
+ this, TQ_SLOT( nextWalk() ) );
stop->setEnabled( true );
}
@@ -109,10 +109,10 @@ void BrowseDialog::stopWalker()
if ( !m_walker )
return;
- disconnect( m_walker, TQT_SIGNAL( resultReady( const Walker::Result & ) ),
- this, TQT_SLOT( insertBrowseItem( const Walker::Result & ) ) );
- disconnect( m_walker, TQT_SIGNAL( finished() ),
- this, TQT_SLOT( nextWalk() ) );
+ disconnect( m_walker, TQ_SIGNAL( resultReady( const Walker::Result & ) ),
+ this, TQ_SLOT( insertBrowseItem( const Walker::Result & ) ) );
+ disconnect( m_walker, TQ_SIGNAL( finished() ),
+ this, TQ_SLOT( nextWalk() ) );
m_walker->deleteLater();
m_walker = 0;
diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp
index e1dfcca..4ecd44e 100644
--- a/ksim/monitors/snmp/configpage.cpp
+++ b/ksim/monitors/snmp/configpage.cpp
@@ -50,24 +50,24 @@ ConfigPage::ConfigPage( Plugin *parent, const char *name )
m_page = new ConfigWidget( this );
- connect( m_page->addHost, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( addNewHost() ) );
- connect( m_page->modifyHost, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( modifyHost() ) );
- connect( m_page->removeHost, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( removeHost() ) );
-
- connect( m_page->addMonitor, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( addNewMonitor() ) );
- connect( m_page->modifyMonitor, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( modifyMonitor() ) );
- connect( m_page->removeMonitor, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( removeMonitor() ) );
-
- connect( m_page->hosts, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( disableOrEnableSomeWidgets() ) );
- connect( m_page->monitors, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( disableOrEnableSomeWidgets() ) );
+ connect( m_page->addHost, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( addNewHost() ) );
+ connect( m_page->modifyHost, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( modifyHost() ) );
+ connect( m_page->removeHost, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( removeHost() ) );
+
+ connect( m_page->addMonitor, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( addNewMonitor() ) );
+ connect( m_page->modifyMonitor, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( modifyMonitor() ) );
+ connect( m_page->removeMonitor, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( removeMonitor() ) );
+
+ connect( m_page->hosts, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( disableOrEnableSomeWidgets() ) );
+ connect( m_page->monitors, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( disableOrEnableSomeWidgets() ) );
}
ConfigPage::~ConfigPage()
diff --git a/ksim/monitors/snmp/monitor.cpp b/ksim/monitors/snmp/monitor.cpp
index aa645cf..1294c10 100644
--- a/ksim/monitors/snmp/monitor.cpp
+++ b/ksim/monitors/snmp/monitor.cpp
@@ -32,7 +32,7 @@ Monitor::Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQ
else
m_timerId = -1;
- TQTimer::singleShot( 0, this, TQT_SLOT( performSnmpRequest() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( performSnmpRequest() ) );
}
Monitor::~Monitor()
diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp
index 5242ee0..4e42bda 100644
--- a/ksim/monitors/snmp/monitorconfig.cpp
+++ b/ksim/monitors/snmp/monitorconfig.cpp
@@ -108,8 +108,8 @@ TQWidget *MonitorConfig::createMonitorWidget( TQWidget *parent, const char *name
w = new ChartMonitor( *this, parent, name );
Monitor *monitor = new Monitor( host, id, refresh, w );
- TQObject::connect( monitor, TQT_SIGNAL( newData( const Value & ) ),
- w, TQT_SLOT( setData( const Value & ) ) );
+ TQObject::connect( monitor, TQ_SIGNAL( newData( const Value & ) ),
+ w, TQ_SLOT( setData( const Value & ) ) );
return w;
}
diff --git a/ksim/monitors/snmp/probedialog.cpp b/ksim/monitors/snmp/probedialog.cpp
index 736c534..2c9e930 100644
--- a/ksim/monitors/snmp/probedialog.cpp
+++ b/ksim/monitors/snmp/probedialog.cpp
@@ -79,10 +79,10 @@ void ProbeDialog::probeOne()
delete m_currentMonitor;
m_currentMonitor = new Monitor( m_host, oid, 0 /* no refresh */, this );
- connect( m_currentMonitor, TQT_SIGNAL( newData( const Identifier &, const Value & ) ),
- this, TQT_SLOT( probeResult( const Identifier &, const Value & ) ) );
- connect( m_currentMonitor, TQT_SIGNAL( error( const Identifier &, const ErrorInfo & ) ),
- this, TQT_SLOT( probeError( const Identifier &, const ErrorInfo & ) ) );
+ connect( m_currentMonitor, TQ_SIGNAL( newData( const Identifier &, const Value & ) ),
+ this, TQ_SLOT( probeResult( const Identifier &, const Value & ) ) );
+ connect( m_currentMonitor, TQ_SIGNAL( error( const Identifier &, const ErrorInfo & ) ),
+ this, TQ_SLOT( probeError( const Identifier &, const ErrorInfo & ) ) );
}
void ProbeDialog::probeResult( const Identifier &oid, const Value &value )
@@ -108,7 +108,7 @@ void ProbeDialog::nextProbe()
if ( m_canceled )
KProgressDialog::done( TQDialog::Rejected );
else
- TQTimer::singleShot( 0, this, TQT_SLOT( probeOne() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( probeOne() ) );
}
#include "probedialog.moc"
diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp
index b0218d4..b39d02c 100644
--- a/ksim/themeprefs.cpp
+++ b/ksim/themeprefs.cpp
@@ -77,8 +77,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
m_urlLabel = new KURLLabel(this);
m_urlLabel->setText(i18n("Open Konqueror in KSim's theme folder"));
m_urlLabel->setURL(TQString::fromLatin1("file://") + themeDir);
- connect(m_urlLabel, TQT_SIGNAL(leftClickedURL(const TQString &)),
- this, TQT_SLOT(openURL(const TQString &)));
+ connect(m_urlLabel, TQ_SIGNAL(leftClickedURL(const TQString &)),
+ this, TQ_SLOT(openURL(const TQString &)));
m_themeLayout->addMultiCellWidget(m_urlLabel, 1, 1, 0, 4);
m_line = new KSeparator(TQt::Horizontal, this);
@@ -99,8 +99,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
m_listView = new TDEListView(this);
m_listView->addColumn(i18n("Theme"));
m_listView->setFullWidth(true);
- connect(m_listView, TQT_SIGNAL(currentChanged(TQListViewItem *)),
- this, TQT_SLOT(selectItem(TQListViewItem *)));
+ connect(m_listView, TQ_SIGNAL(currentChanged(TQListViewItem *)),
+ this, TQ_SLOT(selectItem(TQListViewItem *)));
m_themeLayout->addMultiCellWidget(m_listView, 4, 4, 0, 4);
m_alternateLabel = new TQLabel(this);
@@ -126,8 +126,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
m_fontsCombo->insertItem(i18n("Default"));
m_fontsCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
TQSizePolicy::Fixed));
- connect(m_fontsCombo, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(showFontDialog(int)));
+ connect(m_fontsCombo, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(showFontDialog(int)));
m_themeLayout->addMultiCellWidget(m_fontsCombo, 5, 5, 4, 4);
TQStringList locatedFiles = TDEGlobal::dirs()->findDirs("data", "ksim/themes");
diff --git a/ktimer/ktimer.cpp b/ktimer/ktimer.cpp
index 3a3cef8..fb047f3 100644
--- a/ktimer/ktimer.cpp
+++ b/ktimer/ktimer.cpp
@@ -115,11 +115,11 @@ KTimerPref::KTimerPref( TQWidget *parent, const char *name )
tray->setPixmap( SmallIcon( "ktimer" ) );
// connect
- connect( m_add, TQT_SIGNAL(clicked()), TQT_SLOT(add()) );
- connect( m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(remove()) );
- connect( m_help, TQT_SIGNAL(clicked()), TQT_SLOT(help()) );
- connect( m_list, TQT_SIGNAL(currentChanged(TQListViewItem*)),
- TQT_SLOT(currentChanged(TQListViewItem*)) );
+ connect( m_add, TQ_SIGNAL(clicked()), TQ_SLOT(add()) );
+ connect( m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(remove()) );
+ connect( m_help, TQ_SIGNAL(clicked()), TQ_SLOT(help()) );
+ connect( m_list, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ TQ_SLOT(currentChanged(TQListViewItem*)) );
loadJobs( kapp->config() );
show();
@@ -138,16 +138,16 @@ void KTimerPref::add()
KTimerJob *job = new KTimerJob;
KTimerJobItem *item = new KTimerJobItem( job, m_list );
- connect( job, TQT_SIGNAL(delayChanged(KTimerJob*,unsigned)),
- TQT_SLOT(jobChanged(KTimerJob*)) );
- connect( job, TQT_SIGNAL(valueChanged(KTimerJob*,unsigned)),
- TQT_SLOT(jobChanged(KTimerJob*)) );
- connect( job, TQT_SIGNAL(stateChanged(KTimerJob*,States)),
- TQT_SLOT(jobChanged(KTimerJob*)) );
- connect( job, TQT_SIGNAL(commandChanged(KTimerJob*,const TQString&)),
- TQT_SLOT(jobChanged(KTimerJob*)) );
- connect( job, TQT_SIGNAL(finished(KTimerJob*,bool)),
- TQT_SLOT(jobFinished(KTimerJob*,bool)) );
+ connect( job, TQ_SIGNAL(delayChanged(KTimerJob*,unsigned)),
+ TQ_SLOT(jobChanged(KTimerJob*)) );
+ connect( job, TQ_SIGNAL(valueChanged(KTimerJob*,unsigned)),
+ TQ_SLOT(jobChanged(KTimerJob*)) );
+ connect( job, TQ_SIGNAL(stateChanged(KTimerJob*,States)),
+ TQ_SLOT(jobChanged(KTimerJob*)) );
+ connect( job, TQ_SIGNAL(commandChanged(KTimerJob*,const TQString&)),
+ TQ_SLOT(jobChanged(KTimerJob*)) );
+ connect( job, TQ_SIGNAL(finished(KTimerJob*,bool)),
+ TQ_SLOT(jobFinished(KTimerJob*,bool)) );
job->setUser( item );
@@ -192,22 +192,22 @@ void KTimerPref::currentChanged( TQListViewItem *i )
m_counter->disconnect();
m_slider->disconnect();
- connect( m_commandLine->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)),
- job, TQT_SLOT(setCommand(const TQString &)) );
- connect( m_delay, TQT_SIGNAL(valueChanged(int)),
- job, TQT_SLOT(setDelay(int)) );
- connect( m_loop, TQT_SIGNAL(toggled(bool)),
- job, TQT_SLOT(setLoop(bool)) );
- connect( m_one, TQT_SIGNAL(toggled(bool)),
- job, TQT_SLOT(setOneInstance(bool)) );
- connect( m_stop, TQT_SIGNAL(clicked()),
- job, TQT_SLOT(stop()) );
- connect( m_pause, TQT_SIGNAL(clicked()),
- job, TQT_SLOT(pause()) );
- connect( m_start, TQT_SIGNAL(clicked()),
- job, TQT_SLOT(start()) );
- connect( m_slider, TQT_SIGNAL(valueChanged(int)),
- job, TQT_SLOT(setValue(int)) );
+ connect( m_commandLine->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)),
+ job, TQ_SLOT(setCommand(const TQString &)) );
+ connect( m_delay, TQ_SIGNAL(valueChanged(int)),
+ job, TQ_SLOT(setDelay(int)) );
+ connect( m_loop, TQ_SIGNAL(toggled(bool)),
+ job, TQ_SLOT(setLoop(bool)) );
+ connect( m_one, TQ_SIGNAL(toggled(bool)),
+ job, TQ_SLOT(setOneInstance(bool)) );
+ connect( m_stop, TQ_SIGNAL(clicked()),
+ job, TQ_SLOT(stop()) );
+ connect( m_pause, TQ_SIGNAL(clicked()),
+ job, TQ_SLOT(pause()) );
+ connect( m_start, TQ_SIGNAL(clicked()),
+ job, TQ_SLOT(start()) );
+ connect( m_slider, TQ_SIGNAL(valueChanged(int)),
+ job, TQ_SLOT(setValue(int)) );
m_commandLine->lineEdit()->setText( job->command() );
m_delay->setValue( job->delay() );
@@ -276,16 +276,16 @@ void KTimerPref::loadJobs( TDEConfig *cfg )
KTimerJob *job = new KTimerJob;
KTimerJobItem *item = new KTimerJobItem( job, m_list );
- connect( job, TQT_SIGNAL(delayChanged(KTimerJob*,unsigned)),
- TQT_SLOT(jobChanged(KTimerJob*)) );
- connect( job, TQT_SIGNAL(valueChanged(KTimerJob*,unsigned)),
- TQT_SLOT(jobChanged(KTimerJob*)) );
- connect( job, TQT_SIGNAL(stateChanged(KTimerJob*,States)),
- TQT_SLOT(jobChanged(KTimerJob*)) );
- connect( job, TQT_SIGNAL(commandChanged(KTimerJob*,const TQString&)),
- TQT_SLOT(jobChanged(KTimerJob*)) );
- connect( job, TQT_SIGNAL(finished(KTimerJob*,bool)),
- TQT_SLOT(jobFinished(KTimerJob*,bool)) );
+ connect( job, TQ_SIGNAL(delayChanged(KTimerJob*,unsigned)),
+ TQ_SLOT(jobChanged(KTimerJob*)) );
+ connect( job, TQ_SIGNAL(valueChanged(KTimerJob*,unsigned)),
+ TQ_SLOT(jobChanged(KTimerJob*)) );
+ connect( job, TQ_SIGNAL(stateChanged(KTimerJob*,States)),
+ TQ_SLOT(jobChanged(KTimerJob*)) );
+ connect( job, TQ_SIGNAL(commandChanged(KTimerJob*,const TQString&)),
+ TQ_SLOT(jobChanged(KTimerJob*)) );
+ connect( job, TQ_SIGNAL(finished(KTimerJob*,bool)),
+ TQ_SLOT(jobFinished(KTimerJob*,bool)) );
job->load( cfg, TQString( "Job%1" ).arg(n) );
@@ -327,7 +327,7 @@ KTimerJob::KTimerJob( TQObject *parent, const char *name )
d->user = 0;
d->timer = new TQTimer( this );
- connect( d->timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) );
+ connect( d->timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) );
}
@@ -509,8 +509,8 @@ void KTimerJob::fire()
KShellProcess *proc = new KShellProcess;
(*proc) << d->command;
d->processes.append( proc );
- connect( proc, TQT_SIGNAL(processExited(TDEProcess*)),
- TQT_SLOT(processExited(TDEProcess*)) );
+ connect( proc, TQ_SIGNAL(processExited(TDEProcess*)),
+ TQ_SLOT(processExited(TDEProcess*)) );
bool ok = proc->start( TDEProcess::NotifyOnExit );
emit fired( this );
if( !ok ) {
diff --git a/superkaramba/src/datesensor.cpp b/superkaramba/src/datesensor.cpp
index 6adef6d..24e4675 100644
--- a/superkaramba/src/datesensor.cpp
+++ b/superkaramba/src/datesensor.cpp
@@ -87,7 +87,7 @@ void DateSensor::toggleCalendar(TQMouseEvent *ev)
hidden = false;
cal = new DatePicker(0);
- connect(cal, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCalendarDeleted()));
+ connect(cal, TQ_SIGNAL(destroyed()), TQ_SLOT(slotCalendarDeleted()));
TQPoint c = (TQPoint(ev->x(), ev->y()));
int w = cal->sizeHint().width();
diff --git a/superkaramba/src/disksensor.cpp b/superkaramba/src/disksensor.cpp
index e16d415..50f23ff 100644
--- a/superkaramba/src/disksensor.cpp
+++ b/superkaramba/src/disksensor.cpp
@@ -18,10 +18,10 @@
DiskSensor::DiskSensor( int msec ) : Sensor( msec )
{
- connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
- this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int )));
- connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)),
- this,TQT_SLOT(processExited( TDEProcess * )));
+ connect(&ksp, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+ this,TQ_SLOT(receivedStdout(TDEProcess *, char *, int )));
+ connect(&ksp, TQ_SIGNAL(processExited(TDEProcess *)),
+ this,TQ_SLOT(processExited( TDEProcess * )));
// update values on startup
ksp.clearArguments();
diff --git a/superkaramba/src/imagelabel.cpp b/superkaramba/src/imagelabel.cpp
index 2edac34..4b934a9 100644
--- a/superkaramba/src/imagelabel.cpp
+++ b/superkaramba/src/imagelabel.cpp
@@ -39,7 +39,7 @@ Effect::Effect(ImageLabel* img, int msec) :
if (msec > 0)
{
// remove the effect after the given time
- //TQTimer::singleShot (millisec, myImage, TQT_SLOT(slotEffectExpired()));
+ //TQTimer::singleShot (millisec, myImage, TQ_SLOT(slotEffectExpired()));
//timer -> changeInterval(millisec);
millisec = msec;
}
@@ -57,7 +57,7 @@ void Effect::startTimer()
{
if (millisec > 0)
{
- TQTimer::singleShot (millisec, myImage, TQT_SLOT(slotEffectExpired()));
+ TQTimer::singleShot (millisec, myImage, TQ_SLOT(slotEffectExpired()));
millisec = 0;
}
}
@@ -287,8 +287,8 @@ void ImageLabel::setValue(TQString fn)
KTempFile tmpFile;
TDEIO::FileCopyJob* copy = TDEIO::file_copy(fileName, tmpFile.name(), 0600,
true, false, false);
- connect(copy, TQT_SIGNAL(result(TDEIO::Job*)),
- this, TQT_SLOT(slotCopyResult(TDEIO::Job*)));
+ connect(copy, TQ_SIGNAL(result(TDEIO::Job*)),
+ this, TQ_SLOT(slotCopyResult(TDEIO::Job*)));
return;
}
else
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index ebd7f2f..d4a74f7 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -77,7 +77,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
if(!m_theme.set(url))
{
setFixedSize(0, 0);
- TQTimer::singleShot(100, this, TQT_SLOT(killWidget()));
+ TQTimer::singleShot(100, this, TQ_SLOT(killWidget()));
return;
}
// Add self to list of open themes
@@ -93,8 +93,8 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
setName(qName.ascii());
KDirWatch *dirWatch = KDirWatch::self();
- connect(dirWatch, TQT_SIGNAL( dirty( const TQString & ) ),
- TQT_SLOT( slotFileChanged( const TQString & ) ) );
+ connect(dirWatch, TQ_SIGNAL( dirty( const TQString & ) ),
+ TQ_SLOT( slotFileChanged( const TQString & ) ) );
if(!dirWatch->contains(m_theme.file()))
dirWatch->addFile(m_theme.file());
@@ -132,7 +132,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
if(m_theme.pythonModuleExists())
{
kdDebug() << "Loading python module: " << m_theme.pythonModule() << endl;
- TQTimer::singleShot(0, this, TQT_SLOT(initPythonInterface()));
+ TQTimer::singleShot(0, this, TQ_SLOT(initPythonInterface()));
}
widgetMask = 0;
@@ -142,22 +142,22 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
kWinModule = new KWinModule();
desktop = 0;
- connect( kWinModule,TQT_SIGNAL(currentDesktopChanged(int)), this,
- TQT_SLOT(currentDesktopChanged(int)) );
- connect( kapp, TQT_SIGNAL(backgroundChanged(int)), this,
- TQT_SLOT(currentWallpaperChanged(int)));
+ connect( kWinModule,TQ_SIGNAL(currentDesktopChanged(int)), this,
+ TQ_SLOT(currentDesktopChanged(int)) );
+ connect( kapp, TQ_SIGNAL(backgroundChanged(int)), this,
+ TQ_SLOT(currentWallpaperChanged(int)));
// Setup of the Task Manager Callbacks
- connect(&taskManager, TQT_SIGNAL(activeTaskChanged(Task*)), this,
- TQT_SLOT(activeTaskChanged(Task*)) );
- connect(&taskManager, TQT_SIGNAL(taskAdded(Task*)), this,
- TQT_SLOT(taskAdded(Task*)) );
- connect(&taskManager, TQT_SIGNAL(taskRemoved(Task*)), this,
- TQT_SLOT(taskRemoved(Task*)) );
- connect(&taskManager, TQT_SIGNAL(startupAdded(Startup*)), this,
- TQT_SLOT(startupAdded(Startup*)) );
- connect(&taskManager, TQT_SIGNAL(startupRemoved(Startup*)), this,
- TQT_SLOT(startupRemoved(Startup*)) );
+ connect(&taskManager, TQ_SIGNAL(activeTaskChanged(Task*)), this,
+ TQ_SLOT(activeTaskChanged(Task*)) );
+ connect(&taskManager, TQ_SIGNAL(taskAdded(Task*)), this,
+ TQ_SLOT(taskAdded(Task*)) );
+ connect(&taskManager, TQ_SIGNAL(taskRemoved(Task*)), this,
+ TQ_SLOT(taskRemoved(Task*)) );
+ connect(&taskManager, TQ_SIGNAL(startupAdded(Startup*)), this,
+ TQ_SLOT(startupAdded(Startup*)) );
+ connect(&taskManager, TQ_SIGNAL(startupRemoved(Startup*)), this,
+ TQ_SLOT(startupRemoved(Startup*)) );
themeConfMenu = new TDEPopupMenu( this);
themeConfMenu -> setCheckable(true);
@@ -171,7 +171,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
toDesktopMenu -> setCheckable(true);
mid = toDesktopMenu -> insertItem (i18n("&All Desktops"),
dslot = new DesktopChangeSlot(this,0),
- TQT_SLOT(receive()));
+ TQ_SLOT(receive()));
dslot->setMenuId(mid);
toDesktopMenu -> insertSeparator();
@@ -181,7 +181,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
name += ('0' + ndesktop);
mid = toDesktopMenu -> insertItem (name,
- dslot = new DesktopChangeSlot(this, ndesktop), TQT_SLOT(receive()));
+ dslot = new DesktopChangeSlot(this, ndesktop), TQ_SLOT(receive()));
dslot->setMenuId(mid);
}
@@ -193,11 +193,11 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
menuAccColl = new TDEActionCollection( this );
kpop->insertItem( SmallIconSet("reload"),i18n("Update"), this,
- TQT_SLOT(updateSensors()), Key_F5 );
+ TQ_SLOT(updateSensors()), Key_F5 );
toggleLocked = new TDEToggleAction ( i18n("Toggle &Locked Position"),
SmallIconSet("locked"),
CTRL+Key_L, this,
- TQT_SLOT( slotToggleLocked() ),
+ TQ_SLOT( slotToggleLocked() ),
accColl, "Locked position" );
accColl->insert(toggleLocked);
toggleLocked -> setChecked(true);
@@ -206,7 +206,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
toggleFastTransforms = new TDEToggleAction(i18n("Use &Fast Image Scaling"),
CTRL+Key_F, this,
- TQT_SLOT( slotToggleFastTransforms() ),
+ TQ_SLOT( slotToggleFastTransforms() ),
accColl, "Fast transformations");
accColl->insert(toggleFastTransforms);
@@ -221,9 +221,9 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
kpop->insertItem(i18n("To Des&ktop"), toDesktopMenu);
kpop->insertItem( SmallIconSet("reload3"),i18n("&Reload Theme"),this,
- TQT_SLOT(reloadConfig()), CTRL+Key_R );
+ TQ_SLOT(reloadConfig()), CTRL+Key_R );
kpop->insertItem( SmallIconSet("window-close"),i18n("&Close This Theme"), this,
- TQT_SLOT(killWidget()), CTRL+Key_C );
+ TQ_SLOT(killWidget()), CTRL+Key_C );
if(!SuperKarambaSettings::showSysTray())
showMenuExtension();
@@ -262,7 +262,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
if( !parseConfig() )
{
setFixedSize(0,0);
- TQTimer::singleShot( 100, this, TQT_SLOT(killWidget()) );
+ TQTimer::singleShot( 100, this, TQ_SLOT(killWidget()) );
tqWarning("Could not read config file.");
}
else
@@ -605,7 +605,7 @@ bool karamba::parseConfig()
if (!tiptext.isEmpty())
tmp->setTooltip(tiptext);
- connect(tmp, TQT_SIGNAL(pixmapLoaded()), this, TQT_SLOT(externalStep()));
+ connect(tmp, TQ_SIGNAL(pixmapLoaded()), this, TQ_SLOT(externalStep()));
setSensor(lineParser, (Meter*) tmp );
meterList->append (tmp );
imageList->append (tmp );
@@ -790,12 +790,12 @@ void karamba::start()
{
m_sysTimer = new TQTimer(this);
- connect(m_sysTimer, TQT_SIGNAL(timeout()), TQT_SLOT(step()));
+ connect(m_sysTimer, TQ_SIGNAL(timeout()), TQ_SLOT(step()));
m_sysTimer->start(m_interval);
//Start the widget running
- TQTimer::singleShot( 0, this, TQT_SLOT(step()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(step()) );
if( !(onTop || managed) )
lowerTimer.start();
@@ -1015,7 +1015,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter)
int interval = lineParser.getInt("INTERVAL");
interval = (interval == 0)?5000:interval;
sensor = ( sensorMap["DISK"] = new DiskSensor( interval ) );
- connect( sensor, TQT_SIGNAL(initComplete()), this, TQT_SLOT(externalStep()) );
+ connect( sensor, TQ_SIGNAL(initComplete()), this, TQ_SLOT(externalStep()) );
sensorList->append( sensor );
}
// meter->setMax( ((DiskSensor*)sensor)->getTotalSpace(mntPt)/1024 );
@@ -1216,7 +1216,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter)
if (sensor != 0)
{
- TQTimer::singleShot( 0, sensor, TQT_SLOT(update()) );
+ TQTimer::singleShot( 0, sensor, TQ_SLOT(update()) );
sensor->start();
}
}
@@ -1560,7 +1560,7 @@ void karamba::updateSensors()
((Sensor*) *it)->update();
++it;
}
- TQTimer::singleShot( 500, this, TQT_SLOT(step()) );
+ TQTimer::singleShot( 500, this, TQ_SLOT(step()) );
}
void karamba::updateBackground(TDESharedPixmap* kpm)
@@ -1780,14 +1780,14 @@ void karamba::addMenuConfigOption(TQString key, TQString name)
SignalBridge* action = new SignalBridge(this, key, menuAccColl);
TDEToggleAction* confItem = new TDEToggleAction (name, TDEShortcut::null(),
- action, TQT_SLOT(receive()),
+ action, TQ_SLOT(receive()),
menuAccColl, key.ascii());
confItem -> setName(key.ascii());
menuAccColl -> insert(confItem);
- connect(action, TQT_SIGNAL( enabled(TQString, bool) ),
- this, TQT_SLOT( slotToggleConfigOption(TQString, bool) ));
+ connect(action, TQ_SIGNAL( enabled(TQString, bool) ),
+ this, TQ_SLOT( slotToggleConfigOption(TQString, bool) ));
config -> setGroup("config menu");
confItem -> setChecked(config -> readBoolEntry(key));
@@ -2034,16 +2034,16 @@ void karamba::showMenuExtension()
trayMenuToggleId = kglobal->insertItem(SmallIconSet("superkaramba"),
i18n("Show System Tray Icon"), this,
- TQT_SLOT(slotToggleSystemTray()),
+ TQ_SLOT(slotToggleSystemTray()),
CTRL+Key_S);
trayMenuThemeId = kglobal->insertItem(SmallIconSet("knewstuff"),
i18n("&Manage Themes..."), this,
- TQT_SLOT(slotShowTheme()), CTRL+Key_M);
+ TQ_SLOT(slotShowTheme()), CTRL+Key_M);
trayMenuQuitId = kglobal->insertItem(SmallIconSet("system-log-out"),
i18n("&Quit SuperKaramba"), this,
- TQT_SLOT(slotQuit()), CTRL+Key_Q);
+ TQ_SLOT(slotQuit()), CTRL+Key_Q);
kglobal->polish();
diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp
index 79d7d42..b4bf15c 100644
--- a/superkaramba/src/karambaapp.cpp
+++ b/superkaramba/src/karambaapp.cpp
@@ -141,17 +141,17 @@ void KarambaApplication::setUpSysTray(TDEAboutData* about)
TDEPopupMenu *menu = sysTrayIcon->contextMenu();
menu->insertItem(SmallIconSet("superkaramba"),
i18n("Hide System Tray Icon"), this,
- TQT_SLOT(globalHideSysTray()));
+ TQ_SLOT(globalHideSysTray()));
menu->insertSeparator();
m_helpMenu = new KHelpMenu(themeListWindow, about);
- action = KStdAction::help(m_helpMenu, TQT_SLOT(appHelpActivated()),
+ action = KStdAction::help(m_helpMenu, TQ_SLOT(appHelpActivated()),
sysTrayIcon->actionCollection());
action->plug(menu);
- action = KStdAction::aboutApp(m_helpMenu, TQT_SLOT(aboutApplication()),
+ action = KStdAction::aboutApp(m_helpMenu, TQ_SLOT(aboutApplication()),
sysTrayIcon->actionCollection());
action->plug(menu);
- action = KStdAction::aboutKDE(m_helpMenu, TQT_SLOT(aboutKDE()),
+ action = KStdAction::aboutKDE(m_helpMenu, TQ_SLOT(aboutKDE()),
sysTrayIcon->actionCollection());
action->plug(menu);
@@ -164,8 +164,8 @@ void KarambaApplication::setUpSysTray(TDEAboutData* about)
sysTrayIcon->hide();
//Connect Systray icon's quit event
- TQObject::connect(sysTrayIcon, TQT_SIGNAL(quitSelected()),
- this, TQT_SLOT(globalQuitSuperKaramba()));
+ TQObject::connect(sysTrayIcon, TQ_SIGNAL(quitSelected()),
+ this, TQ_SLOT(globalQuitSuperKaramba()));
}
void KarambaApplication::showKarambaMenuExtension(bool show)
diff --git a/superkaramba/src/kwidgetlistbox.cpp b/superkaramba/src/kwidgetlistbox.cpp
index 1811f38..56e0769 100644
--- a/superkaramba/src/kwidgetlistbox.cpp
+++ b/superkaramba/src/kwidgetlistbox.cpp
@@ -33,8 +33,8 @@ KWidgetListbox::KWidgetListbox(TQWidget *parent, const char *name)
verticalHeader()->hide();
setSelectionMode(TQTable::NoSelection);
setFocusStyle(TQTable::FollowStyle);
- connect(this, TQT_SIGNAL(currentChanged(int, int)),
- this, TQT_SLOT(selectionChanged(int, int)));
+ connect(this, TQ_SIGNAL(currentChanged(int, int)),
+ this, TQ_SLOT(selectionChanged(int, int)));
setHScrollBarMode(TQScrollView::AlwaysOff);
setVScrollBarMode(TQScrollView::Auto);
}
diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp
index 6196983..d336bd4 100644
--- a/superkaramba/src/main.cpp
+++ b/superkaramba/src/main.cpp
@@ -128,7 +128,7 @@ int main(int argc, char **argv)
KarambaApplication::unlockKaramba();
- app.connect(tqApp,TQT_SIGNAL(lastWindowClosed()),tqApp,TQT_SLOT(quit()));
+ app.connect(tqApp,TQ_SIGNAL(lastWindowClosed()),tqApp,TQ_SLOT(quit()));
// Try to restore a previous session if applicable.
app.checkPreviousSession(app, lst);
diff --git a/superkaramba/src/memsensor.cpp b/superkaramba/src/memsensor.cpp
index 98eceea..1d6c4dc 100644
--- a/superkaramba/src/memsensor.cpp
+++ b/superkaramba/src/memsensor.cpp
@@ -57,10 +57,10 @@ MemSensor::MemSensor(int msec) : Sensor(msec)
# if defined(Q_OS_FREEBSD) && defined(__FreeBSD_version) && __FreeBSD_version >= 500018
kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open");
# elif defined Q_OS_FREEBSD
- connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
- this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int )));
- connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)),
- this,TQT_SLOT(processExited( TDEProcess * )));
+ connect(&ksp, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+ this,TQ_SLOT(receivedStdout(TDEProcess *, char *, int )));
+ connect(&ksp, TQ_SIGNAL(processExited(TDEProcess *)),
+ this,TQ_SLOT(processExited( TDEProcess * )));
swapTotal = swapUsed = 0;
diff --git a/superkaramba/src/menu_python.cpp b/superkaramba/src/menu_python.cpp
index c42a009..bc5d9e3 100644
--- a/superkaramba/src/menu_python.cpp
+++ b/superkaramba/src/menu_python.cpp
@@ -40,8 +40,8 @@ long createMenu(long widget)
TDEPopupMenu* tmp = new TDEPopupMenu(currTheme);
currTheme->menuList->append( tmp );
- currTheme->connect(tmp, TQT_SIGNAL(activated(int)), currTheme,
- TQT_SLOT(passMenuItemClicked(int)));
+ currTheme->connect(tmp, TQ_SIGNAL(activated(int)), currTheme,
+ TQ_SLOT(passMenuItemClicked(int)));
return (long)tmp;
}
diff --git a/superkaramba/src/misc_python.cpp b/superkaramba/src/misc_python.cpp
index 271ec51..5f60ff0 100644
--- a/superkaramba/src/misc_python.cpp
+++ b/superkaramba/src/misc_python.cpp
@@ -149,13 +149,13 @@ PyObject* py_execute_command_interactive(PyObject *, PyObject* args)
}
TQApplication::connect(currTheme->currProcess,
- TQT_SIGNAL(processExited(TDEProcess *)),
+ TQ_SIGNAL(processExited(TDEProcess *)),
currTheme,
- TQT_SLOT(processExited(TDEProcess *)));
+ TQ_SLOT(processExited(TDEProcess *)));
TQApplication::connect(currTheme->currProcess,
- TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
currTheme,
- TQT_SLOT(receivedStdout(TDEProcess *, char *, int)));
+ TQ_SLOT(receivedStdout(TDEProcess *, char *, int)));
currTheme->currProcess->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
return Py_BuildValue((char*)"l", (int)(currTheme->currProcess->pid()));
diff --git a/superkaramba/src/programsensor.cpp b/superkaramba/src/programsensor.cpp
index 0c2f3e2..6bae664 100644
--- a/superkaramba/src/programsensor.cpp
+++ b/superkaramba/src/programsensor.cpp
@@ -25,10 +25,10 @@ ProgramSensor::ProgramSensor(const TQString &progName, int interval, TQString en
programName = progName;
//update();
- connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
- this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int )));
- connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)),
- this,TQT_SLOT(processExited( TDEProcess * )));
+ connect(&ksp, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+ this,TQ_SLOT(receivedStdout(TDEProcess *, char *, int )));
+ connect(&ksp, TQ_SIGNAL(processExited(TDEProcess *)),
+ this,TQ_SLOT(processExited( TDEProcess * )));
}
ProgramSensor::~ProgramSensor()
diff --git a/superkaramba/src/sensor.cpp b/superkaramba/src/sensor.cpp
index 378cb1d..8655754 100644
--- a/superkaramba/src/sensor.cpp
+++ b/superkaramba/src/sensor.cpp
@@ -19,7 +19,7 @@ void Sensor::start()
{
if (!timer.isActive())
{
- connect (&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update()));
+ connect (&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update()));
timer.start( (msec == 0)?1000:msec);
}
}
diff --git a/superkaramba/src/sensorsensor.cpp b/superkaramba/src/sensorsensor.cpp
index baea31d..2998ba4 100644
--- a/superkaramba/src/sensorsensor.cpp
+++ b/superkaramba/src/sensorsensor.cpp
@@ -29,10 +29,10 @@ SensorSensor::SensorSensor(int interval, char tempUnit) : Sensor( interval )
#endif
if(tempUnit == 'F')
extraParams = " -f";
- connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
- this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int )));
- connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)),
- this,TQT_SLOT(processExited( TDEProcess * )));
+ connect(&ksp, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+ this,TQ_SLOT(receivedStdout(TDEProcess *, char *, int )));
+ connect(&ksp, TQ_SIGNAL(processExited(TDEProcess *)),
+ this,TQ_SLOT(processExited( TDEProcess * )));
// readValues();
}
diff --git a/superkaramba/src/showdesktop.cpp b/superkaramba/src/showdesktop.cpp
index 57d1f46..1259288 100644
--- a/superkaramba/src/showdesktop.cpp
+++ b/superkaramba/src/showdesktop.cpp
@@ -40,10 +40,10 @@ ShowDesktop::ShowDesktop()
kWinModule = new KWinModule( this );
// on desktop changes or when a window is deiconified, we abort the show desktop mode
- connect( kWinModule, TQT_SIGNAL(currentDesktopChanged(int)),
- TQT_SLOT(slotCurrentDesktopChanged(int)));
- connect( kWinModule, TQT_SIGNAL(windowChanged(WId,unsigned int)),
- TQT_SLOT(slotWindowChanged(WId,unsigned int)));
+ connect( kWinModule, TQ_SIGNAL(currentDesktopChanged(int)),
+ TQ_SLOT(slotCurrentDesktopChanged(int)));
+ connect( kWinModule, TQ_SIGNAL(windowChanged(WId,unsigned int)),
+ TQ_SLOT(slotWindowChanged(WId,unsigned int)));
}
void ShowDesktop::slotCurrentDesktopChanged(int)
diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp
index f8397de..ea93889 100644
--- a/superkaramba/src/systemtray.cpp
+++ b/superkaramba/src/systemtray.cpp
@@ -95,7 +95,7 @@ void Systemtray::initSystray( void )
emb->setAutoDelete(false);
- connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows()));
+ connect(emb, TQ_SIGNAL(embeddedWindowDestroyed()), TQ_SLOT(updateTrayWindows()));
m_Wins.append(emb);
@@ -107,8 +107,8 @@ void Systemtray::initSystray( void )
updateTrayWindows();
- connect(twin_module, TQT_SIGNAL(systemTrayWindowAdded(WId)), TQT_SLOT(systemTrayWindowAdded(WId)));
- connect(twin_module, TQT_SIGNAL(systemTrayWindowRemoved(WId)), TQT_SLOT(systemTrayWindowRemoved(WId)));
+ connect(twin_module, TQ_SIGNAL(systemTrayWindowAdded(WId)), TQ_SLOT(systemTrayWindowAdded(WId)));
+ connect(twin_module, TQ_SIGNAL(systemTrayWindowRemoved(WId)), TQ_SLOT(systemTrayWindowRemoved(WId)));
TQCString screenstr;
screenstr.setNum(tqt_xscreen());
@@ -206,7 +206,7 @@ void Systemtray::systemTrayWindowAdded( WId w )
emb->setAutoDelete(false);
//emb->setBackgroundMode(X11ParentRelative);
emb->setBackgroundMode(FixedPixmap);
- connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows()));
+ connect(emb, TQ_SIGNAL(embeddedWindowDestroyed()), TQ_SLOT(updateTrayWindows()));
m_Wins.append(emb);
emb->embed(w);
diff --git a/superkaramba/src/systray_python.cpp b/superkaramba/src/systray_python.cpp
index c953fdb..e0d96a1 100644
--- a/superkaramba/src/systray_python.cpp
+++ b/superkaramba/src/systray_python.cpp
@@ -111,8 +111,8 @@ long createSystray(long widget, long x, long y, long w, long h)
currTheme->systray->move((int)x,(int)y);
currTheme->systray->setMinimumSize((int)w,(int)h);
currTheme->systray->initSystray();
- TQObject::connect(currTheme->systray,TQT_SIGNAL(updated()),
- currTheme,TQT_SLOT(systrayUpdated()));
+ TQObject::connect(currTheme->systray,TQ_SIGNAL(updated()),
+ currTheme,TQ_SLOT(systrayUpdated()));
currTheme->systray->show();
}
diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp
index e58f9b3..b666d28 100644
--- a/superkaramba/src/taskmanager.cpp
+++ b/superkaramba/src/taskmanager.cpp
@@ -55,11 +55,11 @@ TaskManager::TaskManager(TQObject *parent, const char *name)
twin_module = new KWinModule();
// TDEGlobal::locale()->insertCatalogue("libtaskmanager");
- connect(twin_module, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)));
- connect(twin_module, TQT_SIGNAL(windowRemoved(WId)), TQT_SLOT(windowRemoved(WId)));
- connect(twin_module, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(activeWindowChanged(WId)));
- connect(twin_module, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(currentDesktopChanged(int)));
- connect(twin_module, TQT_SIGNAL(windowChanged(WId,unsigned int)), TQT_SLOT(windowChanged(WId,unsigned int)));
+ connect(twin_module, TQ_SIGNAL(windowAdded(WId)), TQ_SLOT(windowAdded(WId)));
+ connect(twin_module, TQ_SIGNAL(windowRemoved(WId)), TQ_SLOT(windowRemoved(WId)));
+ connect(twin_module, TQ_SIGNAL(activeWindowChanged(WId)), TQ_SLOT(activeWindowChanged(WId)));
+ connect(twin_module, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(currentDesktopChanged(int)));
+ connect(twin_module, TQ_SIGNAL(windowChanged(WId,unsigned int)), TQ_SLOT(windowChanged(WId,unsigned int)));
// register existing windows
const TQValueList