From 83fbc82a101309e171089f0d5ed080f82a367345 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:49:11 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kmid/channel.cpp | 8 ++++---- kmid/channelcfgdlg.cpp | 2 +- kmid/collectdlg.cpp | 6 +++--- kmid/kdisptext.cpp | 12 ++++++------ kmid/kdisptext.h | 2 +- kmid/klcdnumber.cpp | 8 ++++---- kmid/klcdnumber.h | 2 +- kmid/kmidclient.cpp | 40 ++++++++++++++++++++-------------------- kmid/kmidclient.h | 2 +- kmid/kmidframe.cpp | 2 +- kmid/ktrianglebutton.cpp | 16 ++++++++-------- kmid/main.cpp | 2 +- kmid/midicfgdlg.cpp | 4 ++-- kmid/qslidertime.cpp | 2 +- kmid/qslidertime.h | 2 +- kmid/rhythmview.cpp | 2 +- kmid/rhythmview.h | 2 +- 17 files changed, 57 insertions(+), 57 deletions(-) (limited to 'kmid') diff --git a/kmid/channel.cpp b/kmid/channel.cpp index 2fe22de6..7d077dd7 100644 --- a/kmid/channel.cpp +++ b/kmid/channel.cpp @@ -48,7 +48,7 @@ KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent) keyboard = TQPixmap(locate("appdata","icons/keyboard.xpm")); penB = new TQPen (black); penW = new TQPen (white); - penT = new TQPen (tqcolorGroup().background()); + penT = new TQPen (colorGroup().background()); KConfig *kcfg=KGlobal::instance()->config(); kcfg->setGroup("KMid"); @@ -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/channelcfgdlg.cpp b/kmid/channelcfgdlg.cpp index db320a28..45d8fa0f 100644 --- a/kmid/channelcfgdlg.cpp +++ b/kmid/channelcfgdlg.cpp @@ -9,7 +9,7 @@ #include "channelview.h" #include "channelcfgdlg.h" #include "version.h" -#include +#include #include ChannelViewConfigDialog::ChannelViewConfigDialog(TQWidget *parent,const char *name) : KDialogBase(parent,name,TRUE,i18n("Configure Channel View"),Ok|Cancel, Ok) 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..a0e7461d 100644 --- a/kmid/kdisptext.cpp +++ b/kmid/kdisptext.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -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/kdisptext.h b/kmid/kdisptext.h index 8cd9939f..2c331425 100644 --- a/kmid/kdisptext.h +++ b/kmid/kdisptext.h @@ -113,7 +113,7 @@ public: void setLyricsEncoding(const TQString &enc); -// TQSize tqsizeHint(); +// TQSize sizeHint(); public slots: void ScrollDown(); diff --git a/kmid/klcdnumber.cpp b/kmid/klcdnumber.cpp index 355f9578..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) @@ -332,7 +332,7 @@ void KLCDNumber::setRange(double min, double max) maxValue=max; } -TQSize KLCDNumber::tqsizeHint() +TQSize KLCDNumber::sizeHint() { return TQSize(83,28); } diff --git a/kmid/klcdnumber.h b/kmid/klcdnumber.h index cf1fca4e..6f9096c4 100644 --- a/kmid/klcdnumber.h +++ b/kmid/klcdnumber.h @@ -121,7 +121,7 @@ public: void display (int v); void display (double v); - TQSize tqsizeHint (); + TQSize sizeHint (); // TQSizePolicy sizePolicy(); protected: diff --git a/kmid/kmidclient.cpp b/kmid/kmidclient.cpp index 706e7cbf..ce4a18fd 100644 --- a/kmid/kmidclient.cpp +++ b/kmid/kmidclient.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include @@ -96,7 +96,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name connect (timebar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotSeek(int))); timetags = new QSliderTime(timebar,this); - timetags->setMinimumSize(timetags->tqsizeHint()); + timetags->setMinimumSize(timetags->sizeHint()); qlabelTempo= new TQLabel(i18n("Tempo:"), this,"tempolabel", TQLabel::NoFrame); @@ -108,7 +108,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name tempoLCD->setRange(3,999); tempoLCD->setDefaultValue(120); tempoLCD->setUserSetDefaultValue(true); - tempoLCD->setMinimumSize(tempoLCD->tqsizeHint()); + tempoLCD->setMinimumSize(tempoLCD->sizeHint()); connect(tempoLCD,TQT_SIGNAL(valueChanged(double)),this,TQT_SLOT(slotSetTempo(double))); comboSongs = new TQComboBox(FALSE, this,"Songs"); @@ -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,10 +310,10 @@ 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); - tqtopLevelWidget()->setCaption("KMid"); + 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); @@ -353,7 +353,7 @@ int kmidClient::openFile(const char *filename) char *capt=new char[strlen(fn)+20]; sprintf(capt,"KMid - %s",fn); delete fn; - tqtopLevelWidget()->setCaption(capt); + topLevelWidget()->setCaption(capt); delete capt; timebar->setValue(0); @@ -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,12 +1265,12 @@ 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); - tqtopLevelWidget()->setCaption("KMid"); + 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); @@ -1522,9 +1522,9 @@ void kmidClient::downloadFinished(KIO::Job *) kapp->exit_loop(); } -TQSize kmidClient::tqsizeHint() const +TQSize kmidClient::sizeHint() const { - TQSize sh = TQWidget::tqsizeHint(); + TQSize sh = TQWidget::sizeHint(); return sh.expandedTo(TQSize(560,420)); } diff --git a/kmid/kmidclient.h b/kmid/kmidclient.h index dbfa7518..3b6fbad8 100644 --- a/kmid/kmidclient.h +++ b/kmid/kmidclient.h @@ -217,7 +217,7 @@ public: void setCurrentSong(int i); void setPlayListMode(int i); - TQSize tqsizeHint() const; + TQSize sizeHint() const; private: TQSlider *timebar; QSliderTime *timetags; 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 155daf31..e94f0980 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(); } } @@ -75,21 +75,21 @@ void KTriangleButton::paint( TQPainter *painter ) { if ( isDown() || isOn() ) { - if ( tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) qDrawWinButton( painter, 0, 0, width(), - height(), tqcolorGroup(), TRUE ); + height(), colorGroup(), TRUE ); else qDrawShadePanel( painter, 0, 0, width(), - height(), tqcolorGroup(), TRUE, 2, 0L ); + height(), colorGroup(), TRUE, 2, 0L ); } else if ( raised ) { - if ( tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) qDrawWinButton( painter, 0, 0, width(), height(), - tqcolorGroup(), FALSE ); + colorGroup(), FALSE ); else qDrawShadePanel( painter, 0, 0, width(), height(), - tqcolorGroup(), FALSE, 2, 0L ); + colorGroup(), FALSE, 2, 0L ); } if (dir==Right) diff --git a/kmid/main.cpp b/kmid/main.cpp index 45cd1fab..4e83d57f 100644 --- a/kmid/main.cpp +++ b/kmid/main.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/kmid/midicfgdlg.cpp b/kmid/midicfgdlg.cpp index 00497d05..8a434711 100644 --- a/kmid/midicfgdlg.cpp +++ b/kmid/midicfgdlg.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -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); diff --git a/kmid/qslidertime.cpp b/kmid/qslidertime.cpp index ba1b62f8..aa879da5 100644 --- a/kmid/qslidertime.cpp +++ b/kmid/qslidertime.cpp @@ -108,7 +108,7 @@ if (kslider==NULL) return; } -TQSize QSliderTime::tqsizeHint() +TQSize QSliderTime::sizeHint() { return TQSize(10,fontheight+2); } diff --git a/kmid/qslidertime.h b/kmid/qslidertime.h index a409332b..3dda085d 100644 --- a/kmid/qslidertime.h +++ b/kmid/qslidertime.h @@ -43,7 +43,7 @@ public: int getFontHeight(void) {return fontheight;}; - TQSize tqsizeHint(); + TQSize sizeHint(); TQSizePolicy sizePolicy(); private: diff --git a/kmid/rhythmview.cpp b/kmid/rhythmview.cpp index 49499d46..240ee242 100644 --- a/kmid/rhythmview.cpp +++ b/kmid/rhythmview.cpp @@ -95,7 +95,7 @@ void RhythmView::resizeEvent(TQResizeEvent *) } } -TQSize RhythmView::tqsizeHint() +TQSize RhythmView::sizeHint() { return TQSize(10,10); } diff --git a/kmid/rhythmview.h b/kmid/rhythmview.h index 97a7ae1a..8af09613 100644 --- a/kmid/rhythmview.h +++ b/kmid/rhythmview.h @@ -43,7 +43,7 @@ public: void Beat(void); // Just increase the beat - TQSize tqsizeHint(); + TQSize sizeHint(); TQSizePolicy sizePolicy(); private: -- cgit v1.2.1