From 537ccfa7e6fcdcb613f2f83744b19fc28f83b79f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:57:28 -0600 Subject: Remove additional unneeded tq method conversions (cherry picked from commit dc07846059a60d069687585cc72ff501a2096296) --- kmid/channel.cpp | 6 +++--- kmid/collectdlg.cpp | 6 +++--- kmid/kdisptext.cpp | 10 +++++----- kmid/klcdnumber.cpp | 6 +++--- kmid/kmidclient.cpp | 24 ++++++++++++------------ kmid/kmidframe.cpp | 2 +- kmid/ktrianglebutton.cpp | 4 ++-- kmid/midicfgdlg.cpp | 2 +- 8 files changed, 30 insertions(+), 30 deletions(-) (limited to 'kmid') diff --git a/kmid/channel.cpp b/kmid/channel.cpp index 419a375c..7d077dd7 100644 --- a/kmid/channel.cpp +++ b/kmid/channel.cpp @@ -87,7 +87,7 @@ void KMidChannel::paintEvent( TQPaintEvent * ) TQPainter *qpaint=new TQPainter(this); - TQString tmp = i18n("Channel %1").tqarg(channel); + TQString tmp = i18n("Channel %1").arg(channel); qpaint->setFont(*qcvfont); qpaint->setPen(*penB); qpaint->drawText(2,20,tmp); @@ -185,7 +185,7 @@ void KMidChannel::reset(int level) replay=TRUE; }; - tqrepaint(FALSE); + repaint(FALSE); } void KMidChannel::saveState(bool *p,int *pgm) @@ -198,7 +198,7 @@ void KMidChannel::loadState(bool *p,int *pgm) { for (int i=0;i<128;i++) pressed[i]=p[i]; instrumentCombo->setCurrentItem(*pgm); - tqrepaint(FALSE); + repaint(FALSE); } void KMidChannel::pgmChanged(int i) diff --git a/kmid/collectdlg.cpp b/kmid/collectdlg.cpp index 11158b18..20ac8def 100644 --- a/kmid/collectdlg.cpp +++ b/kmid/collectdlg.cpp @@ -164,7 +164,7 @@ void CollectionDialog::newCollection() int i=slman->createCollection(name.ascii()); if (i==-1) { - TQString s = i18n("The name '%1' is already used").tqarg(name); + TQString s = i18n("The name '%1' is already used").arg(name); KMessageBox::sorry(this, s); } else @@ -190,7 +190,7 @@ int i; i=slman->createCollection(name.ascii()); if (i==-1) { - TQString s = i18n("The name '%1' is already used").tqarg(name); + TQString s = i18n("The name '%1' is already used").arg(name); KMessageBox::sorry(this, s); } else @@ -232,7 +232,7 @@ if (idx==0) return; { if (slman->getCollection(name.ascii())!=NULL) { - TQString s = i18n("The name '%1' is already used").tqarg(name); + TQString s = i18n("The name '%1' is already used").arg(name); KMessageBox::sorry(this, s); } else diff --git a/kmid/kdisptext.cpp b/kmid/kdisptext.cpp index 72436009..3eabda50 100644 --- a/kmid/kdisptext.cpp +++ b/kmid/kdisptext.cpp @@ -125,7 +125,7 @@ void KDisplayText::ClearEv(bool totally) TQT_TQOBJECT(this)->killTimers(); autoscrollv=0; resizeContents(0,0); - viewport()->tqrepaint(TRUE); + viewport()->repaint(TRUE); } } @@ -367,7 +367,7 @@ void KDisplayText::CursorToHome(void) setContentsPos(0,0); - viewport()->tqrepaint(true); + viewport()->repaint(true); } void KDisplayText::PaintIn(int type) @@ -487,7 +487,7 @@ void KDisplayText::gotomsec(ulong i) TQT_TQOBJECT(this)->killTimers(); autoscrollv=0; setContentsPos(0,first_line->ypos); - viewport()->tqrepaint(); + viewport()->repaint(); } } @@ -508,7 +508,7 @@ void KDisplayText::fontChanged(void) qfmetr=new TQFontMetrics(*qtextfont); calculatePositions(); nvisiblelines=height()/qfmetr->lineSpacing(); - viewport()->tqrepaint(TRUE); + viewport()->repaint(TRUE); } void KDisplayText::ChangeTypeOfTextEvents(int type) @@ -534,7 +534,7 @@ void KDisplayText::ChangeTypeOfTextEvents(int type) setContentsPos(0,first_line->ypos); } - viewport()->tqrepaint(TRUE); + viewport()->repaint(TRUE); } int KDisplayText::ChooseTypeOfTextEvents(void) diff --git a/kmid/klcdnumber.cpp b/kmid/klcdnumber.cpp index f97e2775..3fdf80c4 100644 --- a/kmid/klcdnumber.cpp +++ b/kmid/klcdnumber.cpp @@ -197,7 +197,7 @@ void KLCDNumber::setValue(double v) void KLCDNumber::display (double v) { setValue(v); - tqrepaint(FALSE); + repaint(FALSE); } void KLCDNumber::display (int v) @@ -317,13 +317,13 @@ void KLCDNumber::defaultValueClicked() void KLCDNumber::setLCDBackgroundColor(int r,int g,int b) { backgcolor=TQColor(r,g,b); - tqrepaint(FALSE); + repaint(FALSE); } void KLCDNumber::setLCDColor(int r,int g,int b) { LCDcolor=TQColor(r,g,b); - tqrepaint(FALSE); + repaint(FALSE); } void KLCDNumber::setRange(double min, double max) diff --git a/kmid/kmidclient.cpp b/kmid/kmidclient.cpp index 40565172..a83e002f 100644 --- a/kmid/kmidclient.cpp +++ b/kmid/kmidclient.cpp @@ -290,10 +290,10 @@ int kmidClient::openFile(const char *filename) switch (r) { case (-1) : errormsg = - i18n("The file %1 does not exist or cannot be opened.").tqarg(filename); + i18n("The file %1 does not exist or cannot be opened.").arg(filename); break; case (-2) : errormsg = - i18n("The file %1 is not a MIDI file.").tqarg(filename);break; + i18n("The file %1 is not a MIDI file.").arg(filename);break; case (-3) : errormsg = i18n("Ticks per quarter note is negative. Please send this file to larrosa@kde.org");break; case (-4) : errormsg = @@ -301,7 +301,7 @@ int kmidClient::openFile(const char *filename) case (-5) : errormsg = i18n("This file is corrupted or not well built.");break; case (-6) : errormsg = - i18n("%1 is not a regular file.").tqarg(filename);break; + i18n("%1 is not a regular file.").arg(filename);break; default : errormsg = i18n("Unknown error message");break; } KMessageBox::error(this, errormsg); @@ -310,9 +310,9 @@ int kmidClient::openFile(const char *filename) midifile_opened=0L; timebar->setRange(0,240000); timebar->setValue(0); - timetags->tqrepaint(TRUE); + timetags->repaint(TRUE); kdispt->ClearEv(); - kdispt->tqrepaint(TRUE); + kdispt->repaint(TRUE); topLevelWidget()->setCaption("KMid"); return -1; @@ -327,7 +327,7 @@ int kmidClient::openFile(const char *filename) // noteArray=player->parseNotes(); noteArray=player->noteArray(); timebar->setRange(0,(int)(player->information()->millisecsTotal)); - timetags->tqrepaint(TRUE); + timetags->repaint(TRUE); kdispt->ClearEv(); spev=player->specialEvents(); while (spev) @@ -343,7 +343,7 @@ int kmidClient::openFile(const char *filename) kdispt->CursorToHome(); // kdispt->updateScrollBars(); emit mustRechooseTextEvent(); - kdispt->tqrepaint(TRUE); + kdispt->repaint(TRUE); tempoLCD->display(tempoToMetronomeTempo(m_kMid.pctl->tempo)); currentTempo=tempoLCD->getValue(); tempoLCD->setDefaultValue(tempoToMetronomeTempo(m_kMid.pctl->tempo)*m_kMid.pctl->ratioTempo); @@ -1129,7 +1129,7 @@ void kmidClient::repaintText(int type) { kdispt->ChangeTypeOfTextEvents(type); typeoftextevents=type; - kdispt->tqrepaint(TRUE); + kdispt->repaint(TRUE); } int kmidClient::ChooseTypeOfTextEvents(void) @@ -1265,11 +1265,11 @@ void kmidClient::slotSelectSong(int i) player->removeSong(); timebar->setRange(0,240000); timebar->setValue(0); - timetags->tqrepaint(TRUE); + timetags->repaint(TRUE); kdispt->ClearEv(); - kdispt->tqrepaint(TRUE); + kdispt->repaint(TRUE); comboSongs->clear(); - comboSongs->tqrepaint(TRUE); + comboSongs->repaint(TRUE); topLevelWidget()->setCaption("KMid"); return; } @@ -1487,7 +1487,7 @@ void kmidClient::slotSetTempo(double value) timebar->setRange(0,(int)(player->information()->millisecsTotal)); timebar->setValue(pausedatmillisec); - timetags->tqrepaint(TRUE); + timetags->repaint(TRUE); kdispt->ClearEv(false); diff --git a/kmid/kmidframe.cpp b/kmid/kmidframe.cpp index 9ebf9f84..0b02c608 100644 --- a/kmid/kmidframe.cpp +++ b/kmid/kmidframe.cpp @@ -567,7 +567,7 @@ void kmidFrame::file_SaveLyrics() if (stat(TQFile::encodeName(filename), &statbuf)!=-1) { - TQString s = i18n("File %1 already exists\nDo you want to overwrite it?").tqarg(filename); + TQString s = i18n("File %1 already exists\nDo you want to overwrite it?").arg(filename); if (KMessageBox::warningYesNo(this,s,TQString(),i18n("Overwrite"),KStdGuiItem::cancel())==1) return; } diff --git a/kmid/ktrianglebutton.cpp b/kmid/ktrianglebutton.cpp index facce021..7d8e2088 100644 --- a/kmid/ktrianglebutton.cpp +++ b/kmid/ktrianglebutton.cpp @@ -47,7 +47,7 @@ void KTriangleButton::enterEvent( TQEvent* ) if ( isEnabled() ) { raised = TRUE; - tqrepaint(FALSE); + repaint(FALSE); } } @@ -56,7 +56,7 @@ void KTriangleButton::leaveEvent( TQEvent * ) if( raised != FALSE ) { raised = FALSE; - tqrepaint(); + repaint(); } } diff --git a/kmid/midicfgdlg.cpp b/kmid/midicfgdlg.cpp index 00497d05..855de04a 100644 --- a/kmid/midicfgdlg.cpp +++ b/kmid/midicfgdlg.cpp @@ -56,7 +56,7 @@ MidiConfigDialog::MidiConfigDialog(DeviceManager *dm, for (int i=0;imidiPorts()+devman->synthDevices();i++) { if (strcmp(devman->type(i),"")!=0) - temp = TQString("%1 - %2").tqarg(devman->name(i)).tqarg(devman->type(i)); + temp = TQString("%1 - %2").arg(devman->name(i)).arg(devman->type(i)); else temp = devman->name(i); -- cgit v1.2.1