diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:57:28 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:57:28 -0600 |
commit | dc07846059a60d069687585cc72ff501a2096296 (patch) | |
tree | 432ead5b09c6ace7e804629f1f74a3ed58f003e0 /arts/builder | |
parent | 3c299dfe48c0060272c2966fff599b3b417e2ee4 (diff) | |
download | tdemultimedia-dc07846059a60d069687585cc72ff501a2096296.tar.gz tdemultimedia-dc07846059a60d069687585cc72ff501a2096296.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'arts/builder')
-rw-r--r-- | arts/builder/createtool.cpp | 8 | ||||
-rw-r--r-- | arts/builder/dirmanager.cpp | 2 | ||||
-rw-r--r-- | arts/builder/interfacedlg.cpp | 6 | ||||
-rw-r--r-- | arts/builder/main.cpp | 8 | ||||
-rw-r--r-- | arts/builder/portposdlg.cpp | 2 | ||||
-rw-r--r-- | arts/builder/propertypanel.cpp | 4 | ||||
-rw-r--r-- | arts/builder/propertypanelbase.ui | 2 | ||||
-rw-r--r-- | arts/builder/qttableview.cpp | 56 | ||||
-rw-r--r-- | arts/builder/qttableview.h | 14 |
9 files changed, 51 insertions, 51 deletions
diff --git a/arts/builder/createtool.cpp b/arts/builder/createtool.cpp index f8d5c7e5..f52573a4 100644 --- a/arts/builder/createtool.cpp +++ b/arts/builder/createtool.cpp @@ -55,7 +55,7 @@ CreateTool::CreateTool(ModuleWidget *mwidget) CreateTool::~CreateTool() { - mwidget->tqrepaint(componentRect); + mwidget->repaint(componentRect); mwidget->setCursor(oldCursor); mwidget->setMouseTracking(oldMouseTracking); } @@ -89,7 +89,7 @@ void CreateTool::mouseMoveEvent(TQMouseEvent *e) && mwidget->colXPos(x + width, &cellx2) && mwidget->rowYPos(y + height, &celly2); if(!posok) return; - mwidget->tqrepaint(componentRect); + mwidget->repaint(componentRect); componentRect = TQRect(cellx, celly, cellx2 - cellx, celly2 - celly); TQPainter *p = new TQPainter; @@ -303,7 +303,7 @@ void ConnectPortsTool::mouseMoveEvent(TQMouseEvent *e) { TQPainter painter(mwidget); painter.setPen(TQt::white); - mwidget->tqrepaint(TQRect(firstPos, lastPos).normalize()); + mwidget->repaint(TQRect(firstPos, lastPos).normalize()); painter.drawLine(firstPos, e->pos()); lastPos = e->pos(); } @@ -334,6 +334,6 @@ void ConnectPortsTool::mouseReleaseEvent(TQMouseEvent *e) } } } - mwidget->tqrepaint(TQRect(firstPos, lastPos).normalize()); + mwidget->repaint(TQRect(firstPos, lastPos).normalize()); mwidget->leaveTool(this); } diff --git a/arts/builder/dirmanager.cpp b/arts/builder/dirmanager.cpp index dae660b2..2f22f104 100644 --- a/arts/builder/dirmanager.cpp +++ b/arts/builder/dirmanager.cpp @@ -83,7 +83,7 @@ char *DirManager::directory(const char *subdir, const TQString &desc) TQString dir = TQFile::decodeName(dirname); message = i18n("You need the folder %1.\n" "It will be used to store %2.\nShould I create it now?") - .tqarg(dir).tqarg(desc); + .arg(dir).arg(desc); if(KMessageBox::questionYesNo(0,message,i18n("aRts Folder Missing"),i18n("Create Folder"),i18n("Do Not Create")) == KMessageBox::Yes) diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp index dd85fc80..cfced15d 100644 --- a/arts/builder/interfacedlg.cpp +++ b/arts/builder/interfacedlg.cpp @@ -159,10 +159,10 @@ void InterfaceDlg::update(const string& interface, const string& indent) { listbox->insertItem((indent + interface).c_str()); - vector<string> *tqchildren = Arts::Dispatcher::the()->interfaceRepo().queryChildren(interface); - for (vector<string>::iterator ci = tqchildren->begin(); ci != tqchildren->end(); ++ci) + vector<string> *children = Arts::Dispatcher::the()->interfaceRepo().queryChildren(interface); + for (vector<string>::iterator ci = children->begin(); ci != children->end(); ++ci) update(ci->c_str(), indent+" "); - delete tqchildren; + delete children; } void InterfaceDlg::update() diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp index 558f650c..229f4f61 100644 --- a/arts/builder/main.cpp +++ b/arts/builder/main.cpp @@ -441,7 +441,7 @@ void ArtsBuilderWindow::publish() checkName(); structure->publish(); KMessageBox::information(this, - i18n("The structure has been published as: '%1' on the server.").tqarg( structure->name().c_str() )); + i18n("The structure has been published as: '%1' on the server.").arg( structure->name().c_str() )); } TQString ArtsBuilderWindow::getOpenFilename(const char *pattern, const char *initialDir) @@ -587,7 +587,7 @@ bool ArtsBuilderWindow::save(TQString filename) if(file.status()) { KMessageBox::sorry(this, i18n("The file '%1' could not be opened for writing: %2") - .tqarg(filename).tqarg(strerror(file.status())), + .arg(filename).arg(strerror(file.status())), i18n("aRts Warning")); return false; } @@ -597,7 +597,7 @@ bool ArtsBuilderWindow::save(TQString filename) if(!file.close()) { KMessageBox::sorry(this, i18n("Saving to file '%1' could not be finished correctly: %2") - .tqarg(filename).tqarg(strerror(file.status())), + .arg(filename).arg(strerror(file.status())), i18n("aRts Warning")); return false; } @@ -872,7 +872,7 @@ ArtsBuilderApp::ArtsBuilderApp(TQString filename) mainWindow->open(filename); } else { KMessageBox::sorry(0, - i18n("The specified file '%1' does not exist.").tqarg(filename), + i18n("The specified file '%1' does not exist.").arg(filename), i18n("aRts Warning")); } } diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp index 69e8ac86..7826b9ad 100644 --- a/arts/builder/portposdlg.cpp +++ b/arts/builder/portposdlg.cpp @@ -247,7 +247,7 @@ void PortPosDlg::update() } } } - listbox->tqrepaint(); + listbox->repaint(); } void PortPosDlg::help() diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp index 98e40de1..4a554272 100644 --- a/arts/builder/propertypanel.cpp +++ b/arts/builder/propertypanel.cpp @@ -128,7 +128,7 @@ void PropertyPanel::setSelectedComponent( StructureComponent *component ) it != modulePorts.end(); it++) { TQString portTitle = (*it)->description - + TQString(" (%1)").tqarg( (*it)->PortDesc.type().direction == Arts::output ? + + TQString(" (%1)").arg( (*it)->PortDesc.type().direction == Arts::output ? i18n("OUTPUT") : i18n("INPUT") ); portCombo->insertItem( portTitle ); } @@ -344,7 +344,7 @@ bool PropertyPanel::eventFilter( TQObject *o, TQEvent *e ) TQString entered = TQT_TQKEYEVENT(e)->text(); bool goodString = entered.length() > 0; -// kdDebug() << TQString("pressed '%1'").tqarg(entered) << endl; +// kdDebug() << TQString("pressed '%1'").arg(entered) << endl; for( unsigned int i = 0; i < entered.length(); i++) goodString = goodString && entered[i].isLetterOrNumber(); diff --git a/arts/builder/propertypanelbase.ui b/arts/builder/propertypanelbase.ui index b327b33f..0ff20382 100644 --- a/arts/builder/propertypanelbase.ui +++ b/arts/builder/propertypanelbase.ui @@ -314,7 +314,7 @@ <property name="name"> <cstring>tipLabel</cstring> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp index d08deab2..4db8af17 100644 --- a/arts/builder/qttableview.cpp +++ b/arts/builder/qttableview.cpp @@ -88,7 +88,7 @@ void TQCornerSquare::paintEvent( TQPaintEvent * ) used by functions such as setXOffset() or maxYOffset(). \i The \e widget coordinates. (0,0) is the top-left corner of the widget, - \e including the frame. They are used by functions such as tqrepaint(). + \e including the frame. They are used by functions such as repaint(). \i The \e view coordinates. (0,0) is the top-left corner of the view, \e excluding the frame. This is the least-used coordinate system; it is used by @@ -135,7 +135,7 @@ void TQCornerSquare::paintEvent( TQPaintEvent * ) The \link setCellHeight() cell height\endlink and \link setCellWidth() cell width\endlink are set to 0. - Frame line tqshapes (TQFrame::HLink and TQFrame::VLine) are disallowed; + Frame line shapes (TQFrame::HLink and TQFrame::VLine) are disallowed; see TQFrame::setFrameStyle(). Note that the \a f argument is \e not \link setTableFlags() table @@ -207,7 +207,7 @@ void QtTableView::show() /*! - \overload void QtTableView::tqrepaint( bool erase ) + \overload void QtTableView::repaint( bool erase ) Repaints the entire view. */ @@ -221,16 +221,16 @@ void QtTableView::show() If \a w is negative, it is replaced with <code>width() - x</code>. If \a h is negative, it is replaced with <code>height() - y</code>. - Doing a tqrepaint() usually is faster than doing an update(), but + Doing a repaint() usually is faster than doing an update(), but calling update() many times in a row will generate a single paint event. At present, QtTableView is the only widget that reimplements \link - TQWidget::tqrepaint() tqrepaint()\endlink. It does this because by + TQWidget::repaint() repaint()\endlink. It does this because by clearing and then repainting one cell at at time, it can make the screen flicker less than it would otherwise. */ -void QtTableView::tqrepaint( int x, int y, int w, int h, bool erase ) +void QtTableView::repaint( int x, int y, int w, int h, bool erase ) { if ( !isVisible() || testWState(WState_BlockUpdates) ) return; @@ -249,7 +249,7 @@ void QtTableView::tqrepaint( int x, int y, int w, int h, bool erase ) } /*! - \overload void QtTableView::tqrepaint( const TQRect &r, bool erase ) + \overload void QtTableView::repaint( const TQRect &r, bool erase ) Replaints rectangle \a r. If \a erase is TRUE draws the background using the palette's background. */ @@ -288,7 +288,7 @@ void QtTableView::setNumRows( int rows ) nRows = rows; if ( autoUpdate() && isVisible() && ( oldLastVisible != lastRowVisible() || oldTopCell != topCell() ) ) - tqrepaint( oldTopCell != topCell() ); + repaint( oldTopCell != topCell() ); } else { // Be more careful - if destructing, bad things might happen. nRows = rows; @@ -328,7 +328,7 @@ void QtTableView::setNumCols( int cols ) if ( autoUpdate() && isVisible() ) { int maxCol = lastColVisible(); if ( maxCol >= oldCols || maxCol >= nCols ) - tqrepaint(); + repaint(); } updateScrollBars( horRange ); updateFrameSize(); @@ -591,7 +591,7 @@ void QtTableView::setCellWidth( int cellWidth ) updateScrollBars( horSteps | horRange ); if ( autoUpdate() && isVisible() ) - tqrepaint(); + repaint(); } @@ -643,7 +643,7 @@ void QtTableView::setCellHeight( int cellHeight ) #endif cellH = (short)cellHeight; if ( autoUpdate() && isVisible() ) - tqrepaint(); + repaint(); updateScrollBars( verSteps | verRange ); } @@ -817,7 +817,7 @@ void QtTableView::setTableFlags( uint f ) (f & Tbl_snapToVGrid) != 0 && yCellDelta != 0 ) { snapToGrid( (f & Tbl_snapToHGrid) != 0, // do snapping (f & Tbl_snapToVGrid) != 0 ); - repaintMask |= Tbl_snapToGrid; // tqrepaint table + repaintMask |= Tbl_snapToGrid; // repaint table } } @@ -825,7 +825,7 @@ void QtTableView::setTableFlags( uint f ) setAutoUpdate( TRUE ); updateScrollBars(); if ( isVisible() && (f & repaintMask) ) - tqrepaint(); + repaint(); } } @@ -881,7 +881,7 @@ void QtTableView::clearTableFlags( uint f ) (f & Tbl_smoothVScrolling) != 0 && yCellDelta != 0 ) { snapToGrid( (f & Tbl_smoothHScrolling) != 0, // do snapping (f & Tbl_smoothVScrolling) != 0 ); - repaintMask |= Tbl_smoothScrolling; // tqrepaint table + repaintMask |= Tbl_smoothScrolling; // repaint table } } if ( f & Tbl_snapToHGrid ) { @@ -894,7 +894,7 @@ void QtTableView::clearTableFlags( uint f ) setAutoUpdate( TRUE ); updateScrollBars(); // returns immediately if nothing to do if ( isVisible() && (f & repaintMask) ) - tqrepaint(); + repaint(); } } @@ -916,20 +916,20 @@ void QtTableView::clearTableFlags( uint f ) automatically whenever it has changed in some way (for example, when a \link setTableFlags() flag\endlink is changed). - If \a enable is FALSE, the view does NOT tqrepaint itself or update + If \a enable is FALSE, the view does NOT repaint itself or update its internal state variables when it is changed. This can be useful to avoid flicker during large changes and is singularly useless otherwise. Disable auto-update, do the changes, re-enable - auto-update and call tqrepaint(). + auto-update and call repaint(). \warning Do not leave the view in this state for a long time (i.e., between events). If, for example, the user interacts with the view when auto-update is off, strange things can happen. - Setting auto-update to TRUE does not tqrepaint the view; you must call - tqrepaint() to do this. + Setting auto-update to TRUE does not repaint the view; you must call + repaint() to do this. - \sa autoUpdate(), tqrepaint() + \sa autoUpdate(), repaint() */ void QtTableView::setAutoUpdate( bool enable ) @@ -963,7 +963,7 @@ void QtTableView::updateCell( int row, int col, bool erase ) TQRect uR = TQRect( xPos, yPos, cellW ? cellW : cellWidth(col), cellH ? cellH : cellHeight(row) ); - tqrepaint( uR.intersect(viewRect()), erase ); + repaint( uR.intersect(viewRect()), erase ); } @@ -1379,7 +1379,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) // Note that this needs to be done regardless whether we do // eraseInPaint or not. Reason: a subclass may implement - // flicker-freeness and encourage the use of tqrepaint(FALSE). + // flicker-freeness and encourage the use of repaint(FALSE). // The subclass, however, cannot draw all pixels, just those // inside the cells. So QtTableView is reponsible for all pixels // outside the cells. @@ -1426,7 +1426,7 @@ void QtTableView::resizeEvent( TQResizeEvent * ) void QtTableView::updateView() { - tqrepaint( viewRect() ); + repaint( viewRect() ); } /*! @@ -1522,7 +1522,7 @@ void QtTableView::setHorScrollBar( bool on, bool update ) else sbDirty = sbDirty | verMask; if ( hideScrollBar && isVisible() ) - tqrepaint( hScrollBar->x(), hScrollBar->y(), + repaint( hScrollBar->x(), hScrollBar->y(), width() - hScrollBar->x(), hScrollBar->height() ); } if ( update ) @@ -1561,7 +1561,7 @@ void QtTableView::setVerScrollBar( bool on, bool update ) else sbDirty = sbDirty | horMask; if ( hideScrollBar && isVisible() ) - tqrepaint( vScrollBar->x(), vScrollBar->y(), + repaint( vScrollBar->x(), vScrollBar->y(), vScrollBar->width(), height() - vScrollBar->y() ); } if ( update ) @@ -2006,7 +2006,7 @@ void QtTableView::updateScrollBars( uint f ) if ( sbDirty & horValue ) hScrollBar->setValue( xOffs ); - // show scrollbar only when it has a sane tqgeometry + // show scrollbar only when it has a sane geometry if ( !hScrollBar->isVisible() ) hScrollBar->show(); } @@ -2030,7 +2030,7 @@ void QtTableView::updateScrollBars( uint f ) if ( sbDirty & verValue ) vScrollBar->setValue( yOffs ); - // show scrollbar only when it has a sane tqgeometry + // show scrollbar only when it has a sane geometry if ( !vScrollBar->isVisible() ) vScrollBar->show(); } @@ -2253,7 +2253,7 @@ void QtTableView::showOrHideScrollBars() Call this function when the table view's total size is changed; typically because the result of cellHeight() or cellWidth() have changed. - This function does not tqrepaint the widget. + This function does not repaint the widget. */ void QtTableView::updateTableSize() diff --git a/arts/builder/qttableview.h b/arts/builder/qttableview.h index 7d4f14e2..3160a38a 100644 --- a/arts/builder/qttableview.h +++ b/arts/builder/qttableview.h @@ -32,9 +32,9 @@ public: virtual void setPalette( const TQPalette & ); void show(); - void tqrepaint( bool erase=TRUE ); - void tqrepaint( int x, int y, int w, int h, bool erase=TRUE ); - void tqrepaint( const TQRect &, bool erase=TRUE ); + void repaint( bool erase=TRUE ); + void repaint( int x, int y, int w, int h, bool erase=TRUE ); + void repaint( const TQRect &, bool erase=TRUE ); protected: QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 ); @@ -235,11 +235,11 @@ inline TQRect QtTableView::cellUpdateRect() const inline bool QtTableView::autoUpdate() const { return isUpdatesEnabled(); } -inline void QtTableView::tqrepaint( bool erase ) -{ tqrepaint( 0, 0, width(), height(), erase ); } +inline void QtTableView::repaint( bool erase ) +{ repaint( 0, 0, width(), height(), erase ); } -inline void QtTableView::tqrepaint( const TQRect &r, bool erase ) -{ tqrepaint( r.x(), r.y(), r.width(), r.height(), erase ); } +inline void QtTableView::repaint( const TQRect &r, bool erase ) +{ repaint( r.x(), r.y(), r.width(), r.height(), erase ); } inline void QtTableView::updateScrollBars() { updateScrollBars( 0 ); } |