From 560378aaca1784ba19806a0414a32b20c744de39 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 3 Jan 2011 04:12:51 +0000
Subject: Automated conversion for enhanced compatibility with TQt for Qt4
 3.4.0 TP1 NOTE: This will not compile with Qt4 (yet), however it does compile
 with Qt3

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 libkmid/deviceman.cc |  2 +-
 libkmid/midistat.cc  | 18 +++++++++---------
 libkmid/midistat.h   | 10 +++++-----
 libkmid/player.cc    |  6 +++---
 libkmid/player.h     |  4 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'libkmid')

diff --git a/libkmid/deviceman.cc b/libkmid/deviceman.cc
index c8030f44e..07a0af9b2 100644
--- a/libkmid/deviceman.cc
+++ b/libkmid/deviceman.cc
@@ -119,7 +119,7 @@ DeviceManager::DeviceManager(int def)
     TQString mapurl(config->readPathEntry("mapFilename"));
     if ((config->readBoolEntry("useMidiMapper", false))&&(!mapurl.isEmpty()))
     {
-      mapper_tmp = new MidiMapper( mapurl.mid(mapurl.find(":")+1 ).local8Bit() );
+      mapper_tmp = new MidiMapper( mapurl.mid(mapurl.tqfind(":")+1 ).local8Bit() );
     }
     else
       mapper_tmp = 0L;
diff --git a/libkmid/midistat.cc b/libkmid/midistat.cc
index 29d1436c8..9a45c2472 100644
--- a/libkmid/midistat.cc
+++ b/libkmid/midistat.cc
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    midistat.cc	- class MidiStatus, change it internally and then send it. 
+    midistat.cc	- class MiditqStatus, change it internally and then send it. 
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html            
@@ -33,7 +33,7 @@
 
 extern int MT32toGM[128];
 
-MidiStatus::MidiStatus()
+MiditqStatus::MiditqStatus()
 {
   int i;
   tempo=1000000;
@@ -51,29 +51,29 @@ MidiStatus::MidiStatus()
   }
 }
 
-MidiStatus::~MidiStatus()
+MiditqStatus::~MiditqStatus()
 {
 }
 
 //    void noteOn	( uchar chn, uchar note, uchar vel );
 //    void noteOff	( uchar chn, uchar note, uchar vel );
 
-void MidiStatus::chnPatchChange	( uchar chn, uchar patch )
+void MiditqStatus::chnPatchChange	( uchar chn, uchar patch )
 {
   chn_patch[chn]=patch;
 }
 
-void MidiStatus::chnPressure	( uchar chn, uchar vel )
+void MiditqStatus::chnPressure	( uchar chn, uchar vel )
 {
   chn_pressure[chn]=vel;
 }
 
-void MidiStatus::chnPitchBender	( uchar chn, uchar lsb,  uchar msb )
+void MiditqStatus::chnPitchBender	( uchar chn, uchar lsb,  uchar msb )
 {
   chn_bender[chn]=((int)msb<<8|lsb);
 }
 
-void MidiStatus::chnController	( uchar chn, uchar ctl , uchar v )
+void MiditqStatus::chnController	( uchar chn, uchar ctl , uchar v )
 {
   if (ctl==7) chn_lastisvolumeev[chn]=1;
   else if (ctl==11) chn_lastisvolumeev[chn]=0;
@@ -81,12 +81,12 @@ void MidiStatus::chnController	( uchar chn, uchar ctl , uchar v )
   chn_controller[chn][ctl]=v;
 }
 
-void MidiStatus::tmrSetTempo(int v)
+void MiditqStatus::tmrSetTempo(int v)
 {
   tempo=v;
 }
 
-void MidiStatus::sendData(DeviceManager *midi,int gm)
+void MiditqStatus::sendData(DeviceManager *midi,int gm)
 {
   for (int chn=0;chn<16;chn++)
   {
diff --git a/libkmid/midistat.h b/libkmid/midistat.h
index 17dda1269..27dd45d87 100644
--- a/libkmid/midistat.h
+++ b/libkmid/midistat.h
@@ -37,11 +37,11 @@
  * @version 0.9.5 17/01/2000
  * @author Antonio Larrosa Jimenez <larrosa@kde.org>
  */
-class MidiStatus
+class MiditqStatus
 {
   private:
-    class MidiStatusPrivate;
-    MidiStatusPrivate *d;
+    class MiditqStatusPrivate;
+    MiditqStatusPrivate *d;
 
     ulong tempo;
 
@@ -56,12 +56,12 @@ class MidiStatus
     /**
      * Constructor.
      */
-    MidiStatus();
+    MiditqStatus();
 
     /**
      * Destructor.
      */ 
-    ~MidiStatus();
+    ~MiditqStatus();
 
 
     //    void noteOn	( uchar chn, uchar note, uchar vel );
diff --git a/libkmid/player.cc b/libkmid/player.cc
index a68a9b147..d6ac22004 100644
--- a/libkmid/player.cc
+++ b/libkmid/player.cc
@@ -575,7 +575,7 @@ void MidiPlayer::play(bool calloutput,void output(void))
   double absTimeAtChangeTempo=0;
   double absTime=0;
   double diffTime=0;
-  MidiStatus *midistat;
+  MiditqStatus *midistat;
   //ulong mspass;
   double prevms=0;
   int j;
@@ -592,7 +592,7 @@ void MidiPlayer::play(bool calloutput,void output(void))
     midi->sync(1);
     midi->tmrStop();
     midi->closeDev();
-    midistat = new MidiStatus();
+    midistat = new MiditqStatus();
     setPos(ctl->gotomsec,midistat);
     minTime=ctl->gotomsec;
     prevms=(ulong)minTime;
@@ -792,7 +792,7 @@ void MidiPlayer::play(bool calloutput,void output(void))
 }
 
 
-void MidiPlayer::setPos(ulong gotomsec,MidiStatus *midistat)
+void MidiPlayer::setPos(ulong gotomsec,MiditqStatus *midistat)
 {
   int trk,minTrk;
   ulong tempo=(ulong)(500000 * ctl->ratioTempo);
diff --git a/libkmid/player.h b/libkmid/player.h
index 6a9210292..cb21a9674 100644
--- a/libkmid/player.h
+++ b/libkmid/player.h
@@ -379,11 +379,11 @@ class KMID_EXPORT MidiPlayer
    * @param gotomsec the number of milliseconds to go to . A subsequent call to
    * play() will start playing the song from that moment, instead of the
    * beginning.
-   * @param midistat a MidiStatus object that will contain the status in
+   * @param midistat a MiditqStatus object that will contain the status in
    * which the MIDI device would be if it would have arrived to this situation by
    * a normal playing of the song.
    */
-  void setPos(ulong gotomsec, class MidiStatus *midistat);
+  void setPos(ulong gotomsec, class MiditqStatus *midistat);
 
   /**
    * Changes the speed at which a song is played. The song's tempo is multiplied
-- 
cgit v1.2.1