Additional k => tde renaming and fixes

7 files changed, 40 insertions, 40 deletions

diff --git a/tdemid/Makefile.am b/tdemid/Makefile.am
index 5984d23e..fe5b2b3a 100644
--- a/tdemid/Makefile.am
+++ b/tdemid/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libtdemidpart.la
 lib_LTLIBRARIES = libtdemidlib.la
 
 libtdemidlib_la_LDFLAGS = $(all_libraries)
-libtdemidlib_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_KIO) -ltdemid $(LIB_QT) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE)
+libtdemidlib_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TDEIO) -ltdemid $(LIB_QT) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE)
 
 libtdemidpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 libtdemidpart_la_LIBADD = libtdemidlib.la
@@ -28,7 +28,7 @@ noinst_HEADERS = tdemidframe.h tdemidclient.h kdisptext.h \
         channelcfgdlg.h instrname.h rhythmview.h \
         songlist.h slman.h tdemid_part.h
 
-tdemid_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdemid_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 tdemid_SOURCES = main.cpp
 tdemid_LDADD   = libtdemidlib.la
 
diff --git a/tdemid/tdemidIface.h b/tdemid/tdemidIface.h
index 8bba2575..f9ad207f 100644
--- a/tdemid/tdemidIface.h
+++ b/tdemid/tdemidIface.h
@@ -1,5 +1,5 @@
-#ifndef _KMIDIFACE_H_
-#define _KMIDIFACE_H_
+#ifndef _TDEMIDIFACE_H_
+#define _TDEMIDIFACE_H_
 
 #include <dcopobject.h>
 
diff --git a/tdemid/tdemid_part.h b/tdemid/tdemid_part.h
index e2f07af1..d15a341e 100644
--- a/tdemid/tdemid_part.h
+++ b/tdemid/tdemid_part.h
@@ -1,5 +1,5 @@
-#ifndef __KMIDPART_H__
-#define __KMIDPART_H__
+#ifndef __TDEMIDPART_H__
+#define __TDEMIDPART_H__
 
 #include <tdeparts/browserextension.h>
 #include <tdeparts/factory.h>
diff --git a/tdemid/tdemidclient.cpp b/tdemid/tdemidclient.cpp
index fa59e749..b05411bc 100644
--- a/tdemid/tdemidclient.cpp
+++ b/tdemid/tdemidclient.cpp
@@ -185,7 +185,7 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char
     tdeconf->setGroup("Midimapper");
     TQCString qs=TQFile::encodeName(tdeconf->readPathEntry("Loadfile","gm.map"));
 
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
     printf("Read Config file: %s\n",qs.data());
 #endif
     setMidiMapFilename(qs.data());
@@ -321,7 +321,7 @@ int tdemidClient::openFile(const char *filename)
     if (midifile_opened) delete midifile_opened;
     midifile_opened=new char[strlen(filename)+1];
     strcpy(midifile_opened,filename);
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
     printf("TOTAL TIME: %g milliseconds\n",player->information()->millisecsTotal);
 #endif
     //    noteArray=player->parseNotes();
@@ -530,7 +530,7 @@ void tdemidClient::slotPlay()
     m_kMid.pctl->error=0;
     m_kMid.pctl->SPEVplayed=0;
     m_kMid.pctl->SPEVprocessed=0;
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
     passcount=0;
 #endif
     noteArray->iteratorBegin();
