diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 10:00:25 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 10:00:25 -0600 |
commit | 1623fe64102c18ab098b79656b80f28cef840756 (patch) | |
tree | 78f35fef11ea3dbbca1ba4c99937736a1a0894cf /parts/replace | |
parent | b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04 (diff) | |
download | tdevelop-1623fe64102c18ab098b79656b80f28cef840756.tar.gz tdevelop-1623fe64102c18ab098b79656b80f28cef840756.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.
Diffstat (limited to 'parts/replace')
-rw-r--r-- | parts/replace/replace_part.cpp | 4 | ||||
-rw-r--r-- | parts/replace/replace_widget.cpp | 18 | ||||
-rw-r--r-- | parts/replace/replacedlg.ui | 8 | ||||
-rw-r--r-- | parts/replace/replaceitem.cpp | 12 | ||||
-rw-r--r-- | parts/replace/replaceview.cpp | 6 |
5 files changed, 24 insertions, 24 deletions
diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp index 7a64cac8..e808ab70 100644 --- a/parts/replace/replace_part.cpp +++ b/parts/replace/replace_part.cpp @@ -99,9 +99,9 @@ void ReplacePart::contextMenu(TQPopupMenu *popup, const Context *context) if (!ident.isEmpty()) { m_popupstr = ident; TQString squeezed = KStringHandler::csqueeze(ident, 30); - int id = popup->insertItem( i18n("Replace Project Wide: %1").arg(squeezed), + int id = popup->insertItem( i18n("Replace Project Wide: %1").tqarg(squeezed), this, TQT_SLOT(slotReplace()) ); - popup->setWhatsThis(id, i18n("<b>Replace Project Wide</b><p>Opens the find in files dialog " + popup->tqsetWhatsThis(id, i18n("<b>Replace Project Wide</b><p>Opens the find in files dialog " "and sets the pattern to the text under the cursor.")); popup->insertSeparator(); } diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp index b9ac5984..1136e08a 100644 --- a/parts/replace/replace_widget.cpp +++ b/parts/replace/replace_widget.cpp @@ -35,7 +35,7 @@ #include <klocale.h> #include <kstdguiitem.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqlineedit.h> #include <tqradiobutton.h> @@ -45,7 +45,7 @@ #include <tqdialog.h> #include <tqfile.h> #include <tqdir.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqdatastream.h> #include <sys/types.h> @@ -65,8 +65,8 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part) _terminateOperation( false ) { // setup outputview - TQVBoxLayout * layout = new TQVBoxLayout( this ); - TQHBoxLayout * buttonlayout = new TQHBoxLayout( layout ); + TQVBoxLayout * tqlayout = new TQVBoxLayout( this ); + TQHBoxLayout * buttontqlayout = new TQHBoxLayout( tqlayout ); _cancel = new KPushButton( KStdGuiItem::cancel(), this ); _replace = new KPushButton( KGuiItem(i18n("Replace"),"filefind"), this ); @@ -74,11 +74,11 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part) _cancel->setEnabled( false ); _replace->setEnabled( false ); - buttonlayout->addWidget( _replace ); - buttonlayout->addWidget( _cancel ); + buttontqlayout->addWidget( _replace ); + buttontqlayout->addWidget( _cancel ); _listview = new ReplaceView( this ); - layout->addWidget( _listview ); + tqlayout->addWidget( _listview ); // setup signals connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( find() ) ); @@ -235,7 +235,7 @@ bool ReplaceWidget::showReplacements() } ++it; - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); } m_part->core()->running( m_part, false ); @@ -330,7 +330,7 @@ bool ReplaceWidget::makeReplacements() } fileitem = fileitem->nextSibling(); - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); } // Telling the project about the edited files diff --git a/parts/replace/replacedlg.ui b/parts/replace/replacedlg.ui index ce58234a..6a8b81f9 100644 --- a/parts/replace/replacedlg.ui +++ b/parts/replace/replacedlg.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -93,7 +93,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -200,7 +200,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -229,7 +229,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> diff --git a/parts/replace/replaceitem.cpp b/parts/replace/replaceitem.cpp index 85033406..853c170d 100644 --- a/parts/replace/replaceitem.cpp +++ b/parts/replace/replaceitem.cpp @@ -11,7 +11,7 @@ #include <tqpainter.h> #include <tqstyle.h> -#include <palette.h> +#include <tqpalette.h> #include <tqcheckbox.h> #include "replaceitem.h" @@ -56,7 +56,7 @@ void ReplaceItem::setChecked( bool checked ) return; } - // this is a parent item, set self and children + // this is a parent item, set self and tqchildren ReplaceItem * item = firstChild(); while ( item ) { @@ -84,13 +84,13 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, const BackgroundMode bgmode = lv->viewport()->backgroundMode(); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); - if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) ) + if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) ) p->fillRect( 0, 0, width, height(), cg.brush( crole ) ); else lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) ); TQFontMetrics fm( lv->fontMetrics() ); - int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv); + int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv); int marg = lv->itemMargin(); int r = marg; @@ -138,8 +138,8 @@ void ReplaceItem::activate( int, TQPoint const & localPos ) { TQListView * lv = listView(); TQCheckBox cb(0); - int boxsize = cb.sizeHint().width(); -//that's KDE-3.1 only int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv); + int boxsize = cb.tqsizeHint().width(); +//that's KDE-3.1 only int boxsize = lv->style().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv); int rightside = lv->itemMargin() + boxsize + ( isFile() ? 0 : lv->treeStepSize() ); // _lineclicked indicates if the click was on the line or in the checkbox diff --git a/parts/replace/replaceview.cpp b/parts/replace/replaceview.cpp index 3c84c0f0..4d5c4b41 100644 --- a/parts/replace/replaceview.cpp +++ b/parts/replace/replaceview.cpp @@ -10,11 +10,11 @@ ***************************************************************************/ #include <tqheader.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqdir.h> #include <tqstringlist.h> #include <tqregexp.h> -#include <palette.h> +#include <tqpalette.h> #include "replaceitem.h" #include "replaceview.h" @@ -119,7 +119,7 @@ void ReplaceView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& po else if ( btn == Qt::LeftButton ) { // map pos to item/column and call ReplacetItem::activate(pos) - item->activate( col, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(item).top() ) ); + item->activate( col, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(item).top() ) ); } } } |