summaryrefslogtreecommitdiffstats
path: root/tdemid
diff options
context:
space:
mode:
Diffstat (limited to 'tdemid')
-rw-r--r--tdemid/CMakeLists.txt2
-rw-r--r--tdemid/README6
-rw-r--r--tdemid/channel.cpp36
-rw-r--r--tdemid/channel.h2
-rw-r--r--tdemid/channelcfgdlg.cpp8
-rw-r--r--tdemid/channelcfgdlg.h2
-rw-r--r--tdemid/channelview.cpp12
-rw-r--r--tdemid/channelview.h2
-rw-r--r--tdemid/collectdlg.cpp22
-rw-r--r--tdemid/collectdlg.h2
-rw-r--r--tdemid/kdisptext.cpp14
-rw-r--r--tdemid/kdisptext.h2
-rw-r--r--tdemid/klcdnumber.cpp16
-rw-r--r--tdemid/klcdnumber.h2
-rw-r--r--tdemid/ktrianglebutton.cpp26
-rw-r--r--tdemid/ktrianglebutton.h2
-rw-r--r--tdemid/main.cpp2
-rw-r--r--tdemid/midicfgdlg.cpp10
-rw-r--r--tdemid/midicfgdlg.h2
-rw-r--r--tdemid/qslidertime.h2
-rw-r--r--tdemid/slman.cpp2
-rw-r--r--tdemid/songlist.cpp2
-rw-r--r--tdemid/tdemid.spec62
-rw-r--r--tdemid/tdemid_part.cpp14
-rw-r--r--tdemid/tdemid_part.h10
-rw-r--r--tdemid/tdemidclient.cpp68
-rw-r--r--tdemid/tdemidclient.h2
-rw-r--r--tdemid/tdemidframe.cpp130
-rw-r--r--tdemid/tdemidframe.h4
29 files changed, 202 insertions, 264 deletions
diff --git a/tdemid/CMakeLists.txt b/tdemid/CMakeLists.txt
index 134a1992..2c90de95 100644
--- a/tdemid/CMakeLists.txt
+++ b/tdemid/CMakeLists.txt
@@ -53,7 +53,7 @@ tde_add_kpart( libtdemidpart AUTOMOC
DESTINATION ${PLUGIN_INSTALL_DIR}
)
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/part_dummy.cpp "" )
+configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake part_dummy.cpp COPYONLY )
##### tdemid (executable) #######################
diff --git a/tdemid/README b/tdemid/README
index c391c24c..a9b806d8 100644
--- a/tdemid/README
+++ b/tdemid/README
@@ -64,7 +64,7 @@ Index
and do a 'make' . Simple , isn't it ?
By default it will use the external midi device, if you want to use another
- one (fm, awe, or anything else), edit the file main.cc and change the value
+ one (fm, awe, or anything else), edit the file main.cpp and change the value
of DEFAULT_DEVICE to the one you want, or specify the -d option as in :
consoletdemid -d 1 mymidifile.mid
@@ -73,7 +73,7 @@ Index
-----------------
No installing of consoleKMid is actually done, just copy the consoleKMid file
yourself to where you want (usually /usr/local/bin ). To use the fm device,
- you should specify in fmout.cc the path to where the fm patches are installed
+ you should specify in fmout.cpp the path to where the fm patches are installed
( /etc by default)
5. Running
@@ -92,7 +92,7 @@ Index
consoletdemid -M /opt/kde/share/apps/tdemid/maps/YamahaPSS790.map mymidifile
- You can also edit main.cc in the player directory and change the value of
+ You can also edit main.cpp in the player directory and change the value of
DEFAULT_MAP to whatever you want, so that you don't need to specify the
-M option each time you run consoletdemid.
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);
diff --git a/tdemid/channel.h b/tdemid/channel.h
index 4f88ae36..2674ffe5 100644
--- a/tdemid/channel.h
+++ b/tdemid/channel.h
@@ -38,7 +38,7 @@ class TQComboBox;
class KMidButton;
class KMidChannel : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
private:
diff --git a/tdemid/channelcfgdlg.cpp b/tdemid/channelcfgdlg.cpp
index e55aaa58..533a5573 100644
--- a/tdemid/channelcfgdlg.cpp
+++ b/tdemid/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 *parent,const char *name) : KDialogBase(parent,name,true,i18n("Configure Channel View"),Ok|Cancel, Ok)
{
TQWidget *page = new TQWidget( this );
setMainWidget(page);
@@ -22,12 +22,12 @@ ChannelViewConfigDialog::ChannelViewConfigDialog(TQWidget *parent,const char *na
rb0=new TQRadioButton(i18n("3D look"),qbg,"3d");
rb1=new TQRadioButton(i18n("3D - filled"),qbg,"4d");
- qbg->setExclusive(TRUE);
+ qbg->setExclusive(true);
topLayout->addWidget( qbg );
- ((ChannelView::lookMode()==0)?rb0:rb1)->setChecked(TRUE);
+ ((ChannelView::lookMode()==0)?rb0:rb1)->setChecked(true);
- connect (qbg, TQT_SIGNAL(pressed(int)),this,TQT_SLOT(modeselected(int)));
+ connect (qbg, TQ_SIGNAL(pressed(int)),this,TQ_SLOT(modeselected(int)));
}
void ChannelViewConfigDialog::modeselected(int idx)
diff --git a/tdemid/channelcfgdlg.h b/tdemid/channelcfgdlg.h
index c4378e4e..73a21efc 100644
--- a/tdemid/channelcfgdlg.h
+++ b/tdemid/channelcfgdlg.h
@@ -30,7 +30,7 @@ class TQVButtonGroup;
class TQRadioButton;
class ChannelViewConfigDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdemid/channelview.cpp b/tdemid/channelview.cpp
index 50a88f24..140d6a7e 100644
--- a/tdemid/channelview.cpp
+++ b/tdemid/channelview.cpp
@@ -40,12 +40,12 @@ ChannelView::ChannelView(void) : TDEMainWindow(0, "ChannelView")
Channel[i]=new KMidChannel3D(i+1,this);
else
Channel[i]=new KMidChannel4D(i+1,this);
- connect(Channel[i],TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(slottotdemidclient(int *)));
+ connect(Channel[i],TQ_SIGNAL(signalToKMidClient(int *)),this,TQ_SLOT(slottotdemidclient(int *)));
Channel[i]->setGeometry(5,5+i*CHANNELHEIGHT,width()-20,CHANNELHEIGHT);
Channel[i]->show();
}
- scrollbar=new TQScrollBar(1,16,1,1,1,Qt::Vertical,this,"Channelscrollbar");
- connect(scrollbar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(ScrollChn(int)));
+ scrollbar=new TQScrollBar(1,16,1,1,1,TQt::Vertical,this,"Channelscrollbar");
+ connect(scrollbar,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(ScrollChn(int)));
setScrollBarRange();
}
@@ -121,7 +121,7 @@ int ChannelView::lookmode=0;
int ChannelView::lookMode(void)
{
- TDEConfig *kcfg=(TDEApplication::kApplication())->config();
+ TDEConfig *kcfg=tdeApp->config();
kcfg->setGroup("KMid");
lookmode=kcfg->readNumEntry("ChannelViewLookMode",0);
@@ -131,7 +131,7 @@ int ChannelView::lookMode(void)
void ChannelView::lookMode(int i)
{
- TDEConfig *kcfg=(TDEApplication::kApplication())->config();
+ TDEConfig *kcfg=tdeApp->config();
lookmode=i;
@@ -150,7 +150,7 @@ void ChannelView::lookMode(int i)
else
Channel[i]=new KMidChannel4D(i+1,this);
- connect(Channel[i],TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(slottotdemidclient(int *)));
+ connect(Channel[i],TQ_SIGNAL(signalToKMidClient(int *)),this,TQ_SLOT(slottotdemidclient(int *)));
Channel[i]->setGeometry(5,5+(i-(scrollbar->value()-1))*CHANNELHEIGHT,width()-20,CHANNELHEIGHT);
Channel[i]->loadState(tmp,&pgm);
Channel[i]->show();
diff --git a/tdemid/channelview.h b/tdemid/channelview.h
index b54015ce..c26ba564 100644
--- a/tdemid/channelview.h
+++ b/tdemid/channelview.h
@@ -32,7 +32,7 @@
class ChannelView : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
private:
KMidChannel *Channel[16];
diff --git a/tdemid/collectdlg.cpp b/tdemid/collectdlg.cpp
index 4df74df7..4f373b49 100644
--- a/tdemid/collectdlg.cpp
+++ b/tdemid/collectdlg.cpp
@@ -38,23 +38,23 @@
#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 *parent,const char *name) : TQDialog(parent,name,true)
{
setCaption(i18n("Collections Manager"));
ok=new KPushButton(KStdGuiItem::ok(),this);
ok->setGeometry(140,200,100,30);
-connect(ok,TQT_SIGNAL(clicked()),TQT_SLOT(accept()) );
+connect(ok,TQ_SIGNAL(clicked()),TQ_SLOT(accept()) );
cancel=new KPushButton(KStdGuiItem::cancel(),this);
cancel->setGeometry(250,200,100,30);
-connect(cancel,TQT_SIGNAL(clicked()),TQT_SLOT(reject()) );
+connect(cancel,TQ_SIGNAL(clicked()),TQ_SLOT(reject()) );
label=new TQLabel(i18n("Available collections:"),this);
label->adjustSize();
label->move(10,10);
collections=new TQListBox(this,"collectionlist");
collections->setGeometry(10,20+label->height(),340,90);
-connect(collections,TQT_SIGNAL(highlighted(int)),TQT_SLOT(collectionselected(int)));
-connect(collections,TQT_SIGNAL(selected(int)),TQT_SLOT(changeCollectionName(int)));
+connect(collections,TQ_SIGNAL(highlighted(int)),TQ_SLOT(collectionselected(int)));
+connect(collections,TQ_SIGNAL(selected(int)),TQ_SLOT(changeCollectionName(int)));
slman=slm;
for (int i=0;i<=slman->numberOfCollections();i++)
{
@@ -74,7 +74,7 @@ label2->move(10,collections->y()+collections->height()+10);
songs=new TQListBox(this,"songlist");
songs->setGeometry(10,label2->y()+label2->height()+10,340,120);
-connect(songs,TQT_SIGNAL(highlighted(int)),TQT_SLOT(songselected(int)));
+connect(songs,TQ_SIGNAL(highlighted(int)),TQ_SLOT(songselected(int)));
currentsl=slman->getCollection(selectedC);
if (slman->numberOfCollections()>0)
{
@@ -85,24 +85,24 @@ if (slman->numberOfCollections()>0)
newC=new TQPushButton(i18n("&New..."),this);
newC->adjustSize();
newC->move(360,collections->y()+5);
-connect(newC,TQT_SIGNAL(clicked()),TQT_SLOT(newCollection()) );
+connect(newC,TQ_SIGNAL(clicked()),TQ_SLOT(newCollection()) );
copyC=new TQPushButton(i18n("&Copy..."),this);
copyC->adjustSize();
copyC->move(360,newC->y()+newC->height()+5);
-connect(copyC,TQT_SIGNAL(clicked()),TQT_SLOT(copyCollection()) );
+connect(copyC,TQ_SIGNAL(clicked()),TQ_SLOT(copyCollection()) );
deleteC=new TQPushButton(i18n("Delete"),this);
deleteC->adjustSize();
deleteC->move(360,copyC->y()+copyC->height()+5);
-connect(deleteC,TQT_SIGNAL(clicked()),TQT_SLOT(deleteCollection()) );
+connect(deleteC,TQ_SIGNAL(clicked()),TQ_SLOT(deleteCollection()) );
addS=new TQPushButton(i18n("&Add..."),this);
addS->adjustSize();
addS->move(360,songs->y()+5);
-connect(addS,TQT_SIGNAL(clicked()),TQT_SLOT(addSong()) );
+connect(addS,TQ_SIGNAL(clicked()),TQ_SLOT(addSong()) );
delS=new TQPushButton(i18n("&Remove"),this);
delS->adjustSize();
delS->move(360,addS->y()+addS->height()+5);
-connect(delS,TQT_SIGNAL(clicked()),TQT_SLOT(removeSong()) );
+connect(delS,TQ_SIGNAL(clicked()),TQ_SLOT(removeSong()) );
ok->move(ok->x(),songs->y()+songs->height()+10);
cancel->move(ok->x()+ok->width()+5,ok->y());
diff --git a/tdemid/collectdlg.h b/tdemid/collectdlg.h
index 262a6227..fcf4b94a 100644
--- a/tdemid/collectdlg.h
+++ b/tdemid/collectdlg.h
@@ -35,7 +35,7 @@ class TQListBox;
class KURL;
class CollectionDialog : public TQDialog
{
- Q_OBJECT
+ TQ_OBJECT
private:
SLManager *slman;
diff --git a/tdemid/kdisptext.cpp b/tdemid/kdisptext.cpp
index d701ccb4..a7e58295 100644
--- a/tdemid/kdisptext.cpp
+++ b/tdemid/kdisptext.cpp
@@ -31,7 +31,7 @@
#include <tdeconfig.h>
#include <tdeglobal.h>
#include <tdeglobalsettings.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdelocale.h>
#include "version.h"
@@ -122,10 +122,10 @@ void KDisplayText::ClearEv(bool totally)
RemoveLinkedList();
if (totally)
{
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
autoscrollv=0;
resizeContents(0,0);
- viewport()->repaint(TRUE);
+ viewport()->repaint(true);
}
}
@@ -425,7 +425,7 @@ void KDisplayText::PaintIn(int type)
autoscrollv+=qfmetr->lineSpacing();
if (b) startTimer(100);
else {
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
startTimer(100/(autoscrollv/qfmetr->lineSpacing()+1));
}
}
@@ -484,7 +484,7 @@ void KDisplayText::gotomsec(ulong i)
}
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
autoscrollv=0;
setContentsPos(0,first_line->ypos);
viewport()->repaint();
@@ -508,7 +508,7 @@ void KDisplayText::fontChanged(void)
qfmetr=new TQFontMetrics(*qtextfont);
calculatePositions();
nvisiblelines=height()/qfmetr->lineSpacing();
- viewport()->repaint(TRUE);
+ viewport()->repaint(true);
}
void KDisplayText::ChangeTypeOfTextEvents(int type)
@@ -534,7 +534,7 @@ void KDisplayText::ChangeTypeOfTextEvents(int type)
setContentsPos(0,first_line->ypos);
}
- viewport()->repaint(TRUE);
+ viewport()->repaint(true);
}
int KDisplayText::ChooseTypeOfTextEvents(void)
diff --git a/tdemid/kdisptext.h b/tdemid/kdisptext.h
index 04a25f27..548e849e 100644
--- a/tdemid/kdisptext.h
+++ b/tdemid/kdisptext.h
@@ -50,7 +50,7 @@ class TQScrollBar;
class KDisplayText : public TQScrollView
{
- Q_OBJECT
+ TQ_OBJECT
private:
TQTextCodec *lyrics_codec;
diff --git a/tdemid/klcdnumber.cpp b/tdemid/klcdnumber.cpp
index 3fdf80c4..7b3ac247 100644
--- a/tdemid/klcdnumber.cpp
+++ b/tdemid/klcdnumber.cpp
@@ -71,10 +71,10 @@ KLCDNumber::KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *parent,
downBtn=new KTriangleButton(KTriangleButton::Left,this,"Down");
upBtn->setGeometry(width()-BUTTONWIDTH,0,BUTTONWIDTH,height());
downBtn->setGeometry(0,0,BUTTONWIDTH,height());
- connect(upBtn,TQT_SIGNAL(clicked()),this,TQT_SLOT(increaseValue()));
- connect(downBtn,TQT_SIGNAL(clicked()),this,TQT_SLOT(decreaseValue()));
- connect(upBtn,TQT_SIGNAL(clickedQuickly()),this,TQT_SLOT(increaseValueFast()));
- connect(downBtn,TQT_SIGNAL(clickedQuickly()),this,TQT_SLOT(decreaseValueFast()));
+ connect(upBtn,TQ_SIGNAL(clicked()),this,TQ_SLOT(increaseValue()));
+ connect(downBtn,TQ_SIGNAL(clicked()),this,TQ_SLOT(decreaseValue()));
+ connect(upBtn,TQ_SIGNAL(clickedQuickly()),this,TQ_SLOT(increaseValueFast()));
+ connect(downBtn,TQ_SIGNAL(clickedQuickly()),this,TQ_SLOT(decreaseValueFast()));
};
}
@@ -197,7 +197,7 @@ void KLCDNumber::setValue(double v)
void KLCDNumber::display (double v)
{
setValue(v);
- repaint(FALSE);
+ repaint(false);
}
void KLCDNumber::display (int v)
@@ -299,7 +299,7 @@ void KLCDNumber::mousePressEvent (TQMouseEvent *e)
void KLCDNumber::timerEvent(TQTimerEvent *)
{
- TQT_TQOBJECT(this)->killTimers();
+ 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);
+ repaint(false);
}
void KLCDNumber::setLCDColor(int r,int g,int b)
{
LCDcolor=TQColor(r,g,b);
- repaint(FALSE);
+ repaint(false);
}
void KLCDNumber::setRange(double min, double max)
diff --git a/tdemid/klcdnumber.h b/tdemid/klcdnumber.h
index b124a5db..d824d2d1 100644
--- a/tdemid/klcdnumber.h
+++ b/tdemid/klcdnumber.h
@@ -32,7 +32,7 @@ class TQColor;
class KLCDNumber : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
protected:
class digit {
diff --git a/tdemid/ktrianglebutton.cpp b/tdemid/ktrianglebutton.cpp
index 5bda855f..4f7fb139 100644
--- a/tdemid/ktrianglebutton.cpp
+++ b/tdemid/ktrianglebutton.cpp
@@ -34,8 +34,8 @@ KTriangleButton::KTriangleButton( Direction d,TQWidget *_parent, const char *nam
: TQButton( _parent , name)
{
dir=d;
- raised = FALSE;
- setFocusPolicy( TQ_NoFocus );
+ raised = false;
+ setFocusPolicy( TQWidget::NoFocus );
}
KTriangleButton::~KTriangleButton()
@@ -46,16 +46,16 @@ void KTriangleButton::enterEvent( TQEvent* )
{
if ( isEnabled() )
{
- raised = TRUE;
- repaint(FALSE);
+ raised = true;
+ repaint(false);
}
}
void KTriangleButton::leaveEvent( TQEvent * )
{
- if( raised != FALSE )
+ if( raised != false )
{
- raised = FALSE;
+ raised = false;
repaint();
}
}
@@ -77,19 +77,19 @@ void KTriangleButton::paint( TQPainter *painter )
{
if ( style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
qDrawWinButton( painter, 0, 0, width(),
- height(), colorGroup(), TRUE );
+ height(), colorGroup(), true );
else
qDrawShadePanel( painter, 0, 0, width(),
- height(), colorGroup(), TRUE, 2, 0L );
+ height(), colorGroup(), true, 2, 0L );
}
else if ( raised )
{
if ( style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
qDrawWinButton( painter, 0, 0, width(), height(),
- colorGroup(), FALSE );
+ colorGroup(), false );
else
qDrawShadePanel( painter, 0, 0, width(), height(),
- colorGroup(), FALSE, 2, 0L );
+ colorGroup(), false, 2, 0L );
}
if (dir==Right)
@@ -144,17 +144,17 @@ void KTriangleButton::mouseReleaseEvent(TQMouseEvent *e)
void KTriangleButton::timerEvent(TQTimerEvent *)
{
- if (!usingTimer) {TQT_TQOBJECT(this)->killTimers();return;};
+ if (!usingTimer) {this->killTimers();return;};
if (timeCount==0)
{
timeCount++;
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
startTimer(120);
} else
if (timeCount==30)
{
timeCount=-1;
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
startTimer(80);
}
else if (timeCount>0) timeCount++;
diff --git a/tdemid/ktrianglebutton.h b/tdemid/ktrianglebutton.h
index 5013b8d8..a6b840ee 100644
--- a/tdemid/ktrianglebutton.h
+++ b/tdemid/ktrianglebutton.h
@@ -32,7 +32,7 @@
class KTriangleButton : public TQButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdemid/main.cpp b/tdemid/main.cpp
index 40902097..3f12b7c9 100644
--- a/tdemid/main.cpp
+++ b/tdemid/main.cpp
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
app.setMainWidget ( tdemidframe );
- TQObject::connect(&app,TQT_SIGNAL(shutDown()),tdemidframe,TQT_SLOT(shuttingDown()));
+ TQObject::connect(&app,TQ_SIGNAL(shutDown()),tdemidframe,TQ_SLOT(shuttingDown()));
if (app.isRestored())
{
diff --git a/tdemid/midicfgdlg.cpp b/tdemid/midicfgdlg.cpp
index 446f7e03..c5c55d6f 100644
--- a/tdemid/midicfgdlg.cpp
+++ b/tdemid/midicfgdlg.cpp
@@ -35,10 +35,10 @@
#include "midicfgdlg.h"
#include "version.h"
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
MidiConfigDialog::MidiConfigDialog(DeviceManager *dm,
- TQWidget *parent,const char *name) : KDialogBase(parent,name,TRUE,
+ TQWidget *parent,const char *name) : KDialogBase(parent,name,true,
i18n("Configure MIDI Devices"), KDialogBase::Ok|KDialogBase::Cancel)
{
setMinimumSize(360,240);
@@ -50,7 +50,7 @@ MidiConfigDialog::MidiConfigDialog(DeviceManager *dm,
topLayout->addWidget(label);
mididevices=new TQListBox(page,"midideviceslist");
topLayout->addWidget(mididevices,3);
- connect(mididevices,TQT_SIGNAL(highlighted(int)),TQT_SLOT(deviceselected(int)));
+ connect(mididevices,TQ_SIGNAL(highlighted(int)),TQ_SLOT(deviceselected(int)));
devman=dm;
TQString temp;
for (int i=0;i<devman->midiPorts()+devman->synthDevices();i++)
@@ -87,11 +87,11 @@ MidiConfigDialog::MidiConfigDialog(DeviceManager *dm,
hbox->addStretch(1);
mapbrowse=new TQPushButton(i18n("Browse..."),page);
hbox->addWidget(mapbrowse);
- connect(mapbrowse,TQT_SIGNAL(clicked()),TQT_SLOT(browseMap()) );
+ connect(mapbrowse,TQ_SIGNAL(clicked()),TQ_SLOT(browseMap()) );
mapnone=new TQPushButton(i18n("None"),page);
hbox->addWidget(mapnone);
- connect(mapnone,TQT_SIGNAL(clicked()),TQT_SLOT(noMap()) );
+ connect(mapnone,TQ_SIGNAL(clicked()),TQ_SLOT(noMap()) );
topLayout->addStretch(1);
diff --git a/tdemid/midicfgdlg.h b/tdemid/midicfgdlg.h
index 98585e6f..e15f73ca 100644
--- a/tdemid/midicfgdlg.h
+++ b/tdemid/midicfgdlg.h
@@ -33,7 +33,7 @@ class TQPushButton;
class TQListBox;
class MidiConfigDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdemid/qslidertime.h b/tdemid/qslidertime.h
index 57aa3b18..4131cde5 100644
--- a/tdemid/qslidertime.h
+++ b/tdemid/qslidertime.h
@@ -30,7 +30,7 @@ class TQWidget;
class QSliderTime : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
private:
diff --git a/tdemid/slman.cpp b/tdemid/slman.cpp
index ca441850..7f63368b 100644
--- a/tdemid/slman.cpp
+++ b/tdemid/slman.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
- slman.cc - SongList Manager, which holds a set of collections (SongLists)
+ slman.cpp - SongList Manager, which holds a set of collections (SongLists)
Copyright (C) 1997,98 Antonio Larrosa Jimenez
This program is free software; you can redistribute it and/or modify
diff --git a/tdemid/songlist.cpp b/tdemid/songlist.cpp
index cc2572d8..01a03a94 100644
--- a/tdemid/songlist.cpp
+++ b/tdemid/songlist.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
- songlist.cc - class SongList, which holds a list of songs (collection)
+ songlist.cpp - class SongList, which holds a list of songs (collection)
Copyright (C) 1997,98 Antonio Larrosa Jimenez
This program is free software; you can redistribute it and/or modify
diff --git a/tdemid/tdemid.spec b/tdemid/tdemid.spec
deleted file mode 100644
index 7305dfe1..00000000
--- a/tdemid/tdemid.spec
+++ /dev/null
@@ -1,62 +0,0 @@
-Summary: Play midi/karaoke files and show lyrics. Support External synths, AWE, GUS, and FM devices. For X11/KDE
-Name: tdemid
-Version: 1.2
-Release: 1
-Copyright: GPL
-Group: X11/K Desktop Environment/Multimedia
-Source: tdemid-1.2.tar.gz
-Requires: qt >= 1.3 , tdelibs
-
-%description
-KMid is a midi/karaoke file player, with configurable midi mapper,
-real Session Management, drag & drop, customizable fonts, etc.
-It has a very nice interface which let you easily follow the tune while
-changing the color of the lyrics.
-It supports output through external synthesizers, AWE, FM and GUS cards.
-It also has a keyboard view to see the notes played by each instrument
-
-%prep
-%setup
-
-%build
-export TDEDIR=/opt/kde
-./configure
-make all
-
-%install
-export TDEDIR=/opt/kde
-make install
-
-%files
-%doc tdemid/README tdemid/COPYING tdemid/PEOPLE tdemid/tdemid.lsm tdemid/ChangeLog
-
-/opt/kde/bin/tdemid
-/opt/kde/share/doc/tde/HTML/en/tdemid
-/opt/kde/share/doc/tde/HTML/es/tdemid
-/opt/kde/share/icons/tdemid.xpm
-/opt/kde/share/icons/mini/tdemid.xpm
-/opt/kde/share/applnk/Multimedia/tdemid.kdelnk
-/opt/kde/share/mimelnk/audio/x-karaoke.kdelnk
-/opt/kde/share/apps/tdemid/toolbar
-/opt/kde/share/apps/tdemid/fm
-/opt/kde/share/apps/tdemid/maps/gm.map
-/opt/kde/share/apps/tdemid/maps/YamahaPSS790.map
-/opt/kde/share/apps/tdemid/maps/YamahaPSR500.map
-/opt/kde/share/apps/tdemid/OFortuna.kar
-/opt/kde/share/apps/tdemid/StopInTheNameOfLove.kar
-/opt/kde/share/apps/tdemid/TheGirlFromIpanema.kar
-/opt/kde/share/apps/tdemid/AnotherGlitchInTheCall.kar
-/opt/kde/share/locale/es/LC_MESSAGES/tdemid.mo
-/opt/kde/share/locale/cs/LC_MESSAGES/tdemid.mo
-/opt/kde/share/locale/de/LC_MESSAGES/tdemid.mo
-/opt/kde/share/locale/fi/LC_MESSAGES/tdemid.mo
-/opt/kde/share/locale/hr/LC_MESSAGES/tdemid.mo
-/opt/kde/share/locale/pl/LC_MESSAGES/tdemid.mo
-/opt/kde/share/locale/pt/LC_MESSAGES/tdemid.mo
-/opt/kde/share/locale/sk/LC_MESSAGES/tdemid.mo
-/opt/kde/share/locale/eo/LC_MESSAGES/tdemid.mo
-/opt/kde/share/locale/no/LC_MESSAGES/tdemid.mo
-/opt/kde/share/locale/sv/LC_MESSAGES/tdemid.mo
-/opt/kde/share/locale/pt_BR/LC_MESSAGES/tdemid.mo
-/opt/kde/share/locale/zh_CN.GB2312/LC_MESSAGES/tdemid.mo
-/opt/kde/share/locale/zh_TW.Big5/LC_MESSAGES/tdemid.mo
diff --git a/tdemid/tdemid_part.cpp b/tdemid/tdemid_part.cpp
index 81c31973..ae176f8c 100644
--- a/tdemid/tdemid_part.cpp
+++ b/tdemid/tdemid_part.cpp
@@ -1,6 +1,6 @@
#include "tdemid_part.h"
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kiconloader.h>
#include <tdelocale.h>
#include <tdeaboutdata.h>
@@ -73,26 +73,26 @@ TDEInstance *KMidFactory::instance()
widget = new tdemidClient(parentWidget, actionCollection());
widget->show();
- widget->setFocusPolicy(TQ_ClickFocus);
+ widget->setFocusPolicy(TQWidget::ClickFocus);
setWidget(widget);
// create and connect our actions
(void)new TDEAction(i18n("Play"), "media-playback-start", 0, this,
- TQT_SLOT(slotPlay()), actionCollection(),
+ TQ_SLOT(slotPlay()), actionCollection(),
"play");
(void)new TDEAction(i18n("Stop"), "media-playback-stop", 0, this,
- TQT_SLOT(slotStop()), actionCollection(),
+ TQ_SLOT(slotStop()), actionCollection(),
"stop");
(void)new TDEAction(i18n("Backward"),
"2leftarrow", 0, this,
- TQT_SLOT(slotBackward()), actionCollection(),
+ TQ_SLOT(slotBackward()), actionCollection(),
"backward");
(void)new TDEAction(i18n("Forward"),
"2rightarrow", 0, this,
- TQT_SLOT(slotForward()), actionCollection(),
+ TQ_SLOT(slotForward()), actionCollection(),
"forward");
m_extension = new KMidBrowserExtension(this);
@@ -111,7 +111,7 @@ bool KMidPart::openFile()
widget->openURL(m_file);
widget->stop();
widget->show();
- TQTimer::singleShot(2000, this, TQT_SLOT(slotPlay()));
+ TQTimer::singleShot(2000, this, TQ_SLOT(slotPlay()));
return true;
}
diff --git a/tdemid/tdemid_part.h b/tdemid/tdemid_part.h
index d15a341e..03c053ef 100644
--- a/tdemid/tdemid_part.h
+++ b/tdemid/tdemid_part.h
@@ -9,9 +9,9 @@ class TDEInstance;
class KMidBrowserExtension;
class tdemidClient;
-class KDE_EXPORT KMidFactory : public KParts::Factory
+class TDE_EXPORT KMidFactory : public KParts::Factory
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMidFactory();
@@ -19,7 +19,7 @@ class KDE_EXPORT KMidFactory : public KParts::Factory
virtual KParts::Part* createPartObject(TQWidget *parentWidget, const char *widgetName,
TQObject* parent = 0, const char* name = 0,
- const char* classname = TQOBJECT_OBJECT_NAME_STRING,
+ const char* classname = "TQObject",
const TQStringList &args = TQStringList());
static TDEInstance *instance();
@@ -31,7 +31,7 @@ class KDE_EXPORT KMidFactory : public KParts::Factory
class KMidPart: public KParts::ReadOnlyPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMidPart(TQWidget *parentWidget, const char *widgetName,
@@ -55,7 +55,7 @@ class KMidPart: public KParts::ReadOnlyPart
class KMidBrowserExtension : public KParts::BrowserExtension
{
- Q_OBJECT
+ TQ_OBJECT
friend class KMidPart;
public:
diff --git a/tdemid/tdemidclient.cpp b/tdemid/tdemidclient.cpp
index b05411bc..8579ae88 100644
--- a/tdemid/tdemidclient.cpp
+++ b/tdemid/tdemidclient.cpp
@@ -43,7 +43,7 @@
#include <tdeglobal.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurl.h>
#include <tdeaction.h>
#include <kdebug.h>
@@ -69,7 +69,7 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char
: DCOPObject("KMidIface"), TQWidget(parent,name)
{
actionCollection=ac;
- TDEConfig *cfg=kapp->config();
+ TDEConfig *cfg=tdeApp->config();
cfg->setGroup("KMid");
midifile_opened=0L;
loopsong=cfg->readNumEntry("Loop",0);
@@ -90,10 +90,10 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char
// currentsl=slman->getCollection(activecollection);
itsme=0;
m_kMid.pid=0;
- timebar = new TQSlider(0,240000,30000,60000,Qt::Horizontal, this);
+ timebar = new TQSlider(0,240000,30000,60000,TQt::Horizontal, this);
timebar->setSteps(30000,60000);
timebar->setValue(0);
- connect (timebar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotSeek(int)));
+ connect (timebar,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotSeek(int)));
timetags = new QSliderTime(timebar,this);
timetags->setMinimumSize(timetags->sizeHint());
@@ -109,14 +109,14 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char
tempoLCD->setDefaultValue(120);
tempoLCD->setUserSetDefaultValue(true);
tempoLCD->setMinimumSize(tempoLCD->sizeHint());
- connect(tempoLCD,TQT_SIGNAL(valueChanged(double)),this,TQT_SLOT(slotSetTempo(double)));
+ connect(tempoLCD,TQ_SIGNAL(valueChanged(double)),this,TQ_SLOT(slotSetTempo(double)));
- comboSongs = new TQComboBox(FALSE, this,"Songs");
- connect (comboSongs,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSelectSong(int)));
+ comboSongs = new TQComboBox(false, this,"Songs");
+ connect (comboSongs,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotSelectSong(int)));
comboSongs->setMinimumWidth(200);
- comboEncodings = new TQComboBox(FALSE, this, "Encodings");
- connect (comboEncodings,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSelectEncoding(int)));
+ comboEncodings = new TQComboBox(false, this, "Encodings");
+ connect (comboEncodings,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotSelectEncoding(int)));
comboEncodings->insertItem(i18n("Default"));
comboEncodings->insertStringList( TDEGlobal::charsets()->descriptiveEncodingNames() );
comboEncodings->setCurrentItem(0);
@@ -125,12 +125,12 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char
rhythmview->setMaximumHeight(7);
rhythmview->setMinimumHeight(7);
- volumebar = new TQSlider(0,200,10,100,Qt::Vertical, this );
+ volumebar = new TQSlider(0,200,10,100,TQt::Vertical, this );
volumebar->setSteps(10,20);
volumebar->setValue(100);
volumebar->setTickmarks(TQSlider::NoMarks);
volumebar->setTickInterval(50);
- connect (volumebar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotSetVolume(int)));
+ connect (volumebar,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotSetVolume(int)));
visiblevolumebar=cfg->readNumEntry("ShowVolumeBar",0);
if (visiblevolumebar) volumebar->show();
@@ -141,9 +141,9 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char
kdispt->show();
timer4timebar=new TQTimer(this);
- connect (timer4timebar,TQT_SIGNAL(timeout()),this,TQT_SLOT(timebarUpdate()));
+ connect (timer4timebar,TQ_SIGNAL(timeout()),this,TQ_SLOT(timebarUpdate()));
timer4events=new TQTimer(this);
- connect (timer4events,TQT_SIGNAL(timeout()),this,TQT_SLOT(processSpecialEvent()));
+ connect (timer4events,TQ_SIGNAL(timeout()),this,TQ_SLOT(processSpecialEvent()));
TQString samplefile =
TDEGlobal::dirs()->findAllResources("appdata", "fm/*.o3").last();
@@ -310,9 +310,9 @@ int tdemidClient::openFile(const char *filename)
midifile_opened=0L;
timebar->setRange(0,240000);
timebar->setValue(0);
- timetags->repaint(TRUE);
+ timetags->repaint(true);
kdispt->ClearEv();
- kdispt->repaint(TRUE);
+ kdispt->repaint(true);
topLevelWidget()->setCaption("KMid");
return -1;
@@ -327,7 +327,7 @@ int tdemidClient::openFile(const char *filename)
// noteArray=player->parseNotes();
noteArray=player->noteArray();
timebar->setRange(0,(int)(player->information()->millisecsTotal));
- timetags->repaint(TRUE);
+ timetags->repaint(true);
kdispt->ClearEv();
spev=player->specialEvents();
while (spev)
@@ -343,7 +343,7 @@ int tdemidClient::openFile(const char *filename)
kdispt->CursorToHome();
// kdispt->updateScrollBars();
emit mustRechooseTextEvent();
- kdispt->repaint(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);
@@ -372,10 +372,10 @@ int tdemidClient::openURL(const TQString _url)
filename = TQString("/tmp/") + u.filename();
TDEIO::Job *iojob = TDEIO::copy( u, KURL::fromPathOrURL( filename ) );
downloaded=false;
- connect( iojob, TQT_SIGNAL( result( TDEIO::Job *) ), this, TQT_SLOT(downloadFinished( TDEIO::Job * ) ) );
+ connect( iojob, TQ_SIGNAL( result( TDEIO::Job *) ), this, TQ_SLOT(downloadFinished( TDEIO::Job * ) ) );
if (!downloaded)
- kapp->enter_loop();
+ tdeApp->enter_loop();
deleteFile=true;
}
@@ -565,7 +565,7 @@ void tdemidClient::slotPlay()
int type;
ulong x=timeOfNextEvent(&type);
if (type!=0)
- timer4events->start(x,TRUE);
+ timer4events->start(x,true);
timer4timebar->start(1000);
@@ -669,12 +669,12 @@ void tdemidClient::slotSeek(int i)
int type;
ulong x=timeOfNextEvent(&type);
if (type!=0)
- timer4events->start(x-(currentmillisec-beginmillisec),TRUE);
+ timer4events->start(x-(currentmillisec-beginmillisec),true);
/*
if (spev==NULL) return;
ulong delaymillisec=spev->absmilliseconds-(currentmillisec-beginmillisec);
- timer4events->start(delaymillisec,TRUE);
+ timer4events->start(delaymillisec,true);
*/
m_kMid.pctl->OK=0;
@@ -892,7 +892,7 @@ void tdemidClient::slotPause()
int type;
ulong x=timeOfNextEvent(&type);
if (type!=0)
- timer4events->start(x-(currentmillisec-beginmillisec),TRUE);
+ timer4events->start(x-(currentmillisec-beginmillisec),true);
timer4timebar->start(1000);
if (noteArray!=NULL)
@@ -925,7 +925,7 @@ void tdemidClient::slotStop()
if (!shuttingdown)
{
- for (int i=0;i<16;i++) m_kMid.pctl->forcepgm[i]=FALSE;
+ for (int i=0;i<16;i++) m_kMid.pctl->forcepgm[i]=false;
if (channelView) channelView->reset();
if (tempoLCD)
{
@@ -1121,7 +1121,7 @@ void tdemidClient::processSpecialEvent()
if (delaymillisec<10) processNext=1;
}
- if (delaymillisec!=~(long)0) timer4events->start(delaymillisec,TRUE);
+ if (delaymillisec!=~(long)0) timer4events->start(delaymillisec,true);
}
@@ -1129,7 +1129,7 @@ void tdemidClient::repaintText(int type)
{
kdispt->ChangeTypeOfTextEvents(type);
typeoftextevents=type;
- kdispt->repaint(TRUE);
+ kdispt->repaint(true);
}
int tdemidClient::ChooseTypeOfTextEvents(void)
@@ -1265,11 +1265,11 @@ void tdemidClient::slotSelectSong(int i)
player->removeSong();
timebar->setRange(0,240000);
timebar->setValue(0);
- timetags->repaint(TRUE);
+ timetags->repaint(true);
kdispt->ClearEv();
- kdispt->repaint(TRUE);
+ kdispt->repaint(true);
comboSongs->clear();
- comboSongs->repaint(TRUE);
+ comboSongs->repaint(true);
topLevelWidget()->setCaption("KMid");
return;
}
@@ -1373,8 +1373,8 @@ void tdemidClient::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(channelView,TQ_SIGNAL(signalToKMidClient(int *)),this,TQ_SLOT(communicationFromChannelView(int *)));
+ connect(tdeApp,TQ_SIGNAL(shutDown()),parentWidget(),TQ_SLOT(shuttingDown()));
}
else if ((channelView!=NULL)&&(i==0))
@@ -1410,7 +1410,7 @@ void tdemidClient::rethinkNextEvent(void)
currentmillisec=tv.tv_sec*1000+tv.tv_usec/1000;
delaymillisec=x-(currentmillisec-beginmillisec);
- timer4events->start(delaymillisec,TRUE);
+ timer4events->start(delaymillisec,true);
}
void tdemidClient::communicationFromChannelView(int *i)
@@ -1487,7 +1487,7 @@ void tdemidClient::slotSetTempo(double value)
timebar->setRange(0,(int)(player->information()->millisecsTotal));
timebar->setValue(pausedatmillisec);
- timetags->repaint(TRUE);
+ timetags->repaint(true);
kdispt->ClearEv(false);
@@ -1519,7 +1519,7 @@ void tdemidClient::slotSetTempo(double value)
void tdemidClient::downloadFinished(TDEIO::Job *)
{
downloaded=true;
- kapp->exit_loop();
+ tdeApp->exit_loop();
}
TQSize tdemidClient::sizeHint() const
diff --git a/tdemid/tdemidclient.h b/tdemid/tdemidclient.h
index a5ebd4c9..15ffda08 100644
--- a/tdemid/tdemidclient.h
+++ b/tdemid/tdemidclient.h
@@ -54,7 +54,7 @@ class TQString;
class tdemidClient : public TQWidget, virtual public KMidIface
{
- Q_OBJECT
+ TQ_OBJECT
private:
#ifdef TDEMidDEBUG
diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp
index fbfaa4c0..aa10a6e4 100644
--- a/tdemid/tdemidframe.cpp
+++ b/tdemid/tdemidframe.cpp
@@ -68,73 +68,73 @@ tdemidFrame::tdemidFrame(const char *name)
/*
kKeysAccel=new TDEAccel(this);
kKeysAccel->insertItem(i18n("Play/Pause"),"Play/Pause", Key_Space);
- kKeysAccel->connectItem("Play/Pause", TQT_TQOBJECT(this), TQT_SLOT(spacePressed()));
+ kKeysAccel->connectItem("Play/Pause", this, TQ_SLOT(spacePressed()));
kKeysAccel->insertItem(i18n("Stop"),"Stop", Key_Backspace);
- kKeysAccel->connectItem("Stop",tdemidclient,TQT_SLOT(song_Stop()));
+ kKeysAccel->connectItem("Stop",tdemidclient,TQ_SLOT(song_Stop()));
kKeysAccel->insertItem(i18n("Previous Song"),"Previous Song", Key_Left);
- kKeysAccel->connectItem("Previous Song",tdemidclient,TQT_SLOT(song_PlayPrevSong()));
+ kKeysAccel->connectItem("Previous Song",tdemidclient,TQ_SLOT(song_PlayPrevSong()));
kKeysAccel->insertItem(i18n("Next Song"),"Next Song", Key_Right);
- kKeysAccel->connectItem("Next Song",tdemidclient,TQT_SLOT(song_PlayNextSong()));
+ kKeysAccel->connectItem("Next Song",tdemidclient,TQ_SLOT(song_PlayNextSong()));
kKeysAccel->insertItem(i18n("Scroll Down Karaoke"),"Scroll down karaoke",Key_Down);
- kKeysAccel->connectItem("Scroll Down karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollDown()));
+ kKeysAccel->connectItem("Scroll Down karaoke",tdemidclient->getKDisplayText(),TQ_SLOT(ScrollDown()));
kKeysAccel->insertItem(i18n("Scroll Up Karaoke"),"Scroll up karaoke",Key_Up);
- kKeysAccel->connectItem("Scroll Up Karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollUp()));
+ kKeysAccel->connectItem("Scroll Up Karaoke",tdemidclient->getKDisplayText(),TQ_SLOT(ScrollUp()));
kKeysAccel->insertItem(i18n("Scroll Page Down Karaoke"),"Scroll page down karaoke",Key_PageDown);
- kKeysAccel->connectItem("Scroll Page Down Karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollPageDown()));
+ kKeysAccel->connectItem("Scroll Page Down Karaoke",tdemidclient->getKDisplayText(),TQ_SLOT(ScrollPageDown()));
kKeysAccel->insertItem(i18n("Scroll Page Up Karaoke"),"Scroll page up karaoke",Key_PageUp);
- kKeysAccel->connectItem("Scroll Page Up Karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollPageUp()));
+ kKeysAccel->connectItem("Scroll Page Up Karaoke",tdemidclient->getKDisplayText(),TQ_SLOT(ScrollPageUp()));
kKeysAccel->readSettings();
*/
- KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_Open()), actionCollection());
- (void)new TDEAction(i18n("&Save Lyrics..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics");
- KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+ KStdAction::open(this, TQ_SLOT(file_Open()), actionCollection());
+ (void)new TDEAction(i18n("&Save Lyrics..."), 0, this,
+ TQ_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics");
+ KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
(void)new TDEAction(i18n("&Play"), "media-playback-start", TQt::Key_Space,
- TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotPlay()), actionCollection(), "song_play");
- (void)new TDEAction(i18n("P&ause"), "media-playback-pause", TQt::Key_P, TQT_TQOBJECT(tdemidclient),
- TQT_SLOT(slotPause()), actionCollection(), "song_pause");
+ tdemidclient, TQ_SLOT(slotPlay()), actionCollection(), "song_play");
+ (void)new TDEAction(i18n("P&ause"), "media-playback-pause", TQt::Key_P, tdemidclient,
+ TQ_SLOT(slotPause()), actionCollection(), "song_pause");
(void)new TDEAction(i18n("&Stop"), "media-playback-stop", TQt::Key_Backspace,
- TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotStop()), actionCollection(), "song_stop");
+ tdemidclient, TQ_SLOT(slotStop()), actionCollection(), "song_stop");
(void)new TDEAction(i18n("P&revious Song"), "media-skip-backward", Key_Left,
- TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotPrevSong()), actionCollection(),
+ tdemidclient, TQ_SLOT(slotPrevSong()), actionCollection(),
"song_previous");
(void)new TDEAction(i18n("&Next Song"), "media-skip-forward", Key_Right,
- TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotNextSong()), actionCollection(),
+ tdemidclient, TQ_SLOT(slotNextSong()), actionCollection(),
"song_next");
- (void)new TDEToggleAction(i18n("&Loop"), 0, TQT_TQOBJECT(this), TQT_SLOT(song_Loop()),
+ (void)new TDEToggleAction(i18n("&Loop"), 0, this, TQ_SLOT(song_Loop()),
actionCollection(), "song_loop");
- (void)new TDEAction(i18n("Rewind"), "2leftarrow", 0, TQT_TQOBJECT(tdemidclient),
- TQT_SLOT(slotRewind()), actionCollection(), "song_rewind");
+ (void)new TDEAction(i18n("Rewind"), "2leftarrow", 0, tdemidclient,
+ TQ_SLOT(slotRewind()), actionCollection(), "song_rewind");
- (void)new TDEAction(i18n("Forward"), "2rightarrow", 0, TQT_TQOBJECT(tdemidclient),
- TQT_SLOT(slotForward()), actionCollection(), "song_forward");
+ (void)new TDEAction(i18n("Forward"), "2rightarrow", 0, tdemidclient,
+ TQ_SLOT(slotForward()), actionCollection(), "song_forward");
- (void)new TDEAction(i18n("&Organize..."), 0, TQT_TQOBJECT(this), TQT_SLOT(collect_organize()),
+ (void)new TDEAction(i18n("&Organize..."), 0, this, TQ_SLOT(collect_organize()),
actionCollection(), "collect_organize");
TQStringList playmodes;
playmodes.append(i18n("In Order"));
playmodes.append(i18n("Shuffle"));
- TDESelectAction *act=new TDESelectAction(i18n("Play Order"), 0, /*this, TQT_SLOT(collect_PlayOrder(int)),*/
+ TDESelectAction *act=new TDESelectAction(i18n("Play Order"), 0, /*this, TQ_SLOT(collect_PlayOrder(int)),*/
actionCollection(), "play_order");
- connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(collect_PlayOrder(int)));
+ connect(act,TQ_SIGNAL(activated(int)),this, TQ_SLOT(collect_PlayOrder(int)));
act->setItems(playmodes);
- (void)new TDEToggleAction(i18n("Auto-Add to Collection"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(collect_AutoAdd()), actionCollection(), "collect_autoadd");
+ (void)new TDEToggleAction(i18n("Auto-Add to Collection"), 0, this,
+ TQ_SLOT(collect_AutoAdd()), actionCollection(), "collect_autoadd");
playmodes.clear();
playmodes.append(i18n("&General MIDI"));
playmodes.append(i18n("&MT-32"));
- act=new TDESelectAction(i18n("File Type"), 0,/* this, TQT_SLOT(options_FileType(int)),*/
+ act=new TDESelectAction(i18n("File Type"), 0,/* this, TQ_SLOT(options_FileType(int)),*/
actionCollection(), "file_type");
- connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(options_FileType(int)));
+ connect(act,TQ_SIGNAL(activated(int)),this, TQ_SLOT(options_FileType(int)));
act->setItems(playmodes);
playmodes.clear();
@@ -142,40 +142,40 @@ tdemidFrame::tdemidFrame(const char *name)
playmodes.append(i18n("&Lyric Events"));
act=new TDESelectAction(i18n("Display Events"), Key_T, /*this,
- TQT_SLOT(options_DisplayEvents(int)),*/ actionCollection(),
+ TQ_SLOT(options_DisplayEvents(int)),*/ actionCollection(),
"display_events");
- connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(options_DisplayEvents(int)));
+ connect(act,TQ_SIGNAL(activated(int)),this, TQ_SLOT(options_DisplayEvents(int)));
act->setItems(playmodes);
- (void)new TDEToggleAction(i18n("Automatic Text Chooser"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(options_AutomaticText()), actionCollection(),
+ (void)new TDEToggleAction(i18n("Automatic Text Chooser"), 0, this,
+ TQ_SLOT(options_AutomaticText()), actionCollection(),
"option_automatictext");
TDEToggleAction* togact = new TDEToggleAction(i18n("Show &Volume Bar"), "volume",
- 0, TQT_TQOBJECT(this), TQT_SLOT(options_ShowVolumeBar()), actionCollection(),
+ 0, this, TQ_SLOT(options_ShowVolumeBar()), actionCollection(),
"toggle_volumebar");
togact->setCheckedState(i18n("Hide &Volume Bar"));
togact = new TDEToggleAction(i18n("Show &Channel View"), "piano",
- 0, TQT_TQOBJECT(this), TQT_SLOT(options_ShowChannelView()), actionCollection(),
+ 0, this, TQ_SLOT(options_ShowChannelView()), actionCollection(),
"toggle_channelview");
togact->setCheckedState(i18n("Hide &Channel View"));
- (void)new TDEAction(i18n("Channel View &Options..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(options_ChannelViewOptions()), actionCollection(),
+ (void)new TDEAction(i18n("Channel View &Options..."), 0, this,
+ TQ_SLOT(options_ChannelViewOptions()), actionCollection(),
"channelview_options");
- (void)new TDEAction(i18n("&Font Change..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(options_FontChange()), actionCollection(),
+ (void)new TDEAction(i18n("&Font Change..."), 0, this,
+ TQ_SLOT(options_FontChange()), actionCollection(),
"change_font");
- (void)new TDEAction(i18n("MIDI &Setup..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(options_MidiSetup()), actionCollection(), "midi_setup");
+ (void)new TDEAction(i18n("MIDI &Setup..."), 0, this,
+ TQ_SLOT(options_MidiSetup()), actionCollection(), "midi_setup");
setupGUI((ToolBar | Keys | StatusBar | Save | Create ), "tdemidui.rc" );
- TDEConfig *cfg=kapp->config();
+ TDEConfig *cfg=tdeApp->config();
cfg->setGroup("KMid");
TDESelectAction *tmplistaction=
((TDESelectAction*)actionCollection()->action("display_events"));
@@ -212,14 +212,14 @@ tdemidFrame::tdemidFrame(const char *name)
setAcceptDrops(true);
- connect( tdemidclient, TQT_SIGNAL( mustRechooseTextEvent() ),
- this, TQT_SLOT( rechooseTextEvent() ) );
+ connect( tdemidclient, TQ_SIGNAL( mustRechooseTextEvent() ),
+ this, TQ_SLOT( rechooseTextEvent() ) );
- connect( tdemidclient, TQT_SIGNAL( stopPause() ),
- this, TQT_SLOT( song_stopPause() ) );
+ connect( tdemidclient, TQ_SIGNAL( stopPause() ),
+ this, TQ_SLOT( song_stopPause() ) );
-// connect( tdemidclient, TQT_SIGNAL( channelView_Destroyed() ),
-// this, TQT_SLOT( channelViewDestroyed() ) );
+// connect( tdemidclient, TQ_SIGNAL( channelView_Destroyed() ),
+// this, TQ_SLOT( channelViewDestroyed() ) );
TDECmdLineArgs * args = TDECmdLineArgs::parsedArgs();
@@ -230,7 +230,7 @@ tdemidFrame::tdemidFrame(const char *name)
cfg->writeEntry("AutoAddToCollection",0);
char ttt[40];
- sprintf(ttt,"%d",kapp->argc());
+ sprintf(ttt,"%d",tdeApp->argc());
int i=0;
int c=autoAddSongToCollection( args->url( 0 ).path() , 1 );
i++;
@@ -242,7 +242,7 @@ tdemidFrame::tdemidFrame(const char *name)
tdemidclient->setActiveCollection(c);
- /// tdemidclient->openURL((kapp->argv())[1]);
+ /// tdemidclient->openURL((tdeApp->argv())[1]);
/* if ((cfg->readNumEntry("AutomaticTextEventChooser",1))==1)
{
if (tdemidclient->ChooseTypeOfTextEvents()==1)
@@ -258,11 +258,11 @@ tdemidFrame::tdemidFrame(const char *name)
/*
kKeys->addKey("Play/Pause",Key_Space);
kKeys->registerWidget("KMidFrame",this);
- kKeys->connectFunction("KMidFrame","Play/Pause",this,TQT_SLOT(spacePressed()));
+ kKeys->connectFunction("KMidFrame","Play/Pause",this,TQ_SLOT(spacePressed()));
*/
// kKeysAccel->writeSettings(cfg);
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
if (!client->isRegistered()) // just in case we're embeeded
{
client->attach();
@@ -304,7 +304,7 @@ void tdemidFrame::song_stopPause()
void tdemidFrame::options_FileType(int i)
{
- TDEConfig *cfg=kapp->config();
+ TDEConfig *cfg=tdeApp->config();
cfg->setGroup("KMid");
cfg->writeEntry("TypeOfMidiFile",i);
tdemidclient->setSongType(1-i);
@@ -312,7 +312,7 @@ void tdemidFrame::options_FileType(int i)
void tdemidFrame::options_DisplayEvents(int i)
{
- TDEConfig *cfg=kapp->config();
+ TDEConfig *cfg=tdeApp->config();
cfg->setGroup("KMid");
cfg->writeEntry("TypeOfTextEvents",(i==0)?1:5);
cfg->sync();
@@ -321,7 +321,7 @@ void tdemidFrame::options_DisplayEvents(int i)
void tdemidFrame::options_AutomaticText()
{
- TDEConfig *cfg=kapp->config();
+ TDEConfig *cfg=tdeApp->config();
cfg->setGroup("KMid");
cfg->writeEntry("AutomaticTextEventChooser",1-cfg->readNumEntry("AutomaticTextEventChooser",1));
}
@@ -333,7 +333,7 @@ void tdemidFrame::options_FontChange()
font=*tdemidclient->getFont();
kfd->getFont(font);
delete kfd;
- TDEConfig *cfg=kapp->config();
+ TDEConfig *cfg=tdeApp->config();
cfg->setGroup("KMid");
cfg->writeEntry("KaraokeFont",font);
cfg->sync();
@@ -345,7 +345,7 @@ int tdemidFrame::autoAddSongToCollection(const TQString& filename,int setactive)
int r;
SLManager *slman;
SongList *sl;
- TDEConfig *cfg=kapp->config();
+ TDEConfig *cfg=tdeApp->config();
cfg->setGroup("KMid");
if (cfg->readNumEntry("AutoAddToCollection",0)==0)
{
@@ -474,7 +474,7 @@ void tdemidFrame::options_MidiSetup()
dlg=new MidiConfigDialog(tdemidclient->devman(),NULL,"MidiDialog");
if (dlg->exec() == TQDialog::Accepted)
{
- TDEConfig *cfg=kapp->config();
+ TDEConfig *cfg=tdeApp->config();
cfg->setGroup("KMid");
cfg->writeEntry("MidiPortNumber",MidiConfigDialog::selecteddevice);
tdemidclient->setMidiDevice(MidiConfigDialog::selecteddevice);
@@ -509,7 +509,7 @@ delete dlg;
void tdemidFrame::rechooseTextEvent()
{
- TDEConfig *cfg=kapp->config();
+ TDEConfig *cfg=tdeApp->config();
cfg->setGroup("KMid");
if ((cfg->readNumEntry("AutomaticTextEventChooser",1))==1)
{
@@ -524,7 +524,7 @@ void tdemidFrame::rechooseTextEvent()
void tdemidFrame::song_Loop()
{
- TDEConfig *cfg=kapp->config();
+ TDEConfig *cfg=tdeApp->config();
cfg->setGroup("KMid");
int i=1-cfg->readNumEntry("Loop",0);
cfg->writeEntry("Loop",i);
@@ -534,7 +534,7 @@ void tdemidFrame::song_Loop()
void tdemidFrame::collect_PlayOrder(int i)
{
- TDEConfig *cfg=kapp->config();
+ TDEConfig *cfg=tdeApp->config();
cfg->setGroup("KMid");
cfg->writeEntry("CollectionPlayMode", i);
cfg->sync();
@@ -543,7 +543,7 @@ void tdemidFrame::collect_PlayOrder(int i)
void tdemidFrame::collect_AutoAdd()
{
- TDEConfig *cfg=kapp->config();
+ TDEConfig *cfg=tdeApp->config();
cfg->setGroup("KMid");
cfg->writeEntry("AutoAddToCollection",1-cfg->readNumEntry("AutoAddToCollection",0));
cfg->sync();
@@ -584,7 +584,7 @@ void tdemidFrame::spacePressed()
}
void tdemidFrame::options_ShowVolumeBar()
{
- TDEConfig *cfg=kapp->config();
+ TDEConfig *cfg=tdeApp->config();
cfg->setGroup("KMid");
int i=1-cfg->readNumEntry("ShowVolumeBar",0);
cfg->writeEntry("ShowVolumeBar",i);
@@ -599,7 +599,7 @@ void tdemidFrame::options_ShowChannelView()
} else
{
tdemidclient->visibleChannelView(1);
- connect (tdemidclient->getChannelView(),TQT_SIGNAL(destroyMe()),this,TQT_SLOT(channelViewDestroyed()));
+ connect (tdemidclient->getChannelView(),TQ_SIGNAL(destroyMe()),this,TQ_SLOT(channelViewDestroyed()));
}
}
diff --git a/tdemid/tdemidframe.h b/tdemid/tdemidframe.h
index bba4e6f7..247e6745 100644
--- a/tdemid/tdemidframe.h
+++ b/tdemid/tdemidframe.h
@@ -39,9 +39,9 @@ class TDEToolBar;
class TQDragEvent;
class TDEAccel;
-class KDE_EXPORT tdemidFrame : public TDEMainWindow
+class TDE_EXPORT tdemidFrame : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
private:
#ifdef TDEMidDEBUG
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 12:46:43 +0000