@@ -538,11 +538,11 @@ void tdemidClient::slotPlay()
     TQApplication::flushX();
     if ((m_kMid.pid=fork())==0)
     {
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
         printf("PlayerProcessID: %d\n",getpid());
 #endif
         player->play(0,(void (*)(void))tdemidOutput);
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
         printf("End of child process\n");
 #endif
         _exit(0);
@@ -551,7 +551,7 @@ void tdemidClient::slotPlay()
 
 
     spev=player->specialEvents();
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
     printf("writing SPEV\n");
     player->debugSpecialEvents();
     printf("writing SPEV(END)\n");
@@ -569,7 +569,7 @@ void tdemidClient::slotPlay()
 
     timer4timebar->start(1000);
 
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
     printf("PlayerProcess: %d . ParentProcessID: %d\n",m_kMid.pid,getpid());
     printf("******************************-\n");
 #endif
@@ -620,7 +620,7 @@ void tdemidClient::slotSeek(int i)
     if (m_kMid.pid!=0)
     {
         kill(m_kMid.pid,SIGTERM);
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
         printf("Waiting for Process %d to be killed\n",m_kMid.pid);
 #endif
         waitpid(m_kMid.pid, NULL, 0);
@@ -630,7 +630,7 @@ void tdemidClient::slotSeek(int i)
     allNotesOff();
 
 
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
     printf("change Time: %d\n",i);
 #endif
 
@@ -648,13 +648,13 @@ void tdemidClient::slotSeek(int i)
     TQApplication::flushX();
     if ((m_kMid.pid=fork())==0)
     {
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
         printf("Player_ProcessID: %d\n",getpid());
 #endif
 
         player->play(0,(void (*)(void))tdemidOutput);
 
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
         printf("End of child process\n");
 #endif
         _exit(0);
@@ -687,7 +687,7 @@ void tdemidClient::slotSeek(int i)
 
 void tdemidClient::moveEventPointersTo(ulong ms)
 {
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
     printf("Move To: %lu\n",ms);
 #endif
     spev=player->specialEvents();
@@ -812,7 +812,7 @@ void tdemidClient::slotNextSong()
      int r;
      while ((r=1+(int) ((double)(currentsl->NumberOfSongs())*rand()/(RAND_MAX+1.0)))==currentsl->getActiveSongID()) ;
 
-     #ifdef KMidDEBUG
+     #ifdef TDEMidDEBUG
      printf("random number:%d\n",r);
      #endif
      currentsl->setActiveSong(r);
@@ -838,7 +838,7 @@ void tdemidClient::slotNextSong()
 void tdemidClient::slotPause()
 {
     if (m_kMid.pctl->playing==0) return;
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
     printf("song Pause\n");
 #endif
     if (m_kMid.pctl->paused==0)
@@ -869,11 +869,11 @@ void tdemidClient::slotPause()
 	TQApplication::flushX();
         if ((m_kMid.pid=fork())==0)
         {
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
             printf("PlayerProcessID: %d\n",getpid());
 #endif
             player->play(0,(void (*)(void))tdemidOutput);
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
             printf("End of child process\n");
 #endif
             _exit(0);
@@ -938,13 +938,13 @@ void tdemidClient::slotStop()
     if (m_kMid.pctl->playing==0) return;
 
     if (m_kMid.pctl->paused) return;
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
     printf("song Stop\n");
 #endif
     if (m_kMid.pid!=0)
     {
         kill(m_kMid.pid,SIGTERM);
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
 	printf("Killing\n");
 #endif
         waitpid(m_kMid.pid, NULL, 0);
@@ -1015,7 +1015,7 @@ void tdemidClient::tdemidOutput(void)
             char *text=new char[ev->length+1];
             strncpy(text,(char *)ev->data,ev->length);
             text[ev->length]=0;
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
             printf("%s , played at: %ld\n",text,currentmillisec-beginmillisec);
 #endif
         }
@@ -1040,7 +1040,7 @@ void tdemidClient::processSpecialEvent()
     }
 */
 
-//#ifdef KMidDEBUG
+//#ifdef TDEMidDEBUG
 //    printf(":::: %ld",passcount++);
 //    printf("%d %s %ld",spev->type,spev->text,spev->absmilliseconds);
 //#endif
@@ -1071,7 +1071,7 @@ void tdemidClient::processSpecialEvent()
             else if (spev->type==3)
             {
                 tempoLCD->display(tempoToMetronomeTempo(spev->tempo));
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
                 printf("Changing lcd tempo: spev->tempo: %d , ratio: %.9g\n",spev->tempo,m_kMid.pctl->ratioTempo);
                 printf("Result: %g %.9g %d\n",tempoToMetronomeTempo(spev->tempo),tempoToMetronomeTempo(spev->tempo),(int)tempoToMetronomeTempo(spev->tempo));
 #endif
@@ -1084,7 +1084,7 @@ void tdemidClient::processSpecialEvent()
             }
             else if (spev->type==7)
             {
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
                 printf("Beat: %d/%d\n",spev->num,spev->den);
 #endif
                 rhythmview->Beat(spev->num);
@@ -1255,7 +1255,7 @@ void tdemidClient::slotSelectSong(int i)
     i++;
     if ((i<=0))  // The collection may be empty, or it may be just a bug :-)
     {
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
         printf("Empty\n");
 #endif
         emit stopPause();
@@ -1323,7 +1323,7 @@ void tdemidClient::setCollectionPlayMode(int i)
 void tdemidClient::saveCollections(void)
 {
     if (slman==NULL) return;
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
     printf("Saving collections in: %s\n",collectionsfile.ascii());
 #endif
     slman->saveConfig(TQFile::encodeName(collectionsfile));
@@ -1450,7 +1450,7 @@ void tdemidClient::slotSetTempo(double value)
         return;
     }
 
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
     printf("Change tempo to %g\n",value);
 #endif
     int autocontplaying=0;
@@ -1471,7 +1471,7 @@ void tdemidClient::slotSetTempo(double value)
     sprintf(s,"%g",ratio);
     if (strcmp(s,"1")!=0) tempoLCD->setLCDColor (255,100,100);
     else tempoLCD->setLCDColor (100,255,100);
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
     printf("ratio: (%.9g = %g ) tempo now: %g , new tempo %g\n",ratio,ratio,tempoToMetronomeTempo(m_kMid.pctl->tempo),value);
     printf("OldValue: %g , value %g\n",tempoLCD->getOldValue(),value);
 #endif
@@ -1479,7 +1479,7 @@ void tdemidClient::slotSetTempo(double value)
     if (m_kMid.pctl->paused==1)
     {
         pausedatmillisec=(long)(((double)pausedatmillisec/m_kMid.pctl->ratioTempo)*ratio);
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
         printf("pausedat: %ld\n",pausedatmillisec);
 #endif
     }
diff --git a/tdemid/tdemidclient.h b/tdemid/tdemidclient.h
index 65fa4e36..a5ebd4c9 100644
--- a/tdemid/tdemidclient.h
+++ b/tdemid/tdemidclient.h
@@ -21,8 +21,8 @@
     or to Antonio Larrosa, Rio Arnoya, 10 5B, 29006 Malaga, Spain
 
 ***************************************************************************/
-#ifndef _KMIDCLIENT_H
-#define _KMIDCLIENT_H
+#ifndef _TDEMIDCLIENT_H
+#define _TDEMIDCLIENT_H
 
 #include "qslidertime.h"
 #include <libtdemid/player.h>
@@ -57,7 +57,7 @@ class tdemidClient : public TQWidget, virtual public KMidIface
     Q_OBJECT
   
 private:
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
     long passcount;
 #endif
 
diff --git a/tdemid/tdemidframe.h b/tdemid/tdemidframe.h
index fe8c5aef..bba4e6f7 100644
--- a/tdemid/tdemidframe.h
+++ b/tdemid/tdemidframe.h
@@ -21,8 +21,8 @@
     or to Antonio Larrosa, Rio Arnoya, 10 5B, 29006 Malaga, Spain
 
 ***************************************************************************/
-#ifndef _KMIDFRAME_H
-#define _KMIDFRAME_H
+#ifndef _TDEMIDFRAME_H
+#define _TDEMIDFRAME_H
 
 #include <tdemainwindow.h>
 #include <tdemenubar.h>
@@ -44,7 +44,7 @@ class KDE_EXPORT tdemidFrame : public TDEMainWindow
     Q_OBJECT
   
 private:
-#ifdef KMidDEBUG
+#ifdef TDEMidDEBUG
     long passcount;
 #endif
 
diff --git a/tdemid/version.h b/tdemid/version.h
index b2416c18..ed1090c6 100644
--- a/tdemid/version.h
+++ b/tdemid/version.h
@@ -29,7 +29,7 @@
 
 // And now, DEBUG messages :
 #ifdef WORKING
-#define KMidDEBUG
+#define TDEMidDEBUG
 //#define KDISPTEXTDEBUG
 //#define COLLECTDLGDEBUG
 //#define DEVICEMANDEBUG