From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 06:00:15 +0000 Subject: TQt4 port kdemultimedia This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- arts/tools/midimanagerview.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'arts/tools/midimanagerview.cpp') diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp index 4849af78..a9cefb07 100644 --- a/arts/tools/midimanagerview.cpp +++ b/arts/tools/midimanagerview.cpp @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the Qt - library, treating Qt like a library that normally accompanies the + Permission is also granted to link this program with the TQt + library, treating TQt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ @@ -78,7 +78,7 @@ public: class ConnectionWidget : public TQWidget { public: MidiManagerView *v; - ConnectionWidget(MidiManagerView *v, TQWidget *parent) : TQWidget(parent), v(v) + ConnectionWidget(MidiManagerView *v, TQWidget *tqparent) : TQWidget(tqparent), v(v) { } void paintEvent(TQPaintEvent * /*event*/) @@ -96,8 +96,8 @@ public: conn != item->info.connections.end(); conn++) { MidiManagerItem *outitem = v->itemMap[*conn]; - TQRect r1 = v->widget->inputsListBox->itemRect(item); - TQRect r2 = v->widget->outputsListBox->itemRect(outitem); + TQRect r1 = v->widget->inputsListBox->tqitemRect(item); + TQRect r2 = v->widget->outputsListBox->tqitemRect(outitem); if(r1.height() > 0 && r2.height() > 0) { @@ -122,14 +122,14 @@ MidiManagerView::MidiManagerView() setCaption(i18n("MIDI Manager")); setIcon( MainBarIcon( "artsfftscope", 32 ) ); - (void)new KAction(i18n("&System MIDI Port (OSS)"), 0, this, TQT_SLOT(addOSSMidiPort()), + (void)new KAction(i18n("&System MIDI Port (OSS)"), 0, TQT_TQOBJECT(this), TQT_SLOT(addOSSMidiPort()), actionCollection(), "add_oss_midi_port"); - (void)new KAction(i18n("&aRts Synthesis MIDI Output"), 0, this, + (void)new KAction(i18n("&aRts Synthesis MIDI Output"), 0, TQT_TQOBJECT(this), TQT_SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output"); - (void) KStdAction::quit( this, TQT_SLOT(close()), actionCollection()); - connect(widget->connectButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConnect())); - connect(widget->disconnectButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDisconnect())); + (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + connect(widget->connectButton,TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotConnect())); + connect(widget->disconnectButton,TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDisconnect())); connectionWidget = new ConnectionWidget(this, widget->connectionFrame); connectionWidget->setMinimumSize(60,10); @@ -185,7 +185,7 @@ void MidiManagerView::updateLists() widget->inputsListBox->setSelected(itemMap[srcID],true); if(destID && itemMap[destID]) widget->outputsListBox->setSelected(itemMap[destID],true); - connectionWidget->repaint(); + connectionWidget->tqrepaint(); } void MidiManagerView::slotConnect() @@ -216,7 +216,7 @@ void MidiManagerView::slotDisconnect() void MidiManagerView::addOSSMidiPort() { - //lukas: no i18n here, QDialog's CTOR doesn't know about QString + //lukas: no i18n here, TQDialog's CTOR doesn't know about TQString //lukas: can't use that with const char *, i18n()'ed in the dialog itself MidiPortDlg *dlg = new MidiPortDlg(0,"/dev/midi","OSS Midi Port"); -- cgit v1.2.1