summaryrefslogtreecommitdiffstats
path: root/tdemid
diff options
context:
space:
mode:
Diffstat (limited to 'tdemid')
-rw-r--r--tdemid/channel.cpp2
-rw-r--r--tdemid/channelview.cpp4
-rw-r--r--tdemid/midicfgdlg.cpp2
-rw-r--r--tdemid/tdemid.spec62
-rw-r--r--tdemid/tdemidclient.cpp10
-rw-r--r--tdemid/tdemidframe.cpp32
6 files changed, 25 insertions, 87 deletions
diff --git a/tdemid/channel.cpp b/tdemid/channel.cpp
index 0b03ddc0..3cda48dd 100644
--- a/tdemid/channel.cpp
+++ b/tdemid/channel.cpp
@@ -32,7 +32,7 @@
#include <kinstance.h>
#include <tdeconfig.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "tdemidbutton.h"
#include "channel.h"
diff --git a/tdemid/channelview.cpp b/tdemid/channelview.cpp
index 32f6472a..140d6a7e 100644
--- a/tdemid/channelview.cpp
+++ b/tdemid/channelview.cpp
@@ -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;
diff --git a/tdemid/midicfgdlg.cpp b/tdemid/midicfgdlg.cpp
index 010e8f42..9a801bed 100644
--- a/tdemid/midicfgdlg.cpp
+++ b/tdemid/midicfgdlg.cpp
@@ -35,7 +35,7 @@
#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,
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/tdemidclient.cpp b/tdemid/tdemidclient.cpp
index dc6f09ae..1c7290db 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);
@@ -375,7 +375,7 @@ int tdemidClient::openURL(const TQString _url)
connect( iojob, TQ_SIGNAL( result( TDEIO::Job *) ), this, TQ_SLOT(downloadFinished( TDEIO::Job * ) ) );
if (!downloaded)
- kapp->enter_loop();
+ tdeApp->enter_loop();
deleteFile=true;
}
@@ -1374,7 +1374,7 @@ void tdemidClient::visibleChannelView(int i)
}
channelView->show();
connect(channelView,TQ_SIGNAL(signalToKMidClient(int *)),this,TQ_SLOT(communicationFromChannelView(int *)));
- connect(kapp,TQ_SIGNAL(shutDown()),parentWidget(),TQ_SLOT(shuttingDown()));
+ connect(tdeApp,TQ_SIGNAL(shutDown()),parentWidget(),TQ_SLOT(shuttingDown()));
}
else if ((channelView!=NULL)&&(i==0))
@@ -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/tdemidframe.cpp b/tdemid/tdemidframe.cpp
index 88069499..aa10a6e4 100644
--- a/tdemid/tdemidframe.cpp
+++ b/tdemid/tdemidframe.cpp
@@ -89,7 +89,7 @@ tdemidFrame::tdemidFrame(const char *name)
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(kapp, TQ_SLOT(quit()), actionCollection());
+ KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
(void)new TDEAction(i18n("&Play"), "media-playback-start", TQt::Key_Space,
tdemidclient, TQ_SLOT(slotPlay()), actionCollection(), "song_play");
@@ -175,7 +175,7 @@ tdemidFrame::tdemidFrame(const char *name)
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"));
@@ -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)
@@ -262,7 +262,7 @@ tdemidFrame::tdemidFrame(const char *name)
*/
// 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);