From a3f1234ece748a30d118e4b6f8333c19505bd516 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:23:49 -0600 Subject: Rename obsolete tq methods to standard names (cherry picked from commit 89856e749bf14e63fed55a8f3436ea9a6f19667a) --- .../KMultiFormListBox/kmultiformlistbox.cpp | 4 ++-- kregexpeditor/auxbuttons.cpp | 16 ++++++------- kregexpeditor/characterswidget.cpp | 18 +++++++------- kregexpeditor/charselector.cpp | 12 +++++----- kregexpeditor/compoundwidget.cpp | 4 ++-- kregexpeditor/editorwindow.cpp | 6 ++--- kregexpeditor/editorwindow.h | 2 +- kregexpeditor/kregexpeditorgui.cpp | 8 +++---- kregexpeditor/kregexpeditorprivate.cpp | 10 ++++---- kregexpeditor/regexpbuttons.cpp | 28 +++++++++++----------- kregexpeditor/selectablelineedit.cpp | 2 +- kregexpeditor/verifybuttons.cpp | 20 ++++++++-------- 12 files changed, 65 insertions(+), 65 deletions(-) (limited to 'kregexpeditor') diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp index a455bae..58b82da 100644 --- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp +++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp @@ -40,9 +40,9 @@ KMultiFormListBox::KMultiFormListBox( KMultiFormListBoxFactory *factory, KMultiF TQWidget *widget = theWidget->qWidget(); - TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); + TQHBoxLayout *layout = new TQHBoxLayout( this ); _factory = factory; - tqlayout->addWidget( widget ); + layout->addWidget( widget ); } void KMultiFormListBox::append( KMultiFormListBoxEntry *element ) diff --git a/kregexpeditor/auxbuttons.cpp b/kregexpeditor/auxbuttons.cpp index 3b7032e..e276acf 100644 --- a/kregexpeditor/auxbuttons.cpp +++ b/kregexpeditor/auxbuttons.cpp @@ -35,48 +35,48 @@ AuxButtons::AuxButtons( TQWidget* parent, const char* name = 0) :TQDockWindow( TQDockWindow::InDock, parent, name) { - TQBoxLayout* tqlayout = boxLayout(); + TQBoxLayout* layout = boxLayout(); _undo = new TQToolButton( this ); _undo->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("undo") ) ); - tqlayout->addWidget( _undo ); + layout->addWidget( _undo ); connect( _undo, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(undo()) ); TQToolTip::add( _undo, i18n( "Undo" ) ); _redo = new TQToolButton( this ); _redo->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("redo") ) ); - tqlayout->addWidget( _redo ); + layout->addWidget( _redo ); connect( _redo, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(redo()) ); TQToolTip::add( _redo, i18n( "Redo" ) ); _cut = new TQToolButton( this ); _cut->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editcut") ) ); - tqlayout->addWidget( _cut ); + layout->addWidget( _cut ); connect( _cut, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(cut()) ); TQToolTip::add( _cut, i18n( "Cut" ) ); _copy = new TQToolButton( this ); _copy->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editcopy") ) ); - tqlayout->addWidget( _copy ); + layout->addWidget( _copy ); connect( _copy, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(copy()) ); TQToolTip::add( _copy, i18n( "Copy" ) ); _paste = new TQToolButton( this ); _paste->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editpaste")) ); - tqlayout->addWidget( _paste ); + layout->addWidget( _paste ); connect( _paste, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(paste()) ); TQToolTip::add( _paste, i18n( "Paste" ) ); _save = new TQToolButton( this ); _save->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("filesave")) ); - tqlayout->addWidget( _save ); + layout->addWidget( _save ); connect( _save, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(save()) ); TQToolTip::add( _save, i18n( "Save" ) ); TQToolButton* button = new TQToolButton(this); button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("contexthelp") ) ); - tqlayout->addWidget( button ); + layout->addWidget( button ); connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEnterWhatsThis())); _undo->setEnabled( false ); diff --git a/kregexpeditor/characterswidget.cpp b/kregexpeditor/characterswidget.cpp index 7f64d56..3926260 100644 --- a/kregexpeditor/characterswidget.cpp +++ b/kregexpeditor/characterswidget.cpp @@ -380,10 +380,10 @@ void CharacterEdits::slotOK() SingleEntry::SingleEntry(TQWidget* parent, const char* name ) :KMultiFormListBoxEntry( parent, name ) { - TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 3, 6 ); + TQHBoxLayout* layout = new TQHBoxLayout( this, 3, 6 ); _selector = new CharSelector( this ); - tqlayout->addWidget( _selector ); - tqlayout->addStretch(1); + layout->addWidget( _selector ); + layout->addStretch(1); } TQString SingleEntry::text() const @@ -405,19 +405,19 @@ bool SingleEntry::isEmpty() const RangeEntry::RangeEntry(TQWidget* parent, const char* name ) :KMultiFormListBoxEntry( parent, name ) { - TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 3, 6 ); + TQHBoxLayout* layout = new TQHBoxLayout( this, 3, 6 ); TQLabel* label = new TQLabel(i18n("From:"), this ); _from = new CharSelector( this ); - tqlayout->addWidget( label ); - tqlayout->addWidget( _from ); + layout->addWidget( label ); + layout->addWidget( _from ); - tqlayout->addStretch(1); + layout->addStretch(1); label = new TQLabel(i18n("end of range","To:"), this ); _to = new CharSelector( this ); - tqlayout->addWidget( label ); - tqlayout->addWidget( _to ); + layout->addWidget( label ); + layout->addWidget( _to ); } TQString RangeEntry::fromText() const diff --git a/kregexpeditor/charselector.cpp b/kregexpeditor/charselector.cpp index 32e2a79..04c6f5d 100644 --- a/kregexpeditor/charselector.cpp +++ b/kregexpeditor/charselector.cpp @@ -43,10 +43,10 @@ class StackContainer :public TQWidget public: StackContainer( TQWidget* child, TQWidget* parent ) : TQWidget( parent ) { - TQHBoxLayout* tqlayout = new TQHBoxLayout( this ); + TQHBoxLayout* layout = new TQHBoxLayout( this ); child->reparent( this, TQPoint(0,0), false ); - tqlayout->addWidget( child ); - tqlayout->addStretch( 1 ); + layout->addWidget( child ); + layout->addStretch( 1 ); } }; @@ -54,7 +54,7 @@ CharSelector::CharSelector( TQWidget* parent, const char* name ) :TQWidget( parent, name ), _oldIndex(0) { TQStringList items; - TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 0, 6 ); + TQHBoxLayout* layout = new TQHBoxLayout( this, 0, 6 ); _type = new TQComboBox( this, "_type" ); items << i18n("Normal Character") @@ -68,10 +68,10 @@ CharSelector::CharSelector( TQWidget* parent, const char* name ) << i18n("TheQt::Horizontal Tab Character (\\t)") << i18n("TheQt::Vertical Tab Character (\\v)"); _type->insertStringList( items ); - tqlayout->addWidget( _type ); + layout->addWidget( _type ); _stack = new TQWidgetStack( this, "_stack" ); - tqlayout->addWidget( _stack ); + layout->addWidget( _stack ); _normal = new LimitedCharLineEdit( LimitedCharLineEdit::NORMAL, 0, "_normal" ); _stack->addWidget( new StackContainer( _normal, _stack ), 0 ); diff --git a/kregexpeditor/compoundwidget.cpp b/kregexpeditor/compoundwidget.cpp index cf133dd..e19e3aa 100644 --- a/kregexpeditor/compoundwidget.cpp +++ b/kregexpeditor/compoundwidget.cpp @@ -40,8 +40,8 @@ CompoundDetailWindow::CompoundDetailWindow( TQWidget* parent, const char* name ) :TQWidget( parent, name ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); TQLabel* label = new TQLabel( i18n("&Title:"), this); _title = new TQLineEdit( this ); diff --git a/kregexpeditor/editorwindow.cpp b/kregexpeditor/editorwindow.cpp index 6f7173f..26b2559 100644 --- a/kregexpeditor/editorwindow.cpp +++ b/kregexpeditor/editorwindow.cpp @@ -289,7 +289,7 @@ void RegExpEditorWindow::cutCopyAux( TQPoint pos ) RegExpWidgetDrag *clipboardData = new RegExpWidgetDrag( regexp, this ); delete regexp; - TQClipboard* clipboard = tqApp->tqclipboard(); + TQClipboard* clipboard = tqApp->clipboard(); clipboard->setData( clipboardData ); emit anythingOnClipboard( true ); emit canSave( _top->hasAnyChildren() ); @@ -298,7 +298,7 @@ void RegExpEditorWindow::cutCopyAux( TQPoint pos ) void RegExpEditorWindow::slotStartPasteAction() { - TQByteArray data = tqApp->tqclipboard()->data()->encodedData( "KRegExpEditor/widgetdrag" ); + TQByteArray data = tqApp->clipboard()->data()->encodedData( "KRegExpEditor/widgetdrag" ); TQTextStream stream( data, IO_ReadOnly ); TQString str = stream.read(); @@ -335,7 +335,7 @@ void RegExpEditorWindow::showRMBMenu( bool enableCutCopy ) _menu->setItemEnabled( CUT, enableCutCopy ); _menu->setItemEnabled( COPY, enableCutCopy ); - if ( ! tqApp->tqclipboard()->data()->provides( "KRegExpEditor/widgetdrag" ) ) + if ( ! tqApp->clipboard()->data()->provides( "KRegExpEditor/widgetdrag" ) ) _menu->setItemEnabled( PASTE, false ); else _menu->setItemEnabled( PASTE, true ); diff --git a/kregexpeditor/editorwindow.h b/kregexpeditor/editorwindow.h index c8899a6..0d20597 100644 --- a/kregexpeditor/editorwindow.h +++ b/kregexpeditor/editorwindow.h @@ -232,7 +232,7 @@ private: /** This points to the top @ref RegExpWidget in the editor window. */ ConcWidget *_top; - /** This points to the tqlayout manager for the editor window */ + /** This points to the layout manager for the editor window */ TQHBoxLayout* _layout; /** Start point and last point draw. Used when doing rubber band selection */ diff --git a/kregexpeditor/kregexpeditorgui.cpp b/kregexpeditor/kregexpeditorgui.cpp index 6208dc6..f419c3b 100644 --- a/kregexpeditor/kregexpeditorgui.cpp +++ b/kregexpeditor/kregexpeditorgui.cpp @@ -38,9 +38,9 @@ KRegExpEditorGUI::KRegExpEditorGUI(TQWidget *parent, const char *name, const TQStringList & ) : TQWidget( parent, name) { - TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 6 ); + TQHBoxLayout* layout = new TQHBoxLayout( this, 6 ); _editor = new KRegExpEditorPrivate( this, "_editor" ); - tqlayout->addWidget( _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) ) ); @@ -74,8 +74,8 @@ KRegExpEditorGUIDialog::KRegExpEditorGUIDialog( TQWidget *parent, parent, name ? name : "KRegExpDialog" ) { TQFrame* frame = plainPage(); - TQVBoxLayout* tqlayout = new TQVBoxLayout( frame, 6 ); - tqlayout->setAutoAdd( true ); + TQVBoxLayout* layout = new TQVBoxLayout( frame, 6 ); + layout->setAutoAdd( true ); _editor = new KRegExpEditorGUI( frame ); connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) ); diff --git a/kregexpeditor/kregexpeditorprivate.cpp b/kregexpeditor/kregexpeditorprivate.cpp index e34e20c..08e661e 100644 --- a/kregexpeditor/kregexpeditorprivate.cpp +++ b/kregexpeditor/kregexpeditorprivate.cpp @@ -154,17 +154,17 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name) // Line Edit - TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout, 6 ); + TQHBoxLayout* layout = new TQHBoxLayout( topLayout, 6 ); TQLabel* label = new TQLabel( i18n("ASCII syntax:"), this ); - tqlayout->addWidget( label ); + layout->addWidget( label ); clearButton = new TQToolButton( this ); const TQString icon( TQString::fromLatin1( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) ); TQIconSet clearIcon = SmallIconSet( icon ); clearButton->setIconSet( clearIcon ); - tqlayout->addWidget( clearButton ); + layout->addWidget( clearButton ); TQToolTip::add( clearButton, i18n("Clear expression") ); _regexpEdit = new TQLineEdit( this ); - tqlayout->addWidget( _regexpEdit ); + layout->addWidget( _regexpEdit ); TQWhatsThis::add( _regexpEdit, i18n( "This is the regular expression in ASCII syntax. You are likely only " "to be interested in this if you are a programmer, and need to " "develop a regular expression using TQRegExp.

