diff options
Diffstat (limited to 'kregexpeditor')
27 files changed, 159 insertions, 168 deletions
diff --git a/kregexpeditor/KMultiFormListBox/ccp.cpp b/kregexpeditor/KMultiFormListBox/ccp.cpp index 7b21f51..4f0d4b3 100644 --- a/kregexpeditor/KMultiFormListBox/ccp.cpp +++ b/kregexpeditor/KMultiFormListBox/ccp.cpp @@ -32,7 +32,7 @@ CCP::CCP(KMultiFormListBoxMultiVisible *ee_, KMultiFormListBoxEntry *eee_) : TQObject() { ee = ee_; eee = eee_; - install(TQT_TQOBJECT(eee)); + install(eee); } void CCP::install(TQObject *elm) diff --git a/kregexpeditor/KMultiFormListBox/indexWindow.cpp b/kregexpeditor/KMultiFormListBox/indexWindow.cpp index 22bc14f..020ecf5 100644 --- a/kregexpeditor/KMultiFormListBox/indexWindow.cpp +++ b/kregexpeditor/KMultiFormListBox/indexWindow.cpp @@ -29,7 +29,7 @@ indexWindow::indexWindow() : TQWidget(0,"", WStyle_Customize | WType_Popup) { lb = new TQListBox(this); - connect(lb,TQT_SIGNAL(selected(int)), this, TQT_SLOT(lbSelected(int))); + connect(lb,TQ_SIGNAL(selected(int)), this, TQ_SLOT(lbSelected(int))); TQHBoxLayout *lay = new TQHBoxLayout(this); lay->addWidget(lb); lbFinish = false; diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp index 09c5052..a394c58 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp @@ -178,9 +178,9 @@ void KMultiFormListBoxMultiVisible::insertElmIntoWidget(KMultiFormListBoxEntry * if (elm->indexButton()) { elm->indexButton()->setPixmap(TQBitmap(indexButtonWidth, indexButtonHeight, indexButtonBits, true)); - connect(elm->indexButton(), TQT_SIGNAL(clicked()), elm, TQT_SLOT(acceptIndexButton())); - connect(elm, TQT_SIGNAL(gotoIndex(KMultiFormListBoxEntry *)), - this, TQT_SLOT(showIndexList(KMultiFormListBoxEntry *))); + connect(elm->indexButton(), TQ_SIGNAL(clicked()), elm, TQ_SLOT(acceptIndexButton())); + connect(elm, TQ_SIGNAL(gotoIndex(KMultiFormListBoxEntry *)), + this, TQ_SLOT(showIndexList(KMultiFormListBoxEntry *))); } // Find the location to insert the new element. @@ -266,14 +266,14 @@ void KMultiFormListBoxMultiVisible::cut(KMultiFormListBoxEntry *elm) } TQDataStream stream(clipboard, IO_WriteOnly); - factory->toStream( TQT_TQOBJECT(elm), stream ); + factory->toStream( elm, stream ); delElement(elm); } void KMultiFormListBoxMultiVisible::copy(KMultiFormListBoxEntry *elm) { TQDataStream stream(clipboard, IO_WriteOnly); - factory->toStream(TQT_TQOBJECT(elm), stream); + factory->toStream(elm, stream); } void KMultiFormListBoxMultiVisible::paste(KMultiFormListBoxEntry *oldElm) @@ -285,7 +285,7 @@ void KMultiFormListBoxMultiVisible::paste(KMultiFormListBoxEntry *oldElm) KMultiFormListBoxEntry *newElm = factory->create(viewport()); TQDataStream stream( clipboard, IO_ReadOnly ); - factory->fromStream(stream, TQT_TQOBJECT(newElm)); + factory->fromStream(stream, newElm); insertElmIntoWidget(newElm,oldElm); } diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp index f39c9e9..a366ad1 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp @@ -46,40 +46,40 @@ KMultiFormListBoxWindowed::KMultiFormListBoxWindowed(KMultiFormListBoxFactory *f TQPushButton *but = new TQPushButton(addButtonText, this,"Add Button"); buttons->addWidget(but,0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewElement())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewElement())); but = new TQPushButton(i18n("Edit"), this,"Edit Button"); buttons->addWidget(but,0); - connect(but,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditSelected())); - connect(_listbox, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), this, TQT_SLOT(slotEditSelected(TQListBoxItem *))); + connect(but,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditSelected())); + connect(_listbox, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), this, TQ_SLOT(slotEditSelected(TQListBoxItem *))); _buttonList.append(but); but = new TQPushButton(i18n("Delete"), this, "Delete Button"); buttons->addWidget(but,0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteEntry())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteEntry())); _buttonList.append(but); but = new TQPushButton(i18n("Copy"), this, "Copy Button"); buttons->addWidget(but,0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCopySelected())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCopySelected())); _buttonList.append(but); if (showUpDownButtons) { but = new TQPushButton(i18n("Up"), this, "Up Button"); buttons->addWidget(but, 0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveItemUp())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveItemUp())); _buttonList.append(but); but = new TQPushButton(i18n("Down"), this, "Down Button"); buttons->addWidget(but, 0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveItemDown())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveItemDown())); _buttonList.append(but); } if (showHelpButton) { but = new KPushButton(KStdGuiItem::help(), this, "Help Button"); buttons->addWidget(but, 0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(showHelp())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(showHelp())); } buttons->addStretch(1); @@ -123,7 +123,7 @@ void KMultiFormListBoxWindowed::addNewElement() TQWidget *widget = new WidgetWindow(_factory, _listbox); widget->show(); - connect(widget, TQT_SIGNAL(finished()), this, TQT_SLOT(slotUpdateButtonState())); + connect(widget, TQ_SIGNAL(finished()), this, TQ_SLOT(slotUpdateButtonState())); } void KMultiFormListBoxWindowed::addElement() diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp index 33eda27..2b22ee5 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp @@ -77,7 +77,7 @@ void KMultiFormListBox::toStream( TQDataStream& stream ) const const KMultiFormListBoxEntryList elms = elements(); stream << elms.count(); for ( TQPtrListIterator<KMultiFormListBoxEntry> it(elms); *it; ++it) - _factory->toStream( TQT_TQOBJECT(*it), stream ); + _factory->toStream( *it, stream ); } void KMultiFormListBox::fromStream( TQDataStream& stream ) @@ -97,7 +97,7 @@ void KMultiFormListBox::fromStream( TQDataStream& stream ) KMultiFormListBoxEntryList elms = elements(); for (TQPtrListIterator<KMultiFormListBoxEntry> it(elms); *it; ++it) - _factory->fromStream( stream, TQT_TQOBJECT(*it) ); + _factory->fromStream( stream, *it ); } diff --git a/kregexpeditor/KMultiFormListBox/widgetwindow.cpp b/kregexpeditor/KMultiFormListBox/widgetwindow.cpp index 9b055a3..6d101a0 100644 --- a/kregexpeditor/KMultiFormListBox/widgetwindow.cpp +++ b/kregexpeditor/KMultiFormListBox/widgetwindow.cpp @@ -47,7 +47,7 @@ void WidgetWindow::init(KMultiFormListBoxFactory *factory, TDEListBox *lb, KMult myWidget = factory->create(frame); } TQDataStream stream( _backup, IO_WriteOnly ); - myFact->toStream( TQT_TQOBJECT(myWidget), stream ); + myFact->toStream( myWidget, stream ); lay->addWidget(myWidget); @@ -86,7 +86,7 @@ void WidgetWindow::slotCancel() } else { TQDataStream stream( _backup, IO_ReadOnly ); - myFact->fromStream( stream, TQT_TQOBJECT(myWidget) ); + myFact->fromStream( stream, myWidget ); } KDialogBase::slotCancel(); } @@ -96,9 +96,9 @@ WidgetWindow *WidgetWindow::clone() WidgetWindow *item = new WidgetWindow(myFact, listbox); TQByteArray data; TQDataStream ws( data, IO_WriteOnly ); - myFact->toStream( TQT_TQOBJECT(myWidget), ws ); + myFact->toStream( myWidget, ws ); TQDataStream rs( data, IO_ReadOnly ); - myFact->fromStream( rs, TQT_TQOBJECT(item->myWidget) ); + myFact->fromStream( rs, item->myWidget ); item->slotOk(); return item; @@ -107,7 +107,7 @@ WidgetWindow *WidgetWindow::clone() void WidgetWindow::display() { TQDataStream stream( _backup, IO_WriteOnly); - myFact->toStream( TQT_TQOBJECT(myWidget), stream ); + myFact->toStream( myWidget, stream ); show(); } diff --git a/kregexpeditor/auxbuttons.cpp b/kregexpeditor/auxbuttons.cpp index ffa47c1..0bcd10d 100644 --- a/kregexpeditor/auxbuttons.cpp +++ b/kregexpeditor/auxbuttons.cpp @@ -40,44 +40,44 @@ AuxButtons::AuxButtons( TQWidget* parent, const char* name = 0) _undo = new TQToolButton( this ); _undo->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-undo") ) ); layout->addWidget( _undo ); - connect( _undo, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(undo()) ); + connect( _undo, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(undo()) ); TQToolTip::add( _undo, i18n( "Undo" ) ); _redo = new TQToolButton( this ); _redo->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-redo") ) ); layout->addWidget( _redo ); - connect( _redo, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(redo()) ); + connect( _redo, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(redo()) ); TQToolTip::add( _redo, i18n( "Redo" ) ); _cut = new TQToolButton( this ); _cut->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-cut") ) ); layout->addWidget( _cut ); - connect( _cut, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(cut()) ); + connect( _cut, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(cut()) ); TQToolTip::add( _cut, i18n( "Cut" ) ); _copy = new TQToolButton( this ); _copy->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-copy") ) ); layout->addWidget( _copy ); - connect( _copy, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(copy()) ); + connect( _copy, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(copy()) ); TQToolTip::add( _copy, i18n( "Copy" ) ); _paste = new TQToolButton( this ); _paste->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-paste")) ); layout->addWidget( _paste ); - connect( _paste, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(paste()) ); + connect( _paste, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(paste()) ); TQToolTip::add( _paste, i18n( "Paste" ) ); _save = new TQToolButton( this ); _save->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("document-save")) ); layout->addWidget( _save ); - connect( _save, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(save()) ); + connect( _save, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(save()) ); TQToolTip::add( _save, i18n( "Save" ) ); TQToolButton* button = new TQToolButton(this); button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("contexthelp") ) ); layout->addWidget( button ); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEnterWhatsThis())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEnterWhatsThis())); _undo->setEnabled( false ); _redo->setEnabled( false ); diff --git a/kregexpeditor/characterswidget.cpp b/kregexpeditor/characterswidget.cpp index 3926260..cae60e8 100644 --- a/kregexpeditor/characterswidget.cpp +++ b/kregexpeditor/characterswidget.cpp @@ -322,7 +322,7 @@ CharacterEdits::CharacterEdits( TQWidget *parent, const char *name) moreLay->addWidget( more ); moreLay->addStretch( 1 ); - connect(more,TQT_SIGNAL(clicked()), _single, TQT_SLOT(addElement())); + connect(more,TQ_SIGNAL(clicked()), _single, TQ_SLOT(addElement())); // Ranges TQVGroupBox* rangeBox = new TQVGroupBox(i18n("Character Ranges"), top ); @@ -337,9 +337,9 @@ CharacterEdits::CharacterEdits( TQWidget *parent, const char *name) more = new TQPushButton( i18n("More Entries"), moreW ); moreLay->addWidget( more ); moreLay->addStretch( 1 ); - connect(more,TQT_SIGNAL(clicked()), _range, TQT_SLOT(addElement())); + connect(more,TQ_SIGNAL(clicked()), _range, TQ_SLOT(addElement())); // Buttons - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotOK())); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotOK())); } void CharacterEdits::slotOK() diff --git a/kregexpeditor/charselector.cpp b/kregexpeditor/charselector.cpp index afba02b..5a3406f 100644 --- a/kregexpeditor/charselector.cpp +++ b/kregexpeditor/charselector.cpp @@ -84,7 +84,7 @@ CharSelector::CharSelector( TQWidget* parent, const char* name ) _stack->raiseWidget( 0 ); - connect( _type, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT(slotNewItem( int ) ) ); + connect( _type, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT(slotNewItem( int ) ) ); } void CharSelector::slotNewItem( int which ) diff --git a/kregexpeditor/compoundwidget.cpp b/kregexpeditor/compoundwidget.cpp index c65e598..0c13bd6 100644 --- a/kregexpeditor/compoundwidget.cpp +++ b/kregexpeditor/compoundwidget.cpp @@ -125,8 +125,8 @@ void CompoundWidget::init( ) _content = new CompoundDetailWindow( _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())); _down = getIcon( TQString::fromLocal8Bit( "1downarrow" )); _up = getIcon( TQString::fromLocal8Bit( "1uparrow" ) ); @@ -246,7 +246,7 @@ void CompoundWidget::slotConfigCanceled() { TQDataStream stream( _backup, IO_ReadOnly ); KWidgetStreamer streamer; - streamer.fromStream( stream, TQT_TQOBJECT(_content) ); + streamer.fromStream( stream, _content ); repaint(); } @@ -300,7 +300,7 @@ int CompoundWidget::edit() _configWindow->sizeHint().height()/2) ); TQDataStream stream( _backup, IO_WriteOnly ); KWidgetStreamer streamer; - streamer.toStream( TQT_TQOBJECT(_content), stream ); + streamer.toStream( _content, stream ); return _configWindow->exec(); } diff --git a/kregexpeditor/editorwindow.cpp b/kregexpeditor/editorwindow.cpp index 58afa1d..0ab7a26 100644 --- a/kregexpeditor/editorwindow.cpp +++ b/kregexpeditor/editorwindow.cpp @@ -23,7 +23,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> // #include <tdefiledialog.h> - #include <kstandarddirs.h> + #include <tdestandarddirs.h> #include <kiconloader.h> #include "editorwindow.moc" #include <klineeditdlg.h> @@ -55,15 +55,15 @@ RegExpEditorWindow::RegExpEditorWindow( TQWidget *parent, const char *name) _pasteData = 0; TQAccel* accel = new TQAccel( this ); - accel->connectItem( accel->insertItem( CTRL+Key_C ), this, TQT_SLOT( slotCopy() ) ); - accel->connectItem( accel->insertItem( CTRL+Key_X ), this, TQT_SLOT( slotCut() ) ); - accel->connectItem( accel->insertItem( Key_Delete ), this, TQT_SLOT( slotCut() ) ); - accel->connectItem( accel->insertItem( Key_BackSpace ), this, TQT_SLOT( slotCut() ) ); - accel->connectItem( accel->insertItem( CTRL+Key_V ), this, TQT_SLOT( slotStartPasteAction() ) ); - accel->connectItem( accel->insertItem( Key_Escape ), this, TQT_SLOT( slotEndActions() ) ); - accel->connectItem( accel->insertItem( CTRL+Key_S ), this, TQT_SLOT( slotSave() ) ); - - connect( this, TQT_SIGNAL( change() ), this, TQT_SLOT( emitVerifyRegExp() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_C ), this, TQ_SLOT( slotCopy() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_X ), this, TQ_SLOT( slotCut() ) ); + accel->connectItem( accel->insertItem( Key_Delete ), this, TQ_SLOT( slotCut() ) ); + accel->connectItem( accel->insertItem( Key_BackSpace ), this, TQ_SLOT( slotCut() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_V ), this, TQ_SLOT( slotStartPasteAction() ) ); + accel->connectItem( accel->insertItem( Key_Escape ), this, TQ_SLOT( slotEndActions() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_S ), this, TQ_SLOT( slotSave() ) ); + + connect( this, TQ_SIGNAL( change() ), this, TQ_SLOT( emitVerifyRegExp() ) ); } RegExp* RegExpEditorWindow::regExp() const diff --git a/kregexpeditor/gen_qregexplexer.cpp b/kregexpeditor/gen_qregexplexer.cpp index 172dd8e..e0f2d7d 100644 --- a/kregexpeditor/gen_qregexplexer.cpp +++ b/kregexpeditor/gen_qregexplexer.cpp @@ -57,15 +57,6 @@ #endif /* __STDC__ */ #endif /* ! __cplusplus */ -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include <io.h> -#include <stdlib.h> -#define YY_USE_CONST -#define YY_USE_PROTOS -#endif - #ifdef YY_USE_CONST #define yyconst const #else diff --git a/kregexpeditor/infopage.cpp b/kregexpeditor/infopage.cpp index 0afa3ea..cb21ca9 100644 --- a/kregexpeditor/infopage.cpp +++ b/kregexpeditor/infopage.cpp @@ -88,7 +88,7 @@ void InfoPage::setSource ( const TQString& name ) TQTextBrowser::setSource( nm ); #else if ( name.startsWith( TQString::fromLocal8Bit("doc://") ) ) { - kapp->invokeHelp( name.mid(6, name.length()-7), TQString::fromLocal8Bit("KRegExpEditor") ); + tdeApp->invokeHelp( name.mid(6, name.length()-7), TQString::fromLocal8Bit("KRegExpEditor") ); } else { KTextBrowser::setSource( name ); // handle mailto and other links diff --git a/kregexpeditor/kregexpeditorgui.cpp b/kregexpeditor/kregexpeditorgui.cpp index f248251..5f89df3 100644 --- a/kregexpeditor/kregexpeditorgui.cpp +++ b/kregexpeditor/kregexpeditorgui.cpp @@ -41,9 +41,9 @@ KRegExpEditorGUI::KRegExpEditorGUI(TQWidget *parent, const char *name, TQHBoxLayout* layout = new TQHBoxLayout( this, 6 ); _editor = new KRegExpEditorPrivate( this, "_editor" ); layout->addWidget( _editor ); - connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) ); - connect( _editor, TQT_SIGNAL( canRedo(bool) ), this, TQT_SIGNAL( canRedo(bool) ) ); - connect( _editor, TQT_SIGNAL( changes(bool) ), this, TQT_SIGNAL( changes(bool) ) ); + connect( _editor, TQ_SIGNAL( canUndo(bool) ), this, TQ_SIGNAL( canUndo(bool) ) ); + connect( _editor, TQ_SIGNAL( canRedo(bool) ), this, TQ_SIGNAL( canRedo(bool) ) ); + connect( _editor, TQ_SIGNAL( changes(bool) ), this, TQ_SIGNAL( changes(bool) ) ); } TQString KRegExpEditorGUI::regExp() const @@ -78,14 +78,14 @@ KRegExpEditorGUIDialog::KRegExpEditorGUIDialog( TQWidget *parent, layout->setAutoAdd( true ); _editor = new KRegExpEditorGUI( frame ); - connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) ); - connect( _editor, TQT_SIGNAL( canRedo(bool) ), this, TQT_SIGNAL( canRedo(bool) ) ); - connect( _editor, TQT_SIGNAL( changes(bool) ), this, TQT_SIGNAL( changes(bool) ) ); + connect( _editor, TQ_SIGNAL( canUndo(bool) ), this, TQ_SIGNAL( canUndo(bool) ) ); + connect( _editor, TQ_SIGNAL( canRedo(bool) ), this, TQ_SIGNAL( canRedo(bool) ) ); + connect( _editor, TQ_SIGNAL( changes(bool) ), this, TQ_SIGNAL( changes(bool) ) ); resize( 640, 400 ); setHelp( TQString(), TQString::fromLocal8Bit( "KRegExpEditor" ) ); #ifdef TQT_ONLY - connect( this, TQT_SIGNAL( helpClicked() ), _editor, TQT_SLOT( showHelp() ) ); + connect( this, TQ_SIGNAL( helpClicked() ), _editor, TQ_SLOT( showHelp() ) ); #endif } @@ -150,7 +150,7 @@ void KRegExpEditorGUI::showHelp() #ifdef TQT_ONLY _editor->showHelp(); #else - kapp->invokeHelp( TQString(), TQString::fromLocal8Bit( "KRegExpEditor" ) ); + tdeApp->invokeHelp( TQString(), TQString::fromLocal8Bit( "KRegExpEditor" ) ); #endif } diff --git a/kregexpeditor/kregexpeditorgui.h b/kregexpeditor/kregexpeditorgui.h index f0e3f4e..8de9fdb 100644 --- a/kregexpeditor/kregexpeditorgui.h +++ b/kregexpeditor/kregexpeditorgui.h @@ -34,7 +34,7 @@ class KRegExpEditorPrivate; @author Jesper Kjær Pedersen <blackie@kde.org> @version 0.1 **/ -class KDE_EXPORT KRegExpEditorGUI :public TQWidget, public KRegExpEditorInterface +class TDE_EXPORT KRegExpEditorGUI :public TQWidget, public KRegExpEditorInterface { TQ_OBJECT @@ -64,7 +64,7 @@ private: KRegExpEditorPrivate* _editor; }; -class KDE_EXPORT KRegExpEditorGUIDialog : public KDialogBase, public KRegExpEditorInterface +class TDE_EXPORT KRegExpEditorGUIDialog : public KDialogBase, public KRegExpEditorInterface { TQ_OBJECT diff --git a/kregexpeditor/kregexpeditorprivate.cpp b/kregexpeditor/kregexpeditorprivate.cpp index 30b1537..bcaf266 100644 --- a/kregexpeditor/kregexpeditorprivate.cpp +++ b/kregexpeditor/kregexpeditorprivate.cpp @@ -21,7 +21,7 @@ #else #include <tdelocale.h> #include <kiconloader.h> - #include <kstandarddirs.h> + #include <tdestandarddirs.h> #include <tdemessagebox.h> #include "kregexpeditorprivate.moc" #endif @@ -77,7 +77,7 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name) _info = new InfoPage( this, "_info" ); _verifier = new Verifier( _editor, "KRegExpEditorPrivate::_verifier" ); - connect( _verifier, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( maybeVerify() ) ); + connect( _verifier, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( maybeVerify() ) ); TQWhatsThis::add( _verifier, i18n("Type in some text in this window, and see what the regular expression you have developed matches.<p>" "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.<p>" @@ -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 <pre>...</pre>, 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/limitedcharlineedit.cpp b/kregexpeditor/limitedcharlineedit.cpp index 5e494d8..f311ebe 100644 --- a/kregexpeditor/limitedcharlineedit.cpp +++ b/kregexpeditor/limitedcharlineedit.cpp @@ -26,7 +26,7 @@ class Validator :public TQValidator { public: Validator( LimitedCharLineEdit::Mode mode, TQWidget* parent ) - :TQValidator( TQT_TQOBJECT(parent), "Validator" ), _mode(mode) + :TQValidator( parent, "Validator" ), _mode(mode) { } 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 a6bb121..3d8fa8f 100644 --- a/kregexpeditor/regexpbuttons.cpp +++ b/kregexpeditor/regexpbuttons.cpp @@ -21,7 +21,7 @@ #else #include <kiconloader.h> #include <tdelocale.h> - #include <kstandarddirs.h> + #include <tdestandarddirs.h> #include "regexpbuttons.moc" #endif @@ -43,8 +43,8 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) _grp->hide(); _grp->setExclusive( true ); - _mapper = new TQSignalMapper( TQT_TQOBJECT(this), "RegExpButtons::_mapper" ); - connect( _mapper, TQT_SIGNAL( mapped(int) ), this, TQT_SIGNAL( clicked(int) ) ); + _mapper = new TQSignalMapper( this, "RegExpButtons::_mapper" ); + 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("<qt>This will change the state of the editor to <i>selection state</i>.<p>" @@ -164,11 +164,11 @@ DoubleClickButton* RegExpButtons::insert(RegExpType tp, const char* name, TQStri DoubleClickButton* but = new DoubleClickButton( pix, this, "RegExpButtons::but"); - _mapper->setMapping( TQT_TQOBJECT(but), tp ); + _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 085c36b..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())); } @@ -151,7 +151,7 @@ void RepeatWidget::slotConfigCanceled() { TQDataStream stream( _backup, IO_ReadOnly ); KWidgetStreamer streamer; - streamer.fromStream( stream, TQT_TQOBJECT(_content) ); + streamer.fromStream( stream, _content ); repaint(); } @@ -161,7 +161,7 @@ int RepeatWidget::edit() _configWindow->sizeHint().height()/2) ); TQDataStream stream( _backup, IO_WriteOnly ); KWidgetStreamer streamer; - streamer.toStream( TQT_TQOBJECT(_content), stream ); + streamer.toStream( _content, stream ); return _configWindow->exec(); } @@ -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 35af60b..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() ) ); } @@ -60,7 +60,7 @@ void TextWidget::slotUpdate() // widget may not be enough for the parent to change size, and in that // case the parent would not repaint, and the text widget would not be // resized. - TQWidget *p = TQT_TQWIDGET(parent()); + TQWidget *p = static_cast<TQWidget*>(parent()); if (p) p->repaint(); _editorWindow->updateContent( this ); diff --git a/kregexpeditor/userdefinedregexps.cpp b/kregexpeditor/userdefinedregexps.cpp index e6d83aa..3051e7d 100644 --- a/kregexpeditor/userdefinedregexps.cpp +++ b/kregexpeditor/userdefinedregexps.cpp @@ -21,7 +21,7 @@ #include <klineeditdlg.h> #include <tdelocale.h> #include <tdemessagebox.h> - #include <kstandarddirs.h> + #include <tdestandarddirs.h> #include <kdebug.h> #include "userdefinedregexps.moc" #endif @@ -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/util.cpp b/kregexpeditor/util.cpp index dedccfc..8482f41 100644 --- a/kregexpeditor/util.cpp +++ b/kregexpeditor/util.cpp @@ -18,7 +18,7 @@ #include "util.h" #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> TQPixmap Util::getKRegExpEditorIcon( const TQString& name ) { #ifdef TQT_ONLY diff --git a/kregexpeditor/verifybuttons.cpp b/kregexpeditor/verifybuttons.cpp index 6f5b316..d7950db 100644 --- a/kregexpeditor/verifybuttons.cpp +++ b/kregexpeditor/verifybuttons.cpp @@ -22,7 +22,7 @@ #else #include <tdelocale.h> #include "verifybuttons.moc" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <kiconloader.h> #include <tdemessagebox.h> @@ -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 <i>verifier window</i>." "(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 |