summaryrefslogtreecommitdiffstats
path: root/kmid
diff options
context:
space:
mode:
Diffstat (limited to 'kmid')
-rw-r--r--kmid/README2
-rw-r--r--kmid/channel.cpp10
-rw-r--r--kmid/channel.h3
-rw-r--r--kmid/channel3d.cpp2
-rw-r--r--kmid/channel3d.h2
-rw-r--r--kmid/channel4d.cpp2
-rw-r--r--kmid/channel4d.h2
-rw-r--r--kmid/channelcfgdlg.cpp2
-rw-r--r--kmid/channelcfgdlg.h3
-rw-r--r--kmid/channelview.cpp2
-rw-r--r--kmid/channelview.h1
-rw-r--r--kmid/collectdlg.cpp14
-rw-r--r--kmid/collectdlg.h5
-rw-r--r--kmid/kdisptext.cpp20
-rw-r--r--kmid/kdisptext.h5
-rw-r--r--kmid/klcdnumber.cpp18
-rw-r--r--kmid/klcdnumber.h9
-rw-r--r--kmid/kmid_part.cpp20
-rw-r--r--kmid/kmid_part.h15
-rw-r--r--kmid/kmidbutton.h4
-rw-r--r--kmid/kmidclient.cpp54
-rw-r--r--kmid/kmidclient.h7
-rw-r--r--kmid/kmidframe.cpp58
-rw-r--r--kmid/kmidframe.h5
-rw-r--r--kmid/ktrianglebutton.cpp24
-rw-r--r--kmid/ktrianglebutton.h3
-rw-r--r--kmid/main.cpp2
-rw-r--r--kmid/midicfgdlg.cpp6
-rw-r--r--kmid/midicfgdlg.h3
-rw-r--r--kmid/qslidertime.cpp12
-rw-r--r--kmid/qslidertime.h7
-rw-r--r--kmid/rhythmview.cpp6
-rw-r--r--kmid/rhythmview.h6
33 files changed, 174 insertions, 160 deletions
diff --git a/kmid/README b/kmid/README
index 52c5f759..3b819871 100644
--- a/kmid/README
+++ b/kmid/README
@@ -60,7 +60,7 @@ Index
3. Compiling consoleKMid
-----------------
- Do a configure from the parent directory, then go to the player directory,
+ Do a configure from the tqparent directory, then go to the player directory,
and do a 'make' . Simple , isn't it ?
By default it will use the external midi device, if you want to use another
diff --git a/kmid/channel.cpp b/kmid/channel.cpp
index 7d077dd7..a4547767 100644
--- a/kmid/channel.cpp
+++ b/kmid/channel.cpp
@@ -39,7 +39,7 @@
#include "instrname.h"
#include <kiconloader.h>
-KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent)
+KMidChannel::KMidChannel(int chn,TQWidget *tqparent) : TQWidget (tqparent)
{
channel=chn;
replay=TRUE;
@@ -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 (colorGroup().background());
+ penT = new TQPen (tqcolorGroup().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").arg(channel);
+ TQString tmp = i18n("Channel %1").tqarg(channel);
qpaint->setFont(*qcvfont);
qpaint->setPen(*penB);
qpaint->drawText(2,20,tmp);
@@ -185,7 +185,7 @@ void KMidChannel::reset(int level)
replay=TRUE;
};
- repaint(FALSE);
+ tqrepaint(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);
+ tqrepaint(FALSE);
}
void KMidChannel::pgmChanged(int i)
diff --git a/kmid/channel.h b/kmid/channel.h
index 7051247b..7eb4166c 100644
--- a/kmid/channel.h
+++ b/kmid/channel.h
@@ -36,9 +36,10 @@
class TQFont;
class TQComboBox;
class KMidButton;
-class KMidChannel : public QWidget
+class KMidChannel : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
private:
bool pressed[128]; // The 128 keys
diff --git a/kmid/channel3d.cpp b/kmid/channel3d.cpp
index d3bef7fd..8a24410b 100644
--- a/kmid/channel3d.cpp
+++ b/kmid/channel3d.cpp
@@ -25,7 +25,7 @@
#include "channel3d.h"
#include <tqpainter.h>
-KMidChannel3D::KMidChannel3D (int chn,TQWidget *parent) : KMidChannel(chn,parent)
+KMidChannel3D::KMidChannel3D (int chn,TQWidget *tqparent) : KMidChannel(chn,tqparent)
{
}
diff --git a/kmid/channel3d.h b/kmid/channel3d.h
index a8c81da0..2ce8de10 100644
--- a/kmid/channel3d.h
+++ b/kmid/channel3d.h
@@ -30,7 +30,7 @@
class KMidChannel3D : public KMidChannel
{
public:
- KMidChannel3D(int chn,TQWidget *parent);
+ KMidChannel3D(int chn,TQWidget *tqparent);
virtual void drawDo (TQPainter *qpaint,int x,int p);
diff --git a/kmid/channel4d.cpp b/kmid/channel4d.cpp
index 4f47c3ae..a12165eb 100644
--- a/kmid/channel4d.cpp
+++ b/kmid/channel4d.cpp
@@ -25,7 +25,7 @@
#include "channel4d.h"
#include <tqpainter.h>
-KMidChannel4D::KMidChannel4D (int chn,TQWidget *parent) : KMidChannel(chn,parent)
+KMidChannel4D::KMidChannel4D (int chn,TQWidget *tqparent) : KMidChannel(chn,tqparent)
{
brushR = new TQBrush (red);
brushW = new TQBrush (white);
diff --git a/kmid/channel4d.h b/kmid/channel4d.h
index e6326f4a..e5cba3c7 100644
--- a/kmid/channel4d.h
+++ b/kmid/channel4d.h
@@ -36,7 +36,7 @@ private:
TQPen *penR;
public:
- KMidChannel4D(int chn,TQWidget *parent);
+ KMidChannel4D(int chn,TQWidget *tqparent);
virtual void drawDo (TQPainter *qpaint,int x,int p);
diff --git a/kmid/channelcfgdlg.cpp b/kmid/channelcfgdlg.cpp
index db320a28..4384dd7c 100644
--- a/kmid/channelcfgdlg.cpp
+++ b/kmid/channelcfgdlg.cpp
@@ -12,7 +12,7 @@
#include <tqlayout.h>
#include <tqvbuttongroup.h>
-ChannelViewConfigDialog::ChannelViewConfigDialog(TQWidget *parent,const char *name) : KDialogBase(parent,name,TRUE,i18n("Configure Channel View"),Ok|Cancel, Ok)
+ChannelViewConfigDialog::ChannelViewConfigDialog(TQWidget *tqparent,const char *name) : KDialogBase(tqparent,name,TRUE,i18n("Configure Channel View"),Ok|Cancel, Ok)
{
TQWidget *page = new TQWidget( this );
setMainWidget(page);
diff --git a/kmid/channelcfgdlg.h b/kmid/channelcfgdlg.h
index c845be3e..040b741b 100644
--- a/kmid/channelcfgdlg.h
+++ b/kmid/channelcfgdlg.h
@@ -31,10 +31,11 @@ class TQRadioButton;
class ChannelViewConfigDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ChannelViewConfigDialog(TQWidget *parent,const char *name);
+ ChannelViewConfigDialog(TQWidget *tqparent,const char *name);
private:
TQVButtonGroup *qbg;
diff --git a/kmid/channelview.cpp b/kmid/channelview.cpp
index a349691a..9a1f1e88 100644
--- a/kmid/channelview.cpp
+++ b/kmid/channelview.cpp
@@ -44,7 +44,7 @@ ChannelView::ChannelView(void) : KMainWindow(0, "ChannelView")
Channel[i]->setGeometry(5,5+i*CHANNELHEIGHT,width()-20,CHANNELHEIGHT);
Channel[i]->show();
}
- scrollbar=new TQScrollBar(1,16,1,1,1,TQScrollBar::Vertical,this,"Channelscrollbar");
+ scrollbar=new TQScrollBar(1,16,1,1,1,Qt::Vertical,this,"Channelscrollbar");
connect(scrollbar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(ScrollChn(int)));
setScrollBarRange();
}
diff --git a/kmid/channelview.h b/kmid/channelview.h
index 3eb51302..eaf92979 100644
--- a/kmid/channelview.h
+++ b/kmid/channelview.h
@@ -33,6 +33,7 @@
class ChannelView : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
private:
KMidChannel *Channel[16];
int nvisiblechannels;
diff --git a/kmid/collectdlg.cpp b/kmid/collectdlg.cpp
index ab476bb6..a98a8a05 100644
--- a/kmid/collectdlg.cpp
+++ b/kmid/collectdlg.cpp
@@ -38,7 +38,7 @@
#include "songlist.h"
#include "slman.h"
-CollectionDialog::CollectionDialog(SLManager *slm,int selC,TQWidget *parent,const char *name) : TQDialog(parent,name,TRUE)
+CollectionDialog::CollectionDialog(SLManager *slm,int selC,TQWidget *tqparent,const char *name) : TQDialog(tqparent,name,TRUE)
{
setCaption(i18n("Collections Manager"));
ok=new KPushButton(KStdGuiItem::ok(),this);
@@ -156,7 +156,7 @@ void CollectionDialog::newCollection()
{
bool ok;
TQString name = KInputDialog::getText( i18n( "New Collection" ),
- i18n( "Enter the name of the new collection:" ), TQString::null,
+ i18n( "Enter the name of the new collection:" ), TQString(),
&ok, this );
if (ok)
@@ -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").arg(name);
+ TQString s = i18n("The name '%1' is already used").tqarg(name);
KMessageBox::sorry(this, s);
}
else
@@ -182,7 +182,7 @@ SongList *src=currentsl;
int i;
bool ok;
TQString name = KInputDialog::getText( i18n( "Copy Collection" ),
- i18n( "Enter the name of the copy collection:" ), TQString::null,
+ i18n( "Enter the name of the copy collection:" ), TQString(),
&ok, this );
if (ok)
@@ -190,7 +190,7 @@ int i;
i=slman->createCollection(name.ascii());
if (i==-1)
{
- TQString s = i18n("The name '%1' is already used").arg(name);
+ TQString s = i18n("The name '%1' is already used").tqarg(name);
KMessageBox::sorry(this, s);
}
else
@@ -225,14 +225,14 @@ if (idx==0) return;
bool ok;
TQString name = KInputDialog::getText( i18n( "Change Collection Name" ),
- i18n( "Enter the name of the selected collection:" ), TQString::null,
+ i18n( "Enter the name of the selected collection:" ), TQString(),
&ok, this );
if (ok)
{
if (slman->getCollection(name.ascii())!=NULL)
{
- TQString s = i18n("The name '%1' is already used").arg(name);
+ TQString s = i18n("The name '%1' is already used").tqarg(name);
KMessageBox::sorry(this, s);
}
else
diff --git a/kmid/collectdlg.h b/kmid/collectdlg.h
index ae9a0b3a..a53dff70 100644
--- a/kmid/collectdlg.h
+++ b/kmid/collectdlg.h
@@ -33,9 +33,10 @@ class KPushButton;
class TQPushButton;
class TQListBox;
class KURL;
-class CollectionDialog : public QDialog
+class CollectionDialog : public TQDialog
{
Q_OBJECT
+ TQ_OBJECT
private:
SLManager *slman;
SongList *currentsl;
@@ -48,7 +49,7 @@ protected:
void addSong(const KURL &);
public:
- CollectionDialog(SLManager *slm,int selc,TQWidget *parent,const char *name);
+ CollectionDialog(SLManager *slm,int selc,TQWidget *tqparent,const char *name);
public slots:
void collectionselected(int idx);
diff --git a/kmid/kdisptext.cpp b/kmid/kdisptext.cpp
index cc1eb4d3..2842608c 100644
--- a/kmid/kdisptext.cpp
+++ b/kmid/kdisptext.cpp
@@ -40,7 +40,7 @@
//#define DRAW_BOUNDING_RECTS
-KDisplayText::KDisplayText(TQWidget *parent,const char *name) : TQScrollView(parent,name)
+KDisplayText::KDisplayText(TQWidget *tqparent,const char *name) : TQScrollView(tqparent,name)
{
first_line_[0]=first_line_[1]=NULL;
linked_list_[0]=linked_list_[1]=NULL;
@@ -122,10 +122,10 @@ void KDisplayText::ClearEv(bool totally)
RemoveLinkedList();
if (totally)
{
- killTimers();
+ TQT_TQOBJECT(this)->killTimers();
autoscrollv=0;
resizeContents(0,0);
- viewport()->repaint(TRUE);
+ viewport()->tqrepaint(TRUE);
}
}
@@ -367,7 +367,7 @@ void KDisplayText::CursorToHome(void)
setContentsPos(0,0);
- viewport()->repaint(true);
+ viewport()->tqrepaint(true);
}
void KDisplayText::PaintIn(int type)
@@ -425,14 +425,14 @@ void KDisplayText::PaintIn(int type)
autoscrollv+=qfmetr->lineSpacing();
if (b) startTimer(100);
else {
- killTimers();
+ TQT_TQOBJECT(this)->killTimers();
startTimer(100/(autoscrollv/qfmetr->lineSpacing()+1));
}
}
// scrollBy(0,qfmetr->lineSpacing());
}
}
- if (paint) repaintContents(tmp->r);
+ if (paint) tqrepaintContents(tmp->r);
}
void KDisplayText::gotomsec(ulong i)
@@ -484,10 +484,10 @@ void KDisplayText::gotomsec(ulong i)
}
- killTimers();
+ TQT_TQOBJECT(this)->killTimers();
autoscrollv=0;
setContentsPos(0,first_line->ypos);
- viewport()->repaint();
+ viewport()->tqrepaint();
}
}
@@ -508,7 +508,7 @@ void KDisplayText::fontChanged(void)
qfmetr=new TQFontMetrics(*qtextfont);
calculatePositions();
nvisiblelines=height()/qfmetr->lineSpacing();
- viewport()->repaint(TRUE);
+ viewport()->tqrepaint(TRUE);
}
void KDisplayText::ChangeTypeOfTextEvents(int type)
@@ -534,7 +534,7 @@ void KDisplayText::ChangeTypeOfTextEvents(int type)
setContentsPos(0,first_line->ypos);
}
- viewport()->repaint(TRUE);
+ viewport()->tqrepaint(TRUE);
}
int KDisplayText::ChooseTypeOfTextEvents(void)
diff --git a/kmid/kdisptext.h b/kmid/kdisptext.h
index d23787c0..2b9c3fed 100644
--- a/kmid/kdisptext.h
+++ b/kmid/kdisptext.h
@@ -51,6 +51,7 @@ class TQScrollBar;
class KDisplayText : public TQScrollView
{
Q_OBJECT
+ TQ_OBJECT
private:
TQTextCodec *lyrics_codec;
@@ -91,7 +92,7 @@ protected:
virtual void timerEvent(TQTimerEvent *e);
public:
- KDisplayText(TQWidget *parent,const char *name);
+ KDisplayText(TQWidget *tqparent,const char *name);
virtual ~KDisplayText();
void ClearEv(bool totally=true);
@@ -112,7 +113,7 @@ public:
void setLyricsEncoding(const TQString &enc);
-// TQSize sizeHint();
+// TQSize tqsizeHint();
public slots:
void ScrollDown();
diff --git a/kmid/klcdnumber.cpp b/kmid/klcdnumber.cpp
index 014188cc..21bdbbd5 100644
--- a/kmid/klcdnumber.cpp
+++ b/kmid/klcdnumber.cpp
@@ -28,8 +28,8 @@
#define BUTTONWIDTH 9
-KLCDNumber::KLCDNumber(int _numDigits,TQWidget *parent,const char *name)
- : TQWidget(parent,name)
+KLCDNumber::KLCDNumber(int _numDigits,TQWidget *tqparent,const char *name)
+ : TQWidget(tqparent,name)
{
initDigits();
setUserChangeValue=false;
@@ -47,8 +47,8 @@ KLCDNumber::KLCDNumber(int _numDigits,TQWidget *parent,const char *name)
setLCDColor(100,255,100);
}
-KLCDNumber::KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *parent,const char *name)
- : TQWidget(parent,name)
+KLCDNumber::KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *tqparent,const char *name)
+ : TQWidget(tqparent,name)
{
initDigits();
setUserChangeValue=_setUserChangeValue;
@@ -197,7 +197,7 @@ void KLCDNumber::setValue(double v)
void KLCDNumber::display (double v)
{
setValue(v);
- repaint(FALSE);
+ tqrepaint(FALSE);
}
void KLCDNumber::display (int v)
@@ -299,7 +299,7 @@ void KLCDNumber::mousePressEvent (TQMouseEvent *e)
void KLCDNumber::timerEvent(TQTimerEvent *)
{
- killTimers();
+ TQT_TQOBJECT(this)->killTimers();
doubleclicked=false;
}
@@ -317,13 +317,13 @@ void KLCDNumber::defaultValueClicked()
void KLCDNumber::setLCDBackgroundColor(int r,int g,int b)
{
backgcolor=TQColor(r,g,b);
- repaint(FALSE);
+ tqrepaint(FALSE);
}
void KLCDNumber::setLCDColor(int r,int g,int b)
{
LCDcolor=TQColor(r,g,b);
- repaint(FALSE);
+ tqrepaint(FALSE);
}
void KLCDNumber::setRange(double min, double max)
@@ -332,7 +332,7 @@ void KLCDNumber::setRange(double min, double max)
maxValue=max;
}
-TQSize KLCDNumber::sizeHint()
+TQSize KLCDNumber::tqsizeHint()
{
return TQSize(83,28);
}
diff --git a/kmid/klcdnumber.h b/kmid/klcdnumber.h
index aaf58dbc..d7be294f 100644
--- a/kmid/klcdnumber.h
+++ b/kmid/klcdnumber.h
@@ -30,9 +30,10 @@ class TQPainter;
class KTriangleButton;
class TQColor;
-class KLCDNumber : public QWidget
+class KLCDNumber : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
protected:
class digit {
public:
@@ -100,8 +101,8 @@ public:
void initDigits(void);
public:
- KLCDNumber(int _numDigits,TQWidget *parent,const char *name);
- KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *parent,const char *name);
+ KLCDNumber(int _numDigits,TQWidget *tqparent,const char *name);
+ KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *tqparent,const char *name);
void setUserSetDefaultValue(bool _userSetDefaultValue);
void setDefaultValue(double v);
@@ -120,7 +121,7 @@ public:
void display (int v);
void display (double v);
- TQSize sizeHint ();
+ TQSize tqsizeHint ();
// TQSizePolicy sizePolicy();
protected:
diff --git a/kmid/kmid_part.cpp b/kmid/kmid_part.cpp
index 39b10603..16618f7d 100644
--- a/kmid/kmid_part.cpp
+++ b/kmid/kmid_part.cpp
@@ -37,11 +37,11 @@ KMidFactory::~KMidFactory()
s_instance = 0;
}
-KParts::Part *KMidFactory::createPartObject(TQWidget *parentWidget, const char *widgetName,
- TQObject *parent, const char *name, const char*,
+KParts::Part *KMidFactory::createPartObject(TQWidget *tqparentWidget, const char *widgetName,
+ TQObject *tqparent, const char *name, const char*,
const TQStringList& )
{
- KParts::Part *obj = new KMidPart(parentWidget, widgetName, parent, name);
+ KParts::Part *obj = new KMidPart(tqparentWidget, widgetName, tqparent, name);
return obj;
}
@@ -65,15 +65,15 @@ KInstance *KMidFactory::instance()
return s_instance;
}
- KMidPart::KMidPart(TQWidget *parentWidget, const char *widgetName,
- TQObject *parent, const char *name)
-: KParts::ReadOnlyPart(parent, name)
+ KMidPart::KMidPart(TQWidget *tqparentWidget, const char *widgetName,
+ TQObject *tqparent, const char *name)
+: KParts::ReadOnlyPart(tqparent, name)
{
setInstance(KMidFactory::instance());
- widget = new kmidClient(parentWidget, actionCollection());
+ widget = new kmidClient(tqparentWidget, actionCollection());
widget->show();
- widget->setFocusPolicy(TQWidget::ClickFocus);
+ widget->setFocusPolicy(TQ_ClickFocus);
setWidget(widget);
// create and connect our actions
@@ -133,8 +133,8 @@ void KMidPart::slotStop()
{
widget->stop();
}
-KMidBrowserExtension::KMidBrowserExtension(KMidPart *parent)
- : KParts::BrowserExtension(parent, "KMidBrowserExtension")
+KMidBrowserExtension::KMidBrowserExtension(KMidPart *tqparent)
+ : KParts::BrowserExtension(tqparent, "KMidBrowserExtension")
{
}
diff --git a/kmid/kmid_part.h b/kmid/kmid_part.h
index 5b0cbc0e..c22d8d43 100644
--- a/kmid/kmid_part.h
+++ b/kmid/kmid_part.h
@@ -12,13 +12,14 @@ class kmidClient;
class KDE_EXPORT KMidFactory : public KParts::Factory
{
Q_OBJECT
+ TQ_OBJECT
public:
KMidFactory();
virtual ~KMidFactory();
- virtual KParts::Part* createPartObject(TQWidget *parentWidget, const char *widgetName,
- TQObject* parent = 0, const char* name = 0,
- const char* classname = "TQObject",
+ virtual KParts::Part* createPartObject(TQWidget *tqparentWidget, const char *widgetName,
+ TQObject* tqparent = 0, const char* name = 0,
+ const char* classname = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList());
static KInstance *instance();
@@ -31,9 +32,10 @@ class KDE_EXPORT KMidFactory : public KParts::Factory
class KMidPart: public KParts::ReadOnlyPart
{
Q_OBJECT
+ TQ_OBJECT
public:
- KMidPart(TQWidget *parentWidget, const char *widgetName,
- TQObject *parent, const char *name);
+ KMidPart(TQWidget *tqparentWidget, const char *widgetName,
+ TQObject *tqparent, const char *name);
virtual ~KMidPart();
@@ -54,9 +56,10 @@ class KMidPart: public KParts::ReadOnlyPart
class KMidBrowserExtension : public KParts::BrowserExtension
{
Q_OBJECT
+ TQ_OBJECT
friend class KMidPart;
public:
- KMidBrowserExtension(KMidPart *parent);
+ KMidBrowserExtension(KMidPart *tqparent);
virtual ~KMidBrowserExtension();
};
diff --git a/kmid/kmidbutton.h b/kmid/kmidbutton.h
index 442b0fbd..ceba94a5 100644
--- a/kmid/kmidbutton.h
+++ b/kmid/kmidbutton.h
@@ -1,7 +1,7 @@
#include <tqpushbutton.h>
#include <tqpainter.h>
-class KMidButton : public QPushButton
+class KMidButton : public TQPushButton
{
protected:
@@ -15,7 +15,7 @@ protected:
public:
- KMidButton (TQWidget *parent,const char *name) : TQPushButton (parent,name)
+ KMidButton (TQWidget *tqparent,const char *name) : TQPushButton (tqparent,name)
{
};
diff --git a/kmid/kmidclient.cpp b/kmid/kmidclient.cpp
index 94467098..74234bac 100644
--- a/kmid/kmidclient.cpp
+++ b/kmid/kmidclient.cpp
@@ -65,8 +65,8 @@
//#define TEMPHACK
-kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name)
- : DCOPObject("KMidIface"), TQWidget(parent,name)
+kmidClient::kmidClient(TQWidget *tqparent, KActionCollection *ac, const char *name)
+ : DCOPObject("KMidIface"), TQWidget(tqparent,name)
{
actionCollection=ac;
KConfig *cfg=kapp->config();
@@ -90,13 +90,13 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name
// currentsl=slman->getCollection(activecollection);
itsme=0;
m_kMid.pid=0;
- timebar = new TQSlider(0,240000,30000,60000,TQSlider::Horizontal, this);
+ timebar = new TQSlider(0,240000,30000,60000,Qt::Horizontal, this);
timebar->setSteps(30000,60000);
timebar->setValue(0);
connect (timebar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotSeek(int)));
timetags = new QSliderTime(timebar,this);
- timetags->setMinimumSize(timetags->sizeHint());
+ timetags->setMinimumSize(timetags->tqsizeHint());
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->sizeHint());
+ tempoLCD->setMinimumSize(tempoLCD->tqsizeHint());
connect(tempoLCD,TQT_SIGNAL(valueChanged(double)),this,TQT_SLOT(slotSetTempo(double)));
comboSongs = new TQComboBox(FALSE, this,"Songs");
@@ -125,7 +125,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name
rhythmview->setMaximumHeight(7);
rhythmview->setMinimumHeight(7);
- volumebar = new TQSlider(0,200,10,100,TQSlider::Vertical, this );
+ volumebar = new TQSlider(0,200,10,100,Qt::Vertical, this );
volumebar->setSteps(10,20);
volumebar->setValue(100);
volumebar->setTickmarks(TQSlider::NoMarks);
@@ -147,7 +147,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name
TQString samplefile =
KGlobal::dirs()->findAllResources("appdata", "fm/*.o3").last();
- samplefile.truncate(samplefile.findRev('/'));
+ samplefile.truncate(samplefile.tqfindRev('/'));
FMOut::setFMPatchesDirectory(TQFile::encodeName(samplefile));
m_kMid.pctlsmID=shmget(IPC_PRIVATE,sizeof(PlayerController),0666 | IPC_CREAT );
@@ -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.").arg(filename);
+ i18n("The file %1 does not exist or cannot be opened.").tqarg(filename);
break;
case (-2) : errormsg =
- i18n("The file %1 is not a MIDI file.").arg(filename);break;
+ i18n("The file %1 is not a MIDI file.").tqarg(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.").arg(filename);break;
+ i18n("%1 is not a regular file.").tqarg(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->repaint(TRUE);
+ timetags->tqrepaint(TRUE);
kdispt->ClearEv();
- kdispt->repaint(TRUE);
- topLevelWidget()->setCaption("KMid");
+ kdispt->tqrepaint(TRUE);
+ tqtopLevelWidget()->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->repaint(TRUE);
+ timetags->tqrepaint(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->repaint(TRUE);
+ kdispt->tqrepaint(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;
- topLevelWidget()->setCaption(capt);
+ tqtopLevelWidget()->setCaption(capt);
delete capt;
timebar->setValue(0);
@@ -1125,11 +1125,11 @@ void kmidClient::processSpecialEvent()
}
-void kmidClient::repaintText(int type)
+void kmidClient::tqrepaintText(int type)
{
kdispt->ChangeTypeOfTextEvents(type);
typeoftextevents=type;
- kdispt->repaint(TRUE);
+ kdispt->tqrepaint(TRUE);
}
int kmidClient::ChooseTypeOfTextEvents(void)
@@ -1265,12 +1265,12 @@ void kmidClient::slotSelectSong(int i)
player->removeSong();
timebar->setRange(0,240000);
timebar->setValue(0);
- timetags->repaint(TRUE);
+ timetags->tqrepaint(TRUE);
kdispt->ClearEv();
- kdispt->repaint(TRUE);
+ kdispt->tqrepaint(TRUE);
comboSongs->clear();
- comboSongs->repaint(TRUE);
- topLevelWidget()->setCaption("KMid");
+ comboSongs->tqrepaint(TRUE);
+ tqtopLevelWidget()->setCaption("KMid");
return;
}
@@ -1374,7 +1374,7 @@ void kmidClient::visibleChannelView(int i)
}
channelView->show();
connect(channelView,TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(communicationFromChannelView(int *)));
- connect(kapp,TQT_SIGNAL(shutDown()),parentWidget(),TQT_SLOT(shuttingDown()));
+ connect(kapp,TQT_SIGNAL(shutDown()),tqparentWidget(),TQT_SLOT(shuttingDown()));
}
else if ((channelView!=NULL)&&(i==0))
@@ -1487,7 +1487,7 @@ void kmidClient::slotSetTempo(double value)
timebar->setRange(0,(int)(player->information()->millisecsTotal));
timebar->setValue(pausedatmillisec);
- timetags->repaint(TRUE);
+ timetags->tqrepaint(TRUE);
kdispt->ClearEv(false);
@@ -1522,9 +1522,9 @@ void kmidClient::downloadFinished(KIO::Job *)
kapp->exit_loop();
}
-TQSize kmidClient::sizeHint() const
+TQSize kmidClient::tqsizeHint() const
{
- TQSize sh = TQWidget::sizeHint();
+ TQSize sh = TQWidget::tqsizeHint();
return sh.expandedTo(TQSize(560,420));
}
@@ -1599,7 +1599,7 @@ void kmidClient::setPlayListMode(int i)
void kmidClient::slotSelectEncoding(int i)
{
if (i == 0)
- kdispt->setLyricsEncoding(TQString::null); // Default
+ kdispt->setLyricsEncoding(TQString()); // Default
else
kdispt->setLyricsEncoding(KGlobal::charsets()->encodingForName(comboEncodings->text(i)));
}
diff --git a/kmid/kmidclient.h b/kmid/kmidclient.h
index 204aefac..dc18208d 100644
--- a/kmid/kmidclient.h
+++ b/kmid/kmidclient.h
@@ -55,6 +55,7 @@ class TQString;
class kmidClient : public TQWidget, virtual public KMidIface
{
Q_OBJECT
+ TQ_OBJECT
private:
#ifdef KMidDEBUG
long passcount;
@@ -105,7 +106,7 @@ private:
int openFile(const char *filename);
void allNotesOff(void);
public:
- kmidClient(TQWidget *parent, KActionCollection *ac, const char *name=0);
+ kmidClient(TQWidget *tqparent, KActionCollection *ac, const char *name=0);
~kmidClient();
char *midiFileName(void) {return midifile_opened;};
@@ -116,7 +117,7 @@ public:
int openURL(const TQString s);
- void repaintText(int typeoftextevents);
+ void tqrepaintText(int typeoftextevents);
static void kmidOutput(void);
int ChooseTypeOfTextEvents(void);
@@ -216,7 +217,7 @@ public:
void setCurrentSong(int i);
void setPlayListMode(int i);
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
private:
TQSlider *timebar;
QSliderTime *timetags;
diff --git a/kmid/kmidframe.cpp b/kmid/kmidframe.cpp
index 54f9d3c5..e986a221 100644
--- a/kmid/kmidframe.cpp
+++ b/kmid/kmidframe.cpp
@@ -68,7 +68,7 @@ kmidFrame::kmidFrame(const char *name)
/*
kKeysAccel=new KAccel(this);
kKeysAccel->insertItem(i18n("Play/Pause"),"Play/Pause", Key_Space);
- kKeysAccel->connectItem("Play/Pause", this, TQT_SLOT(spacePressed()));
+ kKeysAccel->connectItem("Play/Pause", TQT_TQOBJECT(this), TQT_SLOT(spacePressed()));
kKeysAccel->insertItem(i18n("Stop"),"Stop", Key_Backspace);
kKeysAccel->connectItem("Stop",kmidclient,TQT_SLOT(song_Stop()));
kKeysAccel->insertItem(i18n("Previous Song"),"Previous Song", Key_Left);
@@ -86,34 +86,34 @@ kmidFrame::kmidFrame(const char *name)
kKeysAccel->readSettings();
*/
- KStdAction::open(this, TQT_SLOT(file_Open()), actionCollection());
- (void)new KAction(i18n("&Save Lyrics..."), 0, this,
+ KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_Open()), actionCollection());
+ (void)new KAction(i18n("&Save Lyrics..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics");
- KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+ KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
- (void)new KAction(i18n("&Play"), "player_play", Qt::Key_Space,
- kmidclient, TQT_SLOT(slotPlay()), actionCollection(), "song_play");
- (void)new KAction(i18n("P&ause"), "player_pause", Qt::Key_P, kmidclient,
+ (void)new KAction(i18n("&Play"), "player_play", TQt::Key_Space,
+ TQT_TQOBJECT(kmidclient), TQT_SLOT(slotPlay()), actionCollection(), "song_play");
+ (void)new KAction(i18n("P&ause"), "player_pause", TQt::Key_P, TQT_TQOBJECT(kmidclient),
TQT_SLOT(slotPause()), actionCollection(), "song_pause");
- (void)new KAction(i18n("&Stop"), "player_stop", Qt::Key_Backspace,
- kmidclient, TQT_SLOT(slotStop()), actionCollection(), "song_stop");
+ (void)new KAction(i18n("&Stop"), "player_stop", TQt::Key_Backspace,
+ TQT_TQOBJECT(kmidclient), TQT_SLOT(slotStop()), actionCollection(), "song_stop");
(void)new KAction(i18n("P&revious Song"), "player_start", Key_Left,
- kmidclient, TQT_SLOT(slotPrevSong()), actionCollection(),
+ TQT_TQOBJECT(kmidclient), TQT_SLOT(slotPrevSong()), actionCollection(),
"song_previous");
(void)new KAction(i18n("&Next Song"), "player_end", Key_Right,
- kmidclient, TQT_SLOT(slotNextSong()), actionCollection(),
+ TQT_TQOBJECT(kmidclient), TQT_SLOT(slotNextSong()), actionCollection(),
"song_next");
- (void)new KToggleAction(i18n("&Loop"), 0, this, TQT_SLOT(song_Loop()),
+ (void)new KToggleAction(i18n("&Loop"), 0, TQT_TQOBJECT(this), TQT_SLOT(song_Loop()),
actionCollection(), "song_loop");
- (void)new KAction(i18n("Rewind"), "2leftarrow", 0, kmidclient,
+ (void)new KAction(i18n("Rewind"), "2leftarrow", 0, TQT_TQOBJECT(kmidclient),
TQT_SLOT(slotRewind()), actionCollection(), "song_rewind");
- (void)new KAction(i18n("Forward"), "2rightarrow", 0, kmidclient,
+ (void)new KAction(i18n("Forward"), "2rightarrow", 0, TQT_TQOBJECT(kmidclient),
TQT_SLOT(slotForward()), actionCollection(), "song_forward");
- (void)new KAction(i18n("&Organize..."), 0, this, TQT_SLOT(collect_organize()),
+ (void)new KAction(i18n("&Organize..."), 0, TQT_TQOBJECT(this), TQT_SLOT(collect_organize()),
actionCollection(), "collect_organize");
TQStringList playmodes;
@@ -125,7 +125,7 @@ kmidFrame::kmidFrame(const char *name)
connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(collect_PlayOrder(int)));
act->setItems(playmodes);
- (void)new KToggleAction(i18n("Auto-Add to Collection"), 0, this,
+ (void)new KToggleAction(i18n("Auto-Add to Collection"), 0, TQT_TQOBJECT(this),
TQT_SLOT(collect_AutoAdd()), actionCollection(), "collect_autoadd");
playmodes.clear();
@@ -147,29 +147,29 @@ kmidFrame::kmidFrame(const char *name)
connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(options_DisplayEvents(int)));
act->setItems(playmodes);
- (void)new KToggleAction(i18n("Automatic Text Chooser"), 0, this,
+ (void)new KToggleAction(i18n("Automatic Text Chooser"), 0, TQT_TQOBJECT(this),
TQT_SLOT(options_AutomaticText()), actionCollection(),
"option_automatictext");
KToggleAction* togact = new KToggleAction(i18n("Show &Volume Bar"), "volume",
- 0, this, TQT_SLOT(options_ShowVolumeBar()), actionCollection(),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(options_ShowVolumeBar()), actionCollection(),
"toggle_volumebar");
togact->setCheckedState(i18n("Hide &Volume Bar"));
togact = new KToggleAction(i18n("Show &Channel View"), "piano",
- 0, this, TQT_SLOT(options_ShowChannelView()), actionCollection(),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(options_ShowChannelView()), actionCollection(),
"toggle_channelview");
togact->setCheckedState(i18n("Hide &Channel View"));
- (void)new KAction(i18n("Channel View &Options..."), 0, this,
+ (void)new KAction(i18n("Channel View &Options..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(options_ChannelViewOptions()), actionCollection(),
"channelview_options");
- (void)new KAction(i18n("&Font Change..."), 0, this,
+ (void)new KAction(i18n("&Font Change..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(options_FontChange()), actionCollection(),
"change_font");
- (void)new KAction(i18n("MIDI &Setup..."), 0, this,
+ (void)new KAction(i18n("MIDI &Setup..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(options_MidiSetup()), actionCollection(), "midi_setup");
@@ -276,7 +276,7 @@ kmidFrame::~kmidFrame()
void kmidFrame::file_Open()
{
- KURL url = KFileDialog::getOpenURL(TQString::null, "*.kar *.mid *.kar.gz *.mid.gz\n*.kar *.kar.gz\n*.mid *.mid.gz\n*",this);
+ KURL url = KFileDialog::getOpenURL(TQString(), "*.kar *.mid *.kar.gz *.mid.gz\n*.kar *.kar.gz\n*.mid *.mid.gz\n*",this);
if( url.isEmpty() )
return;
@@ -316,7 +316,7 @@ void kmidFrame::options_DisplayEvents(int i)
cfg->setGroup("KMid");
cfg->writeEntry("TypeOfTextEvents",(i==0)?1:5);
cfg->sync();
- kmidclient->repaintText((i==0)?1:5);
+ kmidclient->tqrepaintText((i==0)?1:5);
}
void kmidFrame::options_AutomaticText()
@@ -480,7 +480,7 @@ void kmidFrame::options_MidiSetup()
kmidclient->setMidiDevice(MidiConfigDialog::selecteddevice);
cfg->setGroup("Midimapper");
cfg->writePathEntry("LoadFile",
- (MidiConfigDialog::selectedmap==NULL)? TQString::null:MidiConfigDialog::selectedmap);
+ (MidiConfigDialog::selectedmap==NULL)? TQString():MidiConfigDialog::selectedmap);
kmidclient->setMidiMapFilename(MidiConfigDialog::selectedmap);
}
delete dlg;
@@ -514,7 +514,7 @@ void kmidFrame::rechooseTextEvent()
if ((cfg->readNumEntry("AutomaticTextEventChooser",1))==1)
{
int t=kmidclient->ChooseTypeOfTextEvents();
- kmidclient->repaintText(t);
+ kmidclient->tqrepaintText(t);
if (t==1)
((KSelectAction*)actionCollection()->action("display_events"))->setCurrentItem(0);
else
@@ -551,7 +551,7 @@ void kmidFrame::collect_AutoAdd()
void kmidFrame::file_SaveLyrics()
{
- KURL url = KFileDialog::getSaveURL(TQString::null,"*",this);
+ KURL url = KFileDialog::getSaveURL(TQString(),"*",this);
if( url.isEmpty() )
return;
@@ -567,8 +567,8 @@ void kmidFrame::file_SaveLyrics()
if (stat(TQFile::encodeName(filename), &statbuf)!=-1)
{
- TQString s = i18n("File %1 already exists\nDo you want to overwrite it?").arg(filename);
- if (KMessageBox::warningYesNo(this,s,TQString::null,i18n("Overwrite"),KStdGuiItem::cancel())==1)
+ TQString s = i18n("File %1 already exists\nDo you want to overwrite it?").tqarg(filename);
+ if (KMessageBox::warningYesNo(this,s,TQString(),i18n("Overwrite"),KStdGuiItem::cancel())==1)
return;
}
diff --git a/kmid/kmidframe.h b/kmid/kmidframe.h
index 8891720d..c60d6267 100644
--- a/kmid/kmidframe.h
+++ b/kmid/kmidframe.h
@@ -36,12 +36,13 @@ class KApplication;
class KConfig;
class kmidClient;
class KToolBar;
-class QDragEvent;
+class TQDragEvent;
class KAccel;
class KDE_EXPORT kmidFrame : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
private:
#ifdef KMidDEBUG
long passcount;
@@ -63,7 +64,7 @@ private:
*/
KAccel *kKeysAccel;
protected:
- int autoAddSongToCollection(const TQString& filename=TQString::null,int setactive=1);
+ int autoAddSongToCollection(const TQString& filename=TQString(),int setactive=1);
virtual void saveProperties(KConfig *kcfg);
diff --git a/kmid/ktrianglebutton.cpp b/kmid/ktrianglebutton.cpp
index 1b31dade..f2c47ca5 100644
--- a/kmid/ktrianglebutton.cpp
+++ b/kmid/ktrianglebutton.cpp
@@ -35,7 +35,7 @@ KTriangleButton::KTriangleButton( Direction d,TQWidget *_parent, const char *nam
{
dir=d;
raised = FALSE;
- setFocusPolicy( NoFocus );
+ setFocusPolicy( TQ_NoFocus );
}
KTriangleButton::~KTriangleButton()
@@ -47,7 +47,7 @@ void KTriangleButton::enterEvent( TQEvent* )
if ( isEnabled() )
{
raised = TRUE;
- repaint(FALSE);
+ tqrepaint(FALSE);
}
}
@@ -56,7 +56,7 @@ void KTriangleButton::leaveEvent( TQEvent * )
if( raised != FALSE )
{
raised = FALSE;
- repaint();
+ tqrepaint();
}
}
@@ -75,21 +75,21 @@ void KTriangleButton::paint( TQPainter *painter )
{
if ( isDown() || isOn() )
{
- if ( style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
qDrawWinButton( painter, 0, 0, width(),
- height(), colorGroup(), TRUE );
+ height(), tqcolorGroup(), TRUE );
else
qDrawShadePanel( painter, 0, 0, width(),
- height(), colorGroup(), TRUE, 2, 0L );
+ height(), tqcolorGroup(), TRUE, 2, 0L );
}
else if ( raised )
{
- if ( style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
qDrawWinButton( painter, 0, 0, width(), height(),
- colorGroup(), FALSE );
+ tqcolorGroup(), FALSE );
else
qDrawShadePanel( painter, 0, 0, width(), height(),
- colorGroup(), FALSE, 2, 0L );
+ tqcolorGroup(), FALSE, 2, 0L );
}
if (dir==Right)
@@ -144,17 +144,17 @@ void KTriangleButton::mouseReleaseEvent(TQMouseEvent *e)
void KTriangleButton::timerEvent(TQTimerEvent *)
{
- if (!usingTimer) {killTimers();return;};
+ if (!usingTimer) {TQT_TQOBJECT(this)->killTimers();return;};
if (timeCount==0)
{
timeCount++;
- killTimers();
+ TQT_TQOBJECT(this)->killTimers();
startTimer(120);
} else
if (timeCount==30)
{
timeCount=-1;
- killTimers();
+ TQT_TQOBJECT(this)->killTimers();
startTimer(80);
}
else if (timeCount>0) timeCount++;
diff --git a/kmid/ktrianglebutton.h b/kmid/ktrianglebutton.h
index 3c951dec..c67a0dad 100644
--- a/kmid/ktrianglebutton.h
+++ b/kmid/ktrianglebutton.h
@@ -30,9 +30,10 @@
#include <tqbutton.h>
-class KTriangleButton : public QButton
+class KTriangleButton : public TQButton
{
Q_OBJECT
+ TQ_OBJECT
public:
enum Direction {Left , Right, Up, Down};
diff --git a/kmid/main.cpp b/kmid/main.cpp
index 45cd1fab..3bafb1f9 100644
--- a/kmid/main.cpp
+++ b/kmid/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
/*
struct sigaction act;
act.sa_handler = SIG_DFL;
- sigemptyset(&(act.sa_mask));
+ sigemptyset(&(act.sa_tqmask));
act.sa_flags=0;
sigaction(SIGINT, &act, NULL);
diff --git a/kmid/midicfgdlg.cpp b/kmid/midicfgdlg.cpp
index 855de04a..0be88c72 100644
--- a/kmid/midicfgdlg.cpp
+++ b/kmid/midicfgdlg.cpp
@@ -38,7 +38,7 @@
#include <kstandarddirs.h>
MidiConfigDialog::MidiConfigDialog(DeviceManager *dm,
- TQWidget *parent,const char *name) : KDialogBase(parent,name,TRUE,
+ TQWidget *tqparent,const char *name) : KDialogBase(tqparent,name,TRUE,
i18n("Configure MIDI Devices"), KDialogBase::Ok|KDialogBase::Cancel)
{
setMinimumSize(360,240);
@@ -56,7 +56,7 @@ MidiConfigDialog::MidiConfigDialog(DeviceManager *dm,
for (int i=0;i<devman->midiPorts()+devman->synthDevices();i++)
{
if (strcmp(devman->type(i),"")!=0)
- temp = TQString("%1 - %2").arg(devman->name(i)).arg(devman->type(i));
+ temp = TQString("%1 - %2").tqarg(devman->name(i)).tqarg(devman->type(i));
else
temp = devman->name(i);
@@ -105,7 +105,7 @@ void MidiConfigDialog::deviceselected(int idx)
void MidiConfigDialog::browseMap()
{
TQString path = KGlobal::dirs()->findAllResources("appdata", "maps/*.map").last();
- path.truncate(path.findRev('/'));
+ path.truncate(path.tqfindRev('/'));
KURL url = KFileDialog::getOpenURL(path,"*.map",this);
diff --git a/kmid/midicfgdlg.h b/kmid/midicfgdlg.h
index 14cff5a4..bab949b8 100644
--- a/kmid/midicfgdlg.h
+++ b/kmid/midicfgdlg.h
@@ -34,10 +34,11 @@ class TQListBox;
class MidiConfigDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- MidiConfigDialog(DeviceManager *dm,TQWidget *parent,const char *name);
+ MidiConfigDialog(DeviceManager *dm,TQWidget *tqparent,const char *name);
public slots:
void deviceselected(int idx);
diff --git a/kmid/qslidertime.cpp b/kmid/qslidertime.cpp
index 09975e25..e7313d22 100644
--- a/kmid/qslidertime.cpp
+++ b/kmid/qslidertime.cpp
@@ -28,8 +28,8 @@
#define ARROW_LENGTH 13
-QSliderTime::QSliderTime( TQSlider *ksl, TQWidget *parent, const char *name)
- : TQWidget (parent,name)
+QSliderTime::QSliderTime( TQSlider *ksl, TQWidget *tqparent, const char *name)
+ : TQWidget (tqparent,name)
{
kslider=ksl;
@@ -90,25 +90,25 @@ if (kslider==NULL) return;
int pos=0;
int deltapos=0;
formatMillisecs(0,tmp);
- painter->drawText( 0, posy,tmp);
+ painter->drawText( 0, posy,TQString(tmp));
for ( i = timestep; i <= maxV - timestep; i += timestep )
{
pos = (width()-10) * i / maxV + 5;
formatMillisecs(i,tmp);
deltapos=qfmt.width(tmp)/2;
- painter->drawText( pos-deltapos, posy,tmp);
+ painter->drawText( pos-deltapos, posy,TQString(tmp));
}
pos = width()- 5;
formatMillisecs(maxV,tmp);
deltapos=qfmt.width(tmp);
- painter->drawText( pos-deltapos, posy,tmp);
+ painter->drawText( pos-deltapos, posy,TQString(tmp));
}
-TQSize QSliderTime::sizeHint()
+TQSize QSliderTime::tqsizeHint()
{
return TQSize(10,fontheight+2);
}
diff --git a/kmid/qslidertime.h b/kmid/qslidertime.h
index fcefdc13..c42632b0 100644
--- a/kmid/qslidertime.h
+++ b/kmid/qslidertime.h
@@ -28,9 +28,10 @@
class TQWidget;
-class QSliderTime : public QWidget
+class QSliderTime : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
private:
TQSlider *kslider;
@@ -38,11 +39,11 @@ private:
int fontheight;
public:
- QSliderTime( TQSlider *ksl, TQWidget *parent = NULL, const char *name = NULL );
+ QSliderTime( TQSlider *ksl, TQWidget *tqparent = NULL, const char *name = NULL );
int getFontHeight(void) {return fontheight;};
- TQSize sizeHint();
+ TQSize tqsizeHint();
TQSizePolicy sizePolicy();
private:
diff --git a/kmid/rhythmview.cpp b/kmid/rhythmview.cpp
index 0358620d..a10bb79c 100644
--- a/kmid/rhythmview.cpp
+++ b/kmid/rhythmview.cpp
@@ -23,7 +23,7 @@
***************************************************************************/
#include "rhythmview.h"
-RhythmView::RhythmView (TQWidget *parent, const char *name) : TQWidget (parent,name)
+RhythmView::RhythmView (TQWidget *tqparent, const char *name) : TQWidget (tqparent,name)
{
lamps=NULL;
setRhythm(4,4);
@@ -57,7 +57,7 @@ void RhythmView::setRhythm(int numerator,int denominator)
for (i=0;i<num;i++)
{
- lamps[i]=new KLed(Qt::yellow, KLed::Off, KLed::Sunken, KLed::Rectangular, this);
+ lamps[i]=new KLed(TQt::yellow, KLed::Off, KLed::Sunken, KLed::Rectangular, this);
// lamps[i]->setState(KLed::Off);
lamps[i]->setGeometry(x+2,0,w-4,height());
lamps[i]->show();
@@ -95,7 +95,7 @@ void RhythmView::resizeEvent(TQResizeEvent *)
}
}
-TQSize RhythmView::sizeHint()
+TQSize RhythmView::tqsizeHint()
{
return TQSize(10,10);
}
diff --git a/kmid/rhythmview.h b/kmid/rhythmview.h
index c157e9d8..3754c074 100644
--- a/kmid/rhythmview.h
+++ b/kmid/rhythmview.h
@@ -27,14 +27,14 @@
#include <tqwidget.h>
#include <kled.h>
-class RhythmView : public QWidget
+class RhythmView : public TQWidget
{
int num,den;
KLed **lamps;
public:
- RhythmView (TQWidget *parent, const char *name);
+ RhythmView (TQWidget *tqparent, const char *name);
~RhythmView();
void setRhythm(int numerator,int denominator);
@@ -43,7 +43,7 @@ public:
void Beat(void); // Just increase the beat
- TQSize sizeHint();
+ TQSize tqsizeHint();
TQSizePolicy sizePolicy();
private:
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-06 02:34:54 +0000