From c2637a0da6d9a1c8626ca39f8451ab3b7cda487a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:47:59 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kiconedit/kcolorgrid.cpp | 8 ++++---- kiconedit/kcolorgrid.h | 2 +- kiconedit/kicon.cpp | 10 +++++----- kiconedit/kiconcolors.cpp | 2 +- kiconedit/kiconconfig.cpp | 24 ++++++++++++------------ kiconedit/kiconedit.cpp | 6 +++--- kiconedit/kiconedit.h | 2 +- kiconedit/kiconeditslots.cpp | 10 +++++----- kiconedit/kicongrid.cpp | 10 +++++----- kiconedit/knew.cpp | 4 ++-- kiconedit/kresize.cpp | 10 +++++----- kiconedit/palettetoolbar.cpp | 18 +++++++++--------- 12 files changed, 53 insertions(+), 53 deletions(-) (limited to 'kiconedit') diff --git a/kiconedit/kcolorgrid.cpp b/kiconedit/kcolorgrid.cpp index 35fd9f3e..65d766c9 100644 --- a/kiconedit/kcolorgrid.cpp +++ b/kiconedit/kcolorgrid.cpp @@ -163,7 +163,7 @@ void KColorGrid::resizeEvent(TQResizeEvent *) } */ -TQSize KColorGrid::tqsizeHint() const +TQSize KColorGrid::sizeHint() const { return TQSize(totalwidth, totalheight); } @@ -293,14 +293,14 @@ void KColorGrid::setColor( int colNum, uint col, bool update ) } //kdDebug(4640) << "KColorGrid::setColor - before updateCell" << endl; - tqrepaint((colNum%numCols())*cellsize,(colNum/numCols())*cellsize, cellsize, cellsize); + repaint((colNum%numCols())*cellsize,(colNum/numCols())*cellsize, cellsize, cellsize); //updateCell( colNum/numCols(), colNum%numCols(), false ); //kdDebug(4640) << "KColorGrid::setColor - after updateCell" << endl; } void KColorGrid::updateCell( int row, int col, bool ) { - //kdDebug(4640) << "updateCell - before tqrepaint" << endl; + //kdDebug(4640) << "updateCell - before repaint" << endl; TQWMatrix matrix; TQPainter p; p.begin( this ); @@ -330,6 +330,6 @@ void KColorGrid::setCellSize( int s ) totalheight = (numRows() * s) + 1; resize(totalwidth, totalheight); if ( isVisible() ) - tqrepaint(viewRect(), false); + repaint(viewRect(), false); } #include "kcolorgrid.moc" diff --git a/kiconedit/kcolorgrid.h b/kiconedit/kcolorgrid.h index a5e21fc7..5e466348 100644 --- a/kiconedit/kcolorgrid.h +++ b/kiconedit/kcolorgrid.h @@ -65,7 +65,7 @@ public: virtual void setCellSize( int s ); virtual int cellSize() { return cellsize; } - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; void setSize(const TQSize s) { setNumRows(s.height()); setNumCols(s.width()); } diff --git a/kiconedit/kicon.cpp b/kiconedit/kicon.cpp index f36fde00..9a4da93c 100644 --- a/kiconedit/kicon.cpp +++ b/kiconedit/kicon.cpp @@ -70,7 +70,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url) if(!url.isValid()) // Giving up { - TQString msg = i18n("The URL: %1 \nseems to be malformed.\n").tqarg(url.url()); + TQString msg = i18n("The URL: %1 \nseems to be malformed.\n").arg(url.url()); KMessageBox::sorry((TQWidget*)parent(), msg); return false; } @@ -86,7 +86,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url) { if(!KIO::NetAccess::download( url, filename, (TQWidget*)parent() )) { - TQString msg = i18n("There was an error loading:\n%1\n").tqarg(url.prettyURL()); + TQString msg = i18n("There was an error loading:\n%1\n").arg(url.prettyURL()); KMessageBox::error((TQWidget*)parent(), msg); return false; } @@ -101,7 +101,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url) if(!loadedOk) { - TQString msg = i18n("There was an error loading:\n%1\n").tqarg(url.prettyURL()); + TQString msg = i18n("There was an error loading:\n%1\n").arg(url.prettyURL()); KMessageBox::error((TQWidget*)parent(), msg); } else @@ -208,7 +208,7 @@ bool KIconEditIcon::saveAs(const TQImage *image) { int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), i18n( "A file named \"%1\" already exists. " - "Overwrite it?" ).tqarg(file), + "Overwrite it?" ).arg(file), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ); @@ -265,7 +265,7 @@ bool KIconEditIcon::save(const TQImage *image, const TQString &_filename) } else { - TQString msg = i18n("There was an error saving:\n%1\n").tqarg(str); + TQString msg = i18n("There was an error saving:\n%1\n").arg(str); KMessageBox::error((TQWidget*)parent(), msg); kdDebug(4640) << "KIconEditIcon::save - " << msg << endl; } diff --git a/kiconedit/kiconcolors.cpp b/kiconedit/kiconcolors.cpp index 4393379b..8e5daf84 100644 --- a/kiconedit/kiconcolors.cpp +++ b/kiconedit/kiconcolors.cpp @@ -43,7 +43,7 @@ void KDrawColors::paintCell( TQPainter *painter, int row, int col ) int d = spacing(); qDrawShadePanel( painter, d, d, cellSize()-d, cellSize()-d, - tqcolorGroup(), true, 1, &brush); + colorGroup(), true, 1, &brush); if ( row * numCols() + col == selected) painter->drawWinFocusRect( d+1, d+1, cellSize()-(2*d)+1, cellSize()-(2*d)+1 ); } diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp index d5db3bde..91ad06c3 100644 --- a/kiconedit/kiconconfig.cpp +++ b/kiconedit/kiconconfig.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include @@ -49,7 +49,7 @@ static inline TQPixmap loadIcon( const char * name ) { return KGlobal::instance()->iconLoader() - ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); + ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); } KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent) @@ -60,9 +60,9 @@ KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent) TQVBoxLayout *ml = new TQVBoxLayout(frame); TQGroupBox *grp = new TQGroupBox(i18n("Template"), frame); grp->setColumnLayout(0, Qt::Vertical); - grp->tqlayout()->setSpacing(spacingHint()); - grp->tqlayout()->setMargin(marginHint()); - TQGridLayout *l = new TQGridLayout(grp->tqlayout()); + grp->layout()->setSpacing(spacingHint()); + grp->layout()->setMargin(marginHint()); + TQGridLayout *l = new TQGridLayout(grp->layout()); ln_name = new TQLineEdit( grp ); connect( ln_name, TQT_SIGNAL( textChanged( const TQString & ) ), @@ -130,7 +130,7 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent) TQVBoxLayout* ml = new TQVBoxLayout( this ); ml->addWidget( grp ); - TQVBoxLayout* l = new TQVBoxLayout( grp->tqlayout(), KDialog::spacingHint() ); + TQVBoxLayout* l = new TQVBoxLayout( grp->layout(), KDialog::spacingHint() ); l->addWidget( templates ); for( unsigned int i = 0; i < KIconTemplateContainer::self()->count(); i++ ) @@ -151,7 +151,7 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent) bbox->addStretch( 1 ); - bbox->tqlayout(); + bbox->layout(); l->addWidget( bbox ); } @@ -246,11 +246,11 @@ KBackgroundConfig::KBackgroundConfig( TQWidget* parent ) TQGroupBox *grp1 = new TQGroupBox( i18n( "Select Background" ), this ); grp1->setColumnLayout(0, Qt::Vertical ); - grp1->tqlayout()->setSpacing( KDialog::spacingHint() ); - grp1->tqlayout()->setMargin( KDialog::marginHint() ); + grp1->layout()->setSpacing( KDialog::spacingHint() ); + grp1->layout()->setMargin( KDialog::marginHint() ); mainLayout->addWidget( grp1 ); - TQGridLayout *grp1Layout = new TQGridLayout( grp1->tqlayout(), 3, 2 ); + TQGridLayout *grp1Layout = new TQGridLayout( grp1->layout(), 3, 2 ); TQButtonGroup* btngrp = new TQButtonGroup( grp1 ); btngrp->setExclusive( true ); @@ -548,8 +548,8 @@ KIconConfig::KIconConfig(TQWidget *parent) TQSize min(300, 400); - if (300 < tqsizeHint().width()) { min.setWidth(tqsizeHint().width()); } - if (400 < tqsizeHint().height()) { min.setHeight(tqsizeHint().height()); } + if (300 < sizeHint().width()) { min.setWidth(sizeHint().width()); } + if (400 < sizeHint().height()) { min.setHeight(sizeHint().height()); } resize(min); } diff --git a/kiconedit/kiconedit.cpp b/kiconedit/kiconedit.cpp index 8a4a6af1..38461262 100644 --- a/kiconedit/kiconedit.cpp +++ b/kiconedit/kiconedit.cpp @@ -222,10 +222,10 @@ void KIconEdit::writeConfig() saveMainWindowSettings( config, "MainWindowSettings" ); } -TQSize KIconEdit::tqsizeHint() const +TQSize KIconEdit::sizeHint() const { if(gridview) - return gridview->tqsizeHint(); + return gridview->sizeHint(); else return TQSize(-1, -1); } @@ -477,7 +477,7 @@ bool KIconEdit::setupStatusBar() statusbar->insertFixedItem("99999,99999", 0, true); statusbar->insertFixedItem("99999 x 99999", 1, true); statusbar->insertFixedItem(" 1:999", 2, true); - str = i18n("Colors: %1").tqarg(9999999); + str = i18n("Colors: %1").arg(9999999); statusbar->insertFixedItem(str, 3, true); statusbar->insertItem("", 4); diff --git a/kiconedit/kiconedit.h b/kiconedit/kiconedit.h index e912e0f7..7af10e74 100644 --- a/kiconedit/kiconedit.h +++ b/kiconedit/kiconedit.h @@ -65,7 +65,7 @@ public: KIconEdit( const TQImage image, const char *name = "kiconedit"); ~KIconEdit(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; static WindowList windowList; signals: diff --git a/kiconedit/kiconeditslots.cpp b/kiconedit/kiconeditslots.cpp index f229b325..7d8fffd7 100644 --- a/kiconedit/kiconeditslots.cpp +++ b/kiconedit/kiconeditslots.cpp @@ -195,7 +195,7 @@ void KIconEdit::slotPrint() { KPrinter printer; - if ( printer.setup(this, i18n("Print %1").tqarg(icon->url().section('/', -1))) ) + if ( printer.setup(this, i18n("Print %1").arg(icon->url().section('/', -1))) ) { int margin = 10, yPos = 0; printer.setCreator("KDE Icon Editor"); @@ -422,13 +422,13 @@ void KIconEdit::slotUpdateZoom( int s ) void KIconEdit::slotUpdateStatusPos(int x, int y) { - TQString str = i18n("Status Position", "%1, %2").tqarg(x).tqarg(y); + TQString str = i18n("Status Position", "%1, %2").arg(x).arg(y); statusbar->changeItem( str, 0); } void KIconEdit::slotUpdateStatusSize(int x, int y) { - TQString str = i18n("Status Size", "%1 x %2").tqarg(x).tqarg(y); + TQString str = i18n("Status Size", "%1 x %2").arg(x).arg(y); statusbar->changeItem( str, 1); } @@ -443,13 +443,13 @@ void KIconEdit::slotUpdateStatusScaling(int s) void KIconEdit::slotUpdateStatusColors(uint) { - TQString str = i18n("Colors: %1").tqarg(grid->numColors()); + TQString str = i18n("Colors: %1").arg(grid->numColors()); statusbar->changeItem( str, 3); } void KIconEdit::slotUpdateStatusColors(uint n, uint *) { - TQString str = i18n("Colors: %1").tqarg(n); + TQString str = i18n("Colors: %1").arg(n); statusbar->changeItem( str, 3); } diff --git a/kiconedit/kicongrid.cpp b/kiconedit/kicongrid.cpp index b24db091..672dbdac 100644 --- a/kiconedit/kicongrid.cpp +++ b/kiconedit/kicongrid.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -1035,7 +1035,7 @@ void KIconEditGrid::load( TQImage *image) setColor((y*numCols())+x, *l, false); } //kdDebug(4640) << "Row: " << y << endl; - kapp->tqprocessEvents(200); + kapp->processEvents(200); } updateColors(); @@ -1044,7 +1044,7 @@ void KIconEditGrid::load( TQImage *image) emit changed(pixmap()); setUpdatesEnabled(true); emit needPainting(); - //tqrepaint(viewRect(), false); + //repaint(viewRect(), false); history->clear(); } @@ -1118,7 +1118,7 @@ TQImage KIconEditGrid::clipboardImage(bool &ok) { TQCString format = fileFormats.current(); TQCString type = "image/" + format.lower(); - if (kapp->tqclipboard()->data()->provides(type ) ) + if (kapp->clipboard()->data()->provides(type ) ) { oneIsSupported = true; } @@ -1379,7 +1379,7 @@ void KIconEditGrid::editPasteAsNew() *img = tmp; load(img); setModified(true); - //tqrepaint(viewRect(), false); + //repaint(viewRect(), false); p = *img; emit changed(TQPixmap(p)); diff --git a/kiconedit/knew.cpp b/kiconedit/knew.cpp index e38d58bb..4a29fe05 100644 --- a/kiconedit/knew.cpp +++ b/kiconedit/knew.cpp @@ -18,7 +18,7 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include #include #include @@ -173,7 +173,7 @@ NewSelect::NewSelect(TQWidget *parent) : TQWidget( parent ) l->addWidget( rbtempl, 1 ); //l->addWidget(rbtempl, 5, AlignLeft); - //grp->setMinimumSize(grp->tqchildrenRect().size()); + //grp->setMinimumSize(grp->childrenRect().size()); grp->setButton( 0 ); } diff --git a/kiconedit/kresize.cpp b/kiconedit/kresize.cpp index ac98e214..4e73dad9 100644 --- a/kiconedit/kresize.cpp +++ b/kiconedit/kresize.cpp @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include @@ -37,18 +37,18 @@ KResizeWidget::KResizeWidget( TQWidget* parent, const char* name, group->setColumnLayout( 0, Qt::Horizontal ); genLayout->addWidget( group ); - TQHBoxLayout* tqlayout = new TQHBoxLayout( group->tqlayout(), 6 ); + TQHBoxLayout* layout = new TQHBoxLayout( group->layout(), 6 ); m_width = new KIntSpinBox( 1, 200, 1, 1, 10, group ); m_width->setValue( size.width() ); - tqlayout->addWidget( m_width, 1 ); + layout->addWidget( m_width, 1 ); TQLabel* label = new TQLabel( "X", group ); - tqlayout->addWidget( label ); + layout->addWidget( label ); m_height = new KIntSpinBox( 1, 200, 1, 1, 10, group); m_height->setValue( size.height() ); - tqlayout->addWidget( m_height, 1 ); + layout->addWidget( m_height, 1 ); setMinimumSize( 200, 100 ); } diff --git a/kiconedit/palettetoolbar.cpp b/kiconedit/palettetoolbar.cpp index 225e2439..907b447a 100644 --- a/kiconedit/palettetoolbar.cpp +++ b/kiconedit/palettetoolbar.cpp @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include @@ -42,7 +42,7 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name ) m_lblPreview = new TQLabel( base ); m_lblPreview->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); m_lblPreview->setFixedHeight( 64 ); - m_lblPreview->tqsetAlignment( TQt::AlignHCenter|TQt::AlignVCenter ); + m_lblPreview->setAlignment( TQt::AlignHCenter|TQt::AlignVCenter ); TQWhatsThis::add(m_lblPreview, i18n( "Preview\n\nThis is a 1:1 preview" " of the current icon" ) ); m_layout->addWidget( m_lblPreview ); @@ -50,31 +50,31 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name ) m_currentColorView = new TQLabel( base ); m_currentColorView->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); m_currentColorView->setFixedHeight( 24 ); - m_currentColorView->tqsetAlignment( TQt::AlignHCenter|TQt::AlignVCenter ); + m_currentColorView->setAlignment( TQt::AlignHCenter|TQt::AlignVCenter ); TQWhatsThis::add(m_currentColorView, i18n( "Current color\n\nThis is the currently selected color" ) ); m_layout->addWidget( m_currentColorView ); - TQVBoxLayout *vtqlayout = new TQVBoxLayout( m_layout, 0 ); + TQVBoxLayout *vlayout = new TQVBoxLayout( m_layout, 0 ); TQLabel *l = new TQLabel( i18n( "System colors:" ), base ); - vtqlayout->addWidget( l ); + vlayout->addWidget( l ); m_sysColors = new KSysColors( base ); TQWhatsThis::add(m_sysColors, i18n( "System colors\n\nHere you can select" " colors from the KDE icon palette" ) ); - vtqlayout->addWidget( m_sysColors ); + vlayout->addWidget( m_sysColors ); connect( m_sysColors, TQT_SIGNAL( newColor(uint) ), TQT_SIGNAL( newColor(uint) ) ); - vtqlayout = new TQVBoxLayout( m_layout, 0 ); + vlayout = new TQVBoxLayout( m_layout, 0 ); l = new TQLabel( i18n( "Custom colors:" ), base ); - vtqlayout->addWidget( l ); + vlayout->addWidget( l ); m_customColors = new KCustomColors( base ); TQWhatsThis::add(m_customColors, i18n( "Custom colors\n\nHere you can" " build a palette of custom colors.\nDouble-click on a box to edit" " the color" ) ); - vtqlayout->addWidget( m_customColors ); + vlayout->addWidget( m_customColors ); connect( m_customColors, TQT_SIGNAL( newColor(uint) ), TQT_SIGNAL( newColor(uint) ) ); -- cgit v1.2.1