" @@ -178,7 +178,7 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name) #endif _error = new TQLabel( this ); _error->setPixmap( pix ); - tqlayout->addWidget( _error ); + layout->addWidget( _error ); _error->hide(); _timer = new TQTimer(this); diff --git a/kregexpeditor/regexpbuttons.cpp b/kregexpeditor/regexpbuttons.cpp index 0456816..2c2b247 100644 --- a/kregexpeditor/regexpbuttons.cpp +++ b/kregexpeditor/regexpbuttons.cpp @@ -37,7 +37,7 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) : TQDockWindow( TQDockWindow::InDock, parent, name), _keepMode(false) { - TQBoxLayout *tqlayout = boxLayout(); + TQBoxLayout *layout = boxLayout(); _grp = new TQButtonGroup(this); _grp->hide(); @@ -57,7 +57,7 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) #endif _selectBut->setPixmap( pix ); - tqlayout->addWidget( _selectBut ); + layout->addWidget( _selectBut ); _grp->insert(_selectBut); _selectBut->setToggleButton( true ); connect( _selectBut, TQT_SIGNAL(clicked()), TQT_SIGNAL(doSelect())); @@ -76,19 +76,19 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) but = insert(TEXT, "text", i18n("Text"), i18n( "This will insert a text field, where you may write text. The text you write will " "be matched literally. (i.e. you do not need to escape any characters)" ) ); - tqlayout->addWidget( but ); + layout->addWidget( but ); but = insert(CHARSET, "characters", i18n("A single character specified in a range"), i18n("This will match a single character from a predefined range.

