1 files changed, 18 insertions, 18 deletions

diff --git a/tdemid/channel.cpp b/tdemid/channel.cpp
index 6b8e23cf..b7e7c870 100644
--- a/tdemid/channel.cpp
+++ b/tdemid/channel.cpp
@@ -29,10 +29,10 @@
 #include <tqcombobox.h>
 
 #include <tdeglobal.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeconfig.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include "tdemidbutton.h"
 
 #include "channel.h"
@@ -42,7 +42,7 @@
 KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent)
 {
     channel=chn;
-    replay=TRUE;
+    replay=true;
     int i;
     for (i=0;i<128;i++) pressed[i]=0;
     keyboard = TQPixmap(locate("appdata","icons/keyboard.xpm"));
@@ -52,26 +52,26 @@ KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent)
 
     TDEConfig *kcfg=TDEGlobal::instance()->config();
     kcfg->setGroup("KMid");
-    TQFont *qtextfontdefault=new TQFont("lucida",18,TQFont::Bold,TRUE);
+    TQFont *qtextfontdefault=new TQFont("lucida",18,TQFont::Bold,true);
     qcvfont=new TQFont(kcfg->readFontEntry("ChannelViewFont",qtextfontdefault));
     delete qtextfontdefault;
 
-    instrumentCombo = new TQComboBox(FALSE,this,"instr");
+    instrumentCombo = new TQComboBox(false,this,"instr");
     instrumentCombo->setGeometry(160,2,200,20);
 
     for (i=0;i<128;i++)
         instrumentCombo->insertItem(i18n(instrumentName[i]),i);
 
-    connect(instrumentCombo,TQT_SIGNAL(activated(int)),this,TQT_SLOT(pgmChanged(int)));
+    connect(instrumentCombo,TQ_SIGNAL(activated(int)),this,TQ_SLOT(pgmChanged(int)));
 
     forcepgm=new KMidButton(this,"forcepgm");
     forcepgm->setGeometry(135,4,16,16);
-    forcepgm->setToggleButton(TRUE);
+    forcepgm->setToggleButton(true);
     button1 = TQPixmap(locate("appdata","icons/button1.xpm"));
     button2 = TQPixmap(locate("appdata","icons/button2.xpm"));
     forcepgm->setPixmaps(button1,button2);
     forcepgm->show();
-    connect(forcepgm,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(changeForcedState(bool)));
+    connect(forcepgm,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(changeForcedState(bool)));
 
 }
 
@@ -169,9 +169,9 @@ void KMidChannel::changeInstrument(int pgm)
 
 void KMidChannel::changeForceState(bool i)
 {
-        replay=FALSE;
+        replay=false;
         forcepgm->setOn(i);
-        replay=TRUE;
+        replay=true;
 }
 
 void KMidChannel::reset(int level)
@@ -180,12 +180,12 @@ void KMidChannel::reset(int level)
     if (level>=1)
     {
         instrumentCombo->setCurrentItem(0);
-        replay=FALSE;
-        forcepgm->setOn(FALSE);
-        replay=TRUE;
+        replay=false;
+        forcepgm->setOn(false);
+        replay=true;
     };
 
-    repaint(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);
-    repaint(FALSE);
+    repaint(false);
 }
 
 void KMidChannel::pgmChanged(int i)
@@ -209,9 +209,9 @@ void KMidChannel::pgmChanged(int i)
     data[2]=i;
     data[3]=0;
 
-    replay=FALSE;
-    forcepgm->setOn(TRUE);
-    replay=TRUE;
+    replay=false;
+    forcepgm->setOn(true);
+    replay=true;
 
     emit signalToKMidClient(data);