" "When you insert this widget a dialog box will appear, which lets you specify " "which characters this regexp item will match.") ); - tqlayout->addWidget( but ); + layout->addWidget( but ); but = insert(DOT, "anychar", i18n("Any character"), i18n("This will match any single character") ); - tqlayout->addWidget( but ); + layout->addWidget( but ); but = insert(REPEAT, "repeat", i18n("Repeated content"), @@ -102,14 +102,14 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) "is abc, then this regexp item will match the empty string, " "the string abc, the string abcabc, the string abcabcabcabc, " "etc.") ); - tqlayout->addWidget( but ); + layout->addWidget( but ); but = insert(ALTN, "altn", i18n("Alternatives"), i18n("This regexp item will match any of its alternatives.

" "You specify alternatives by placing regexp items on top of " "each other inside this widget.") ); - tqlayout->addWidget( but ); + layout->addWidget( but ); but = insert(COMPOUND, "compound", i18n("Compound regexp"), @@ -118,38 +118,38 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) "a small box. This makes it easier for you to get an overview of large " "regexp items. This is especially useful if you load a predefined regexp item " "you perhaps don't care about the inner workings of.") ); - tqlayout->addWidget( but ); + layout->addWidget( but ); but = insert(BEGLINE, "begline", i18n("Beginning of line"), i18n("This will match the beginning of a line.") ); - tqlayout->addWidget( but ); + layout->addWidget( but ); but = insert(ENDLINE, "endline", i18n("End of line"), i18n("This will match the end of a line.") ); - tqlayout->addWidget( but ); + layout->addWidget( but ); _wordBoundary = insert(WORDBOUNDARY, "wordboundary", i18n("Word boundary"), i18n("This asserts a word boundary (This part does not actually match any characters)") ); - tqlayout->addWidget( _wordBoundary ); + layout->addWidget( _wordBoundary ); _nonWordBoundary = insert(NONWORDBOUNDARY, "nonwordboundary", i18n("Non Word boundary"), i18n("This asserts a non-word boundary " "(This part does not actually match any characters)") ); - tqlayout->addWidget( _nonWordBoundary ); + layout->addWidget( _nonWordBoundary ); _posLookAhead = insert(POSLOOKAHEAD, "poslookahead", i18n("Positive Look Ahead"), i18n("This asserts a regular expression (This part does not actually match any characters). " "You can only use this at the end of a regular expression.") ); - tqlayout->addWidget( _posLookAhead ); + layout->addWidget( _posLookAhead ); _negLookAhead = insert(NEGLOOKAHEAD, "neglookahead", i18n("Negative Look Ahead"), i18n("This asserts a regular expression that must not match " "(This part does not actually match any characters). " "You can only use this at the end of a regular expression.") ); - tqlayout->addWidget( _negLookAhead ); + layout->addWidget( _negLookAhead ); } DoubleClickButton* RegExpButtons::insert(RegExpType tp, const char* name, TQString tooltip, TQString whatsthis) diff --git a/kregexpeditor/selectablelineedit.cpp b/kregexpeditor/selectablelineedit.cpp index dda0a9b..0e085d5 100644 --- a/kregexpeditor/selectablelineedit.cpp +++ b/kregexpeditor/selectablelineedit.cpp @@ -33,7 +33,7 @@ SelectableLineEdit::SelectableLineEdit( RegExpWidget* owner, TQWidget* parent, c void SelectableLineEdit::setSelected( bool selected ) { if ( selected ) { - TQPalette pal = TQPalette(tqpalette()); + TQPalette pal = TQPalette(palette()); pal.setBrush( TQColorGroup::Base, gray ); setPalette( pal ); } diff --git a/kregexpeditor/verifybuttons.cpp b/kregexpeditor/verifybuttons.cpp index e36e934..283b2fa 100644 --- a/kregexpeditor/verifybuttons.cpp +++ b/kregexpeditor/verifybuttons.cpp @@ -42,7 +42,7 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name ) :TQDockWindow( TQDockWindow::InDock, parent, name ), _configMenu( 0 ) { - TQBoxLayout* tqlayout = boxLayout(); + TQBoxLayout* layout = boxLayout(); _verify = new TQToolButton(this); TQIconSet icon = Util::getSystemIconSet( TQString::fromLatin1("spellcheck")); @@ -50,48 +50,48 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name ) TQToolTip::add( _verify, i18n( "Verify regular expression" ) ); 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).")); - tqlayout->addWidget( _verify ); + layout->addWidget( _verify ); connect( _verify, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( verify() ) ); TQToolButton* button = new TQToolButton(this); button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("fileopen")) ); - tqlayout->addWidget( button ); + layout->addWidget( button ); connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadText())); TQToolTip::add( button, i18n("Load text in the verifier window") ); button = new TQToolButton(this); button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("package_settings")) ); - tqlayout->addWidget( button ); + layout->addWidget( button ); connect(button, TQT_SIGNAL(clicked()), this, TQT_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); - // tqlayout->addWidget( _first ); + // layout->addWidget( _first ); // connect(_first, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoFirst())); // _first->setFixedWidth( 25 ); // // _prev = new TQToolButton(TQString::fromLatin1("<"), this); - // tqlayout->addWidget( _prev ); + // layout->addWidget( _prev ); // connect(_prev, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoPrev())); // _prev->setFixedWidth( 20 ); // // _next = new TQToolButton(TQString::fromLatin1(">"), this); - // tqlayout->addWidget( _next ); + // layout->addWidget( _next ); // connect(_next, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoNext())); // _next->setFixedWidth( 20 ); // // _last = new TQToolButton(TQString::fromLatin1(">>"), this); - // tqlayout->addWidget( _last ); + // layout->addWidget( _last ); // connect(_last, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoLast())); // _last->setFixedWidth( 25 ); // Same as above // TQLabel* label = new TQLabel( i18n("Matches: "), this ); -// tqlayout->addWidget( label ); +// layout->addWidget( label ); // _matches = new TQLabel(i18n("-"), this ); -// tqlayout->addWidget( _matches ); +// layout->addWidget( _matches ); // TQString txt = i18n( "Shows number of times regular expression matches the text in the verifier window"); // TQToolTip::add( label, txt ); // TQToolTip::add( _matches, txt ); -- cgit v1.2.3